From 32c622afbe2e66f1bba9613fe1f83bf6ff56ee43 Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Sat, 29 Dec 2018 11:33:08 -0700
Subject: [PATCH] Support for local and global wind

---
 equates.s     |   2 ++
 fan.s         |  42 +++++++++++++++++++++++++++++++++++++++++-
 gamemanager.s |   3 ++-
 gscats.2mg    | Bin 819264 -> 819264 bytes
 macros.s      |   9 +++++++++
 projectile.s  |  34 +++++++++++++++++++++++++---------
 6 files changed, 79 insertions(+), 11 deletions(-)

diff --git a/equates.s b/equates.s
index 264ad45..582fa32 100644
--- a/equates.s
+++ b/equates.s
@@ -63,6 +63,8 @@ JD_VY = 138
 JD_TYPE = 140
 JD_NEW = 142
 JD_STATIC = 144
+JD_OWNER = 146
+JD_FACING = 148
 
 MAXPROJECTILES = 3
 
diff --git a/fan.s b/fan.s
index 2778ee6..3d9d4ec 100644
--- a/fan.s
+++ b/fan.s
@@ -5,6 +5,10 @@
 ;  Created by Quinn Dunki on 8/15/18
 ;
 
+FANRANGE = 100	; In pixels
+FANMAGNITUDE = $10		; 12.4 fixed point speed delta, in pixels
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; deployFan
 ;
@@ -36,7 +40,7 @@ updateFan:
 	SAVE_AXY
 
 	lda projectileData+JD_STATIC,y
-	bne updateFanDone		; We're already static, so no work to do
+	bne updateFanWind		; We're set up, so apply our wind
 
 	; Wait for fan to collide with us as it falls from the sky
 	lda projectileData+GO_POSX,y
@@ -70,6 +74,42 @@ updateFanDone:
 	RESTORE_AXY
 	rts
 
+updateFanWind:
+	lda projectileData+JD_OWNER,y
+	cmp currentPlayer		; We're not affected by our own fan
+	beq updateFanDone
+
+	tyx
+	ldy projectileActive
+	bmi updateFanDone		; No active projectile
+
+	; Calculate distance to fan
+	lda projectileData+GO_POSX,y
+	sta SCRATCHL
+	lda projectileData+GO_POSX,x
+	sec
+	sbc SCRATCHL
+	ABSA
+	cmp #FANRANGE			; Check if we're within range
+	bcs updateFanDone
+
+	; Apply wind
+	lda projectileData+JD_FACING,y
+	bne updateFanWindNeg
+
+	sec
+	lda projectileData+JD_PRECISEX,y
+	sbc #FANMAGNITUDE
+	sta projectileData+JD_PRECISEX,y
+	bra updateFanDone
+
+updateFanWindNeg:
+	clc
+	lda projectileData+JD_PRECISEX,y
+	adc #FANMAGNITUDE
+	sta projectileData+JD_PRECISEX,y
+	bra updateFanDone
+
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; renderFan
diff --git a/gamemanager.s b/gamemanager.s
index 5793d96..6752d41 100644
--- a/gamemanager.s
+++ b/gamemanager.s
@@ -384,7 +384,8 @@ projectileActive:
 	.word -1			; Y offset of active shot
 paused:
 	.word 0
-
+globalWind:
+	.word 0				; 12.4 velocity
 
 ; Position of map viewing window. Can be visualized in two ways:
 ; a) Word-distance from right edge of terrain data (which is in memory right-to-left) to left edge of visible screen
diff --git a/gscats.2mg b/gscats.2mg
index d459b972abb0de687d53a86f83c3fc108ff2aaeb..d2c1b25ea6e7af68ff3121b96f28c58fca32c6bb 100644
GIT binary patch
delta 1576
zcmY*YZ%kWN6u<8RkG2oCF1qElOX12yP&cj9#2P;cj4BM+Ajsxwmh^+0ukZRw;ftX$
z;i;)h)TbXRd+X*VY|in>n*GCdFSCeCDrqJWv&0xaEK7{ZFpGPOEQC$+Jh#A7ZgO(Z
zJNKOPJAZy}Qr$kOZa-gLR(ZU(N<ipO<X}p2Ynk_@<F&q3i%-C)e#h?SU{m9+w%`kX
zKSGHA1-**i=trx81tl3T^FB&duv{7``-$fUlYJF>Qmt6`v7<8MsO0)S<J`$E{(;`$
z#Jt}082&laaFp9FJh7yh-?+5<iaFvEBW|QEDCQPHTU5+iL3^kW63rw}b3Trn&@X()
zorLSnGh8D#kvV*Z^EGjknejR9%Z-)K$H*&ga%ep%T~Ds*oi^7YF2%@=D1nE882O+#
zeNnRbuP;jEl>WWVkr!L(PIeL=vxEA@^n{e}MAnwmp1|B;l#BX3Mkms~mB4PTJM9r8
zhtc%pkOS9nr-q)zzAZ~JZ9;M-qGIG2(k3N9HEbLF$%#sa_+cd(7@|0-Z<RSgFX!;f
z?qz^~z2FqS=1))PyExp;CG;eR15ZxLhFXzoqXt5$4w~9c<5IX~He~kDnFcc_Ya^ZJ
zlzx}P)q_2hY>qKgqijyefjKuy?U3USq_DY{PLE60{MEBpB>z9)k?>@5a^NqIyR_A|
zz4>?0`9I8kbfzL;wo(?>O4TV5beK8QuP)<Rg3%}^cw-$R!(A+IJ$edOzj`w57!Q|h
zI20L)JR`3f5o$Tpz~fDWvnLTccEq)EMxhA5^Y*P0H1qecZ9^`AAht4T+tz{feI=EX
z(+f%pdWWui=;v3Y^thDTOD%`Nq0~OA^6X(B1y`04iUjw9)<)AyN~(*7Mhjr0=C6w7
zjBA4*MF~P`X`Fl&WhuHTYXCsg4-0WD7ATcoR9s`(PeKU?*b_W?YY)tP*|=wakrB4A
z9KN<IaxYrw>CVb4>+*fJskaBs-BgU&HtY{bl}D;vEaE^bReq454aPfY-v4^O7rPrF
zsMw9^;y@b(HWd7(<h&dCH;2qFy4vk;isg=L(Ozhl)j))px)4|ATl9lIyrJr7@7nU9
zvL04r=Q4|ie7Me;lfB;M&zujFcbocHj(PH4;l5)4d3bWU8<<4uV=97KYG)-z@GDXn
zE~uSNb?sOH!tG$lR-JmgkU>0hfKTwV<Y3n=*!V^xueVp>dRdRHtq<Z#+81Nc-`J;Y
zLt{n3?BDdjfc&ofIpnX&<`tFX&)IG<JFTdj*h4vcaH@Bi6{|P1*A?Jx_J(5d+Jb(w
z3VUle_Z8u>DoffM`pj->IT^jWDSR0@-B*o0J0FcWTPFk-bCASedb~~u12479Qg|4l
zHRKi}4wT?me#3;LXhT!FT8+02{@!<l`HU6{xVOTWFM|Cc10#`a!)Js2D+Io-#6tzk
zxKsoY6sCjyGtPL(5DNb3V88XWC`FK~Wz=vX$N(1C=miI?>v~T>n)|V8%y?}N$vPQU
tT;EFY<Cns`!RZap;nG9RH5jA>gz04<JV-f+1H=j90ueIJH5LEu{~z56V`l&W

delta 1952
zcmY*ZT~HHO6u!Ga%!a>IM-3pd4LUYsZBy+7ZTb)uJB-B&qcBdKDlhG1v$KSBrVr*N
zTP~nujb)0kEHW0^Dp|(VmLd@T#Gl%sMN92NEn^)<`vZkZm+7`nX~*>3B(!j6PVT+u
zeD~b*edlh*#O-6^_D>4ZGTS!iJ%!LCWF(8GXVY?DT;ZY7GrRW}@7cBU_1E^iV7DWL
z3=`;Or1{ViEWT*+r{(^aD(?C0eA+cblP^PR5;L-~F|*&8N%`KB-cF?~O;v_Rl9Qp+
zq+M(1FZ!Kr)b{kJ2ZhLoreKc{Id8IXW)$odB8BO}J|VI>Jvbn+KM4Iz7pQ!S8kRo2
zNOi(=u#4JB4fnTnQTe;5(f;09>ixBu_q^;&X7+eCo0`pzNo6r=pXFi=>#t@ZV69;{
zd&50$&CuTCW=o|jF^b(`;P;YIpA#|hc1w8JJzj>i!V5V?vn}ZJYI}}ahJqit!LMaq
z$gyxO==Nx{k+xE$&0FdG!izP*VYjKi+QOYh!BIEds>Wh~XU}Dl8{f@jt<5~$)I!lt
zb0YQcxe%_pZVwMjWfWaZVX2v-i#FAHR53#~@+v~IiI+2Yzq_hr$`x77PreeV^#sqC
zMe3vliZ0l+nrCl%iR%d$sq+-gnvsk={>3G@maabG`ro1H!4zvf_aXNS2Q5pElBrIF
z&bFG8BNVBX$~Vw!3WkNTSWMd=?h)i#Pq<f*p&F=THGgWr4bCp7fnFCNhhzf};rPnP
zhX(~Yi+6?M`9hIXg2woRwrUn3G1bpHs#OZfW<FV2cp!d^9EEO%`vg<>NQ0~12>yBl
zd#DmfC!CdUEOUYk31Xc{vgFg5f!6Ao=@c|Mzr?rJV_!uyqQ#Wb9B(9pw{Wo-s0Ym)
zN1|uBS&kWasGl?&SlVA5_tNH_aAG-ztS!fkJTxMXtMiPTkv-29$>QTQ_nJbH(}HI9
z2iJRnC#iz%^@@-Eq7KbkDK5L)yRud&vjX~NFH1CYKA+yg)OvDr6Wa|NX*MudL(=K&
zS|6F`)mjgT(|6#~fSdisD<V)dc*#v(*nqnVCg4FH$;x}-3bT>itZflz;u$QhZyM?i
zQ|w#i)6nL%Y6E0V_}HHEMe$ogV^N$anUaP!(&m7(W@X)wFQv4z1~lkCN&45lEGhYD
zazI48Y5X#>TSpoMksZGrGh0SZ3gS8vSVaPi_#5%k;)9VB0^3nO(kN(#U`I_-!xbDP
zHlI%0cXN3Wgi=cBY)!<>YYcgrW*&CS$^ebrRq^8D1unJA6dKu*Ui4S3)LuYu%&+xW
zI3ubzB)^(^<Nq-Dw!SN%w`~phS_vi;7hoaz$WBLnE|o?Wb{l;u>Px=%6Vmf6ZLvmu
zlZ@Y`rpKe<s86$5+#E8Mgj5p(Ja{CIrJoBd+B7EXx?PX{s(&1Hz~5V*9+F)ymo5)F
zxNO)}6ze}7Ni63^_3j}Dmr1;b^~$SyMMV;GK<}&2D~{^&VFy<L;fbg&&pWs>ls5&#
z!L3JmYBY+^sqzUts?JZ~A8}M^w`nNAWJPhi(qTi{%;+@kP_EdJ#>ggoMY&_svKga@
z?<n^H$Yf36`^p1?o0!Hh11gK`LX8huwE<sKWju+$#}Dxw*3~=sXRP5xr486IxJ~J`
zWiw9PtK5RQ4Bt|2!z^O>4KUL{elDs<fxHze|5DZ;2lR=nAi!68@d15Du^#wC-~D)*
zDun=x#q`RUelW@Z;356b3gVNGIyfG<4h@x*l<4x`4i3PC`3HpbJ^WDpXF_R=(~06n
z<%}%=45HKcjM7P*sXK6|60&6@#wp{F(oKA(A>6I>5T>$-dw_|iF~$_&a)aPR8Q)MQ
zlln|5ca!?uRb~<j;TdHixmrk|2;%GMq<&f|5%###N`s|<rGlk_8NgP78NnDZ6Igne
I)0%PQUk#TQ5&!@I

diff --git a/macros.s b/macros.s
index 877b385..fe65ea9 100644
--- a/macros.s
+++ b/macros.s
@@ -233,6 +233,15 @@ jsri_smc:
 	jsr 0
 .endmacro
 
+.macro ABSA		; Absolute value of accumulator. Assumes status flags set correctly for accumulator!
+	.local done
+	bpl done
+	eor #$ffff
+	inc
+done:
+.endmacro
+
+
 ;;;;;;;;;;
 ; Stack Macros
 
diff --git a/projectile.s b/projectile.s
index 2ea0423..7c6a40c 100644
--- a/projectile.s
+++ b/projectile.s
@@ -22,8 +22,10 @@ projectileData:
 	.word 0		; Type
 	.word 1		; New?
 	.word 0		; Static?
+	.word 0		; Owner (player index)
+	.word 0		; Facing (0,1) = (+X,-X)
 
-	.repeat 110
+	.repeat 106
 	.byte 0		; Padding to 256-byte boundary
 	.endrepeat
 
@@ -43,8 +45,10 @@ projectileData:
 	.word 0		; Type
 	.word 1		; New?
 	.word 0		; Static?
+	.word 0		; Owner (player index)
+	.word 0		; Facing (0,1) = (+X,-X)
 
-	.repeat 110
+	.repeat 106
 	.byte 0		; Padding to 256-byte boundary
 	.endrepeat
 
@@ -64,8 +68,10 @@ projectileData:
 	.word 0		; Type
 	.word 1		; New?
 	.word 0		; Static?
+	.word 0		; Owner (player index)
+	.word 0		; Facing (0,1) = (+X,-X)
 
-	.repeat 110
+	.repeat 106
 	.byte 0		; Padding to 256-byte boundary
 	.endrepeat
 
@@ -209,7 +215,19 @@ fireProjectile:
 	lda #0
 	sta projectileData+JD_STATIC,y
 	sty projectileActive
+	lda currentPlayer
+	sta projectileData+JD_OWNER,y
 
+	; Set facing. For now assume player orientations are constant
+	beq fireProjectilePosX
+	lda #1
+	sta projectileData+JD_FACING,y
+	bra fireProjectileSetup
+fireProjectilePosX:
+	lda #0
+	sta projectileData+JD_FACING,y
+
+fireProjectileSetup:
 	lda projectileParams		; Fixed point version of X pos
 	asl
 	asl
@@ -328,13 +346,9 @@ updateProjectilePhysics:
 	SAVE_AXY
 
 	lda projectileData+GO_POSX,y
-	bmi updateProjectilePhysicsSkip		; Not allocated
+	bmi updateProjectilePhysicsDone		; Not allocated
 	lda projectileData+JD_STATIC,y
-	bne updateProjectilePhysicsSkip		; Static
-	bra updateProjectilePhysicsActive
-
-updateProjectilePhysicsSkip:
-	jmp updateProjectilePhysicsDone
+	bne updateProjectilePhysicsSpecial		; Static
 
 updateProjectilePhysicsActive:
 	; Integrate gravity over velocity
@@ -356,6 +370,7 @@ updateProjectilePhysicsActive:
 	ror
 	clc
 	adc projectileData+JD_PRECISEX,y
+	adc globalWind						; Add wind
 	sta projectileData+JD_PRECISEX,y
 
 	; Convert to integer for rendering
@@ -393,6 +408,7 @@ updateProjectilePhysicsContinue:
 	cmp #GAMEOBJECTHEIGHT
 	bmi updateProjectilePhysicsDelete
 
+updateProjectilePhysicsSpecial:
 	; Check for special update code
 	phy
 	lda projectileData+JD_TYPE,y