Fixed polymorph bug when not all categories of things to change were …

…changed
frasdoge · Aug 12, 2020 · 481dc7d · 481dc7d
1 parent 6cc24a6
commit 481dc7d
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/...OfOrigins_395a6fbb-f855-4cb0-97a9-6674bfd1799b/Story/RawFiles/Goals/BOO_BookOfOrigins.txt b/...OfOrigins_395a6fbb-f855-4cb0-97a9-6674bfd1799b/Story/RawFiles/Goals/BOO_BookOfOrigins.txt
@@ -176,16 +176,28 @@ AND
 NOT QryIsPolymorphing(_Char) // Not going from one poly form to another
 AND
 DB_BOO_RacialSkillsMap(_Char, _Skill)
+THEN
+BOO_RemoveRacialSkills(_Char);
+CharacterAddSkill(_Char, _Skill, 0);
+
+PROC
+ProcObjectTimerFinished((CHARACTERGUID)_Char, "BOO_PolymorphReset")
+AND
+NOT QryIsPolymorphing(_Char) // Not going from one poly form to another
 AND
 DB_BOO_RacialCivilsMap(_Char, _Civil)
+THEN
+BOO_RemoveRacialCivils(_Char);
+CharacterAddTalent(_Char, _Civil);
+
+PROC
+ProcObjectTimerFinished((CHARACTERGUID)_Char, "BOO_PolymorphReset")
+AND
+NOT QryIsPolymorphing(_Char) // Not going from one poly form to another
 AND
 DB_BOO_RacialAbilitiesMap(_Char, _Ability)
 THEN
-BOO_RemoveRacialSkills(_Char);
-BOO_RemoveRacialCivils(_Char);
 BOO_RemoveRacialAbilities(_Char);
-CharacterAddSkill(_Char, _Skill, 0);
-CharacterAddTalent(_Char, _Civil);
 CharacterAddTalent(_Char, _Ability);
 
 // Removal functions

diff --git a/Mods/BookOfOrigins_395a6fbb-f855-4cb0-97a9-6674bfd1799b/meta.lsx b/Mods/BookOfOrigins_395a6fbb-f855-4cb0-97a9-6674bfd1799b/meta.lsx
@@ -34,7 +34,7 @@
                     <attribute id="Tags" value="" type="30" />
                     <attribute id="Type" value="Add-on" type="22" />
                     <attribute id="UUID" value="395a6fbb-f855-4cb0-97a9-6674bfd1799b" type="22" />
-                    <attribute id="Version" value="386007040" type="4" />
+                    <attribute id="Version" value="386138112" type="4" />
                     <children>
                         <node id="PublishVersion">
                             <attribute id="Version" value="909321303" type="4" />