From f72eaeacf48f5fab7d5ba853b40e08b1da659f13 Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Sun, 2 Jun 2024 14:12:36 -0400 Subject: [PATCH 1/5] Update readme to reflect changed directory structure. --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 80c4f53..46ebcdb 100644 --- a/README.md +++ b/README.md @@ -22,13 +22,13 @@ This can be accomplished in a couple different ways. You could do it using Git b Or you can do it manually through a text editor of your choice by changing the lines required where a "-" indicates the original line and a "+" indicates the change necessary. Where to find the specific lines can be found after the @@ before each change, where it states the line number. There are a total of seven lines to change and one line to add. -### 2) Replace the DBC files in your AzerothCore Data directory with the ones provided in [DBFilesClient](https://github.com/benjymansy123/mod-worgoblin/tree/master/patch-contents/DBFilesClient). +### 2) Replace the DBC files in your AzerothCore Data directory with the ones provided in [DBFilesClient](https://github.com/heyitsbench/mod-worgoblin/tree/master/data/patch/DBFilesClient). Upon downloading the repo, you'll have the patch-contents file available to you. Copy all the contents of the DBFilesClient folder to your AzerothCore Data directory. Feel free to make a backup of the DBCs you'll be replacing, as backups never hurt. ### 3) Compile and install AzerothCore. -### 4) Move the [patch-contents](https://github.com/benjymansy123/mod-worgoblin/tree/master/patch-contents) folder to your Data folder in your WoW client and rename the folder to `patch-A.MPQ`. +### 4) Move the [patch](https://github.com/heyitsbench/mod-worgoblin/tree/master/data/patch) folder to your Data folder in your WoW client and rename the folder to `patch-A.MPQ`. ### 5) Remove signature checks from your WoW executable. I recommend Windows users to use [this patcher](https://model-changing.net/index.php?app=downloads&module=downloads&controller=view&id=314&tab=details) created by kebabstorm to patch your Wow.exe file. I recommend macOS users to download this [pre-patched .app file](https://github.com/benjymansy123/custom-race-ac-12_6_21/releases/download/sig-check/WoW.app.zip), since no easy patcher exists for macOS. From 44ff50fc41787275261722ffd9712a81435eef37 Mon Sep 17 00:00:00 2001 From: Greg Wilkinson Date: Sun, 21 Jul 2024 19:00:34 -0700 Subject: [PATCH 2/5] Fix build and startup errors as a result of updates. - Update SQL to reflect June 2024 changes to `creature_template` and `creature_template_model`. - Minor cleanup. - Adjust capitalization of `GetLevel` usage. --- data/sql/db-world/worgoblin.sql | 104 +++++++++++++++++--------------- src/Worgoblin.cpp | 2 +- 2 files changed, 58 insertions(+), 48 deletions(-) diff --git a/data/sql/db-world/worgoblin.sql b/data/sql/db-world/worgoblin.sql index 2825242..03a8aed 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, 35249, 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; 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 0184ac030157dc6997ffa1620c12bb989bfaa577 Mon Sep 17 00:00:00 2001 From: Greg Wilkinson Date: Fri, 26 Jul 2024 17:17:32 -0700 Subject: [PATCH 3/5] Update patch file to match upstream files. --- 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 From f82f1672cd5e07821fa6f802c880eecfcde65d45 Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Sat, 27 Jul 2024 14:05:39 -0400 Subject: [PATCH 4/5] Update patch file. Nitpicky type fixes/changes that bother me. --- worgoblin.patch | 22 ++++++++++++++-------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/worgoblin.patch b/worgoblin.patch index 26d33d2..c52d831 100644 --- a/worgoblin.patch +++ b/worgoblin.patch @@ -1,18 +1,25 @@ +--- + 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 0b643923b..18de7dce6 100644 +index 0b643923b36d48..d49e22ff19a5c6 100644 --- a/src/server/game/Entities/Player/Player.cpp +++ b/src/server/game/Entities/Player/Player.cpp -@@ -12293,6 +12293,8 @@ float Player::GetReputationPriceDiscount(Creature const* creature) const +@@ -12293,6 +12293,9 @@ float Player::GetReputationPriceDiscount(Creature const* creature) const float Player::GetReputationPriceDiscount(FactionTemplateEntry const* factionTemplate) const { -+ if (HasSpell(69044)) // 69044 = Best Deals Anywhere ++ if (HasSpell(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 6c503243c..77136f8b1 100644 +index 6c503243cea85f..77136f8b1a0bef 100644 --- a/src/server/game/Handlers/CharacterHandler.cpp +++ b/src/server/game/Handlers/CharacterHandler.cpp @@ -2144,7 +2144,7 @@ void WorldSession::HandleCharFactionOrRaceChangeCallback(std::shared_ptrSetData(0, lowGuid); diff --git a/src/server/shared/SharedDefines.h b/src/server/shared/SharedDefines.h -index 1b0568fe6..8be349630 100644 +index 1b0568fe6cab1f..37456685d851f8 100644 --- a/src/server/shared/SharedDefines.h +++ b/src/server/shared/SharedDefines.h @@ -76,9 +76,10 @@ enum Races @@ -33,11 +40,11 @@ index 1b0568fe6..8be349630 100644 RACE_GNOME = 7, // TITLE Gnome RACE_TROLL = 8, // TITLE Troll - //RACE_GOBLIN = 9, -+ RACE_GOBLIN = 9, // TITLE Blood Elf ++ RACE_GOBLIN = 9, // TITLE Goblin RACE_BLOODELF = 10, // TITLE Blood Elf - RACE_DRAENEI = 11 //, TITLE Draenei + RACE_DRAENEI = 11, // TITLE Draenei -+ RACE_WORGEN = 12 //, TITLE Worgen ++ RACE_WORGEN = 12 // TITLE Worgen //RACE_FEL_ORC = 12, //RACE_NAGA = 13, //RACE_BROKEN = 14, @@ -62,4 +69,3 @@ index 1b0568fe6..8be349630 100644 + (1<<(RACE_GNOME-1)) | (1<<(RACE_DRAENEI-1)) | (1<<(RACE_WORGEN-1))) #define RACEMASK_HORDE RACEMASK_ALL_PLAYABLE & ~RACEMASK_ALLIANCE - From c2b059d90faeff49105c89c2b2e5e5eda069e658 Mon Sep 17 00:00:00 2001 From: Benjamin Jackson <38561765+heyitsbench@users.noreply.github.com> Date: Sat, 27 Jul 2024 14:11:38 -0400 Subject: [PATCH 5/5] Maybe fix patch. Why must I always break things. --- worgoblin.patch | 1 + 1 file changed, 1 insertion(+) diff --git a/worgoblin.patch b/worgoblin.patch index c52d831..6ab1b11 100644 --- a/worgoblin.patch +++ b/worgoblin.patch @@ -69,3 +69,4 @@ index 1b0568fe6cab1f..37456685d851f8 100644 + (1<<(RACE_GNOME-1)) | (1<<(RACE_DRAENEI-1)) | (1<<(RACE_WORGEN-1))) #define RACEMASK_HORDE RACEMASK_ALL_PLAYABLE & ~RACEMASK_ALLIANCE +