From 54a4ed6d64f4055b7e1ccbdbba87562edb87f9d4 Mon Sep 17 00:00:00 2001
From: Humza Shahid <humzasaur@gmail.com>
Date: Fri, 28 Feb 2025 13:18:42 +0000
Subject: [PATCH] code box locations of right frames for whip attack

---
 fcore/level/player/sprites/raster/attack.png | Bin 1613 -> 1600 bytes
 fcore/level/player/whip.sml                  |  72 ++++++++++++++++++-
 oms.mlb                                      |   3 +-
 3 files changed, 73 insertions(+), 2 deletions(-)

diff --git a/fcore/level/player/sprites/raster/attack.png b/fcore/level/player/sprites/raster/attack.png
index 01b261bc11f30e0713f3544a59772cf6aa9b2470..a841cbaac3873a055f3939f6525df4f9cff3f400 100644
GIT binary patch
literal 1600
zcmeAS@N?(olHy`uVBq!ia0y~yV3`DD7jUovNmsq7Rv^V$;1OBOz`%C|gc+x5^GP!>
zuzvD%aSW-L^Y*S|(QN}B)(cvff5%70?!0`?!Z4?k#bMv}SBpARofe+ZKVf(7vrRoC
z(3}I@@i*ClG=l?wlM0A-V(|n~EgT>#88`%0K&k|kJeYu#g3AOJAmz}ZzzL)p1RRBc
z6oVpGjX&qsGVHeOdwl8q{O6UoHwr9H+q#k;XrGN0#Ndk)r#!i<*ReWQJZ3pmssbuS
zjGg;80}W%4cy7`6#(BpRoAYm+GaTnOMuHsAdQ*gH&EYwA(?80cUYrYZVap4k^Ba6a
z_MiTHVef2(*;dTToRb(5CcWc+rYAjFv{dr<yXO`Mc%FUP+4KGHGIr0oY|m%z_B-_I
zalqdnagv6SDLtK5M@r?jfqv#IQDNk{WP9gT(RW~M%y6H;V!uO*<wi&ULcKK$PFLQr
z6<}p}5Vz8Cl4}Y7tB__ZpzRZU-Ge5TJ2TGy9P=tPc=;|4CPsz^(VA3wkkc4!p#l9d
z0~muJE|vG&*MI-<ZTJ8AQdcA^T!G=e!C<yiL+Omm&yDV#uiU~5)B+E9xm@N1&-+`&
z+(Yvmuch%aI857yY;i&RHb<cYdMu6C_x#?szRZYm&8xdVORm56D}Tka2Na_bGkg^f
zSe<!UEcyO<%?&e<a}=#6O{yqaB>r`kXY93Q`xqDk`hk%>>mrirv9Gt>y56>$dG5~*
zISdRd7Uxc2+0ebtQGwyk!QQ2|D~!J=dU!qJs|I`jfK-mqw@bBp`>OU?-fx^b<MOjr
zcK3kkrR~MOPL>7J{PT4}?@#z>Z!WOV4w#q>rurU=TX)U+_w)6q>S`OTX9AU5ft9bS
zVti72bL+`>S|{pipPjP1zjJ=yvaKtH&nSCTO?GvK1@#(WfE@^4&C<AfPruiu-Dk?`
zYo7(>%gy1oT_N0~?(u5^=PLHnRgSU^TxWD0*!p7{_cvb!hX0Si>k1c|m>D{RN*v|@
zy?ev!dV$D`vv-*P@r5aZQ@$fRC_`wRWder(s~@NAKtaV&bz$O^BeLJ*uB>D$y)l`8
zEek_K6(|8ZROactb({<I(xsGl8@?~_GhM;F=A>Gpe)#LTe?Nz(?zcNI_e^GSsBAva
z&(5KH8JI2{zAEkA|9Zmfz})hyk`n&FX!l8+ykYvg*rnm;x4(NY{~&(d!{X5WZ9qpz
zEc(Sd;e4t-TRF&c@BfvUymg(MVB>hH-6z0yMKJFxpvyL}0Zq0SV)-=TZtAqVVe|j~
zo9Vr`^2EIAjzD!_n*E~I-34|vgVv_Vg!FU&ZH$k{&0TqF=T4A5e@>=_eBAjBmT70U
zL$U<WQwPLa7CW#N^Z&4p=mq6|v2X9#-re8*y*&4y+aJGw%g<dev5q^T;=$Cwa%)ZH
z(PaV&vS7Ut=vhJN085ht149BUFcr*jnQh9zaMzcAlFp*)faOwGfMrdC7bu4*aR3XN
zu+LL#fu3Pt_@aQX_}RA=7%4xpk8H2`_3T2`70Dk{fDTMxG;3veZLs`&>Yn?LFM^Xc
ztYoVIW}>c3pagAtJkymk;83AV{r}qQS8N`Y0}Hv|LXZ;gkuik@ATgyF){>J1jsF-5
Wb-X<6ZcP>k1(T<%pUXO@geCwpW->7V

delta 1312
zcmX|BYgm$J7=Ae=ltH1@Ov}%t!?j#<xy_<NJ`V+J8fAJ_YT7PZ<*aNjLoe|oC|m19
zSkpvOYne+eD$Suw>8b^Jz-HhfhgQ0&s9_2oP;2kEANzj2@BQ4*b3M=f-p{9XZg7^b
z<$T}=quWKfgJyH`OZJ=@&*i2uY;WF~OSeaTs6jS=??JKI_4-|5{|Kn)ue{9w@DsgG
zvJ>!wK$iIzWsN|8$K)h14<>)-nC!2tTr>+tv^=%~XHfsVXna<s3Mo~6tz8gv93mrB
z#VZO*fv2>&EJD=tc~k&=uOc)lc^<@a4Os_CnR3bsEWMNi?{T^9gAW{Ya-v(x9do`C
z?2DU^G66U6%adSIUD&wycU?SP;o7^|egtxXC}a~80FNb;;cwS54zw5f`6>_^vpD^T
zD#ayST(Ty}K2lcuRJbYPX|-c5-B<R7cvY7<wgurIAKfZGyD|5SNk@idcJ=Wr-I)1R
z;0i)O3mg0PWQVCI<?<;KoNB$4HNLS>d#$#xI#ooxpZx-W?JVA#rOHM3nrQeSSqP0t
zo?ph)69HH^9xcY(0!D-fuK;<nsT}}G)>ZM;M4PUnb9$^h-=JM7WdX^#Hdo@n;~Y-b
zyL6vW`7c}mFaR_Y=UI4qVABsQLRas2S8$`DtEj%GYVB;G{aDJ%xYq_>K_aFq*ayVJ
zvxm-dA2d{1+f(U7tyTSfzqY6>MmJH2oD9^TDFY?q9WQ!TcU-tZQ@Bz^S%$eVQ`1D|
z%dcpO|M*#9cb@3B<<&A-{jKDw!Kq>_>iIQG?hKI6L771j<^ifN!az3w(Cx(|Hm%#h
zD_W>0av6(<RH&+ejxy7_Y=D%%TzTUD_L^l6t{yfVi(B4Yrnz@v>>awzuJn+Ul-vO}
z+Y6_(Hh<w%oh({!9Y<&&yKdQQpHlno>9Nwt8V+|0o^rkd>8mKgDAL+`7f#8YsGTuN
zQw*gzHcu0oXSLnDe&Dc$3{BLkPzFG8dbh~Q&Nsbp6vkN8b(4CbJ(n|Wzq0wECTW#1
zKMWe{bg4!T68D{RiX6JQ(wC9!%_F{wiXiRu_W;~W`J^{wKG1Hxm2sVWuz4{Id+{t!
zXmqH*K$%b4?ZP6+bKE}%Kp!MG>i6y0vmS*n$)!UZWB^k0Tq6l^IZ_t#34{}S2%T<5
zw_z97BNEYBawLIiXxe2pVV&{zev(ZXs$AJGnx#mu+l5FhP>izuV(qaSx@Pg;&BX?-
z2)ZC{CN7`#?ZFM5w`wp<QlrUeyga?|`!xBbhg>yj!Fj)(v18?_VR`Qz^*1`~ef!yG
z*pEayC;mXgN!+&%xKEFJd2KT8&sC<R)T2?;ma)cYOM}@`e(Iy6(iAd3;aP(xXl(UK
zT;215?WfzVdRD8^IKho#(1czL{|=B;zvFOeUy_^kJytn`Ka&iEOFbx&>QPCG+I<lp
z0QKEt{)t$C$J_D=_jlOvr$-Nk4~q6IMVYPzU5wFh!bW}y_0n=m@CtWxWGu?dyauQx
z7%K3l#nF%Zzyc(c$twJhO9BEFa{5$4G9*YoK&73R$l-4xc|_xY2pp&g&14YfT~s?o
zPQ|;!BDx=ACv0^E6GeVQ;rP<bZvB608f|ciVHSuV#@hto#Q1*qgkYWLz#q`Vh&#%R
vX&r#D_WhwOGaDxms=YJKl+euIC=v6!1Bw&3g|=j83-Aa(BrN!LV4U<{j9@$8

diff --git a/fcore/level/player/whip.sml b/fcore/level/player/whip.sml
index 2bf3b4f..4557eee 100644
--- a/fcore/level/player/whip.sml
+++ b/fcore/level/player/whip.sml
@@ -1,4 +1,74 @@
 structure Whip =
 struct
-  type box = {x: int, y: int, size: int}
+  type box = {x: int, y: int}
+  val size = 16
+  val sizeReal: Real32.real = 16.0
+
+  (* right frames *)
+  val rf1 =
+   #[ {x = 64, y = ~15}
+    , {x = 64, y = 2}
+    , {x = 64, y = 18}
+    , {x = 49, y = 25}
+    ]
+
+  val rf2 =
+   #[ {x = 67, y = ~15}
+    , {x = 66, y = 2}
+    , {x = 64, y = 18}
+    , {x = 49, y = 25}
+    ]
+
+  val rf3 =
+   #[ {x = 73, y = ~15}
+    , {x = 70, y = 2}
+    , {x = 64, y = 18}
+    , {x = 49, y = 25}
+    ]
+
+  val rf4 =
+   #[ {x = 192, y = 10}
+    , {x = 128, y = 15}
+    , {x = 64, y = 20}
+    , {x = 49, y = 25}
+    ]
+
+  val rf5 =
+   #[ {x = 305, y = 25}
+    , {x = 241, y = 28}
+    , {x = 177, y = 25}
+    , {x = 113, y = 22}
+    , {x = 49, y = 25}
+    ]
+
+  val rf6 =
+   #[ {x = 305, y = 25}
+    , {x = 241, y = 28}
+    , {x = 177, y = 25}
+    , {x = 113, y = 25}
+    , {x = 49, y = 25}
+    ]
+
+  val rf7 =
+   #[ {x = 241, y = 31}
+    , {x = 177, y = 29}
+    , {x = 113, y = 27}
+    , {x = 49, y = 25}
+    ]
+
+  val rf8 =
+   #[ {x = 177, y = 33}
+    , {x = 113, y = 29}
+    , {x = 49, y = 25}
+    ]
+
+  val rf9 =
+   #[ {x = 113, y = 31}
+    , {x = 49, y = 25}
+    ]
+
+  val rf10 =
+   #[ {x = 49, y = 25} ]
+
+  val rightFrames = #[ rf1, rf2, rf3, rf4, rf5, rf6, rf7, rf8, rf9, rf10 ]
 end
diff --git a/oms.mlb b/oms.mlb
index 49d60ec..7f56600 100644
--- a/oms.mlb
+++ b/oms.mlb
@@ -19,8 +19,9 @@ in
   vendored/cozette-sml/fonts/cozette-ascii.mlb
   fcore/block.sml
   fcore/field.sml
-  fcore'box.sml
+  fcore/box.sml
   fcore/level/chain-edge.sml
+  fcore/level/player/whip.sml
 end