Commit Graph

477 Commits

Author SHA1 Message Date
tkrokli
34d310aff8 Core/Scripts: remove hardcoded text from npc_sayge
- remove hardcoded (and wrong) text from the script
- copy valid text from broadcast_text to gossip_menu_option
- gossip_menu / npc_text is already correct in TDB 335.61
- sort + clean up core script enum list and add new entries
- keep gossip handling unchanged in the script (low prio)

(cherry picked from commit 582af02509)

Core/Scripts/DB: move npc_gregan_brewspewer to DB

- Remove npc_gregan_brewspewer, thereby removing hardcoded text
`#define GOSSIP_HELLO "Buy somethin', will ya?"`
- Move all gossip handling to DB (gossip texts already exist in TDB)
(cherry picked from commit 3acf6f36d1)

Core/Scripts: npc_grandmother gossip text moved to DB

Removing one more hardcoded text line from core scripts.
Also adding correct gossip to the npc_grandmother script.

Gossip changes in this script:
- remove hardcoded text from core script
- use existing npc_text IDs in gossip enum
- add missing text rows to gossip_menu_option
- use values from gossip_menu_option in enum
- replace spawn coordinates 0.0f with GetPosition()
(cherry picked from commit c214f987d7)

Core/Scripts: remove hardcoded text from npc_locksmith

- remove hardcoded text from script
- move the gossip handling to DB SQL
- move the script conditions to DB SQL
- use correct gossip from broadcast_text
- remove options not existing in broadcast_text
- add Key to Searing Gorge option (related spell)
- add The Eye of Haramad option (related spell)
(cherry picked from commit e6ee6e2ae8)
2017-01-12 23:37:37 +01:00
vincent-michael
86b98686a9 Update copyright note for 2017
Happy new year
2017-01-01 16:23:13 +01:00
Shauren
5411ca8cdf Core/Units: Removed attack speed float to int conversion special case in building SMSG_UPDATE_OBJECT 2016-11-25 17:58:48 +01:00
Traesh
d4887311e3 Core/Scenes: Implemented scene system
Closes #17858
Closes #17976
2016-09-25 16:13:12 +02:00
Shauren
2056ce4d66 Scripts: Build fix 2016-07-17 15:20:56 +02:00
Shocker
b539ac6afa Core/GameObjects: Add isUse parameter to GossipHello for distinction between CMSG_GAMEOBJECT_USE and CMSG_GAMEOBJECT_REPORT_USE 2016-05-26 13:09:56 +03:00
Shauren
3ac33163db Core/Misc: Fixed -Wmisleading-indentation warnings 2016-04-23 13:22:03 +02:00
Chaouki Dhib
3cbbcdb51a Core/Movement: Clean up and improvements on Unit::SetSpeed (#16843)
- Clean up of Unit::SetSpeed (mostly cherry picks from the 6.x branch):
- the opcode sent depends on the unit. until now, MSG_MOVE_SET_* were sent for every units which isn't like retail behavior.
- Removed the unused method parameter "forced" from Unit::SetSpeed
- Renamed Unit::SetSpeed to SetSpeedRate
- Removed the unused method parameter "forced" from Unit::UpdateSpeed
- Added utility method Unit::SetSpeed which take the new flat value.
(cherry picked from commit dc3327f9c5)

# Conflicts:
#	src/server/game/Entities/Unit/Unit.cpp
#	src/server/game/Handlers/MovementHandler.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_akilzon.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_nalorakk.cpp
#	src/server/scripts/EasternKingdoms/ZulAman/boss_zuljin.cpp
#	src/server/scripts/Kalimdor/zone_azshara.cpp
#	src/server/scripts/Kalimdor/zone_durotar.cpp
#	src/server/scripts/Outland/zone_hellfire_peninsula.cpp
2016-04-16 02:26:24 +01:00
Vincent-Michael
179b521dce Core: Remove whitespaces
(cherry picked from commit 5e74c2223b)
2016-04-09 17:14:08 +02:00
Kittnz
d9d2778eb8 Core/Pets: Move Egbert & Pandaren Monk into pet_generic.cpp
(cherry picked from commit 542f5264d3)
2016-04-08 18:33:47 +02:00
Kittnz
b33afb6958 Pet/Misc: Improve Egbert's AI even more
(cherry picked from commit af5f4ae85b)
2016-04-05 22:15:54 +02:00
Kittnz
a6a8b5b3d4 Pet/Misc: Improve Egbert's AI
(cherry picked from commit 2322ef3f50)
2016-04-05 22:15:06 +02:00
Keader
f63db31c42 Fix multiple summon of Omen (Lunar Festival)
(cherry picked from commit 8130de1b9a)
2016-04-05 22:11:33 +02:00
Shauren
3e59899f56 Build fix 2016-04-02 20:06:54 +02:00
Vincent-Michael
e518655b0f Scripts: Fixed warning
(cherry picked from commit 96cb26de28)
2016-04-02 19:40:41 +02:00
Kittnz
b6b151fb1e Build fix
(cherry picked from commit add2179b75)
2016-04-02 19:40:30 +02:00
Kittnz
b535d1e9f3 Pet/Misc: Implement Pandaran Monk followup
(cherry picked from commit 5650b9deb2)
2016-04-02 19:40:15 +02:00
Kittnz
c4b6e08829 Pet/Misc: Implement Pandaran Monk's pet abilitys
(cherry picked from commit 64d1addbbf)
2016-04-02 19:39:23 +02:00
Rushor
c3a2cbc844 Scripts/Northrend: Knockbackimmunity Cleanup
(cherry picked from commit c560cb0a0c)
2016-04-02 19:33:43 +02:00
treeston
ca1239af9f Code style, urand -> urandms.
(cherry picked from commit e064000a35)
2016-04-02 19:26:59 +02:00
Kittnz
422c8a97f6 Fix build & tabs
(cherry picked from commit 57a5879070)
2016-04-02 19:26:46 +02:00
Kittnz
a8504c6730 Pet/Misc: Implement Egbert's running around
Closes #16479

(cherry picked from commit 859b617613)
2016-04-02 19:26:35 +02:00
Vincent-Michael
33593ce0d5 Scripts: Added missing override
(cherry picked from commit d1a185e3d5)
2016-04-02 19:25:43 +02:00
treeston
9873800207 Item/Misc: Implement Toy Train Set and Wind-Up Train Wrecker.
(cherry picked from commit 8c7cd03d08)
2016-04-02 19:20:17 +02:00
sirikfoll
a962db8b3c Core/Scripts Script npc needed for Quest Torch Tossing part2
Script for Npc Torch Tossing Target_Bunny_Controller, responsable for handle the targets rotation for Midsummer Fire Festival quest, Torch Tossing.

(cherry picked from commit 8b74038531)
2016-04-02 18:32:38 +02:00
Gabriele Gelardi
0d8a73e53c Scripts/Duel: prevent possible abuse in Duel Reset system
(cherry picked from commit c0ed819e0c)
2016-04-02 15:00:32 +02:00
treeston
5f6da87269 Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-base
(cherry picked from commit e203d78d2a)
2016-03-29 19:22:02 +02:00
treeston
e2f2c70ba4 Merge branch '3.3.5-bossboundary' into 3.3.5-base (PR #16089)
(cherry picked from commit 5b8b8c6530)
2016-03-22 22:56:43 +01:00
treeston
68c3af4166 Merge remote-tracking branch 'velinath/sai-migrations-3' into 3.3.5-base
(cherry picked from commit 5084b17308)
2016-03-21 23:22:03 +01:00
treeston
40ea130f5a Merge remote-tracking branch 'velinath/sai-migrations-2' into 3.3.5-base
(cherry picked from commit 1d9d03b289)
2016-03-21 23:21:18 +01:00
treeston
c9fdb6af59 Merge remote-tracking branch 'velinath/sai-migrations' into 3.3.5-base
(cherry picked from commit c7459327b2)
2016-03-21 23:20:26 +01:00
Treeston
e6ab6b4b0b Merge pull request #16182 from velinath/sai-migrations
Core/Scripts: remove unused npc_taxi scripts
(cherry picked from commit 48d0fd276d)
2016-03-21 22:35:20 +01:00
joschiwald
ee38d8b4a1 Merge pull request #16171 from velinath/sai-migrations
Core/Scripts/DB: move Gryphoneer Windbellow to SAI
(cherry picked from commit f377a5875c)
2016-03-21 22:18:29 +01:00
treeston
d68b809f9b Merge remote-tracking branch 'tkrokli/move_wyrmrest_temple_taxi_to_sai' into 3.3.5
(cherry picked from commit e0ffc2921b)
2016-03-21 21:46:04 +01:00
treeston
94b7e562e2 Merge pull request #16126 from velinath/taxi-to-sai
(partially cherry picked from commit b6ed3d3fc2)
2016-03-21 21:29:53 +01:00
Naios
5534915f74 Core/Scripts: Split the huge scriptloader into smaller pieces
* Each subdirectory contains it's own translation unit now
  which is responsible for loading it's directory
* Improves merging & decoupling between 3.3.5 <-> 6.x
* Removes unused Battleground loader
* Ref #15671
2016-02-21 15:36:41 +01:00
Killyana
6e4948a498 Creature/script: William Kielar
Fix Gossips used for taxi
Closes #16112

(cherry picked from commit 79c9af11b9)
2016-01-17 13:58:15 +01:00
joschiwald
ea5f39354b Scripts/Taxi: addition to 660f7e72be
(cherry picked from commit 35aed8902a)
2016-01-03 02:54:07 +01:00
Vincent-Michael
478cc756eb Update copyright note for 2016
Happy new year (Again new year with idiots ...)
2016-01-01 00:34:25 +01:00
Carbenium
0ffc89999e Fix build after recent cherry-picks 2015-11-23 10:32:28 +01:00
MitchesD
843955b8bf Merge pull request #15732 from ShinDarth/reset-health-mana
Scripts/Duel: implement duel reset of health and mana and improve duel reset
(cherry picked from commit a1150ce20f)

Conflicts:
	src/server/game/Spells/SpellHistory.cpp
2015-11-23 10:11:53 +01:00
Shauren
61c7161a10 Core/Units: Updated melee/spell hit chance calculation 2015-11-10 17:33:36 +01:00
Shauren
88584a7398 Merge pull request #15495 from Treeston/3.3.5-gemperfection
Core/Spell: Implement "Gem Perfection" (and framework for similar spells in the future)
(cherry picked from commit 15cafba8d5)
2015-11-07 01:15:21 +01:00
blub
bf7175ee83 Merge pull request #15731 from ShinDarth/toscri
Convert the Duel Cooldown Reset feature to scripts
(cherry picked from commit 5c449b50aa)
2015-11-07 00:38:05 +01:00
MitchesD
26d362febc Revert "DB/NPC: Stable Masters" Please in the future mark 335 only commits with *_335 in the end of SQL file, if it has any.
This reverts commit 18f511431a.
2015-10-30 14:46:14 +01:00
Killyana
18f511431a DB/NPC: Stable Masters
Closes #15505

(cherry picked from commit a513abc02c)

# Conflicts:
#	src/server/scripts/World/npcs_special.cpp
2015-10-30 14:34:46 +01:00
joschiwald
7a2b87cefb Merge pull request #15385 from Tonghost/3.3.5
Core/Scripts: Remove duplicate code
(cherry picked from commit 5c68223ab6)
2015-09-24 23:30:42 +02:00
Golrag
d999caee67 Core/AreaTrigger: Added 'bool entered' to OnTrigger 2015-04-18 11:22:30 +02:00
Shauren
d02f4da355 Core/Chat: Implemented instance chat type 2015-04-12 00:20:06 +02:00
Shauren
0ba2e0d5ee Core/Spells: Implemented multiple spell power costs 2015-03-08 13:31:57 +01:00