[all] object.ids fixes (all), action add for pst

Adding non-RES version of ForceSpellNoFeedback for PsT https://www.gibberlings3.net/forums/topic/34875-bug-report-ee-content-bugs/page/10/#comment-317235 Expanding/correcting object.ids https://www.gibberlings3.net/forums/topic/35564-objectids-typos-or-missing-lines
CamDawg · Oct 31, 2022 · 6efada7 · 6efada7
1 parent f044f2e
commit 6efada7
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 1 deletion.
diff --git a/eefixpack/files/ids/object_iwdee.ids b/eefixpack/files/ids/object_iwdee.ids
@@ -0,0 +1,21 @@
+94 LastKilled
+95 NearestAllyOf
+96 SecondNearestAllyOf
+97 ThirdNearestAllyOf
+98 FourthNearestAllyOf
+99 FifthNearestAllyOf
+100 SixthNearestAllyOf
+101 SeventhNearestAllyOf
+102 EighthNearestAllyOf
+103 NinthNearestAllyOf
+104 TenthNearestAllyOf
+105 FarthestEnemyOf
+106 SecondFarthestEnemyOf
+107 ThirdFarthestEnemyOf
+108 FourthFarthestEnemyOf
+109 FifthFarthestEnemyOf
+110 SixthFarthestEnemyOf
+111 SeventhFarthestEnemyOf
+112 EighthFarthestEnemyOf
+113 NinthFarthestEnemyOf
+114 TenthFarthestEnemyOf
diff --git a/eefixpack/files/tph/bg2ee.tph b/eefixpack/files/tph/bg2ee.tph
@@ -16,6 +16,8 @@ END
 
 INCLUDE ~eefixpack/files/tph/a7/anim_3001.tph~ // fix missing creature animation definitions for Neothelid
 
+INCLUDE ~eefixpack/files/tph/tbd_object_ids.tph~ // tbd, cam: missing/dupe entries in object.ids
+
 /*
 luke
 **splprot.2da**
@@ -47,6 +49,8 @@ INCLUDE ~eefixpack/files/tph/clswpbon.tpa~ // tbd, cam: fix non-prof penalties f
 COPY_EXISTING ~25stweap.2da~ ~override~
   REPLACE_TEXTUALLY ~[ %TAB%]ham07[ %TAB%]~ ~ hamm07 ~
   PRETTY_PRINT_2DA
+
+CLEAR_IDS_MAP // reload ids, if we end up having any changes
 
 /////                                                  \\\\\
 ///// mass copy/includes actions                       \\\\\

diff --git a/eefixpack/files/tph/bgee.tph b/eefixpack/files/tph/bgee.tph
@@ -38,6 +38,8 @@ COPY_EXISTING ~bgee.lua~ ~override~
 
 INCLUDE ~eefixpack/files/tph/a7/anim_3001.tph~ // fix missing creature animation definitions for Neothelid
 
+INCLUDE ~eefixpack/files/tph/tbd_object_ids.tph~ // tbd, cam: missing/dupe entries in object.ids
+
 // tbd, cam (from jmerry)
 // clck31 available in bp, but missing in armor exclusionlist (fixed in sod)
 APPEND ~itemexcl.2da~ ~clck31 1~ UNLESS ~^clck31[ %TAB%]~ // clck31 available via black pits
@@ -137,6 +139,8 @@ WITH_SCOPE BEGIN
 END
 
 LAM "SPELL_IDS" // relaunch so as to take into account the BG2 entries
+
+CLEAR_IDS_MAP // reload ids, if we end up having any changes
 
 /////                                                  \\\\\
 ///// mass copy/includes actions                       \\\\\

diff --git a/eefixpack/files/tph/iwdee.tph b/eefixpack/files/tph/iwdee.tph
@@ -16,6 +16,8 @@ END
 
 INCLUDE ~eefixpack/files/tph/a7/anim_3001.tph~ // fix missing creature animation definitions for Neothelid
 
+INCLUDE ~eefixpack/files/tph/tbd_object_ids.tph~ // tbd, cam: missing/dupe entries in object.ids
+
 /*
 luke
 **splprot.2da**
@@ -59,7 +61,7 @@ INCLUDE ~eefixpack/files/tph/clswpbon.tpa~ // tbd, cam: fix non-prof penalties f
 // regression: add full oiwd soundsets for iwdee now that engine fully supports them
 INCLUDE ~eefixpack/files/tph/iwdee_soundsets.tph~
 
-// CLEAR_IDS_MAP // reload ids, if we end up having any changes
+CLEAR_IDS_MAP // reload ids, if we end up having any changes
 
 /////                                                  \\\\\
 ///// mass copy/includes actions                       \\\\\

diff --git a/eefixpack/files/tph/pstee.tph b/eefixpack/files/tph/pstee.tph
@@ -16,17 +16,23 @@ END
 
 // tbd, cam
 // Names of parameters 2 and 3 for ExploreMapChunk() should be swapped in ACTION.IDS
+// adding non-res version of ForceSpellNoFeedback action
 COPY_EXISTING ~action.ids~ ~override~
   REPLACE_TEXTUALLY ~435 ExploreMapChunk(P:Center\*,I:Radius\*,I:Mode\*)~ ~435 ExploreMapChunk(P:Center*,I:Mode*,I:Radius*)~
+  REPLACE_TEXTUALLY ~^\(466[ %TAB%].+\)$~ ~466 ForceSpellNoFeedback(O:Target,I:Spell*Spell)%WNL%\1~ // add non-res version
   BUT_ONLY
 
 COPY_EXISTING ~animate.ids~ ~override~
   REPLACE_TEXTUALLY ~0xf005[ %TAB%]+cl_4_Collector_Thug~ ~0xf006 cl_4_Collector_Thug~
   REPLACE_TEXTUALLY ~0xf042[ %TAB%]+Trelon~ ~0xf043 Trelon~
 BUT_ONLY
 
+INCLUDE ~eefixpack/files/tph/tbd_object_ids.tph~ // tbd, cam: missing/dupe entries in object.ids
+
 INCLUDE ~eefixpack/files/tph/clswpbon.tpa~ // tbd, cam: fix non-prof penalties for shadowdancers, mage-thieves
 INCLUDE ~eefixpack/files/tph/a7/pst_ini_extra.tph~  // extra animation slots for special characters
+
+CLEAR_IDS_MAP // reload ids, if we end up having any changes
 
 /////                                                  \\\\\
 ///// mass copy/includes actions                       \\\\\

diff --git a/eefixpack/files/tph/tbd_object_ids.tph b/eefixpack/files/tph/tbd_object_ids.tph
@@ -0,0 +1,10 @@
+// tbd, cam
+// missing/dupe entries in object.ids: https://www.gibberlings3.net/forums/topic/35564-objectids-typos-or-missing-lines
+COPY_EXISTING ~object.ids~ ~override~
+  PATCH_IF !game_is_iwdee BEGIN
+    REPLACE_TEXTUALLY ~^[56]7 EigthNearest.+[ %TAB%%LNL%%MNL%%WNL%]+~ ~~
+  END ELSE BEGIN
+    REPLACE_TEXTUALLY ~^\([56]7 \)Eigth\(Nearest.+\)$~ ~\1Eighth\2~
+    APPEND_FILE ~eefixpack/files/ids/object_iwdee.ids~
+  END  
+  BUT_ONLY