v4b10sd18

fnp compatibiity
subtledoctor · Oct 16, 2023 · a6ec547 · a6ec547
1 parent 96909f8
commit a6ec547
Show file tree

Hide file tree

Showing 4 changed files with 110 additions and 113 deletions.
diff --git a/item_rev/components/spellcasting_armor.tpa b/item_rev/components/spellcasting_armor.tpa
@@ -176,16 +176,6 @@ ACTION_PHP_EACH armor AS ind => res BEGIN
               END
             END
           END
-//          PATCH_FOR_EACH d5arca IN d5arcal d5arcac d5arcap d5arca1 d5arca2 d5arca3 BEGIN // compat with subtledoctor
-/*
-            LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = ~d5arcal~ END
-            LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = ~d5arcac~ END
-            LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = ~d5arcap~ END
-            LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = ~d5arca1~ END
-            LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = ~d5arca2~ END
-            LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = ~d5arca3~ END
-*/
-//          END 
         END
 
         SPRINT text_update casting_penalty

diff --git a/item_rev/item_rev.tp2 b/item_rev/item_rev.tp2
@@ -5,7 +5,7 @@ README ~item_rev/readme-item_rev.html~
 
 ASK_EVERY_COMPONENT
 
-VERSION ~v4beta10sd17~
+VERSION ~v4beta10sd18~
 
 ALWAYS
   OUTER_PATCH ~~ BEGIN
@@ -231,6 +231,11 @@ LOAD_TRA ~item_rev/languages/english/proficiencies.tra~
 LOAD_TRA ~item_rev/languages/%LANGUAGE%/proficiencies.tra~
 INCLUDE ~item_rev/components/weapon_changes.tpa~
 
+ACTION_IF (MOD_IS_INSTALLED ~faiths_and_powers.tp2~ ~75~) BEGIN
+  INCLUDE ~item_rev/lib/fnp_weapons.tpa~
+  LAF d5_fnp_weaps END
+END
+
 
 ///////////////////////////////////////////////////////////////////////////
 // Enchantment Doesn't Affect Speed Factor of Weapons                    //

diff --git a/item_rev/lib/fnp_weapons.tpa b/item_rev/lib/fnp_weapons.tpa
@@ -0,0 +1,32 @@
+// Function for compatibility with Faiths & Powers revised cleric weapon use
+
+
+DEFINE_ACTION_FUNCTION d5_fnp_weaps BEGIN
+
+  ACTION_DEFINE_ASSOCIATIVE_ARRAY fnpproftypes BEGIN
+    89 => 22
+    90 => 20
+    91 => 19
+    92 => 25
+    93 => 57
+    94 => 30
+    95 => 29
+    96 => 16
+    97 => 21
+    98 => 44
+    99 => 69
+    100 => 23
+    101 => 17
+    102 => 26
+    115 => 26
+  END
+  COPY_EXISTING_REGEXP GLOB ~^.+\.itm$~ ~override~
+    READ_BYTE  0x31 prof
+    PHP_EACH fnpproftypes AS profnum => itemtype BEGIN
+      PATCH_IF prof = %profnum% BEGIN
+        WRITE_SHORT 0x1c %itemtype%
+      END
+    END
+  BUT_ONLY
+
+END	//	end define function