From d6587e6d01934e79f2bd22a776d89d224d47083d Mon Sep 17 00:00:00 2001 From: Greg Wilkinson Date: Sun, 21 Jul 2024 16:26:21 -0700 Subject: [PATCH 1/4] Update worgoblin.sql Update sql to reflect June 2024 changes to creature_template and creature_template_model. minor cleanup. --- data/sql/db-world/worgoblin.sql | 104 +++++++++++++++++--------------- 1 file changed, 57 insertions(+), 47 deletions(-) diff --git a/data/sql/db-world/worgoblin.sql b/data/sql/db-world/worgoblin.sql index 2825242..3d60a96 100644 --- a/data/sql/db-world/worgoblin.sql +++ b/data/sql/db-world/worgoblin.sql @@ -87,6 +87,62 @@ INSERT INTO `item_template` (`entry`, `class`, `subclass`, `SoundOverrideSubclas (49521, 4, 1, -1, 'Goblin Acolyte\'s Pants', 62621, 1, 0, 0, 1, 0, 1, 7, -1, -1, 1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 11, 0, 0, 0, 0, 0, 0, 1000, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, '', 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 40, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0), (49522, 4, 1, -1, 'Goblin Acolyte\'s Shoes', 4143, 1, 0, 0, 1, 0, 1, 8, -1, -1, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 1000, 0, 0, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, 0, 0, 0, -1, 0, -1, 0, '', 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0, '', 0, 0, 0, 0, 0, 0); +INSERT INTO `playercreateinfo_skills` (`raceMask`, `classMask`, `skill`, `rank`, `comment`) VALUES +(2048, 8, 44, 0, 'Axes - Worgen'), -- Yes, these are hackfixes and I'm very mad about it, +(256, 8, 54, 0, 'Maces - Goblin'), -- But right now I don't see any other way to add these. +(2048, 0, 789, 0, 'Worgen - Racial'), -- And unfortunately, I really want worgen and goblins +(256, 0, 790, 0, 'Goblin - Racial'); -- To have their starting gear from cata, and the rogues have funky weapons. + +DELETE FROM `spell_script_names` WHERE `spell_id` = 69041; +INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (69041, 'spell_rocket_barrage'); + +DELETE FROM `creature_model_info` WHERE `DisplayID` IN (29422, 29423, 33000, 33001, 32385, 35249, 35250, 36445, 36446, 39095, 39096); +INSERT INTO `creature_model_info` (`DisplayID`, `BoundingRadius`, `CombatReach`, `Gender`, `DisplayID_Other_Gender`) VALUES +(29422, 0.406, 1.5, 0, 0), -- Worgen +(29423, 0.406, 1.5, 1, 0), -- Worgenette +(32385, 0.2325, 1.5, 0, 0), -- Gobber +(35249, 0.35, 1.5, 2, 0), -- Trike +(35250, 0.35, 1.5, 2, 0), -- Quik-trike +(36445, 0.406, 1.5, 0, 0), -- Lord Harford +(36446, 0.306, 1.5, 0, 0), -- Gally Lumpstain +(39095, 1, 1.5, 2, 0), -- Horse +(39096, 1, 1.5, 2, 0); -- Quik-horse + +DELETE FROM `creature_template` WHERE `entry` IN (36613, 46754, 46755, 55272, 55273); +INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES +(36613, 0, 0, 0, 0, 0, 'Gobber', '', NULL, 0, 55, 55, 0, 120, 131072, 1, 1.14286, 1, 1, 18, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 512, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 3, 1, 1, 1, 0, 0, 1, 0, 0, 2, '', 12340), +(46754, 0, 0, 0, 0, 0, 'Goblin Trike', NULL, NULL, 0, 20, 20, 0, 35, 0, 1, 1.38571, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 33554432, 2048, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 140, 1, 0, 0, 0, '', 0), +(46755, 0, 0, 0, 0, 0, 'Goblin Turbo-Trike', NULL, NULL, 0, 40, 40, 0, 35, 0, 1, 1.38571, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 33554432, 2048, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 140, 1, 0, 0, 0, '', 0), +(55272, 0, 0, 0, 0, 0, 'Mountain Horse', NULL, NULL, 0, 20, 20, 0, 35, 0, 1, 1.38571, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 140, 1, 0, 0, 0, '', 0), +(55273, 0, 0, 0, 0, 0, 'Swift Mountain Horse', NULL, NULL, 0, 40, 40, 0, 35, 0, 1, 1.38571, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 140, 1, 0, 0, 0, '', 0); + +DELETE FROM `creature_template_model` WHERE `CreatureID` IN (36613, 46754, 46755, 55272, 55273); + +INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES + (36613, 0, 32385, 1, 1, 12340), + (46754, 0, 32549, 1, 1, 12340), + (46755, 0, 35250, 1, 1, 12340), + (55272, 0, 39096, 1, 1, 12340), + (55273, 0, 39095, 1, 1, 12340); + +DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (13473, 13474, 13475, 13476, 13477, 13478); +INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES +(13473, 2, 0, 9, ''), -- Achievement 2422 (Shake Your Bunny-Maker) +(13473, 9, 18, 0, ''), +(13473, 10, 1, 0, ''), +(13474, 2, 0, 12, ''), +(13474, 9, 18, 0, ''), +(13474, 10, 1, 0, ''), +(13475, 2, 0, 9, ''), -- Achievement 291 (Check Your Head) +(13476, 2, 0, 12, ''), +(13477, 21, 0, 9, ''), -- Achievement 1429 (Realm First! Level 80 Goblin) +(13478, 21, 0, 12, ''); -- Achievement 1430 (Realm First! Level 80 Worgen) + +UPDATE quest_template SET AllowableRaces = AllowableRaces|256 WHERE AllowableRaces & 2 AND AllowableRaces != -1 AND AllowableRaces != 2147483647 AND AllowableRaces != 2047 AND AllowableRaces != 4095 AND AllowableRaces != 8191 AND AllowableRaces != 16383 AND AllowableRaces != 32767 AND AllowableRaces != 65535 AND AllowableRaces != 131071 AND AllowableRaces != 262143 AND AllowableRaces != 524287 AND AllowableRaces != 1048575 AND AllowableRaces != 2097151; +UPDATE quest_template SET AllowableRaces = AllowableRaces|2048 WHERE AllowableRaces & 1 AND AllowableRaces != -1 AND AllowableRaces != 2147483647 AND AllowableRaces != 2047 AND AllowableRaces != 4095 AND AllowableRaces != 8191 AND AllowableRaces != 16383 AND AllowableRaces != 32767 AND AllowableRaces != 65535 AND AllowableRaces != 131071 AND AllowableRaces != 262143 AND AllowableRaces != 524287 AND AllowableRaces != 1048575 AND AllowableRaces != 2097151; +UPDATE quest_template SET AllowableRaces = 1 WHERE ID = 12742; +UPDATE quest_template SET AllowableRaces = 2 WHERE ID = 12748; + DELETE FROM `playercreateinfo_action` WHERE `race` = 9 OR `race` = 12; INSERT INTO `playercreateinfo_action` (`race`, `class`, `button`, `action`) VALUES (9, 1, 72, 6603), @@ -182,56 +238,10 @@ INSERT INTO `playercreateinfo_action` (`race`, `class`, `button`, `action`) VALU (12, 11, 96, 6603); -- (12, 11, 120, 68992), Darkflight Druid -- (12, 11, 120, 68996), Two Forms Druid --- (12, 11, 120, 87840), Running Wild Druid +-- (12, 11, 120, 87840) Running Wild Druid UPDATE `playercreateinfo_skills` SET `racemask` = `racemask`|256|2048 WHERE `skill` = 46; -- Guns UPDATE `playercreateinfo_skills` SET `racemask` = `racemask`|256|2048 WHERE `skill` = 173; -- Daggers UPDATE `playercreateinfo_skills` SET `racemask` = `racemask`|256 WHERE `skill` = 160; -- 2h-mace goblins UPDATE `playercreateinfo_skills` SET `racemask` = `racemask`|256 WHERE `skill` = 109; -- Orcish language goblins UPDATE `playercreateinfo_skills` SET `racemask` = `racemask`|2048 WHERE `skill` = 98; -- Common language worgen -INSERT INTO `playercreateinfo_skills` (`raceMask`, `classMask`, `skill`, `rank`, `comment`) VALUES -(2048, 8, 44, 0, 'Axes - Worgen'), -- Yes, these are hackfixes and I'm very mad about it, -(256, 8, 54, 0, 'Maces - Goblin'), -- But right now I don't see any other way to add these. -(2048, 0, 789, 0, 'Worgen - Racial'), -- And unfortunately, I really want worgen and goblins -(256, 0, 790, 0, 'Goblin - Racial'); -- To have their starting gear from cata, and the rogues have funky weapons. - -DELETE FROM `spell_script_names` WHERE `spell_id` = 69041; -INSERT INTO `spell_script_names` (`spell_id`, `ScriptName`) VALUES (69041, 'spell_rocket_barrage'); - -DELETE FROM `creature_model_info` WHERE `DisplayID` IN (33000, 33001, 32385, 35249, 35250, 36445, 36446, 39095, 39096); -INSERT INTO `creature_model_info` (`DisplayID`, `BoundingRadius`, `CombatReach`, `Gender`, `DisplayID_Other_Gender`) VALUES -(29422, 0.406, 1.5, 0, 0), -- Worgen -(29423, 0.406, 1.5, 1, 0), -- Worgenette -(32385, 0.2325, 1.5, 0, 0), -- Gobber -(35249, 0.35, 1.5, 2, 0), -- Trike -(35250, 0.35, 1.5, 2, 0), -- Quik-trike -(36445, 0.406, 1.5, 0, 0), -- Lord Harford -(36446, 0.306, 1.5, 0, 0), -- Gally Lumpstain -(39095, 1, 1.5, 2, 0), -- Horse -(39096, 1, 1.5, 2, 0); -- Quik-horse - -DELETE FROM `creature_template` WHERE `entry` IN (36613, 46754, 46755, 55272, 55273); -INSERT INTO `creature_template` (`entry`, `difficulty_entry_1`, `difficulty_entry_2`, `difficulty_entry_3`, `KillCredit1`, `KillCredit2`, `modelid1`, `modelid2`, `modelid3`, `modelid4`, `name`, `subname`, `IconName`, `gossip_menu_id`, `minlevel`, `maxlevel`, `exp`, `faction`, `npcflag`, `speed_walk`, `speed_run`, `speed_swim`, `speed_flight`, `detection_range`, `scale`, `rank`, `dmgschool`, `DamageModifier`, `BaseAttackTime`, `RangeAttackTime`, `BaseVariance`, `RangeVariance`, `unit_class`, `unit_flags`, `unit_flags2`, `dynamicflags`, `family`, `trainer_type`, `trainer_spell`, `trainer_class`, `trainer_race`, `type`, `type_flags`, `lootid`, `pickpocketloot`, `skinloot`, `PetSpellDataId`, `VehicleId`, `mingold`, `maxgold`, `AIName`, `MovementType`, `HoverHeight`, `HealthModifier`, `ManaModifier`, `ArmorModifier`, `ExperienceModifier`, `RacialLeader`, `movementId`, `RegenHealth`, `mechanic_immune_mask`, `spell_school_immune_mask`, `flags_extra`, `ScriptName`, `VerifiedBuild`) VALUES -(36613, 0, 0, 0, 0, 0, 32385, 0, 0, 0, 'Gobber', '', NULL, 0, 55, 55, 0, 120, 131072, 1, 1.14286, 1, 1, 18, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 512, 2048, 0, 0, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 3, 1, 1, 1, 0, 0, 1, 0, 0, 2, '', 12340), -(46754, 0, 0, 0, 0, 0, 35249, 0, 0, 0, 'Goblin Trike', NULL, NULL, 0, 20, 20, 0, 35, 0, 1, 1.38571, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 33554432, 2048, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 140, 1, 0, 0, 0, '', 0), -(46755, 0, 0, 0, 0, 0, 35250, 0, 0, 0, 'Goblin Turbo-Trike', NULL, NULL, 0, 40, 40, 0, 35, 0, 1, 1.38571, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 33554432, 2048, 0, 0, 0, 0, 0, 0, 9, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 140, 1, 0, 0, 0, '', 0), -(55272, 0, 0, 0, 0, 0, 39096, 0, 0, 0, 'Mountain Horse', NULL, NULL, 0, 20, 20, 0, 35, 0, 1, 1.38571, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 140, 1, 0, 0, 0, '', 0), -(55273, 0, 0, 0, 0, 0, 39095, 0, 0, 0, 'Swift Mountain Horse', NULL, NULL, 0, 40, 40, 0, 35, 0, 1, 1.38571, 1, 1, 20, 1, 0, 0, 1, 2000, 2000, 1, 1, 1, 0, 2048, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, '', 0, 1, 1, 1, 1, 1, 0, 140, 1, 0, 0, 0, '', 0); - -DELETE FROM `achievement_criteria_data` WHERE `criteria_id` IN (13473, 13474, 13475, 13476, 13477, 13478); -INSERT INTO `achievement_criteria_data` (`criteria_id`, `type`, `value1`, `value2`, `ScriptName`) VALUES -(13473, 2, 0, 9, ''), -- Achievement 2422 (Shake Your Bunny-Maker) -(13473, 9, 18, 0, ''), -(13473, 10, 1, 0, ''), -(13474, 2, 0, 12, ''), -(13474, 9, 18, 0, ''), -(13474, 10, 1, 0, ''), -(13475, 2, 0, 9, ''), -- Achievement 291 (Check Your Head) -(13476, 2, 0, 12, ''), -(13477, 21, 0, 9, ''), -- Achievement 1429 (Realm First! Level 80 Goblin) -(13478, 21, 0, 12, ''); -- Achievement 1430 (Realm First! Level 80 Worgen) - -UPDATE quest_template SET AllowableRaces = AllowableRaces|256 WHERE AllowableRaces & 2 AND AllowableRaces != -1 AND AllowableRaces != 2147483647 AND AllowableRaces != 2047 AND AllowableRaces != 4095 AND AllowableRaces != 8191 AND AllowableRaces != 16383 AND AllowableRaces != 32767 AND AllowableRaces != 65535 AND AllowableRaces != 131071 AND AllowableRaces != 262143 AND AllowableRaces != 524287 AND AllowableRaces != 1048575 AND AllowableRaces != 2097151; -UPDATE quest_template SET AllowableRaces = AllowableRaces|2048 WHERE AllowableRaces & 1 AND AllowableRaces != -1 AND AllowableRaces != 2147483647 AND AllowableRaces != 2047 AND AllowableRaces != 4095 AND AllowableRaces != 8191 AND AllowableRaces != 16383 AND AllowableRaces != 32767 AND AllowableRaces != 65535 AND AllowableRaces != 131071 AND AllowableRaces != 262143 AND AllowableRaces != 524287 AND AllowableRaces != 1048575 AND AllowableRaces != 2097151; -UPDATE quest_template SET AllowableRaces = 1 WHERE ID = 12742; -UPDATE quest_template SET AllowableRaces = 2 WHERE ID = 12748; From 167955dabb3aeb39574e531909796616b8e98f55 Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Sun, 21 Jul 2024 20:26:13 -0400 Subject: [PATCH 2/4] Capitalization of method. --- src/Worgoblin.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Worgoblin.cpp b/src/Worgoblin.cpp index f1422ac..3ba884c 100644 --- a/src/Worgoblin.cpp +++ b/src/Worgoblin.cpp @@ -26,7 +26,7 @@ class spell_rocket_barrage : public SpellScript void HandleDamage(SpellEffIndex /*effIndex*/) { Unit* caster = GetCaster(); - int32 basePoints = 0 + caster->getLevel() * 2; + int32 basePoints = 0 + caster->GetLevel() * 2; basePoints += caster->SpellBaseDamageBonusDone(GetSpellInfo()->GetSchoolMask()) * 0.429; //BM=0.429 here, don't ask me how. basePoints += caster->GetTotalAttackPowerValue(caster->getClass() != CLASS_HUNTER ? BASE_ATTACK : RANGED_ATTACK) * 0.25; // 0.25=BonusCoefficient, hardcoding it here SetEffectValue(basePoints); From 88999f599991e916d06045fa4715b44797c7dbea Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Sun, 21 Jul 2024 21:12:13 -0400 Subject: [PATCH 3/4] Adjust SQL display ID. --- data/sql/db-world/worgoblin.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/sql/db-world/worgoblin.sql b/data/sql/db-world/worgoblin.sql index 3d60a96..03a8aed 100644 --- a/data/sql/db-world/worgoblin.sql +++ b/data/sql/db-world/worgoblin.sql @@ -120,7 +120,7 @@ DELETE FROM `creature_template_model` WHERE `CreatureID` IN (36613, 46754, 46755 INSERT INTO `creature_template_model` (`CreatureID`, `Idx`, `CreatureDisplayID`, `DisplayScale`, `Probability`, `VerifiedBuild`) VALUES (36613, 0, 32385, 1, 1, 12340), - (46754, 0, 32549, 1, 1, 12340), + (46754, 0, 35249, 1, 1, 12340), (46755, 0, 35250, 1, 1, 12340), (55272, 0, 39096, 1, 1, 12340), (55273, 0, 39095, 1, 1, 12340); From 76ebba9ecdef8aa90be87887ba0b3daadbaccff3 Mon Sep 17 00:00:00 2001 From: Greg Wilkinson Date: Fri, 26 Jul 2024 13:53:21 -0700 Subject: [PATCH 4/4] Add files via upload Update worgoblin.patch --- worgoblin.patch | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/worgoblin.patch b/worgoblin.patch index 14e0254..26d33d2 100644 --- a/worgoblin.patch +++ b/worgoblin.patch @@ -1,28 +1,21 @@ ---- - src/server/game/Entities/Player/Player.cpp | 3 +++ - src/server/game/Handlers/CharacterHandler.cpp | 2 +- - src/server/shared/SharedDefines.h | 13 +++++++------ - 3 files changed, 11 insertions(+), 7 deletions(-) - diff --git a/src/server/game/Entities/Player/Player.cpp b/src/server/game/Entities/Player/Player.cpp -index 80818758fad0..5c2a1f9cbd82 100644 +index 0b643923b..18de7dce6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp -@@ -12031,6 +12031,9 @@ float Player::GetReputationPriceDiscount(Creature const* creature) const +@@ -12293,6 +12293,8 @@ float Player::GetReputationPriceDiscount(Creature const* creature) const float Player::GetReputationPriceDiscount(FactionTemplateEntry const* factionTemplate) const { + if (HasSpell(69044)) // 69044 = Best Deals Anywhere + return 0.8f; -+ if (!factionTemplate || !factionTemplate->faction) { return 1.0f; diff --git a/src/server/game/Handlers/CharacterHandler.cpp b/src/server/game/Handlers/CharacterHandler.cpp -index e159441c88a5..9a086c5a1427 100644 +index 6c503243c..77136f8b1 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp -@@ -2149,7 +2149,7 @@ void WorldSession::HandleCharFactionOrRaceChangeCallback(std::shared_ptrAppend(stmt); // Race specific languages @@ -32,15 +25,15 @@ index e159441c88a5..9a086c5a1427 100644 stmt = CharacterDatabase.GetPreparedStatement(CHAR_INS_CHAR_SKILL_LANGUAGE); stmt->SetData(0, lowGuid); diff --git a/src/server/shared/SharedDefines.h b/src/server/shared/SharedDefines.h -index 584e0c3f854f..a647d586f8f3 100644 +index 1b0568fe6..8be349630 100644 --- a/src/server/shared/SharedDefines.h +++ b/src/server/shared/SharedDefines.h -@@ -75,9 +75,10 @@ enum Races +@@ -76,9 +76,10 @@ enum Races RACE_TAUREN = 6, // TITLE Tauren RACE_GNOME = 7, // TITLE Gnome RACE_TROLL = 8, // TITLE Troll - //RACE_GOBLIN = 9, -+ RACE_GOBLIN = 9, // TITLE Goblin ++ RACE_GOBLIN = 9, // TITLE Blood Elf RACE_BLOODELF = 10, // TITLE Blood Elf - RACE_DRAENEI = 11 //, TITLE Draenei + RACE_DRAENEI = 11, // TITLE Draenei @@ -48,7 +41,7 @@ index 584e0c3f854f..a647d586f8f3 100644 //RACE_FEL_ORC = 12, //RACE_NAGA = 13, //RACE_BROKEN = 14, -@@ -91,17 +92,17 @@ enum Races +@@ -92,17 +93,17 @@ enum Races }; // max+1 for player race