From 5490294c5f65bb6e3f397b2bb7780ec44e2864d3 Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Sun, 5 Jan 2020 15:48:59 -0800
Subject: [PATCH] Dirt explosions now happen at point of projectile hit

---
 dirt.s        |  14 +++++++++-----
 gamemanager.s |   2 ++
 gscats.2mg    | Bin 819264 -> 819264 bytes
 projectile.s  |  15 ++++++++++-----
 terrain.s     |   2 +-
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/dirt.s b/dirt.s
index 46a1897..c91ce8b 100644
--- a/dirt.s
+++ b/dirt.s
@@ -33,11 +33,7 @@ createDirtExplosion:
 	lda #1
 	sta dirtExplosionActive
 
-	lda #120
-	sta PARAML0
-	lda #100
-	sta PARAML1
-	lda #3
+	lda #3			; Radius hard-coded for now
 	sta PARAML2
 	asl
 	sta CACHEDATA	; Cache diameter
@@ -168,10 +164,13 @@ createDirtExplosionColumnLoopNowY:
 ;
 renderDirtExplosion:
 	SAVE_AXY
+
 	lda dirtExplosionActive
 	beq renderDirtExplosionDone
 
 	ldx #0
+	stz dirtExplosionActive		; Assume we're done unless a particle says otherwise
+
 renderDirtExplosionLoop:
 	PARTICLEPTR_XY
 	jsr updateDirtParticle
@@ -266,8 +265,13 @@ updateDirtParticle:
 	lda #$11
 	sta SHADOWVRAMBANK,x
 
+	; Let everyone know we did work
+	lda #1
+	sta dirtExplosionActive
+	
 updateDirtParticleDone:
 	RESTORE_AXY
+updateDirtParticleDoneRTS:
 	rts
 
 updateDirtParticleKill:
diff --git a/gamemanager.s b/gamemanager.s
index ead409e..f9bcc04 100644
--- a/gamemanager.s
+++ b/gamemanager.s
@@ -177,6 +177,8 @@ gameplayLoopVictoryCondition:
 gameplayEndTurnCondition:
 	lda turnRequested
 	beq gameplayLoopEndFrame
+	lda dirtExplosionActive
+	bne gameplayLoopEndFrame
 	jsr endTurn
 
 gameplayLoopEndFrame:
diff --git a/gscats.2mg b/gscats.2mg
index 9b21d7b77b8807e8258d197ae917bef0bcbcdae9..7f1ca3076fb7c4a31f613dac340baaf88b8fcf1d 100644
GIT binary patch
delta 2378
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

delta 2342
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
OAUufgVEg0#?!N)N44vu#

diff --git a/projectile.s b/projectile.s
index ae0ce53..9b1e65e 100644
--- a/projectile.s
+++ b/projectile.s
@@ -222,9 +222,6 @@ allocProjectileDone:
 ;
 ;
 fireProjectile:
-	jsr createDirtExplosion
-	rts
-
 	SAVE_AXY
 
 	; Allocate a projectile
@@ -880,7 +877,7 @@ processPlayerImpactDeath:
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; processTerrainImpact
 ;
-; Trashes A,Y, SCRATCHL
+; Trashes A,Y, SCRATCHL, PARAML0, PARAML1
 ;
 processTerrainImpact:
 	ldy projectileActive
@@ -901,10 +898,12 @@ processTerrainImpactNegative:
 
 processTerrainStoreContinue:
 	sta PARAML0
+	pha						; Dirt explosion will need this
 	lda projectileData+GO_POSY,y
 	sec
 	sbc #GAMEOBJECTHEIGHT	; This fudge makes tunneling work better
 	sta PARAML1
+	pha						; Dirt explosion will need this
 
 	lda projectileData+JD_TYPE,y
 	tay
@@ -915,7 +914,7 @@ processTerrainStoreContinue:
 	phy					; We'll need the radius in a moment
 
 	jsr craterTerrain
-
+	
 	jsr unclipTerrain	
 
 	; Recompile the rows affected by the crater
@@ -937,4 +936,10 @@ processTerrainStoreContinue:
 
 	jsr clipTerrain
 
+	pla
+	sta PARAML1
+	pla
+	sta PARAML0
+	jsr createDirtExplosion
+
 	rts
diff --git a/terrain.s b/terrain.s
index 5287aa0..94874ec 100644
--- a/terrain.s
+++ b/terrain.s
@@ -282,7 +282,7 @@ compileTerrainDone:
 ; X = Last row to compile (bottom-relative)
 ; A = |X-Y|
 ;
-; Trashes A,Y, SCRATCHL
+; Trashes A,Y, SCRATCHL, PARAML0, PARAML1
 ;
 compileTerrainChunk:
 ;HARDBRK