From 36c1f1e40fbe3346c8bf44b18791347cc99ccf3a Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 10:24:10 -0400 Subject: [PATCH 01/21] Update .gitignore --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 34d91d3..5a55e3b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ setup-item_rev setup-item_rev.command item_rev/backup/* +.DS_Store From 1a9b71f48fe46542f43eae39e8684e434c382729 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 10:25:45 -0400 Subject: [PATCH 02/21] 4b10sd1 backstabbing - thief item usability --- item_rev/components/backstabbing.tpa | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/item_rev/components/backstabbing.tpa b/item_rev/components/backstabbing.tpa index 4ec0d6d..adcb1a5 100644 --- a/item_rev/components/backstabbing.tpa +++ b/item_rev/components/backstabbing.tpa @@ -46,8 +46,13 @@ COPY_EXISTING_REGEXP GLOB ~^.+\.itm$~ override PATCH_IF SOURCE_SIZE>0x71 BEGIN END END ELSE BEGIN READ_BYTE 0x1f us2 + READ_BYTE 0x31 prof PATCH_IF (us2 & 2)!=2 || (us3 & 11)!=11 BEGIN // usable by any thief multiclass - WRITE_BYTE 0x20 (us3 & `64) + PATCH_IF (IS_AN_INT %prof%) BEGIN + PATCH_IF (prof > 88) && (prof < 116) BEGIN + WRITE_BYTE 0x20 (us3 & `64) + END + END END END END From 918b5fba79c4e7cec991b6e06336702824c9c947 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 10:27:16 -0400 Subject: [PATCH 03/21] 4b10sd2 marek's cure --- item_rev/components/main/items.2da | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/item_rev/components/main/items.2da b/item_rev/components/main/items.2da index 30413bd..f021026 100644 --- a/item_rev/components/main/items.2da +++ b/item_rev/components/main/items.2da @@ -786,7 +786,7 @@ POTION_OF_INSIGHT POTION potn43 1 1 1 POTION_OF_STRENGTH POTION potn44 1 1 1 1 1 1 #6976 @3084 #16264 @3085 * * * * //extra_content POTION_OF_FREEDOM POTION potn45 1 1 1 1 1 1 #6976 @3086 #16264 @3087 * * * * //extra_content POTION_OF_STONE_FORM POTION potn46 1 1 1 1 1 1 #6976 @3088 #16264 @3089 * * * * //extra_content -MAREKS_POTION_OF_ANTIDOTE POTION potn47 1 1 1 1 1 1 #6976 @3090 #16264 @3091 * * * * //extra_content +MAREKS_POTION_OF_ANTIDOTE POTION potn47 1 1 1 0 1 0 #6976 @3090 #16264 @3091 * * * * //extra_content VIAL_OF_MYSTERIOUS_LIQUID POTION potn48 1 1 1 1 1 1 #6976 @3092 #16264 @3093 * * * * POTION_OF_EXTRA_HEALING POTION potn52 1 1 1 1 1 1 #6976 @3094 #16264 @3095 * * * * //extra_content FESTULE_THE_ALCHEMISTS_POTION POTION potn53 1 1 0 0 1 1 #6976 @3096 #16264 @3097 * * * * From 88b8ad966d3312b9760e9b8a00eee8cf33111ea3 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 10:29:24 -0400 Subject: [PATCH 04/21] 4b10sd3 potn19 sound duration fix --- item_rev/itm/potn19.spl | Bin 1930 -> 1930 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/item_rev/itm/potn19.spl b/item_rev/itm/potn19.spl index 4022d76b977a2b393fa56c18a6bb047f38d77507..edb4f152a48065a50c942f831ebf7f7b30219367 100644 GIT binary patch delta 23 ccmeC;@8X{j&B_1*6BAZ2*)VM8Vr*ao073T!J^%m! delta 23 ecmeC;@8X{j&AOn+fq`{m!V0Dcrp;W84Qv2dw+77s From cc762cb15d0b0b0b39bf9dee7e218425a9f508f8 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 10:30:26 -0400 Subject: [PATCH 05/21] 4b10sd4 shaman usability --- item_rev/components/main_component.tpa | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/item_rev/components/main_component.tpa b/item_rev/components/main_component.tpa index cfcc5ed..d66bd58 100644 --- a/item_rev/components/main_component.tpa +++ b/item_rev/components/main_component.tpa @@ -189,3 +189,21 @@ COPY - ~item_rev/components/main/items.2da~ ~item_rev/components/main~ /*------------------Iron Crisis-----------------*/ INCLUDE ~item_rev/lib/iron_crisis.tpa~ + + +/*-------------------Shamans--------------------*/ +// from subtledoctor +ACTION_IF FILE_EXISTS_IN_GAME ~enginest.2da~ BEGIN + COPY_EXISTING_REGEXP GLOB ~^.+\.itm$~ ~override~ + PATCH_IF (~%SOURCE_SIZE%~ > ~0x71~) BEGIN + READ_BYTE 0x1c type + READ_BYTE 0x31 prof + PATCH_IF (%prof% = 92) OR (%prof% = 105) OR (%type% = 5) BEGIN // axes or shortbows or arrows + WRITE_BYTE 0x21 (THIS BAND 0b10111111) + LPF DELETE_EFFECT INT_VAR silent = 1 match_opcode = 319 match_target = 1 match_power = 0 match_parameter2 = 5 match_parameter1 = 11 match_timing = 2 END + LPF ADD_ITEM_EQEFFECT INT_VAR opcode = 319 target = 1 power = 0 parameter2 = 5 parameter1 = 11 timing = 2 END + END + END + BUT_ONLY +END + From bcc5445492d66e98b22bad5d04122bbb2a563155 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 11:02:02 -0400 Subject: [PATCH 06/21] 4b10sd4 cold iron weapons --- item_rev/itm/blun10.itm | Bin 554 -> 554 bytes item_rev/itm/sw1h03.itm | Bin 890 -> 890 bytes item_rev/itm/sw1h15.itm | Bin 458 -> 458 bytes item_rev/itm/sw1h18.itm | Bin 458 -> 458 bytes item_rev/itm/sw1h24.itm | Bin 890 -> 890 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/item_rev/itm/blun10.itm b/item_rev/itm/blun10.itm index 68e1b7db33eb09e4d14a75a2f4a575cab35fe2c6..26a0fd1a4d8a49104cf8e887bd9f9aa8b742745e 100644 GIT binary patch delta 35 kcmZ3*vWi8@GsIUR%uqq0w2Oh^gCZjX4CF9vloDV90FeU*qyPW_ delta 35 pcmZ3*vWi8@GsIUR%uqq0w2Oh^gCZjX5G?3%U|`K**eE5y1OT732onGR diff --git a/item_rev/itm/sw1h03.itm b/item_rev/itm/sw1h03.itm index 31d433d5b9a5c723e3be633360bfc91308c17adb..82fc726bccc874875aaee53e04232249b1121938 100644 GIT binary patch delta 35 kcmeyx_KQu*GsIUR%uqq0vyy>fg9;-94CF9uluBR*0Hb6FT>t<8 delta 35 pcmeyx_KQu*GsIUR%uqq0vyy>fg9;-95G?3%U|`K*+$fd63;?nu2+sfj diff --git a/item_rev/itm/sw1h15.itm b/item_rev/itm/sw1h15.itm index a897a3134ef41ac476bf486e13e208909d4f3e3d..d782a0c061b2e5fe609ea766c970156b338911e5 100644 GIT binary patch delta 35 kcmX@be2Q7hGsIUR%uqpL-BAXHP!&c77|3DRD7AqR0GWUXTL1t6 delta 35 pcmX@be2Q7hGsIUR%uqpL-BAXHP!&c7AXw1jz`&ZrxKU~YBLJvC2+aTh diff --git a/item_rev/itm/sw1h18.itm b/item_rev/itm/sw1h18.itm index a7710ffa551eda944fec41cdd90d52f74a3d408f..283d43cac19e5160fc69b27e12102f56131015fe 100644 GIT binary patch delta 12 TcmX@be2RI3BqQ@isSS((8(Ra! delta 12 TcmX@be2RI3BqQTSsSS((8&Lzo diff --git a/item_rev/itm/sw1h24.itm b/item_rev/itm/sw1h24.itm index 5a8429f29aac5b7489708059aac1429b4dce5d0a..c246d1f504ffb84e384cb853d3e4ed256cfebfac 100644 GIT binary patch delta 35 jcmeyx_KQu*GsIUR%uqo=e Date: Fri, 22 May 2020 11:21:36 -0400 Subject: [PATCH 07/21] 4b10sd5 starmetal = cold iron --- item_rev/components/main_component.tpa | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/item_rev/components/main_component.tpa b/item_rev/components/main_component.tpa index d66bd58..3024640 100644 --- a/item_rev/components/main_component.tpa +++ b/item_rev/components/main_component.tpa @@ -207,3 +207,11 @@ ACTION_IF FILE_EXISTS_IN_GAME ~enginest.2da~ BEGIN BUT_ONLY END + +/*-----------starmetal hits loup garou------------*/ +COPY_EXISTING ~smcudge.itm~ ~override~ + ~cdismcud.itm~ ~override~ + ~sw2h07.itm~ ~override~ + WRITE_BYTE 0x19 (THIS BOR 0b00000010) +IF_EXISTS BUT_ONLY + From fe53699b24dd3c7116401f9206074763d0b4b65e Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 11:22:10 -0400 Subject: [PATCH 08/21] 4b10sd6 daystar damage fix --- item_rev/components/main/shared_effects.tpa | 1 + item_rev/itm/holydam2.eff | Bin 0 -> 272 bytes item_rev/itm/sw1h31.itm | Bin 610 -> 610 bytes 3 files changed, 1 insertion(+) create mode 100644 item_rev/itm/holydam2.eff diff --git a/item_rev/components/main/shared_effects.tpa b/item_rev/components/main/shared_effects.tpa index 3ef46c7..c02fed1 100644 --- a/item_rev/components/main/shared_effects.tpa +++ b/item_rev/components/main/shared_effects.tpa @@ -23,6 +23,7 @@ COPY ~item_rev/itm/goledam6.eff~ ~override~ COPY ~item_rev/itm/goledam8.eff~ ~override~ COPY ~item_rev/itm/goledie.eff~ ~override~ COPY ~item_rev/itm/holydam.eff~ ~override~ +COPY ~item_rev/itm/holydam2.eff~ ~override~ COPY ~item_rev/itm/holydam3.eff~ ~override~ COPY ~item_rev/itm/holydam4.eff~ ~override~ COPY ~item_rev/itm/holydam6.eff~ ~override~ diff --git a/item_rev/itm/holydam2.eff b/item_rev/itm/holydam2.eff new file mode 100644 index 0000000000000000000000000000000000000000..86188a41230cf16dc0ac161a7f815dc6bef39386 GIT binary patch literal 272 zcmZ>Db5jU2(lc;{(wi9=7?^+<1ek%C1BhY#6p$bg7$iG@X<`VNUL>_3?W_<}SXus~ K0VH(;!UO;#EEi4y literal 0 HcmV?d00001 diff --git a/item_rev/itm/sw1h31.itm b/item_rev/itm/sw1h31.itm index 57d9e9ba9ee67579c00fef3585ad16192c66c701..40ccf098d92f27b1c990ea36b6cbfcb071f205f5 100644 GIT binary patch delta 42 rcmaFF@`y#kGsIUR%uqo=e Date: Fri, 22 May 2020 11:23:20 -0400 Subject: [PATCH 09/21] 4b10sd7 bracers of speed fatigue subspell --- item_rev/components/main_component.tpa | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/item_rev/components/main_component.tpa b/item_rev/components/main_component.tpa index 3024640..eb8ed92 100644 --- a/item_rev/components/main_component.tpa +++ b/item_rev/components/main_component.tpa @@ -215,3 +215,11 @@ COPY_EXISTING ~smcudge.itm~ ~override~ WRITE_BYTE 0x19 (THIS BOR 0b00000010) IF_EXISTS BUT_ONLY + +/*-------------------EE brac11------------------*/ +ACTION_IF GAME_IS ~bgee bg2ee eet iwdee~ BEGIN + COPY_EXISTING ~dvwinded.spl~ ~override~ + LPF ALTER_SPELL_HEADER INT_VAR target = 7 END + BUT_ONLY +END + From fb2ddcf6dd7d1a0255998e6c4a7b14512b3935bd Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 11:24:50 -0400 Subject: [PATCH 10/21] 4b10sd8 shield usability fix --- item_rev/itm/shld06.itm | Bin 402 -> 402 bytes item_rev/itm/shld15.itm | Bin 402 -> 402 bytes item_rev/itm/shld18.itm | Bin 402 -> 402 bytes item_rev/itm/shld23.itm | Bin 594 -> 594 bytes item_rev/itm/shld30.itm | Bin 402 -> 402 bytes 5 files changed, 0 insertions(+), 0 deletions(-) diff --git a/item_rev/itm/shld06.itm b/item_rev/itm/shld06.itm index 18684f66039cc87fbd4798826673e3cfdbb820f6..f941bf23bd6667f9ef7c2b908f3f3cb8f6cbb2fd 100644 GIT binary patch delta 57 xcmbQlJc-%BGsIUR%uqpLp%eqdQXqzb93X>-!GXai!Nr7ufgdK!ve6)k5daS!2iX7s delta 57 zcmbQlJc-%BGsIUR%uqpLp%eqdQXmF`1w9T7tT{ji4}$}PPlAgH0|P$;kO=~88x4{e E0YF&^i~s-t diff --git a/item_rev/itm/shld15.itm b/item_rev/itm/shld15.itm index 6857342e87446b94a4b22b10adb6d13b8387ab16..7c7fe59dd6cc4be833873a160351ed6eb105366d 100644 GIT binary patch delta 18 WcmbQlJc)UNCOZQduxvC)VgvvpOan6j delta 18 XcmbQlJc)UNCc6Uz2(WE5NMZy4B^Cp9 diff --git a/item_rev/itm/shld18.itm b/item_rev/itm/shld18.itm index 3e29ede23ac060c431849ce0abe1f3709525f335..22b2a5e2d34f0c0f9677a46be044f1631eaad84f 100644 GIT binary patch delta 18 WcmbQlJc)UNCOZQduxvC)VgvvpOan6j delta 18 XcmbQlJc)UNCc6Uz2(WE5NMZy4B^Cp9 diff --git a/item_rev/itm/shld23.itm b/item_rev/itm/shld23.itm index e62eb0e678c4d2c5b56faa9cfb08a9bfe72de25b..cef8b30aaffd78d5ab08413f8b8e8e7470856dc2 100644 GIT binary patch delta 57 xcmcb_a*4&jGsIUR%uqpLp%eqdA6W)C$N{o=7#tXU5|WJ=82Dl0EE^4!m;gH_2$KK+ delta 57 zcmcb_a*4&jGsIUR%uqpLp%eqdA6W(vSkU9Zz?uVO@Gv+q_#`A7F);8m0GS}bw$VU| F2>@(i3Pu0` diff --git a/item_rev/itm/shld30.itm b/item_rev/itm/shld30.itm index 56e84a0576edf74cdd4528cd8b3199448e7cf885..b925f5f8095fd9e6563191ef95ca0115075ae07a 100644 GIT binary patch delta 39 ncmbQlJc)UNhztV|Q5 delta 39 qcmbQlJc)UNh)iZlYHkh#0|O6(1A|XOvJnFVF9VPX0&E)%k{AK2AqOe| From 8ff0c651b4e58486d8e43e38f4f06b512904a73f Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 11:25:37 -0400 Subject: [PATCH 11/21] 4b10sd9 dagger of venom usability --- item_rev/itm/misc75.itm | Bin 410 -> 410 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/item_rev/itm/misc75.itm b/item_rev/itm/misc75.itm index 9739e7cb2ab61ab7573284c4a1ce65bd01ce3154..94f99028c507df309256e347b92f49ccabe2655e 100644 GIT binary patch delta 41 pcmbQmJd0VuGsIUR%uqpLLL~#kab-pZ7{~!K1Q;6JH!4&y0syjZ2d@AC delta 41 scmbQmJd0VuGsIUR%uqpLLL~#kab-pZAXp-z!oZRPWC#H9MujRy0K9(($N&HU From 83361655e78bbc569ee26b6c0821ffec629f379e Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 11:27:14 -0400 Subject: [PATCH 12/21] 4b10sd10 ammo stacks = 80 in EEs --- item_rev/components/main_component.tpa | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/item_rev/components/main_component.tpa b/item_rev/components/main_component.tpa index eb8ed92..58b91a4 100644 --- a/item_rev/components/main_component.tpa +++ b/item_rev/components/main_component.tpa @@ -223,3 +223,17 @@ ACTION_IF GAME_IS ~bgee bg2ee eet iwdee~ BEGIN BUT_ONLY END + +/*----------------EE ammo stacks----------------*/ +// from subtledoctor +ACTION_IF GAME_IS ~bgee bg2ee eet iwdee~ BEGIN + COPY_EXISTING_REGEXP GLOB ~^.+\.itm$~ ~override~ + PATCH_IF (~%SOURCE_SIZE%~ > ~0x71~) BEGIN + READ_BYTE 0x1c type + PATCH_IF (%type% = 5) OR (%type% = 14) OR (%type% = 31) BEGIN // arrows or bullets or bolts + WRITE_SHORT 0x38 80 + END + END + BUT_ONLY +END + From 1ee392bed640f9a3c4259cf75819eb86ca75b1e0 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 11:31:46 -0400 Subject: [PATCH 13/21] 4b10sd11 shapechange claw flags --- item_rev/itm/dvjelly.itm | Bin 2282 -> 2282 bytes item_rev/itm/dvrat.itm | Bin 1082 -> 1082 bytes item_rev/itm/dvwere.itm | Bin 1082 -> 1082 bytes 3 files changed, 0 insertions(+), 0 deletions(-) diff --git a/item_rev/itm/dvjelly.itm b/item_rev/itm/dvjelly.itm index 908e3838a055acbf37576f1b72f14820a9653e30..15ce494aa20acdf1031e9528e3dfed31afbcad2b 100644 GIT binary patch delta 16 WcmaDQ_)2hs2rB~+yx1stkploOX9X(& delta 16 XcmaDQ_)2hs2&;jp14G6}$%`BSFaHHF diff --git a/item_rev/itm/dvrat.itm b/item_rev/itm/dvrat.itm index 378bab4fc7d809cdeeb46f23e41b5a132e1e6767..36c933fc3bfc34e55885476df188833bfc27046d 100644 GIT binary patch delta 16 WcmdnRv5RAZ2rB~+yx1tI$N~T+X9NWR delta 16 XcmdnRv5RAZ2&;~$14G6}NktX_C))%D diff --git a/item_rev/itm/dvwere.itm b/item_rev/itm/dvwere.itm index 7088d562b384640721f7e3cc20b3beb1d08b9c8a..64ba1a290d263cc8e88eaee15235709a6211eece 100644 GIT binary patch delta 16 WcmdnRv5RAZ2rB~+tk@{2$N~T*Cj-R* delta 16 XcmdnRv5RAZ2y0Oi1B1p!NktX_DY*n0 From d455889b744f3c627f160c5d6e2e3523c84df954 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 22 May 2020 11:33:30 -0400 Subject: [PATCH 14/21] 4b10sd12 saving grace shield --- item_rev/item_rev.tp2 | 2 +- item_rev/itm/shld27.itm | Bin 546 -> 546 bytes item_rev/itm/shld27i.eff | Bin 272 -> 272 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/item_rev/item_rev.tp2 b/item_rev/item_rev.tp2 index 1c96f66..f95d770 100644 --- 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 ~V4 Beta 10~ +VERSION ~V4 Beta 10 SD 12~ ALWAYS OUTER_PATCH ~~ BEGIN diff --git a/item_rev/itm/shld27.itm b/item_rev/itm/shld27.itm index 914eebd97be6bee56bcb95e92ea577ba08db5fe4..02de3ae777ed75835ae4efebe184e1fe955d8c18 100644 GIT binary patch delta 24 ecmZ3)vWR7Z2r~l%!$$G@jI4}62KVIOjOqYJ1_fgP delta 24 gcmZ3)vWR7Z2(y8x!$$G@jI2xy3=Hg(e>18B08Tpvj+-} delta 42 ncmbQhG=XV?3M(T65KPqc;$4&Gz`)AD0H# Date: Fri, 29 May 2020 10:48:30 -0400 Subject: [PATCH 15/21] 4b10sd13 temple services fix --- item_rev/lib/store_rev_macros.tpa | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/item_rev/lib/store_rev_macros.tpa b/item_rev/lib/store_rev_macros.tpa index 1e60f3b..4821f7d 100644 --- a/item_rev/lib/store_rev_macros.tpa +++ b/item_rev/lib/store_rev_macros.tpa @@ -128,9 +128,18 @@ DEFINE_ACTION_MACRO spelldesc BEGIN END ACTION_IF comp_sr=1 BEGIN - OUTER_SPRINT $temple("cure_medium_wounds") sppr215 - OUTER_SPRINT $temple("cure_serious_wounds") sppr315 - OUTER_SPRINT $temple("cure_critical_wounds") sppr401 + ACTION_IF (FILE_CONTAINS_EVALUATED (~SPELL.IDS~ ~[ %TAB%]CLERIC_CURE_MODERATE_WOUNDS[ %TAB%%LNL%%MNL%%WNL%]~)) BEGIN + LAF RES_NUM_OF_SPELL_NAME STR_VAR spell_name = ~CLERIC_CURE_MODERATE_WOUNDS~ RET spell_res END + OUTER_SPRINT $temple("cure_medium_wounds") ~%spell_res%~ + END + ACTION_IF (FILE_CONTAINS_EVALUATED (~SPELL.IDS~ ~[ %TAB%]CLERIC_CURE_MEDIUM_WOUNDS[ %TAB%%LNL%%MNL%%WNL%]~)) BEGIN + LAF RES_NUM_OF_SPELL_NAME STR_VAR spell_name = ~CLERIC_CURE_MEDIUM_WOUNDS~ RET spell_res END + OUTER_SPRINT $temple("cure_serious_wounds") ~%spell_res%~ + END + ACTION_IF (FILE_CONTAINS_EVALUATED (~SPELL.IDS~ ~[ %TAB%]CLERIC_CURE_SERIOUS_WOUNDS[ %TAB%%LNL%%MNL%%WNL%]~)) BEGIN + LAF RES_NUM_OF_SPELL_NAME STR_VAR spell_name = ~CLERIC_CURE_SERIOUS_WOUNDS~ RET spell_res END + OUTER_SPRINT $temple("cure_critical_wounds") ~%spell_res%~ + END END COPY_EXISTING speldesc.2da override From d7b8b3bd5fa6bd4417440cd6ef4821a4929c4210 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Fri, 10 Sep 2021 00:29:06 -0400 Subject: [PATCH 16/21] 4b10sd15 sword of backstabbing -> rangers, not swashies --- item_rev/components/main/item_content.tpa | 4 ++++ item_rev/item_rev.tp2 | 2 +- item_rev/itm/d51h10x.spl | Bin 0 -> 202 bytes item_rev/itm/sw1h10.itm | Bin 602 -> 650 bytes item_rev/itm/sw1h10b.eff | Bin 272 -> 272 bytes .../languages/english/description_updates.tra | 0 .../languages/english/item_descriptions.tra | 0 item_rev/languages/english/item_upgrades.tra | 0 item_rev/languages/english/masterwork.tra | 0 item_rev/languages/english/multiclasses.tra | 0 .../languages/english/potion_descriptions.tra | 0 item_rev/languages/english/proficiencies.tra | 0 item_rev/languages/english/spell_revisions.tra | 0 item_rev/languages/english/store_revisions.tra | 0 14 files changed, 5 insertions(+), 1 deletion(-) create mode 100755 item_rev/itm/d51h10x.spl mode change 100644 => 100755 item_rev/languages/english/description_updates.tra mode change 100644 => 100755 item_rev/languages/english/item_descriptions.tra mode change 100644 => 100755 item_rev/languages/english/item_upgrades.tra mode change 100644 => 100755 item_rev/languages/english/masterwork.tra mode change 100644 => 100755 item_rev/languages/english/multiclasses.tra mode change 100644 => 100755 item_rev/languages/english/potion_descriptions.tra mode change 100644 => 100755 item_rev/languages/english/proficiencies.tra mode change 100644 => 100755 item_rev/languages/english/spell_revisions.tra mode change 100644 => 100755 item_rev/languages/english/store_revisions.tra diff --git a/item_rev/components/main/item_content.tpa b/item_rev/components/main/item_content.tpa index db155a5..154bee7 100644 --- a/item_rev/components/main/item_content.tpa +++ b/item_rev/components/main/item_content.tpa @@ -786,6 +786,10 @@ COPY ~%source%/STAFF_OF_RYNN_3.tpa~ ~%target%~ COPY ~item_rev/itm/sw1h10a.eff~ ~override~ COPY ~item_rev/itm/sw1h10b.eff~ ~override~ COPY ~item_rev/itm/sw1h10c.eff~ ~override~ + COPY ~item_rev/itm/d51h10x.spl~ ~override~ + ACTION_IF (FILE_EXISTS_IN_GAME ~clabth04.2da~) BEGIN + APPEND ~clabth04.2da~ ~NO_SW1H10 AP_D51H10X **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** **** ~ UNLESS ~AP_D51H10X~ + END >>>>>>>> COPY ~%source%/SHORT_SWORD_OF_BACKSTABBING_3.tpa~ ~%target%~ diff --git a/item_rev/item_rev.tp2 b/item_rev/item_rev.tp2 index f95d770..5002ef0 100644 --- 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 ~V4 Beta 10 SD 12~ +VERSION ~V4 Beta 10 SD 15~ ALWAYS OUTER_PATCH ~~ BEGIN diff --git a/item_rev/itm/d51h10x.spl b/item_rev/itm/d51h10x.spl new file mode 100755 index 0000000000000000000000000000000000000000..1f201717deb0ef75edff0d59cc63f178002f3925 GIT binary patch literal 202 zcmWFz@KFdeR8aU21q?87fPt9>#zvzVfqW3g1~AM4Dk=hEMuu5X<;)BSb6FYWpeC__ jWf{Rd5Xs1J4v0affh0J=vMCI~;f5ZD22K%RE*b#aU literal 0 HcmV?d00001 diff --git a/item_rev/itm/sw1h10.itm b/item_rev/itm/sw1h10.itm index a3298388528e646c9dc513ab64cf566b1649ebff..e5fec3e27360ab2cc8c13232947cf1e5070c2919 100644 GIT binary patch delta 30 kcmcb`(#1NVfRSrrp(2o&yn1pTqt0Y2MiWM!$@z@00hh}Op#T5? delta 28 jcmeBTy~Q%2fRS@zp(2o&yn1pTqrqf5MxDv07!Lpdh~(7-8T;==ri0jvN=i5JKK literal 272 zcmZ>Db5jU2(lc;{((H^33_t`1Fq#R Date: Tue, 22 Nov 2022 10:36:58 -0500 Subject: [PATCH 17/21] v4b10sd16 cleric's staff, armor list --- item_rev/item_rev.tp2 | 10 +++++++++- item_rev/itm/helm24.itm | Bin 450 -> 402 bytes item_rev/itm/staf19.itm | Bin 458 -> 458 bytes item_rev/lib/armor_list.tpa | 2 +- 4 files changed, 10 insertions(+), 2 deletions(-) diff --git a/item_rev/item_rev.tp2 b/item_rev/item_rev.tp2 index 5002ef0..bbd7cb8 100644 --- 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 ~V4 Beta 10 SD 15~ +VERSION ~v4beta10sd16~ ALWAYS OUTER_PATCH ~~ BEGIN @@ -45,6 +45,10 @@ LANGUAGE ~Russian~ ~item_rev/languages/russian/description_updates.tra~ + +/////////////////////////////////////////////////////////////////////////// + + /////////////////////////////////////////////////////////////////////////// // Item Revisions by Demivrgvs (Main Component) - Installs all items // /////////////////////////////////////////////////////////////////////////// @@ -65,8 +69,10 @@ LOAD_TRA ~item_rev/languages/english/potion_descriptions.tra~ LOAD_TRA ~item_rev/languages/%LANGUAGE%/item_descriptions.tra~ LOAD_TRA ~item_rev/languages/%LANGUAGE%/item_upgrades.tra~ LOAD_TRA ~item_rev/languages/%LANGUAGE%/potion_descriptions.tra~ + INCLUDE ~item_rev/components/main_component.tpa~ + /////////////////////////////////////////////////////////////////////////// // Store Revisions // /////////////////////////////////////////////////////////////////////////// @@ -105,6 +111,7 @@ END /////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////// + /////////////////////////////////////////////////////////////////////////// // Revised Armor // /////////////////////////////////////////////////////////////////////////// @@ -425,3 +432,4 @@ INCLUDE ~item_rev/components/wands.tpa~ //REQUIRE_PREDICATE (ENGINE_IS ~tob bgee bg2ee~ /* || ENGINE_IS ~iwdee~ */) @9002 // //INCLUDE ~item_rev/components/shield_bash.tpa~ + diff --git a/item_rev/itm/helm24.itm b/item_rev/itm/helm24.itm index b11b1271f0df85410785559981d6fe28b2f3568a..5a8a000e4e4eb729e4b3a70a1fb92b1c3c22458d 100644 GIT binary patch delta 15 XcmX@aJc)Ti0VCVQ!ikfO7$*P#D%1r_ delta 33 pcmbQle295M0VDgw!il^*42%rk3=9lR3=ABMlld8yCo?fl004f822ub3 diff --git a/item_rev/itm/staf19.itm b/item_rev/itm/staf19.itm index 001dbb4bbd4cfe3479c0c42a767a1db01b7bd2ad..a3a4646ea67e20859925c8cd15d59e58f2b2b68a 100644 GIT binary patch delta 38 ncmX@be2Q7ZGsIUR%uqqWa3TZ4A{9mk7?>#G!N|NZF_RGhq;>~> delta 38 scmX@be2Q7ZGsIUR%uqqWa3TZ4A{9mkAjoKQU|^jn;laqXF)@=70JI?pumAu6 diff --git a/item_rev/lib/armor_list.tpa b/item_rev/lib/armor_list.tpa index be1112d..d7cf82a 100644 --- a/item_rev/lib/armor_list.tpa +++ b/item_rev/lib/armor_list.tpa @@ -609,7 +609,7 @@ bdchan04 => 4 // Commander's Chain (chain) bdchan05 => 4 // Corwin's armor (chain) bdchan06 => 5 // Stalwart Scale (splint) bdchanca => 4 // Hallowed Hero (chain) -bdchanel => 4 // elven chain +bdchanel => 36 // elven chain bdchangh => 5 // splint +1 bdleat01 => 3 // Cornugon Revenge (hide) bdleat02 => 3 // Goblin Hide (hide) From 4c32177e90606ea71e032a8f5e1172c63ec76fcd Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Tue, 17 Jan 2023 11:58:37 -0500 Subject: [PATCH 18/21] 4b10sd17 TnB magus compatibility --- item_rev/components/spellcasting_armor.tpa | 20 +++++++++++++++++--- item_rev/item_rev.tp2 | 2 +- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/item_rev/components/spellcasting_armor.tpa b/item_rev/components/spellcasting_armor.tpa index 5e0a42a..5ef79df 100644 --- a/item_rev/components/spellcasting_armor.tpa +++ b/item_rev/components/spellcasting_armor.tpa @@ -139,7 +139,7 @@ ACTION_PHP_EACH armor AS ind => res BEGIN PATCH_IF bards_armor_spell_penalties || (class != 5 || (res != 4 && res != 1 && res != 12 && res != 3 && res != 2 && res != 12 && res != 36)) BEGIN LPF ADD_ITEM_EQEFFECT INT_VAR opcode=177 target=1 timing=2 parameter1=class parameter2=5 STR_VAR resource=EVAL ~7c#IR%value%~ END END - END + END END END @@ -157,9 +157,9 @@ ACTION_PHP_EACH armor AS ind => res BEGIN 17 // fighter/mage/cleric BEGIN /* CrevsDaak: avoid patching leather, studded, hide and chain (both mithral and elven) when it comes to Bards, as per Demi's request. */ - PATCH_IF bards_armor_spell_penalties || (class != 5 || (res != 4 && res != 1 && res != 12 && res != 3 && res != 2 && res != 12 && res != 36)) BEGIN + PATCH_IF bards_armor_spell_penalties || (class != 5 || (res != 4 && res != 1 && res != 12 && res != 3 && res != 2 && res != 12 && res != 36)) BEGIN LPF ADD_ITEM_EQEFFECT INT_VAR opcode=177 target=1 timing=2 parameter1=class parameter2=5 STR_VAR resource=EVAL ~ag#irs%value%~ END - END + END END PATCH_IF option=3 BEGIN PATCH_FOR_EACH class IN @@ -176,6 +176,16 @@ 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 @@ -183,6 +193,10 @@ ACTION_PHP_EACH armor AS ind => res BEGIN 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 = EVAL ~%d5arca%~ END + END + END BUT_ONLY END END diff --git a/item_rev/item_rev.tp2 b/item_rev/item_rev.tp2 index bbd7cb8..cf949ac 100644 --- 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 ~v4beta10sd16~ +VERSION ~v4beta10sd17~ ALWAYS OUTER_PATCH ~~ BEGIN From 96909f82fcd4d46962b98801517af1b6d9843562 Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Tue, 17 Jan 2023 12:56:16 -0500 Subject: [PATCH 19/21] v4b10sd18 more armor compat --- item_rev/components/spellcasting_armor.tpa | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/item_rev/components/spellcasting_armor.tpa b/item_rev/components/spellcasting_armor.tpa index 5ef79df..9e38f34 100644 --- a/item_rev/components/spellcasting_armor.tpa +++ b/item_rev/components/spellcasting_armor.tpa @@ -197,6 +197,17 @@ ACTION_PHP_EACH armor AS ind => res BEGIN LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = EVAL ~%d5arca%~ END END + PATCH_FOR_EACH zarm IN ~d5zarm1l~ ~d5zarm2l~ ~d5zarm3l~ ~d5zarm1c~ ~d5zarm2c~ ~d5zarm3c~ ~d5zarm1p~ ~d5zarm2p~ ~d5zarm3p~ BEGIN // compat with subtledoctor + LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = EVAL ~%zarm%~ END + END + LPF DELETE_EFFECT INT_VAR match_opcode = 146 STR_VAR match_resource = ~d5zarml~ END + LPF DELETE_EFFECT INT_VAR match_opcode = 146 STR_VAR match_resource = ~d5zarmc~ END + LPF DELETE_EFFECT INT_VAR match_opcode = 146 STR_VAR match_resource = ~d5zarmp~ END + LPF DELETE_EFFECT INT_VAR match_opcode = 146 STR_VAR match_resource = ~d5zw172l~ END + LPF DELETE_EFFECT INT_VAR match_opcode = 146 STR_VAR match_resource = ~d5zw172c~ END + LPF DELETE_EFFECT INT_VAR match_opcode = 146 STR_VAR match_resource = ~d5zw172p~ END + LPF DELETE_EFFECT INT_VAR match_opcode = 177 STR_VAR match_resource = ~d5zncast~ END + END BUT_ONLY END END From a6ec547e4123726d5e1cd2282cdcf3523da8460e Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Sun, 15 Oct 2023 22:39:32 -0400 Subject: [PATCH 20/21] v4b10sd18 fnp compatibiity --- item_rev/components/spellcasting_armor.tpa | 10 -- item_rev/item_rev.tp2 | 7 +- item_rev/lib/fnp_weapons.tpa | 32 ++++ item_rev/lib/identify_item.tpa | 174 +++++++++------------ 4 files changed, 110 insertions(+), 113 deletions(-) create mode 100644 item_rev/lib/fnp_weapons.tpa diff --git a/item_rev/components/spellcasting_armor.tpa b/item_rev/components/spellcasting_armor.tpa index 9e38f34..7638ad7 100644 --- 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 index cf949ac..0744fb1 100644 --- 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 new file mode 100644 index 0000000..b61b96e --- /dev/null +++ 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 diff --git a/item_rev/lib/identify_item.tpa b/item_rev/lib/identify_item.tpa index 7ce8ad2..696e930 100644 --- a/item_rev/lib/identify_item.tpa +++ b/item_rev/lib/identify_item.tpa @@ -20,6 +20,7 @@ DEFINE_PATCH_MACRO identify_item BEGIN TO_UPPER ~SOURCE_RES~ READ_SHORT 0x1c item +READ_SHORT 0x22 anim_num READ_ASCII 0x22 anim (2) READ_BYTE 0x26 strreq READ_BYTE 0x31 prof @@ -85,8 +86,7 @@ is_weapon=0 PATCH_IF item=0x1 BEGIN amulet=1 SPRINT itemtype ~amulet~ -END ELSE - +END PATCH_IF item=0x2 BEGIN PATCH_IF VARIABLE_IS_SET $armor2("%SOURCE_RES%") BEGIN @@ -129,57 +129,48 @@ PATCH_IF item=0x2 BEGIN robe=1 SPRINT itemtype ~robe~ END -END ELSE - +END PATCH_IF item=0x3 BEGIN belt=1 SPRINT itemtype ~belt~ -END ELSE - +END PATCH_IF item=0x4 BEGIN boots=1 SPRINT itemtype ~boots~ -END ELSE - +END PATCH_IF item=0x5 BEGIN arrow=1 SPRINT itemtype ~arrow~ is_ammo=1 -END ELSE - +END PATCH_IF item=0x6 BEGIN bracers=1 SPRINT itemtype ~bracers~ -END ELSE - +END PATCH_IF item=0x7 BEGIN helmet=1 SPRINT itemtype ~helmet~ -END ELSE - +END PATCH_IF item=0x9 BEGIN potion=1 SPRINT itemtype ~potion~ -END ELSE - +END PATCH_IF item=0xa BEGIN ring=1 SPRINT itemtype ~ring~ -END ELSE - +END PATCH_IF item=0xb BEGIN scroll=1 SPRINT itemtype ~scroll~ -END ELSE - +END PATCH_IF item=0xc BEGIN PATCH_IF VARIABLE_IS_SET $shield2("%SOURCE_RES%") BEGIN @@ -223,15 +214,13 @@ PATCH_IF item=0xc BEGIN SPRINT itemtype ~tower_shield~ END END -END ELSE - +END PATCH_IF item=0xe BEGIN bullet=1 SPRINT itemtype ~bullet~ is_ammo=1 -END ELSE - +END PATCH_IF item=0xf BEGIN PATCH_IF prof=0x69 BEGIN @@ -239,155 +228,144 @@ PATCH_IF item=0xf BEGIN SPRINT itemtype ~short_bow~ is_weapon=1 END ELSE - PATCH_IF prof=0x68 BEGIN PATCH_IF strreq<16 BEGIN long_bow=1 SPRINT itemtype ~long_bow~ is_weapon=1 END ELSE - BEGIN comp_long_bow=1 SPRINT itemtype ~comp_long_bow~ is_weapon=1 END END -END ELSE - +END -PATCH_IF item=0x10 BEGIN +PATCH_IF prof=96 BEGIN dagger=1 SPRINT itemtype ~dagger~ is_weapon=1 -END ELSE - +END -PATCH_IF item=0x11 BEGIN - PATCH_IF prof=0x73 BEGIN +PATCH_IF prof=115 BEGIN club=1 SPRINT itemtype ~club~ is_weapon=1 - END ELSE +END - PATCH_IF prof=0x65 BEGIN +PATCH_IF prof=101 BEGIN mace=1 SPRINT itemtype ~mace~ is_weapon=1 - END -END ELSE - +END PATCH_IF item=0x12 BEGIN sling=1 SPRINT itemtype ~sling~ is_weapon=1 -END ELSE - +END -PATCH_IF item=0x13 BEGIN - PATCH_IF prof=0x5b BEGIN +PATCH_IF prof=91 BEGIN short_sword=1 SPRINT itemtype ~short_sword~ is_weapon=1 - END ELSE +END - PATCH_IF prof=0x5e || prof=0x5f BEGIN +PATCH_IF prof=95 BEGIN + PATCH_IF (anim_num=21331) OR (anim_num=13139) BEGIN wakizashi=1 SPRINT itemtype ~wakizashi~ is_weapon=1 END -END ELSE - +END -PATCH_IF item=0x14 BEGIN - PATCH_IF prof=0x59 BEGIN +PATCH_IF prof=89 BEGIN bastard_sword=1 SPRINT itemtype ~bastard_sword~ is_weapon=1 - END ELSE +END - PATCH_IF prof=0x5a BEGIN +PATCH_IF prof=90 BEGIN long_sword=1 SPRINT itemtype ~long_sword~ is_weapon=1 - END ELSE +END - PATCH_IF (prof=0x5b || prof=0x5f) && (~%anim%~ STRING_EQUAL_CASE ~s1~) BEGIN +PATCH_IF prof=95 BEGIN + PATCH_IF (anim_num=12627) BEGIN ninjato=1 SPRINT itemtype ~ninjato~ is_weapon=1 - END ELSE + END +END - PATCH_IF prof=0x5d BEGIN +PATCH_IF prof=93 BEGIN twohanded_sword=1 SPRINT itemtype ~twohanded_sword~ is_weapon=1 - END ELSE +END - PATCH_IF prof=0x5e BEGIN +PATCH_IF prof=94 BEGIN + PATCH_IF (anim_num=13139) BEGIN katana=1 SPRINT itemtype ~katana~ is_weapon=1 - END ELSE + END +END - PATCH_IF prof=0x5f && (~%anim%~ STRING_EQUAL_CASE ~sc~ || ~%SOURCE_RES%~ STRING_EQUAL_CASE ~sw1h53~) BEGIN +PATCH_IF prof=95 && (~%anim%~ STRING_EQUAL_CASE ~sc~ || ~%SOURCE_RES%~ STRING_EQUAL_CASE ~sw1h53~) BEGIN scimitar=1 SPRINT itemtype ~scimitar~ is_weapon=1 - END -END ELSE - +END -PATCH_IF item=0x15 BEGIN +PATCH_IF prof=97 BEGIN hammer=1 SPRINT itemtype ~hammer~ is_weapon=1 -END ELSE - - -PATCH_IF item=0x16 BEGIN - morning_star=1 - SPRINT itemtype ~morning_star~ - is_weapon=1 -END ELSE - +END -PATCH_IF item=0x17 BEGIN - flail=1 - SPRINT itemtype ~flail~ - is_weapon=1 -END ELSE +PATCH_IF prof=100 BEGIN + PATCH_IF anim_num=17229 BEGIN + morning_star=1 + SPRINT itemtype ~morning_star~ + is_weapon=1 + END +END +PATCH_IF prof=100 BEGIN + PATCH_IF anim_num=19526 BEGIN + flail=1 + SPRINT itemtype ~flail~ + is_weapon=1 + END +END PATCH_IF item=0x18 BEGIN dart=1 SPRINT itemtype ~dart~ is_weapon=1 -END ELSE - +END -PATCH_IF item=0x19 BEGIN +PATCH_IF prof=92 BEGIN PATCH_IF strreq>9 BEGIN battleaxe=1 SPRINT itemtype ~battleaxe~ is_weapon=1 END ELSE - BEGIN handaxe=1 SPRINT itemtype ~handaxe~ is_weapon=1 END -END ELSE - +END -PATCH_IF item=0x1a BEGIN +PATCH_IF prof=102 BEGIN staff=1 SPRINT itemtype ~staff~ is_weapon=1 -END ELSE - +END PATCH_IF item=0x1b BEGIN PATCH_IF strreq<10 BEGIN @@ -395,28 +373,24 @@ PATCH_IF item=0x1b BEGIN SPRINT itemtype ~light_xbow~ is_weapon=1 END ELSE - BEGIN heavy_xbow=1 SPRINT itemtype ~heavy_xbow~ is_weapon=1 END -END ELSE - +END -PATCH_IF item=0x1d BEGIN +PATCH_IF prof=98 BEGIN spear=1 SPRINT itemtype ~spear~ is_weapon=1 -END ELSE - +END -PATCH_IF item=0x1e BEGIN +PATCH_IF prof=99 BEGIN halberd=1 SPRINT itemtype ~halberd~ is_weapon=1 -END ELSE - +END PATCH_IF item=0x1f BEGIN bolt=1 @@ -424,29 +398,25 @@ PATCH_IF item=0x1f BEGIN is_ammo=1 END - PATCH_IF item=0x20 BEGIN cloak=1 SPRINT itemtype ~cloak~ -END ELSE - +END PATCH_IF item=0x22 BEGIN gem=1 SPRINT itemtype ~gem~ -END ELSE - +END PATCH_IF item=0x23 BEGIN wand=1 SPRINT itemtype ~wand~ -END ELSE - +END PATCH_IF item=0x24 BEGIN bag=1 SPRINT itemtype ~bag~ END -END +END // end define function From 063218236a4dba3dd64f615f8251dd51c5db238b Mon Sep 17 00:00:00 2001 From: subtledoctor Date: Wed, 25 Oct 2023 22:55:38 -0400 Subject: [PATCH 21/21] v4b10sd19 fnp compat --- item_rev/item_rev.tp2 | 2 +- item_rev/lib/identify_item.tpa | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/item_rev/item_rev.tp2 b/item_rev/item_rev.tp2 index 0744fb1..1bc7710 100644 --- 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 ~v4beta10sd18~ +VERSION ~v4beta10sd19~ ALWAYS OUTER_PATCH ~~ BEGIN diff --git a/item_rev/lib/identify_item.tpa b/item_rev/lib/identify_item.tpa index 696e930..a7e9934 100644 --- a/item_rev/lib/identify_item.tpa +++ b/item_rev/lib/identify_item.tpa @@ -273,7 +273,7 @@ PATCH_IF prof=91 BEGIN END PATCH_IF prof=95 BEGIN - PATCH_IF (anim_num=21331) OR (anim_num=13139) BEGIN + PATCH_IF (~%anim%~ STRING_EQUAL_CASE ~ss~) OR (~%anim%~ STRING_EQUAL_CASE ~s3~) BEGIN wakizashi=1 SPRINT itemtype ~wakizashi~ is_weapon=1 @@ -307,7 +307,7 @@ PATCH_IF prof=93 BEGIN END PATCH_IF prof=94 BEGIN - PATCH_IF (anim_num=13139) BEGIN + PATCH_IF (~%anim%~ STRING_EQUAL_CASE ~s3~) BEGIN katana=1 SPRINT itemtype ~katana~ is_weapon=1 @@ -327,7 +327,7 @@ PATCH_IF prof=97 BEGIN END PATCH_IF prof=100 BEGIN - PATCH_IF anim_num=17229 BEGIN + PATCH_IF (~%anim%~ STRING_EQUAL_CASE ~mc~) OR (~%anim%~ STRING_EQUAL_CASE ~m2~) BEGIN morning_star=1 SPRINT itemtype ~morning_star~ is_weapon=1 @@ -335,7 +335,7 @@ PATCH_IF prof=100 BEGIN END PATCH_IF prof=100 BEGIN - PATCH_IF anim_num=19526 BEGIN + PATCH_IF (~%anim%~ STRING_EQUAL_CASE ~fl~) OR (~%anim%~ STRING_EQUAL_CASE ~f0~) OR (~%anim%~ STRING_EQUAL_CASE ~f1~) OR (~%anim%~ STRING_EQUAL_CASE ~f3~) BEGIN flail=1 SPRINT itemtype ~flail~ is_weapon=1