From 39433a8cf4b4fda4d9b01d4d12f3984902b3778a Mon Sep 17 00:00:00 2001 From: pkali Date: Sun, 3 Jul 2022 22:35:47 -0400 Subject: [PATCH] tosser upgr and deathshead fix --- ai.asm | 50 +++++++++++++++++++++++++++++++++++++++----------- scorch.xex | Bin 40443 -> 40557 bytes weapons.asm | 22 +++++++++++++++++++++- 3 files changed, 60 insertions(+), 12 deletions(-) diff --git a/ai.asm b/ai.asm index 0c5678c..a8e3f72 100644 --- a/ai.asm +++ b/ai.asm @@ -56,7 +56,7 @@ AIRoutines .word Moron-1 .word Shooter-1 ;Shooter .word Poolshark-1 ;Poolshark - .word Toosser-1 ;Toosser + .word Tosser-1 ;Tosser .word Poolshark-1 ;Chooser .word Poolshark-1 ;Spoiler .word Poolshark-1 ;Cyborg @@ -271,7 +271,7 @@ endo sta temp lda TanksWeaponsTableH,x sta temp+1 - ldy #32 ;the last weapon + ldy #ind_Laser__________ ;the last offensive weapon loop dey lda (temp),y @@ -286,13 +286,13 @@ AngleTable ; 16 bytes ;ba w $348b L$3350 .by 18,26,34,43,50,58,66,74 .endp ;---------------------------------------------- -.proc Toosser +.proc Tosser ; use best defensive :) ; allways ; first check check if any is in use lda ActiveDefenceWeapon,x bne DefensiveInUse - ldy #64 ;the last defensive weapon + ldy #ind_Nuclear_Winter_+1 ;the last defensive weapon @ dey cpy #ind_Battery________ ;first defensive weapon (White Flag nad Battery - never use) @@ -334,7 +334,7 @@ PurchaseAIRoutines .word MoronPurchase-1 .word ShooterPurchase-1 ;ShooterPurchase .word PoolsharkPurchase-1 ;PoolsharkPurchase - .word PoolsharkPurchase-1 ;ToosserPurchase + .word TosserPurchase-1 ;TosserPurchase .word PoolsharkPurchase-1 ;ChooserPurchase .word PoolsharkPurchase-1 ;SpoilerPurchase .word PoolsharkPurchase-1 ;CyborgPurchase @@ -349,6 +349,7 @@ PurchaseAIRoutines .proc TryToPurchaseOnePiece ; A - weapon number, better it will be in range(1,32) ; TankNr in X + ; DOES NOT CHANGE X tay lda PurchaseMeTable,y beq SorryNoPurchase @@ -399,16 +400,16 @@ SorryNoPurchase mva #2 tempXroller; number of offensive purchases to perform ldx TankNr @ - randomize 49 55 + randomize ind_Battery________ ind_StrongParachute jsr TryToPurchaseOnePiece dec tempXroller bne @- ; and now offensives mva #4 tempXroller; number of offensive purchases to perform - ldx TankNr + ;ldx TankNr @ - randomize 1 14 + randomize ind_Battery________ ind_Heavy_Roller___ jsr TryToPurchaseOnePiece dec tempXroller bne @- @@ -421,19 +422,46 @@ SorryNoPurchase mva #3 tempXroller; number of offensive purchases to perform ldx TankNr @ - randomize 49 61 + randomize ind_Battery________ ind_Auto_Defense___ jsr TryToPurchaseOnePiece dec tempXroller bne @- ; and now offensives mva #8 tempXroller; number of purchases to perform - ldx TankNr + ;ldx TankNr @ - randomize 1 30 + randomize ind_Missile________ ind_Dirt_Charge____ jsr TryToPurchaseOnePiece dec tempXroller bne @- rts .endp +;---------------------------------------------- +.proc TosserPurchase + + ; what is my money level + ldx TankNr + lda MoneyH,x ; money / 256 + sta tempXroller ; perform this many purchase attempts + ; first try to buy defensives + mva #3 tempXroller; number of defensive purchases to perform +@ + randomize ind_Battery________ ind_Auto_Defense___ + jsr TryToPurchaseOnePiece + dec tempXroller + bne @- + + ; and now offensives + lda MoneyH,x ; money / 256 + asl ;*2 + sta tempXroller ; perform this many purchase attempts +@ + randomize ind_Missile________ ind_Dirt_Charge____ + jsr TryToPurchaseOnePiece + dec tempXroller + bne @- + + rts +.endp diff --git a/scorch.xex b/scorch.xex index df1e4e97336174964b576316e58baba979cd88fa..78536c942d036df7848ca80bc150f7f622f50466 100644 GIT binary patch delta 14805 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 E7msx>Z2$lO delta 14715 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 diff --git a/weapons.asm b/weapons.asm index 7d34b7f..c17543b 100644 --- a/weapons.asm +++ b/weapons.asm @@ -232,16 +232,22 @@ NoExplosionInFunkyBomb mva #31 ExplosionRadius jsr CalculateExplosionRange - mva #sfx_nuke sfx_effect + mva #sfx_nuke sfx_effect + SaveDrawXY jsr xmissile + UnSaveDrawXY sbw xdraw #35 jsr CalculateExplosionRange mva #sfx_nuke sfx_effect + SaveDrawXY jsr xmissile + UnSaveDrawXY adw xdraw #70 jsr CalculateExplosionRange mva #sfx_nuke sfx_effect + SaveDrawXY jsr xmissile + UnSaveDrawXY sbw xdraw #35 ; sbw ydraw #35 @@ -249,18 +255,32 @@ NoExplosionInFunkyBomb cpw ydraw #screenHeight bcs NoUpperCircle mva #sfx_nuke sfx_effect + SaveDrawXY jsr xmissile + UnSaveDrawXY NoUpperCircle adw ydraw #70 ;jsr CalculateExplosionRange cpw ydraw #screenHeight bcs NoLowerCircle mva #sfx_nuke sfx_effect + SaveDrawXY jsr xmissile + UnSaveDrawXY NoLowerCircle mva #sfx_silencer sfx_effect rts .endp +.proc SaveDrawXY + mwa xdraw tempXROLLER + mwa ydraw modify + rts +.endp +.proc UnSaveDrawXY + mwa tempXROLLER xdraw + mwa modify ydraw + rts +.endp ; ------------------------ .proc babyroller inc FallDown2