From 8941380b684216841276bc744410882468de9917 Mon Sep 17 00:00:00 2001 From: Kiri Date: Thu, 23 Mar 2023 00:25:43 -0700 Subject: [PATCH] Almost done. --- TODO.md | 7 ++++--- sprites/jmpka0.png | Bin 0 -> 1284 bytes sprites/kit.aseprite | Bin 0 -> 3423 bytes textures.txt | 6 ++++++ zscript.zs | 9 +++++++-- 5 files changed, 17 insertions(+), 5 deletions(-) create mode 100644 sprites/jmpka0.png create mode 100644 sprites/kit.aseprite diff --git a/TODO.md b/TODO.md index 5aaa709..a3df6d3 100644 --- a/TODO.md +++ b/TODO.md @@ -13,13 +13,14 @@ x Switching to mag manager goes to batteries screen x Empty batteries disappear x Add (or make sure) loadout code in loadout editor x Help screen - -- Pickup sprites for every angle - - Spool of wire, a tool, and some electical tape +x Pickup sprites for every angle +n - Spool of wire, a tool, and some electical tape +x Set bulk - 1st-person sprites - Wire cutters and electrical tape +- Pickup sound diff --git a/sprites/jmpka0.png b/sprites/jmpka0.png new file mode 100644 index 0000000000000000000000000000000000000000..950ebdfad5a6103a6d78797d8c7973cb830989f6 GIT binary patch literal 1284 zcmd^8@r&DJ7=F*2WL!9VvwC5dgASvX5m|&F5yA*AH*;r>%Xt~(hk$j&SukkCDAffF z7_p2hVHPPGwX(t@)UAW6{h`AuC-jHH-Jq}z3syFvjN9m7a}z;cvkCqaeth5i!VB;7 zyx;dc---1#Wp-v^1^{MPmX|h?{A6VK^!lho0AW z-JWfCEvsXiZNq44T0>D{Nverr#Pb!73t6_rFhM5c({zEN+;rMbrSc@1BM6fqbb`+huG9ck14x=8hwKRJH~sb34#`zSi;7rmNH)xn@g| zC5AbnXz;$y6*SgXvN@U2rHm@j5=ZfDnq^Xx$z(hpk4B^6aMJ6DF_1J_X~xB<2bf$Tb5;-rePSGrYVXd%d#knf*^1lm(6Aw zhAE)qO!E0rF1Kx%9Zhd2YE_cUf)sFq%W@Wz)#;2(QG6=RkR(NP;;>aMHY$D`7OF)j z^6j!`m0UBh4bRdFIn^=bye{Qb!H{`f;;Mla7WBYY3ppvT^QOXTA|vy(=Ua|zW%52Z&9?5Ya|d5E(>> zC8!Ee=Ag(V=FG|*Eih@0CKHN#RuTa?00w{pNQ!_}8OJJmNh@x{b`>HA?AW%qexH3V z`4{l!#+v>w+1&~MSL?rP%a{HvBu{mEW$BqCPk(g%K}XI%*)@59|7{= zqtEVt{0aE#?UR3Bv=4mx{9EpDyxh9&pL?P9i~8BrYrYzMy?W-my{F=LR?q!lKK1%< zAK$o9d;hBN{n1wk!%wd7`s+Nu_0aMIi}Rt|xzsrS#*dTbxw!}LfA`kZ<;Rv6!f!7m Q4h2{_ytZ`q(2MW=17QoM{r~^~ literal 0 HcmV?d00001 diff --git a/sprites/kit.aseprite b/sprites/kit.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..9e99a488c5899ba06f506f6e33b3568c5a763019 GIT binary patch literal 3423 zcmcJSeNa@_8HcZ5g$k6!RX0j>H-QEe$r{j7AsvjXAyc$#*>pCOt=&(G{y{cm5HhdX1rj z(fmf4RhI+08~Yti8)H_(YY?_Zgw0`LV@TLgDU1Z* z?K&Uqt@Xn0kW|!FDHU~;J7H_U4qNFn%;ZEbC^rKJTn zH#ft^#zt7L)+-W;a9*cYEgTMWUQ<&8tJT_7R#tLeUS19Z0jbyT_rsEs66o=Gpj)kD zfm%nWT1SUkN1Iy5T(yo?tJIsV)-f|vDz&I}Oiq^S64g4E=+c^}w-^?8xuC1n0iBID zXy2C$^J;RSwNhHh30PpJS7ymlAoG)KmzgnHjnJ484-JViFvb`K8^b|ZUsDG6RZA7& zU5s@jKP&BV{lkApgqR|YXb6Yu*41n zZn?k2C3hCv0-ERY)Qj%=7~lc#djQ<*u*oa?$5 z_H@eq9St&)rjYcz&u4-mrva8(rBZLIB=lacb+rfdh6cG33JFyPb(c%dRlanUAo-JB zq zW5`UDRkI{Wzs!N6v_n=DWqrwqqKuZktSD!Cjg@n~J5T77xzgz$=V-04MhiiYCSwbe z(BVTgZRmp+11|yI0HS|gNBmeH<>Px~kLl4ojz{p=UDRG*kJK?bI>+UR9E+oH{EfUZ zH`>P82pe0YYCMgkF*JI{&4?K*qhx%Hj4?49#=&e2>?>OX?;>4{i*9i(qQ$Z(HWEOt zm=&$!RD_C6Q7Ilpq8Jo?;!ebgHBlzMM3$HmP2xxdi5*cRUPOu*5gp<}M2H1ZApS#s zm=EpYJcNhsP#vB_au^Q1;WosE)leEfLuQx^jo~l^hP_Z1-a=X!3tizVM1`eL6n;WZ zmw7G zm;-I#41|F#L>0OhNni-{fEy44RuCm{AOlQ*25`Mo*4?c*CW7N47# z)iAuE_ry!dj-KghDU&MA)x$Enl73W>R558u@6dS1nb-{tNiFkM9(t^5;qJoRPfI^o z^upYi3(tO1c*}oa*WDwQgWmYe!i)2lezo}PHlw>Y>sZ}{=ii+^^~&SZ4)uM%dXwqE zg(IG=XD*eld*_68^pEp5E`Gswtt8&CCUMi@X|_=lEJ-h>Y^X?U-+6S_qMh+S*xOmx zGU1b{k^IK9;R}vChj%^Qk>*;Kb}^XJzQJ^RlQFu~);jN<^A~2E+Pb!5%(eZWUkt7; z8ventIorptdU@qxy}B%R&2LtG*?TMQUxP0Ap6Tmn&WG{!_q+W3cMiw%wYYTivh`1W zuW54ZkYmx8EmKO*pVsxgNn1wG3Pu0nr`Kn0JQTS&XR`bDID5bQwbyOOZSi{5$F17k z1;@ucKkj$$k4pa8GDrK?thk@w7{C5bTKnxMmtG2%-rE1`Uv7H+?b?c09$AsU>h1J` z>pwg={K*;m<^FAVwx>r0_Z%E^;<blh^ZNX~ z_1oV}tt#4mBW|K;%gOw?#->9Te(}+(e=~e@K7VV&={XDQFO6`|c=x5N&;99W>HhZB z4T0rHuWmSTZspv0-<m z;UAh~t-c$cTTcvq)7;SaRZrGOFUF8()y zNJC+DQ()R_dlT-|Wc~43HJBkE@~B@A2QJ=o49Y()^|GuX-=0U7J2^ aLAvkcinsp$`H?TenZ2bZW2`F_x8&a$ApCCt literal 0 HcmV?d00001 diff --git a/textures.txt b/textures.txt index 960187a..2cfad22 100644 --- a/textures.txt +++ b/textures.txt @@ -14,3 +14,9 @@ sprite JMPRD0, 49, 43 { offset 24, 21 patch JMPRA0,0,0 { translation "112:120=96:111" } } + +sprite JMPKA0, 48, 32 { + offset 24, 16 + patch JMPKA0,0,0 { } +} + diff --git a/zscript.zs b/zscript.zs index bbef16d..b20397c 100644 --- a/zscript.zs +++ b/zscript.zs @@ -229,7 +229,7 @@ class JumperCablesUsable : HDWeapon weapon.selectionorder 1014; scale 0.6; - inventory.icon "DERPEX"; + inventory.icon "JMPKA0"; inventory.pickupmessage "Picked up a wiring bypass kit."; inventory.pickupsound "derp/crawl"; translation 0; @@ -238,6 +238,11 @@ class JumperCablesUsable : HDWeapon hdweapon.refid HDLD_KIRI_JUMPERCABLES; } + override double WeaponBulk() + { + return 7; + } + override bool AddSpareWeapon(actor newowner) { return AddSpareWeaponRegular(newowner); @@ -253,7 +258,7 @@ class JumperCablesUsable : HDWeapon { spawn: - DERP A -1; + JMPK A -1; stop; select: