v6

btigi · Dec 8, 2006 · f88303e · f88303e
1 parent a8ee365
commit f88303e
Show file tree

Hide file tree

Showing 2 changed files with 47 additions and 23 deletions.
diff --git a/iiProjectileR/Readme-iiProjectileR.txt b/iiProjectileR/Readme-iiProjectileR.txt
@@ -1,4 +1,4 @@
-Projectile Retrieval Mod V5
+Projectile Retrieval Mod V6
 ---------------------------
 
 +) Contents
@@ -73,6 +73,9 @@ they got those items.
 
 +) Section 5. Version History
 =============================
+V6 [08/12/2006]
+ - Fixed bug with bullets not being retrieval when using the 'decrementing magic' option
+
 V5 [20/11/2006]
  - Added support for throwing axes, throwing daggers, and darts
  - Added option to retrieve items at lower magical levels

diff --git a/iiProjectileR/Setup-iiProjectileR.tp2 b/iiProjectileR/Setup-iiProjectileR.tp2
@@ -1,8 +1,8 @@
 // ----------------------------------------------------------------------------
 // Name:    Projectile Retrieval Mod
 // Author:  igi + Andy B.
-// Date:    20/11/2006
-// Version: 5
+// Date:    08/12/2006
+// Version: 6
 // ----------------------------------------------------------------------------
 BACKUP ~iiProjectileR/backup~
 AUTHOR ~igi / Andy B.~
@@ -38,6 +38,11 @@ OUTER_WHILE !(IS_AN_INT %how%) || (%how% > 2) || (%how% < 1) BEGIN
  ACTION_READLN how
 END
 
+OUTER_SET iegame = 1
+ACTION_IF (FILE_EXISTS_IN_GAME ~bull05.itm~) THEN BEGIN
+OUTER_SET iegame = 2
+END
+
 ACTION_IF (%how% = 1) THEN BEGIN
  PRINT @10
  ACTION_READLN choice
@@ -414,28 +419,36 @@ ACTION_IF (%how% = 1) THEN BEGIN
        END
        ELSE
        PATCH_IF (%item_type% = 14) BEGIN
-        PATCH_IF (FILE_EXISTS_IN_GAME ~bull05.itm~) BEGIN
+        PATCH_IF (%iegame% = 2) BEGIN
          PATCH_IF (%thac0% > 3) BEGIN
           WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull05~ #8    // resource
          END
          ELSE
          PATCH_IF (%thac0% = 3) BEGIN
           WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull03~ #8    // resource
          END
+         ELSE
+         PATCH_IF (%thac0% = 2) BEGIN
+          WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull02~ #8    // resource
+         END
+         ELSE
+         PATCH_IF (%thac0% = 1) || (%thac0% < 1) BEGIN
+          WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull01~ #8    // resource
+         END
         END
         ELSE
-        PATCH_IF !(FILE_EXISTS_IN_GAME ~bull05.itm~) BEGIN
+        PATCH_IF (%iegame% = 1) BEGIN
          PATCH_IF (%thac0% > 2) BEGIN
           WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull03~ #8    // resource
          END
-        END
-        ELSE
-        PATCH_IF (%thac0% = 2) BEGIN
-         WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull02~ #8    // resource
-        END
-        ELSE
-        PATCH_IF (%thac0% = 1) || (%thac0% < 1) BEGIN
-         WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull01~ #8    // resource
+         ELSE
+         PATCH_IF (%thac0% = 2) BEGIN
+          WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull02~ #8    // resource
+         END
+         ELSE
+         PATCH_IF (%thac0% = 1) || (%thac0% < 1) BEGIN
+          WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull01~ #8    // resource
+         END
         END
        END
        ELSE
@@ -1042,28 +1055,36 @@ ACTION_IF (%how% = 2) THEN BEGIN
        WRITE_BYTE  ("%fx_off%" + 0x0c + ("%abil_fx_idx%" * 0x30)) 1              // instant/perm
        WRITE_BYTE  ("%fx_off%" + 0x12 + ("%abil_fx_idx%" * 0x30)) %EffectChance% // probability
        READ_BYTE   ("%abil_off%" + 0x14 + ("%index%" * 0x38)) "thac0"
-       PATCH_IF (FILE_EXISTS_IN_GAME ~bull05.itm~) BEGIN
+       PATCH_IF (%iegame% = 2) BEGIN
         PATCH_IF (%thac0% > 3) BEGIN
          WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull05~ #8    // resource
         END
         ELSE
         PATCH_IF (%thac0% = 3) BEGIN
          WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull03~ #8    // resource
         END
+        ELSE
+        PATCH_IF (%thac0% = 2) BEGIN
+         WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull02~ #8    // resource
+        END
+        ELSE
+        PATCH_IF (%thac0% = 1) || (%thac0% < 1) BEGIN
+         WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull01~ #8    // resource
+        END
        END
        ELSE
-       PATCH_IF !(FILE_EXISTS_IN_GAME ~bull05.itm~) BEGIN
+       PATCH_IF (%iegame% = 1) BEGIN
         PATCH_IF (%thac0% > 2) BEGIN
          WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull03~ #8    // resource
         END
-       END
-       ELSE
-       PATCH_IF (%thac0% = 2) BEGIN
-        WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull02~ #8    // resource
-       END
-       ELSE
-       PATCH_IF (%thac0% = 1) || (%thac0% < 1) BEGIN
-        WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull01~ #8    // resource
+        ELSE
+        PATCH_IF (%thac0% = 2) BEGIN
+         WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull02~ #8    // resource
+        END
+        ELSE
+        PATCH_IF (%thac0% = 1) || (%thac0% < 1) BEGIN
+         WRITE_ASCII ("%fx_off%" + 0x14 + ("%abil_fx_idx%" * 0x30)) ~bull01~ #8    // resource
+        END
        END
        SET "delta" = ("%delta%" + 1)
       END