V1.2 modifications. Enemies drop more ammo, down+fire while ducking f…

…ires forward, no splash damage to player from own weapons, some more pistol ammo pickups near start of game.
cadaver · Feb 9, 2018 · 55cfa34 · 55cfa34
1 parent a422f9c
commit 55cfa34
Show file tree

Hide file tree

Showing 12 changed files with 51 additions and 47 deletions.
diff --git a/aligneddata.s b/aligneddata.s
@@ -1,3 +1,5 @@
+alignedDataStart:
+
                 org (* + $ff) & $ff00
 
         ; Sprite cache / depacking tables

diff --git a/bg/world.lva b/bg/world.lva
diff --git a/bg/world.s b/bg/world.s
@@ -4,46 +4,46 @@ WORLDSIZEBLOCKS = 32190
 
 WORLDSIZESCREENS = 704
 
-LVLDATAACTTOTALSIZE = 70
+LVLDATAACTTOTALSIZE = 71
 
 LVLOBJTOTALSIZE = 28
 
 lvlDataActBitsStart:
                 dc.b 0
-                dc.b 5
-                dc.b 8
-                dc.b 10
-                dc.b 15
-                dc.b 19
-                dc.b 22
-                dc.b 28
-                dc.b 31
-                dc.b 40
-                dc.b 42
-                dc.b 49
-                dc.b 55
-                dc.b 58
-                dc.b 63
-                dc.b 67
+                dc.b 6
+                dc.b 9
+                dc.b 11
+                dc.b 16
+                dc.b 20
+                dc.b 23
+                dc.b 29
+                dc.b 32
+                dc.b 41
+                dc.b 43
+                dc.b 50
+                dc.b 56
+                dc.b 59
+                dc.b 64
+                dc.b 68
 lvlObjBitsStart:
-                dc.b 70
                 dc.b 71
                 dc.b 72
                 dc.b 73
-                dc.b 75
-                dc.b 77
-                dc.b 79
-                dc.b 82
+                dc.b 74
+                dc.b 76
+                dc.b 78
+                dc.b 80
                 dc.b 83
-                dc.b 86
+                dc.b 84
                 dc.b 87
-                dc.b 90
+                dc.b 88
                 dc.b 91
                 dc.b 92
-                dc.b 95
+                dc.b 93
                 dc.b 96
+                dc.b 97
 lvlObjBitsEnd:
-                dc.b 98
+                dc.b 99
 lvlLimitL:
                 dc.b 0
                 dc.b 18

diff --git a/bg/world00.lva b/bg/world00.lva
diff --git a/bg/world03.lva b/bg/world03.lva
diff --git a/bg/world10.lva b/bg/world10.lva
diff --git a/bullet.s b/bullet.s
@@ -60,6 +60,7 @@ MoveSmallSplash:ldy #2
         ; Modifies: A,Y
 
 MoveExplosion:  ldy #4
+OneShotAnimateAndRemoveDelay1:
                 lda #1
 OneShotAnimateAndRemove:
                 jsr OneShotAnimation
@@ -349,9 +350,8 @@ MEMP_ColorDone: jsr RadiusDamage
                 jsr DrainBattery
 MEMP_NoDrain:   lda actSX,x
                 jsr MoveActorX
-                lda #1
                 ldy #3
-                jmp OneShotAnimateAndRemove
+                jmp OneShotAnimateAndRemoveDelay1
 
         ; Check bullet collisions and optionally apply damage
         ;
@@ -399,7 +399,13 @@ MEMP_NoAnim:    rts
 RadiusDamage:   ldy #ACTI_LASTNPC
 RD_Loop:        lda actHp,y                     ;Skip if bystander or already dead
                 beq RD_Next
-                jsr CheckActorCollision
+                tya
+                bne RD_NotPlayer                ;Skip radius damage to player from own weapons
+                cpx #ACTI_FIRSTPLRBULLET
+                bcc RD_NotPlayer
+                cpx #ACTI_FIRSTNPCBULLET
+                bcc RD_Next
+RD_NotPlayer:   jsr CheckActorCollision
                 bcc RD_Next
                 sty tgtActIndex
                 jsr ApplyTargetDamage

diff --git a/docs/Manual.odt b/docs/Manual.odt
diff --git a/docs/Manual.pdf b/docs/Manual.pdf
diff --git a/itemdata.s b/itemdata.s
@@ -48,14 +48,14 @@ itemDefaultPickup:
                 dc.b 1                          ;Knife
                 dc.b 1                          ;Nightstick
                 dc.b 1                          ;Bat
-                dc.b 6                          ;Pistol
-                dc.b 4                          ;Shotgun
-                dc.b 10                         ;Auto rifle
-                dc.b 3                          ;Sniper rifle
+                dc.b 7                          ;Pistol
+                dc.b 5                          ;Shotgun
+                dc.b 15                         ;Auto rifle
+                dc.b 5                          ;Sniper rifle
                 dc.b 25                         ;Minigun
                 dc.b 30                         ;Flamethrower
-                dc.b 7                          ;Laser rifle
-                dc.b 6                          ;Plasma gun
+                dc.b 8                          ;Laser rifle
+                dc.b 7                          ;Plasma gun
                 dc.b 1                          ;EMP generator
                 dc.b 3                          ;Grenade launcher
                 dc.b 2                          ;Bazooka

diff --git a/pics/loadpic.iff b/pics/loadpic.iff
diff --git a/player.s b/player.s
@@ -132,21 +132,17 @@ MP_NotDown2:    sty scrollSY
 MP_NoPlayerScroll:
                 lda menuMode                    ;No new controls in inventory / interaction / dialogue
                 bne MP_SetWeapon
-                ldy actF1+ACTI_PLAYER
-                cpy #FR_DUCK+1
-                bne MP_NoDuckFirePrevent
-                lda actCtrl,x
-                cmp #JOY_DOWN                   ;Prevent fire+down immediately after ducking
-                bne MP_NoDuckFirePrevent        ;(need to release down direction first)
-                lda joystick
-                cmp #JOY_DOWN+JOY_FIRE
-                bne MP_NoDuckFirePrevent
-                ldy #$ff-JOY_FIRE
-                bne MP_StoreControlMask
-MP_NoDuckFirePrevent:
                 lda joystick
+                ldy actF1+ACTI_PLAYER
+                cpy #FR_DUCK+1                  ;Turn ducking down+fire to left+fire or right+fire, depending on dir
+                bne MP_NoDuckFireCtrl
                 cmp #JOY_DOWN+JOY_FIRE
-                beq MP_ControlMask
+                bne MP_NoDuckFireCtrl
+                lda #JOY_FIRE+JOY_RIGHT
+                ldy actD
+                bpl MP_NoDuckFireCtrl
+                eor #JOY_LEFT|JOY_RIGHT
+MP_NoDuckFireCtrl:
                 ldy #$ff
 MP_StoreControlMask:
                 sty MP_ControlMask+1