Skip to content
This repository has been archived by the owner on Apr 29, 2020. It is now read-only.

modifier number change to resolve conflict #6018

Merged
merged 1 commit into from
May 19, 2019
Merged

modifier number change to resolve conflict #6018

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions scripts/globals/status.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1508,7 +1508,7 @@ dsp.mod =
ALL_WSDMG_ALL_HITS = 840, -- Generic (all Weaponskills) damage, on all hits.
-- Per https://www.bg-wiki.com/bg/Weapon_Skill_Damage we need all 3..
ALL_WSDMG_FIRST_HIT = 841, -- Generic (all Weaponskills) damage, first hit only.
WS_NO_DEPLETE = 948, -- % chance a Weaponskill depletes no TP.
WS_NO_DEPLETE = 949, -- % chance a Weaponskill depletes no TP.

-- Circle Abilities Extended Duration from AF/AF+1
HOLY_CIRCLE_DURATION = 857,
Expand All @@ -1530,9 +1530,9 @@ dsp.mod =

-- The spares take care of finding the next ID to use so long as we don't forget to list IDs that have been freed up by refactoring.
-- 570 - 825 used by WS DMG mods these are not spares.
-- SPARE = 949, -- stuff
-- SPARE = 950, -- stuff
-- SPARE = 951, -- stuff
-- SPARE = 952, -- stuff
};

dsp.latent =
Expand Down
4 changes: 2 additions & 2 deletions sql/item_mods.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40456,7 +40456,7 @@ INSERT INTO `item_mods` VALUES (27507,25,5);
INSERT INTO `item_mods` VALUES (27507,27,-5);
INSERT INTO `item_mods` VALUES (27507,28,10);
INSERT INTO `item_mods` VALUES (27507,296,2);
INSERT INTO `item_mods` VALUES (27510,948,1); -- Fotia Gorget 1% No Tp used on Weaponskill
INSERT INTO `item_mods` VALUES (27510,949,1); -- Fotia Gorget 1% No Tp used on Weaponskill
INSERT INTO `item_mods` VALUES (27516,12,6); -- Satlada Necklace INT +6
INSERT INTO `item_mods` VALUES (27516,311,10); -- Magic Damage +10
INSERT INTO `item_mods` VALUES (27524,2,25); -- Nodens Gorget: HP +25
Expand Down Expand Up @@ -48902,7 +48902,7 @@ INSERT INTO `item_mods` VALUES (28419,536,1); -- Thunder day and weather bon
INSERT INTO `item_mods` VALUES (28419,537,1); -- Light day and weather bonus
INSERT INTO `item_mods` VALUES (28419,538,1); -- Dark day and weather bonus
INSERT INTO `item_mods` VALUES (28420,1,7); -- Fotia Belt: DEF 7
INSERT INTO `item_mods` VALUES (28420,948,1); -- 1% No Tp used on Weaponskill
INSERT INTO `item_mods` VALUES (28420,949,1); -- 1% No Tp used on Weaponskill
INSERT INTO `item_mods` VALUES (28421,13,4); -- Rumination Sash: MND +4
INSERT INTO `item_mods` VALUES (28421,30,3); -- Magic Accuracy +3
INSERT INTO `item_mods` VALUES (28421,114,7); -- Enfeebling magic skill +7
Expand Down
4 changes: 2 additions & 2 deletions src/map/modifier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -766,7 +766,7 @@ enum class Mod
ALL_WSDMG_ALL_HITS = 840, // Generic (all Weaponskills) damage, on all hits.
// Per https://www.bg-wiki.com/bg/Weapon_Skill_Damage we need all 3..
ALL_WSDMG_FIRST_HIT = 841, // Generic (all Weaponskills) damage, first hit only.
WS_NO_DEPLETE = 948, // % chance a Weaponskill depletes no TP.
WS_NO_DEPLETE = 949, // % chance a Weaponskill depletes no TP.

EXPERIENCE_RETAINED = 914, // Experience points retained upon death (this is a percentage)
CAPACITY_BONUS = 915, // Capacity point bonus granted
Expand All @@ -776,9 +776,9 @@ enum class Mod

// The spares take care of finding the next ID to use so long as we don't forget to list IDs that have been freed up by refactoring.
// 570 through 825 used by WS DMG mods these are not spares.
// SPARE = 949, // stuff
// SPARE = 950, // stuff
// SPARE = 951, // stuff
// SPARE = 952, // stuff
};

//temporary workaround for using enum class as unordered_map key until compilers support it
Expand Down