From 015f4c2da1ae5e5de674239bd3029d95ce97f43d Mon Sep 17 00:00:00 2001
From: blondie7575 <qd@quinndunki.com>
Date: Tue, 5 Sep 2017 12:55:27 -0700
Subject: [PATCH] Added power level controls

---
 gamemanager.s |  27 ++++++++++++++++++++++++++-
 gscats.2mg    | Bin 819264 -> 819264 bytes
 input.s       |  16 ++++++++++++++++
 player.s      |  31 +++++++++++++++++++++++++++++++
 4 files changed, 73 insertions(+), 1 deletion(-)

diff --git a/gamemanager.s b/gamemanager.s
index fbfee23..3fb8dd6 100644
--- a/gamemanager.s
+++ b/gamemanager.s
@@ -66,9 +66,15 @@ gameplayLoopKbd:
 gameplayLoopAngle:
 	; Update aim angle if needed
 	lda angleDeltaRequested
-	beq gameplayLoopFire
+	beq gameplayLoopPower
 	jsr changeAngle
 
+gameplayLoopPower:
+	; Update power if needed
+	lda powerDeltaRequested
+	beq gameplayLoopFire
+	jsr changePower
+
 gameplayLoopFire:
 	lda fireRequested
 	beq gameplayLoopProjectiles
@@ -171,6 +177,23 @@ changeAngle:
 	rts
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; changePower
+;
+; Handles changing a player's power
+;
+changePower:
+	ldy currentPlayer
+	tax
+	jsr playerDeltaPower
+
+	ldy currentPlayer
+	jsr renderPlayerHeader
+
+	stz powerDeltaRequested
+	rts
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; fire
 ;
@@ -191,6 +214,8 @@ mapScrollRequested:
 	.word $FFFF
 angleDeltaRequested:
 	.word $0000
+powerDeltaRequested:
+	.word $0000
 fireRequested:
 	.word $0000
 turnRequested:
diff --git a/gscats.2mg b/gscats.2mg
index 42c85f552a952f60a3a2ad182d8a7db2900d357f..75945a2a7d88085dea3c5d97cd44c58e355ec5b0 100644
GIT binary patch
delta 1635
zcmZvcZ%i9y9LJxwtdtHy(I|z4^jL?u&BbFlff2MUi(^}5Y{C_qiYK!5_weWSqA%9l
z7`m99uv|=RECGocie9pW7fUrr$D-*aTkM-D;f=6lY{VFEY||C8;P2`6bS7N#yXW(K
z@Av%q-t#9Z?Mq7guJmmy`KFgtd0#Cg<T`OMuqw^gA7^~_=g(TsD1i%&mc28|1<8_k
zqbu&4DgE$jfu%?Jd87{C`J>JFJ~BFP8Jt-i<qsWS41VU!K2smN-)|K3Lams%3Zsp}
z2kRilEkt@4FDBBTEoN5YIYF+WiBiE$9Yn6Bi3UO5PZN!TTt~SEs`zfz?CAx*>gH*1
zarJ-n!f;uAJVi340$-vfv1{k_?AR&ysj}%s$>t9zv0KYq<_EUSe@~hE<zdx#UEB*!
z9C)&xaOr}{LnNNeDviRVKdW?-_)p5UU-`G2f_8iQ(ZcWYYr)(6B$=?xHU-ng_m*tw
zzb^TLab9i?N)4#(($mFQxG5j?1ylH4_h9uXJ~@fy6#w@*y?pVKPib9v#q!3?(8BdX
z>r0@t+}RrmcX5vk)K1U~xOYlooxrsQR1sWW4nS=M-p2hFR@*?gaRk(ptSkYwos~Oa
z#Fbp)zV7FyDL2xm3QU|0tKF>8LRj^K{*}Mop@yJbvl6{X4#Bq};KE%o0mN7cr2Dv5
z@^L?i9C=3W0jJyxZaPNf)4=^u65rgETY+VCf{5*=xhq1hd0S3cFol!YUwgK55>R%p
z>`~rYDT}<wW~W`$Yqd{xk9J?L*Ov7rZCyX8J<tzpk9EH`p`Xw`*M)groafaZ(AtRp
zpu8MMHR}4xfdfW`%>t)6&ojW$5pZ?}pn}62iUFv!gIH)}{|zD`o65Cg<w~3NS;cwR
z6RDxm45+m<x&dkpWg9tKL9w1C4^`{3#A>)d)%_HA-(dH!1NC7$*A<Lb=ESCVpAx+k
z=N7G|F%j4)XbGwraM}F5eX5tbDbChQ)k>-nsV~A_X1E6{s9ZtWu8}jq=WA!IE-P;G
zFl%QfnWcNsLuHSVyaAen@Peih*NF*2a5VXFhq?jsk&ZYXvSZozn;oenTlpIy&>wNT
z0~#UeI)|C7ynN3SIp4?rsQ~PUiXg3WLj%%X=}z|OPN9guN^CK_eA(Z!7{sv>88~`#
ztMj@6Tb<W0`sWC@9DM?*)ST6Xi5x`cCQZp#nM*oo!jcKMO^|lva?YE;d2`AR6Oty(
zn;`DY<@97>9c_){l*Vy3ihuR>NOq;p4XD*rx5uif|J=a;jqYR@ljo_635~kg#kBq3
ziwT$P>_FlPuzpi12H3d)Xw?98Y5+Pl0G%R4FdMBJ5?VC?tr~z<4M3{~pj89VssU)#
z0JLfVTE%?`;`g{<#$qO_=oHe_Y?Dx**@ag5ys;)hR6}_ncY|_y&@;nb&dVPvTKlMI
e&4OXYuwmq3Y{Rf)<YPE63NV~ki`KT+e)12sAl&W%

delta 1533
zcmZvcUrbw79LG;vC~cvkm37=gu&3jXF=X)$|BOKvwuNPE)@3Gok;Xs8xb(-r#1}R3
z!QSZ5J#ZcK#$?q3P2&SaZ#L71rCE^LA?YP9_JOg6_y8o^AdATzI^%f3-|6jTn0S)k
zIiK^pzjMy-d+s?WBerG4wrhjs?z8Wa=Ej3ngxn-H24?xV`Ipo&>;6wnb#m{8PE&bG
zz95>)zUxbJsoKx4+f6?Cw@Zhyt{6X#_37~`)5+B4IN$xu6-Tj5r#*tS1nF9V8?X^+
z8PZ1tsQ~FtL0SR&JIHYRP^%yK=39;6qV0e9Vbt56%#p{n0`FEc#8u^(nf>5Aciua*
zB3c5^$@90@s`kdqKQ8a9d=k(p=a>I#{;H3*IB=yzJE3`dqMIbI6g{0nB2e_aL6Vd5
z<{kbmPta=3KPo(s_6OJb1c{qwJ;8kS#;PU%_ZSyU@{%_w9zox;TD}?^Zh((+!5n_q
zeAqpMrQ~8U)lWX>*Dj86@`r^NOi!o2FWjs$KM2e3-#r-V>ZAYI6%S~3`i?v10ou~5
zG=Qs~HiO~>-a@a2m1@u|G#^&ntX&IVa%EQO=^^^c0BsvoYM4_BEA=dRI;>QJrUYKI
zDPE{k%|vrbUiiTaw5u;x1EH7~#D_@}kt!iX$y1W=C2&Z7;07j$)Clw^cXDS(asrF+
zKnTap&}%|zcr^}p7w0Mn^3c83h>5VWgN3ydWSzfCGOI4i@>4Hrt?JiWt@=>o)iv!!
zbzAFD<64*ct=668Ls?$&fqIT;f7aFEdU{{G*U_PON*QK(2DmN)=A{FA+(nNa=^F@P
z2J+7@*U9J1HFEgAFR}#D7%0mSodjhG*qMuFSieYFP*#e>dU)WJ0^o5v`Sz#{{i9ZT
zC>WhDIX(S*oC|DAqKgn~fRDE!)Du)<;IafN29*WeJj`tYlzC8zIQS;34C6*JAZ37^
z3MmGBh5C`%WyVwMVB?G+qvb}jAZ7L7Nl<Ns7gUwFUX2rit4XI`S0?5DjoN))&>m59
zuS!V%@a~7P4PT^rkZo5Du)S&kag(+Ti}%I5#fvwMPTZGJkDmCcp`Mi>PMnUxnOl2r
zk8#^3;s0)1_s|@nYtcC5a&u+_;w6a8B@EXwe<|pM0jmbA8z3Gi#e8Z2Z7g{X7?3d_
zYe1-}6!UHowo%p;rZk1w$U}EJBfAQlhLuIotg%H1G!6e(Y!iE0e0!c26zgJ7OXcp<
zg8#@roQ?yVJC|dC3+RAybwIT`pjsVH_#-7kxw;GG>VR@}K)E`gTpduZ4k%X#l&b^E
z)dA(=!Gq8Z{Av0RP3K@5X?pgk(Ej*Wl**S)9JL7{y!cW*$d^ZaDSElT;xp&g7tSpc
cni<W4R)$uNW<{$&v!U719M_#&mCt|qFE_-WHvj+t

diff --git a/input.s b/input.s
index 0d8b40c..61e8e47 100644
--- a/input.s
+++ b/input.s
@@ -28,6 +28,10 @@ kbdScan:
 	beq kbdScanA
 	cmp #('z' + $80)
 	beq kbdScanZ
+	cmp #('s' + $80)
+	beq kbdScanS
+	cmp #('x' + $80)
+	beq kbdScanX
 	cmp #(' ' + $80)
 	beq kbdScanSpace
 	cmp #(27 + $80)
@@ -76,6 +80,18 @@ kbdScanZ:
 	sta angleDeltaRequested
 	rts
 
+kbdScanS:
+	BITS16
+	lda #1
+	sta powerDeltaRequested
+	rts
+
+kbdScanX:
+	BITS16
+	lda #-1
+	sta powerDeltaRequested
+	rts
+
 kbdScanSpace:
 	BITS16
 	lda #1
diff --git a/player.s b/player.s
index dcc55ed..c7c6f80 100644
--- a/player.s
+++ b/player.s
@@ -100,6 +100,37 @@ playerDeltaAngleClampHigh:
 	bra playerDeltaAngleStore
 
 
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; playerDeltaPower
+;
+; Y = Player index
+; X = Delta
+;
+playerDeltaPower:
+	SAVE_AXY
+	PLAYERPTR_Y
+
+	txa
+	clc
+	adc playerData+PD_POWER,y
+	beq playerDeltaPowerClampLow
+	cmp #15
+	bpl playerDeltaPowerClampHigh
+
+playerDeltaPowerStore:
+	sta playerData+PD_POWER,y
+	RESTORE_AXY
+	rts
+
+playerDeltaPowerClampLow:
+	lda #1
+	bra playerDeltaPowerStore
+
+playerDeltaPowerClampHigh:
+	lda #15
+	bra playerDeltaPowerStore
+
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; playerFire
 ;