From a5f4c342368f1943724b69d866d88e565daa31f3 Mon Sep 17 00:00:00 2001 From: pennyrigate Date: Fri, 2 Jun 2023 18:03:44 -0400 Subject: [PATCH] changed sg sprite to work better with palettes --- autoloads/game.gd | 1 + graphics/hud/file_select_arrow.png | Bin 0 -> 185 bytes graphics/hud/file_select_arrow.png.import | 35 +++++++ graphics/hud/sg_menu.png | Bin 2314 -> 2022 bytes graphics/player/pal_purplearmor.png | Bin 166 -> 0 bytes graphics/player/palettes/default.png | Bin 0 -> 183 bytes .../default.png.import} | 6 +- graphics/player/palettes/msx.png | Bin 0 -> 181 bytes graphics/player/palettes/msx.png.import | 35 +++++++ graphics/player/palettes/strawberry.png | Bin 0 -> 179 bytes .../player/palettes/strawberry.png.import | 35 +++++++ graphics/player/sg_blink.png | Bin 338 -> 344 bytes graphics/player/sg_bow.png | Bin 436 -> 440 bytes graphics/player/sg_climb.png | Bin 340 -> 344 bytes graphics/player/sg_doublejump.png | Bin 360 -> 365 bytes graphics/player/sg_fall.png | Bin 2025 -> 2030 bytes graphics/player/sg_fall_scared.png | Bin 357 -> 361 bytes graphics/player/sg_idle.png | Bin 288 -> 293 bytes graphics/player/sg_jump.png | Bin 299 -> 305 bytes graphics/player/sg_shoot.png | Bin 455 -> 460 bytes graphics/player/sg_shoot_air.png | Bin 306 -> 311 bytes graphics/player/sg_shoot_grounded.png | Bin 493 -> 497 bytes graphics/player/sg_stab.png | Bin 374 -> 380 bytes graphics/player/sg_step.png | Bin 293 -> 297 bytes graphics/player/sg_walk.png | Bin 430 -> 435 bytes menus/cool.tscn | 19 ++++ menus/file_select.gd | 16 +++ menus/file_select.tscn | 83 ++++++++++++++++ menus/file_select_panel.gd | 12 +++ menus/file_select_panel.tscn | 91 ++++++++++++++++++ menus/main_menu.gd | 1 + menus/main_menu.tscn | 24 ++++- objects/player/player.gd | 3 + objects/player/player.tscn | 4 +- 34 files changed, 356 insertions(+), 9 deletions(-) create mode 100644 graphics/hud/file_select_arrow.png create mode 100644 graphics/hud/file_select_arrow.png.import delete mode 100644 graphics/player/pal_purplearmor.png create mode 100644 graphics/player/palettes/default.png rename graphics/player/{pal_purplearmor.png.import => palettes/default.png.import} (69%) create mode 100644 graphics/player/palettes/msx.png create mode 100644 graphics/player/palettes/msx.png.import create mode 100644 graphics/player/palettes/strawberry.png create mode 100644 graphics/player/palettes/strawberry.png.import create mode 100644 menus/cool.tscn create mode 100644 menus/file_select.gd create mode 100644 menus/file_select.tscn create mode 100644 menus/file_select_panel.gd create mode 100644 menus/file_select_panel.tscn diff --git a/autoloads/game.gd b/autoloads/game.gd index 2c23872..0ae099a 100644 --- a/autoloads/game.gd +++ b/autoloads/game.gd @@ -26,6 +26,7 @@ var is_easy_mode = false var easy_mode_speed_factor = 0.75 var use_lives = false var can_pause = true +var current_palette = "default" func _ready(): Save.load_file(current_file) diff --git a/graphics/hud/file_select_arrow.png b/graphics/hud/file_select_arrow.png new file mode 100644 index 0000000000000000000000000000000000000000..6667a67b86563a6753bda35d49b5d8374afda8ef GIT binary patch literal 185 zcmeAS@N?(olHy`uVBq!ia0vp^AT|dFGm!kQGOqVM%xNb!1@J z*w6hZkrl}24DbnY{r~@eLqh|QXA`$u2S_oO1o;L3|Icv!6faOM180FpWHAE+-(e7D zJf6QI1t_TH>Eak75gvPbBQMZCCdY*T3tcx%I&$9BN$!@$x3$+SZZ2pyB-E0 Wn<2SFpm--x7lWs(pUXO@geCwcUN#Q^ literal 0 HcmV?d00001 diff --git a/graphics/hud/file_select_arrow.png.import b/graphics/hud/file_select_arrow.png.import new file mode 100644 index 0000000..b9569fd --- /dev/null +++ b/graphics/hud/file_select_arrow.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/file_select_arrow.png-c4dd38af48f940ca232cee7aab98deca.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/hud/file_select_arrow.png" +dest_files=[ "res://.import/file_select_arrow.png-c4dd38af48f940ca232cee7aab98deca.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/graphics/hud/sg_menu.png b/graphics/hud/sg_menu.png index 5429f7c3f79172324ec12815b432356fc00ebc7f..57b7176564cd4c5882370993f8457d5cfb5db5b5 100644 GIT binary patch delta 1979 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 diff --git a/graphics/player/pal_purplearmor.png b/graphics/player/pal_purplearmor.png deleted file mode 100644 index ff68eb2e61db70bffee19be91cf6f683308e3e82..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1SHiab7}%9#^NA%Cx&(BWL|<~(j9#r85lP9 zbN@+X1@buyJR*x382Ao>Fr%o3R|8Pc+SA1`L?S%-M||qX`sZ){hd(zoFxU|B?qSHz z^3d48*Z=?j=MmG2S!%Y(K}^74_X_Eir%%?3PZZ|%WMgPn5WB}2naB+^hQZU-&t;uc GLK6TjGcafX diff --git a/graphics/player/palettes/default.png b/graphics/player/palettes/default.png new file mode 100644 index 0000000000000000000000000000000000000000..eb98d1d54aab318f25b319dbae2e30782a81ccae GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=7>k44ofy`glX(e}Nq6*hWMJ6X z&;2Kn70Bl-@Q5sCVBp&i!i*NI!74yOA5Ry@5Q*^QAMvRl|NlRC^Z)<&x!>nEHa@iP zek$k3Hnloj@`~tIiGTn9pFeQq!#kDcCzF>tc(Sp%DI{DHxSBd);>Gk0g~6#mvfg}= ZXZYeQ{k44ofy`glX(e}Nq6*hWMJ6X z&;2Kn70Bl-@Q5sCVBk9d!i-thIyr%YUY;(FArj%qC7%oauV20R{DjvFjxBgF`OtwQ z3@q~YH3>6n9*7<8-<&Qf!NSV=KRY}7zy0eMKjc+TK3c!FVdQ&MBb@0IjG%w*UYD literal 0 HcmV?d00001 diff --git a/graphics/player/palettes/msx.png.import b/graphics/player/palettes/msx.png.import new file mode 100644 index 0000000..49a8b74 --- /dev/null +++ b/graphics/player/palettes/msx.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/msx.png-afd8ff86bb458e4177e0aa622ca7db04.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/player/palettes/msx.png" +dest_files=[ "res://.import/msx.png-afd8ff86bb458e4177e0aa622ca7db04.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/graphics/player/palettes/strawberry.png b/graphics/player/palettes/strawberry.png new file mode 100644 index 0000000000000000000000000000000000000000..78b7496a4cb0996e770a3c49805e47258d53ea42 GIT binary patch literal 179 zcmeAS@N?(olHy`uVBq!ia0vp^EFjFm1|(O0oL2{=7>k44ofy`glX(e}Nq6*hWMJ6X z&;2Kn70Bl-@Q5sCVBp&i!i*NI!74yO4^J1z5Q*^QJ=5m=ozKW&(%mB|v30Vs zQ$3z0q;~8(aQ?&p|MhHY8_&y2{5U_KNi!*dg-I>ev5u|WQm-vUQ?YIRF~9$eJ&uAO UCH}eO1I=XcboFyt=akR{0A`Li8UO$Q literal 0 HcmV?d00001 diff --git a/graphics/player/palettes/strawberry.png.import b/graphics/player/palettes/strawberry.png.import new file mode 100644 index 0000000..220eab5 --- /dev/null +++ b/graphics/player/palettes/strawberry.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/strawberry.png-3a39f091919ee3d7a564aa066e171830.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://graphics/player/palettes/strawberry.png" +dest_files=[ "res://.import/strawberry.png-3a39f091919ee3d7a564aa066e171830.stex" ] + +[params] + +compress/mode=0 +compress/lossy_quality=0.7 +compress/hdr_mode=0 +compress/bptc_ldr=0 +compress/normal_map=0 +flags/repeat=0 +flags/filter=false +flags/mipmaps=false +flags/anisotropic=false +flags/srgb=2 +process/fix_alpha_border=true +process/premult_alpha=false +process/HDR_as_SRGB=false +process/invert_color=false +process/normal_map_invert_y=false +stream=false +size_limit=0 +detect_3d=true +svg/scale=1.0 diff --git a/graphics/player/sg_blink.png b/graphics/player/sg_blink.png index 61ef0f8c00a85ba92b0964d39022e680775766eb..18a88f5f16ad9715a81b93ba7846e7f84a6e4a70 100644 GIT binary patch delta 288 zcmcb_bc1PvW4%g%Plzi6!+!^c|Nnu=;eP|e|AvPD4G#Yu9R4!^$%g+7K*YeXru~Q% zkm4x`@(cct01QI+&z%E`a~60+7BevL9ROj*tZSW|K*6P+E{-7<{!{w{`Hm=Xu&!LX z=0S zyn0h;X6M#zzCJmfS8l1Xr70;1E)?@k@_zDownW5_nb%6bxP04xqk4b-T-}K~C4bl^ a*Dy4&NKIwkd7vBUWCl-HKbLh*2~7Z1yF*u?EiA)3jp!kKWG~S#wY3+_yOA_VMT!?h=Kx$nd!*&+MPzaOtMd z%ubiD0>ZbIu2*$5&g?jGW`*nI8)8p?D6)ywEen&io%mOO+qHS_Kuh)N{NKxe5I!WK UTy6N`CeXnQp00i_>zopr00O9fSO5S3 diff --git a/graphics/player/sg_bow.png b/graphics/player/sg_bow.png index de319b1c690634ec6a86ea74bb6826daf469005b..0b269d69b1b109d51aaff720678aa7115a7d7dd5 100644 GIT binary patch delta 384 zcmdnOyn}gyW4(HSPlzi6!+!^c|Nnu=;eP|e|Aq!2{lCHCzk|bn1|Zq+p8<#%7@kWh z-vCm)B|(0{|B(QL?F*$gpaf@uM`SSr1K%MKW)#)%YG7bsWb|}#4Ds+jI_cuH!wMWO zD=&1d{QrM%cURbzIhVz^)qhTSVrA9F@~PjXX`#pS*m*fN4>wxIM%J68&DrM@E+x2i zlUJwkWzhx!C&{SDr>E@>N_ez|h5adPIGXSWU*Iv!Pm71C+D*mZ&tW1mH6rXdY;Pk`C?^L&!yac z)#SJKS;-GS^=+}w^4^Qt{9Klh*?jl)DW45~?KU?#_N{yU_gdw2b?JluSI_y+@JTI< V^W}xra=@{yC@KaDLxM&po;8cq)@M-prhLyKwym?r)O88f`Lz>7yG>bcPgOlTW(_bOP_CR z^T*nf=(i@C@ti5{*f{4}R~nm!Dnkx=HZQ_ESIEbHx3Y UTedCd1BMZUr>mdKI;Vst09V|$6#xJL diff --git a/graphics/player/sg_climb.png b/graphics/player/sg_climb.png index 847c97b6e177d5b2b8c1e4a6a435057b82cf7ced..43603cc12247625966144759f2eb6b541f102046 100644 GIT binary patch delta 288 zcmcb@bc1PvW4%g%Plzi6!+!^c|Nnu=;eP|e|AvPD4G#Yu9R4!^$%g+7K*YeXru~Q% zkm4x`@(cct01QI+&z%E`a~60+7BevL9RguSQ4OyKpx{zZ7sn6_|Eawfg<2Fi7*28+ z{r_LjFDRJv>{*^X&$hD*{??!PuUL{Z&*izlMOZ^Xs^ztJWsQnz?3 Z{~r@+=7m?2!+}m_@O1TaS?83{1OR~Kg53ZB delta 284 zcmcb?bcJbxW4&U4Plzi6!+!^c|Nnu=;eP|e{|1Nu4i5hrfMmme1|VW!sGgZ*1Ejc1 zg8YL2!vTYrKjSB$FlT{BWHAE+-(e7DJf6QI1t_@G)5S5w!hdRCpwM9j4%SY_q&@!| zyBk=}_$caia}g?dTLC5dqP)Lt0|dPdPJud*D*17M22Ngef6m2S^1v02`rpz*Evq_ zexr1vCbl}@SgWUFntt<}OPBBL{;jefIzW diff --git a/graphics/player/sg_doublejump.png b/graphics/player/sg_doublejump.png index d77733fcf16c47c8dff36e6a8233dcff353d3fac..37936e96446f08b1d35b15e744608008918bf80b 100644 GIT binary patch delta 309 zcmaFC^p8$ zkm4x`@(cct01QI+&z%E`a~60+7BevL9RguSQ4OyKpx`b~7sn6_|Ec}aVuuwtTviGh z7XJVJ_5(-nw&lL>+u7SztJIt1ecJEgb!EOqx=a82w4OuN#uF0~rheTQ@$nnW!JQgM zgSzDIu>}aMOVaH*9PP}zWOB!>*T?q6x-NG~VpJxAp4h#aqA((aW`{wv?O1?Ue3Pgg&ebxsLQ0R1S7DF6Tf delta 304 zcmaFM^nz)EW4&U4Plzi6!+!^c|Nnu=;eP|e{|1Nu4nWlKpTXfj1CV53@Jrv@1Ejc1 zg8YL2!vTYrKjSB$FlT{BWHAE+-(e7DJf6QI1t_@F)5S5w!hdRiwAf(<4i`=(wRiOg zW#tSne%tc$?}@|*T5Z3a|B2V1Jn>8Tc~8dgyk{DF&4p!o_I#4*?(I;|nA6>M;>@?s z84ixcqTJkeg0jXJ=DJ)7TII2~`-RuW$Deyu+}zr&q%8K{(>P@D)^O!i*RH*?it1NZ zu6iVW@nGty3g15uW`tBPN-?-16=Ay0D{SM+ci#?Vr#JnZxAgL@yhj3gi?XIUT5E3N t$Xi`1DH|-KRCe~>A=Q5m7T);Ho!KGr=G=!UKA<-kJYD@<);T3K0RS#tjHv(s diff --git a/graphics/player/sg_fall.png b/graphics/player/sg_fall.png index 88f79c7f25fa9a12740bcdb3bd8f8a22d89bf0b1..45d2977932eee4d4ed6b993c4f3dd5ec6e8c87ec 100644 GIT binary patch delta 245 zcmaFK|BipdR>mlm0G|+728RC*4FCTFk;DH6hW`x>{~H|sJ2?Dj0Fn*=8Gwj^VNLrH zDImpD666>B9|0JI?w>mc6z44Ph%9Dc;M)(vj25iHDx0~Pf?4a!JzX3_G=g(`qlJzt za5(RrqIBxt_vj}J?`3`#oMfEL^7lfMLFi7sKW1x%bzU~D%y`EpSQusUol{?BbH+o4 zlDjV7Ip_M#oqg~E+oD~!8S`?ti%35?!#eXRYiE>jqEbHlmb3LQW>5OqqUHMC{a4%G ha@k~;$n)DnhR>m;J0G|+728RC*4FCTFk;DH6hW`x?{~a9uGXTkk{|rFHz)(Fi$p%Pq zmjw9*|AzwxFMq~QKw-`TkH}&M2EGFz%$RkplXEjaQ!s0NnWu|mh(>U3ueZzrM$VrLU+>d7V}AwO9~iv&Ft`h zQS#~yPg|J4#k*_;+15*MC_Imw5NS7Ig{k20_b(f+{cO9ZxpQ8?(ie40;%`)6H*{+$ e-M91?gWYN#u|rjBJ$QglWAJqKb6Mw<&;$T4Ice$u diff --git a/graphics/player/sg_fall_scared.png b/graphics/player/sg_fall_scared.png index b8304b78a89c5856b36e79d15771c9c39d2e5ed3..446b3f0854ce913aea645830cdc0510562fc2e21 100644 GIT binary patch delta 305 zcmaFL^pa_UW4%g%Plzi6!+!^c|Nnu=;eP|e|AvPD4G#Yu9R4!^$%g+7K*YeXru~Q% zkm4x`@(cct01QI+&z%E`a~60+7BevL?FV5-3)Wy2px`!77sn6_|K9#+p%w)mmd$EH zQ-0qs|I8%3=GLvB4$E>o4%PoK_Ga;YlWr94|6|XYL(dLJ8fwpeq{tY#H%cp7Nr_3J zYHP?gH)T1M^?RbUy7>btgywqQxv@*oL-=aY%=MRAWQ;o2WZwyXb~S7fTkp=TDyOuQ zKflhA^4)50t(ziW s+sij^(2Too`tEn%GtHdde{&7@u`^4(4dK1@3Frp~Pgg&ebxsLQ0CQxDd;kCd delta 301 zcmaFK^pt6WW4&U4Plzi6!+!^c|Nnu=;eP|e{|1Nu4i5hrfMmme1|VW!sGgZ*1Ejc1 zg8YL2!vTYrKjSB$FlT{BWHAE+-vJP2%(~Xe2^8Gs>Eak-;osXIz3GSohs#WcSv&r- z#>W{YtXh^=FY)_{2Irc3HP`wJN9vYusyXyL)oh#mxmh=Fis^Hncy;wsWLF1A!wVqY z=eEZqu5xRMnEZkXojW?%PfItN1nSQHspWe@wfV%ZW45Vrxl%sRC`$6@O##=r$w$nbOs39#BvE|KEI3l|ytMW2zGokIZQP`^&pmvb>)(fJmveHu nzt^sRUb(1J>h#6^o3F`NUX!SJ7Fqlm=m!Q*S3j3^P6hc(NvWyu=Fel861S-Q z_&T%SzUEh$nxJgZ4;Vy~_Xzs>0T%I>YX^_X3uZ??SV X7T(aq_ieWUt!MCb^>bP0l+XkK#Ybn3 delta 231 zcmZ3=w18=XW4&U4Plzi6!+!^c|Nnu=;eP|e{|1Nu4i5hrfMmme1|VW!sGgZ*1Ejc1 zg8YL2!vTYrKjSB$FlT{BWHAE+-yslY6xHx*016g*x;Tbt1h<}vAnL0_xcVVJTlK} SvMvB^XYh3Ob6Mw<&;$TweP8MT diff --git a/graphics/player/sg_jump.png b/graphics/player/sg_jump.png index e55f19d9a76b9835b04ebd834802ca1e03844ac8..2a0d0dcda34279d390de8d826807ec2d05044a2f 100644 GIT binary patch delta 248 zcmZ3@w2^6oW4%g%Plzi6!+!^c|Nnu=;eP|e|AvPD4G#Yu9R4!^QNw?ShW`u<47I*z z3xO0*NswRge*|CCBeIx*f$ty)Gwzs}{T3)#=jq}Yq7j_i8!dEHfx~(4 z6s1%DzDLJ-?Y&&XQk0T3Szoj;ciGnGAwRVD#51eu&FXrRC&F+>X{YsGhO0_DqZ#AO zAJqmNU$)p>A;aCJe0FcueRso=z`f6Sj^`iZ-d`sy lne1|-<)Q(IFx&m|xgQu&X%Q~loCIFlpYnA{2 delta 242 zcmdnUw3=yxW4&U4Plzi6!+!^c|Nnu=;eP|e{|1Nu4i5hrfT-cWL&JXt28LC^+2KHn zyCldj_&*#lc=U3ueZrUNm>v*5@JF6{7dnGYX6Qx)zypF{DkrGxuIY*2Ft&8S#vPR_M;YDR9|19l@o%+!A>nvlL{ha!Le)*>K2qs>( gOwU`DrO{~^~W4(HSPlzi6!+!^c|Nnu=;eP|e|Aq!2{lCHCzk|bn1|Zq+p8<#%7@kWh z-vCm)B|(0{|B(QL?F*$gpaf@uM`SSr1K%MKW)#)%YG7bs6!mm*4Ds+jI`LuNVFQkq znZDW9Uw_-bHxS^D2wG`hf5R_OWS`6&=Y)UVWjZ=9Kd-bY+sF9h*HiD5UrwE$Q;nVm zO6v(n(M$8SnyU8Xzelb$l}w&A^`y$QeKN0^KPKj^%&FIXFlpKvAGH_{&95g_ zU-Pc^H-2|GF7Xz>aMb&NgTLNIv}Rt|eeY#aZ@&C)!K|xilili-Hr$%+F8r~6*Y=$e zvlEk~6gpn%e&tf zo38v|+9l7zlP*;bZ)PW+%x1o~p00i_>zopr0PJ(U^#A|> delta 400 zcmX@Ze4KfLW4%g%Plzi6!+!^c|Nnu=;eP|e{{{yj{oldiKLe1_@Sg#Q7#J2$c~}jk zcuIo&g8w4`gV6nR=YZmz1s;*b3=DjSL74G){)!X^21XH27sn6}@1v70PHHybaLsg@ zb>q+f|9XsPn694t(s=jxgA?^15A|xCslV9Qs=C*H>hW{x4E^TuN|)Ka=IBq>oIXoM z)!UORm@mL9Qd~1~<{R^EVoSQGtnpFX_~luIbdvG5kZt$H3Ov2T)P(hxO!@U>($~hT z%O$_3t~Yqw&bhXHMM7=)nnNZpg5Q_yJhr|6F2}`NZ*9`Ps4}hITWKP=zIt}|)_O^` zZGui$Cb{<1F`lDW`?{U#EXZ+%r(?O$W~QRmXEQ0}-awRJ_SI-F((PJ6WM)ygwxi{GVwyZ!5{X|U}- po{YWUb^7}ZpPk%n{$|EsM!WO;YE$1khX5VJ;OXk;vd$@?2>@$Rc-H^` delta 249 zcmdnaw25hgW4%g%Plzi6!+!^c|Nnu=;eP|e{{{yj{oldiKLZdo{C8;h&%nS?6!$^^ zNb!^e`33(+00yD^=gtAeISV`@iy0XB4uUY_j)~cCfr9m(E{-7@!MS~bd@PC_&ay3{ zPyc<7<+5@!{=4E!rqukvSvkYs$ l&wIEuxyN#6+2Lt7<;{-qUR|-@TN>yV22WQ%mvv4FO#qb(aC86w diff --git a/graphics/player/sg_shoot_grounded.png b/graphics/player/sg_shoot_grounded.png index 4cbeae8b9a727993e73707ad755dc8d49f4657c9..33faf1bf378ae0be0850cbf4bf35f83052b2b2b7 100644 GIT binary patch delta 442 zcmaFM{E>NrW4%FuPlzi6!+!^c|Nnu=;eP|e|Aq!2{lCHCzXOm0GQctnKyJf-1|R~0 z<&0TCQlKQrFBqf(2{1fRj+F$;aTa()7BevL9RguSQ4OyK1_nkwPZ!4!5AUNBA5J=~ zz|ms4RIt8!*`EKmVqlbC_Y}jr*n}Mg($mPSi>}i@z)>mpuE_xpb{#5@&I@(`o(qf-I(gK>3?Tt3i z(fs(3!&oWsQk?or(fRylX?Egs_N{(*e&!(o@oNq0wh|Y;LcLsPIIIrsoq3+!yUW2m z&`R*>Cmus_N4x2rUXjg$t!odSGjA%bZ(6okans^5At&x2`Hw|cs<>?Aw=R14`TveJ zXZ3IFntpw6_J+?pjUOl#$X1*c`x2O+Ui@Lv+#Htq&wp0jD8BAz*7QH@jJ>g5#>>(- SJNE!Xl)=;0&t;ucLK6TruFul| delta 416 zcmey!{FZrwqoi(tPlzi6!+!^c|Nnu=;eP|e{{{yjJuz0Ye&t)WI}8jA{3Stt!T(VJ z!<9QT76PR>3p^r=85sBugD~Uq{1qt-42*i7E{-7{-bW{0oOW1&!)0aC2Gghi?YA$; zxaj+Rj@=GxeziM1J%)_`)O!;GZq{D+Gh0{i`{A8azm{%1xpVr>$!;!d*BEW;yeVAY zAkd_@cFnER_YN8^&;c>t>}51iJMyGw_RWf9hpAITt7opA+A7c=754YgqlavDH*e4M zWoUDeRH}GxdRnAWHp_0;3)Kgjm7jXos&k$URJ+I9G3BKA%*b<7eiXDwPV}&wd%yQv z*Likn&pHL%Pd>gdHqorKm5#(x%P}d=kDp}_e^j6 zj42S@!M7)k``4=Nn=LCY`k6JI|6F7Dc3-x-^uc=VXX1oq3uW%XMw_mf-BrY=8QIbLed92N%K z<}W@1PA}xY^i1EZz_yjY>e%V_To;qPRkxiUJloQkkzP@A_;e-n)dcTHjRl_*!)7g+ z^R|25$D&!jW)lLcWqy8Qn>JnBv1`@GqbeOs=Wv)zZZK2$*^_qo*@d!eOnZ87*z$6D z9dO?g@9;9oeV2d_GxN!J&de$+w!X8@V(-3f$2Z|Yao)lAtZQu<{VM&w$QL(U1bU0X M)78&qol`;+0LojE)Bpeg delta 318 zcmeyv^o?nPW4&U4Plzi6!+!^c|Nnu=;eP|e{|1Nu4i5hrfMmme1|VW!sGgZ*1Ejc1 zg8YL2!vTYrKjSB$FlT{BWHAE+-(e7DJf6QI1t@sj)5S5w!~5+7N4~=b94sq)-yZp2 zU$Ajg&}k|4RaF`MGo4xDOqA+9{!fbj(9R^epl?R;t0#q797XqKeqIuIs>1L>a!GpA zluJJrq%WGoYPquZf^p!xZGsnLLQXpgJloRv;(+Zw!KZr~vo@)IbZFT*d#c{ju-}V- zYSX%TMXm_C@7vS(^sQIGrmQ+c&Z2B}rnM>ycs=YEU)^B2rFknuzT9p{XU-oT=HIwA zoZoneH)S3Od}C+g(3E@on`~*r(c16KDnI5#f2ekR@4wZ={gRCQN*AD~7(8A5T-G@y GGywoL9FIT% diff --git a/graphics/player/sg_step.png b/graphics/player/sg_step.png index 272f20d05565e6b34fd1b0b6dbc5288c724beec0..62319a22cd8e4b64c4830c1adb69cc56abc9e093 100644 GIT binary patch delta 240 zcmZ3=w32CpW4%g%Plzi6!+!^c|Nnu=;eP|e|AvPD4G#Yu9R4!^$%g+7K*YeXru~Q% zkm4x`@(cct01QI+&z%E`a~60+7BevL9ROj*tZSW|K*2Ik7sn8d;M`tEz5@yzESjz^ zKmXTvGi3#R-(WDgW5IMC&P?T<&s)-O%e*_JCs{ZvS4hy^@~qq^*G)yA*cNOTm>TS7 zU39Ocz3f2YHr@wOYnzpFCMEly)DiboabkRJ8MxLy(_HmhaMzN%@+<$PWcyaX=X?FL b?-jewao)Id+t~L2oxtGf>gTe~DWM4fM7C#I delta 236 zcmZ3(AM1A%<)!}_|?~;x>4+l}s-7na>U|0(gQBvW+#s`_c{%hYzycjD3f^=Ee6^t>Y%CY&sUpZ|8I&|dRJx+cnP zZ8~=M4FWI!3D$d)=JBQ0T;-J2?&+}|cX>JOsy$5$HLLnIaU0mAeEP|)ow9rWE~63y z7tz}1+?!*V1f84J=d%lSP7qZ)v7=*67?8b`K!MeRlb?d UR*Fiw4h$j&Pgg&ebxsLQ0R6$O#sB~S delta 374 zcmdnYypDN-W4&U4Plzi6!+!^c|Nnu=;eP|e{|1Nu4i5hrfMmme1|VW!sGgZ*1Ejc1 zg8YL2!vTYrKjSB$FlT{BWHAE+-vJP2%(~Xe2^9SA>Eak-;lFl*2FJ@@=? zwC7rwq4sz7xkD$4B{IDKZ&a$^!1MF3P?E<@@%x{4l`6Nj>Fj%*oU>7>t!>Rdj*>{r zr%&!HvW0}54NhEJDih|H`0P_v#@AY=`%}McD0J|?>QMbP&J)uME_qu%X zw4JOMuXTOM~qes~?C0 P1B1cS)z4*}Q$iB}t3|Q6 diff --git a/menus/cool.tscn b/menus/cool.tscn new file mode 100644 index 0000000..d09ad4f --- /dev/null +++ b/menus/cool.tscn @@ -0,0 +1,19 @@ +[gd_scene load_steps=3 format=2] + +[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=1] + +[sub_resource type="ShaderMaterial" id=1] +shader = ExtResource( 1 ) +shader_param/color_1 = Color( 0.145098, 0.0823529, 0.0823529, 1 ) +shader_param/color_2 = Color( 1, 0, 0, 1 ) +shader_param/checker_size = Vector2( 16, 16 ) +shader_param/cycle_speed = Vector2( -8, 0 ) +shader_param/pan_speed = Vector2( 0, 8 ) +shader_param/uv_transform = Transform2D( 1, 0, 1, 4, 0, 0 ) + +[node name="Node2D" type="Node2D"] + +[node name="ColorRect" type="ColorRect" parent="."] +material = SubResource( 1 ) +margin_right = 256.0 +margin_bottom = 192.0 diff --git a/menus/file_select.gd b/menus/file_select.gd new file mode 100644 index 0000000..1eccaec --- /dev/null +++ b/menus/file_select.gd @@ -0,0 +1,16 @@ +extends Node + + +# Declare member variables here. Examples: +# var a = 2 +# var b = "text" + + +# Called when the node enters the scene tree for the first time. +func _ready(): + pass # Replace with function body. + + +# Called every frame. 'delta' is the elapsed time since the previous frame. +#func _process(delta): +# pass diff --git a/menus/file_select.tscn b/menus/file_select.tscn new file mode 100644 index 0000000..7f7b068 --- /dev/null +++ b/menus/file_select.tscn @@ -0,0 +1,83 @@ +[gd_scene load_steps=7 format=2] + +[ext_resource path="res://menus/file_select_panel.tscn" type="PackedScene" id=1] +[ext_resource path="res://graphics/borders/skaborder.png" type="Texture" id=8] +[ext_resource path="res://graphics/hud/file_select_arrow.png" type="Texture" id=9] +[ext_resource path="res://menus/file_select.gd" type="Script" id=10] +[ext_resource path="res://shaders/ska_plane.gdshader" type="Shader" id=11] + +[sub_resource type="ShaderMaterial" id=2] +shader = ExtResource( 11 ) +shader_param/color_1 = Color( 0.2, 0.294118, 1, 1 ) +shader_param/color_2 = Color( 0, 0.0352941, 0.329412, 1 ) +shader_param/checker_size = Vector2( 16, 16 ) +shader_param/cycle_speed = Vector2( 0, 16 ) +shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/uv_transform = Transform2D( 2, 0, 2, 1, 0, 0 ) + +[node name="FileSelect" type="Node"] +script = ExtResource( 10 ) + +[node name="TextureRect2" type="TextureRect" parent="."] +visible = false +modulate = Color( 0, 0.109804, 1, 1 ) +anchor_right = 1.0 +anchor_bottom = 1.0 +texture = ExtResource( 8 ) +expand = true +stretch_mode = 2 + +[node name="ColorRect" type="ColorRect" parent="."] +material = SubResource( 2 ) +margin_right = 256.0 +margin_bottom = 192.0 + +[node name="Panel" parent="." instance=ExtResource( 1 )] +margin_left = 12.0 +margin_top = 64.0 +margin_right = 84.0 +margin_bottom = 128.0 + +[node name="Panel2" parent="." instance=ExtResource( 1 )] +margin_left = 92.0 +margin_top = 64.0 +margin_right = 164.0 +margin_bottom = 128.0 +number = 2 + +[node name="Panel3" parent="." instance=ExtResource( 1 )] +margin_left = 172.0 +margin_top = 64.0 +margin_right = 244.0 +margin_bottom = 128.0 +number = 3 + +[node name="SelectFile1" type="TextureButton" parent="."] +margin_left = 12.0 +margin_top = 130.0 +margin_right = 84.0 +margin_bottom = 138.0 +texture_normal = ExtResource( 9 ) +texture_focused = ExtResource( 9 ) +expand = true +stretch_mode = 3 + +[node name="SelectFile2" type="TextureButton" parent="."] +margin_left = 92.0 +margin_top = 130.0 +margin_right = 164.0 +margin_bottom = 138.0 +texture_normal = ExtResource( 9 ) +texture_focused = ExtResource( 9 ) +expand = true +stretch_mode = 3 + +[node name="SelectFile3" type="TextureButton" parent="."] +margin_left = 172.0 +margin_top = 130.0 +margin_right = 244.0 +margin_bottom = 138.0 +texture_normal = ExtResource( 9 ) +texture_focused = ExtResource( 9 ) +expand = true +stretch_mode = 3 diff --git a/menus/file_select_panel.gd b/menus/file_select_panel.gd new file mode 100644 index 0000000..452255d --- /dev/null +++ b/menus/file_select_panel.gd @@ -0,0 +1,12 @@ +extends Panel + +export var number = 1 + +func _ready(): + var file = File.new() + if !file.file_exists("user://file" + str(number) + ".pr"): + $FileExists.visible = false + $FileDoesNotExist.visible = true + else: + #Fill out info + pass diff --git a/menus/file_select_panel.tscn b/menus/file_select_panel.tscn new file mode 100644 index 0000000..d10cb4b --- /dev/null +++ b/menus/file_select_panel.tscn @@ -0,0 +1,91 @@ +[gd_scene load_steps=10 format=2] + +[ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=1] +[ext_resource path="res://ui/2ndpuberty_outline.tres" type="Material" id=2] +[ext_resource path="res://objects/collectibles/key.tscn" type="PackedScene" id=3] +[ext_resource path="res://ui/theme.tres" type="Theme" id=4] +[ext_resource path="res://objects/collectibles/shard.tscn" type="PackedScene" id=5] +[ext_resource path="res://menus/file_select_panel.gd" type="Script" id=6] +[ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=8] +[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=9] + +[sub_resource type="ShaderMaterial" id=1] +shader = ExtResource( 1 ) +shader_param/border_color = Color( 0, 0, 0, 1 ) +shader_param/border_corners = true +shader_param/palette = ExtResource( 9 ) + +[node name="Panel" type="Panel"] +margin_right = 72.0 +margin_bottom = 64.0 +theme = ExtResource( 4 ) +script = ExtResource( 6 ) +__meta__ = { +"_edit_group_": true +} + +[node name="FileNumber" type="Label" parent="."] +material = ExtResource( 2 ) +margin_top = -10.0 +margin_right = 72.0 +theme = ExtResource( 4 ) +text = "file1" +align = 1 + +[node name="FileExists" type="Node2D" parent="."] + +[node name="Name" type="Label" parent="FileExists"] +margin_left = 8.0 +margin_top = 4.0 +margin_right = 64.0 +margin_bottom = 14.0 +text = "SG" +align = 1 + +[node name="TimeCounter" type="Label" parent="FileExists"] +margin_left = 3.0 +margin_top = 50.0 +margin_right = 69.0 +margin_bottom = 60.0 +text = "00:00" +align = 1 + +[node name="Palette" type="TextureRect" parent="FileExists"] +material = SubResource( 1 ) +margin_left = 8.0 +margin_top = 16.0 +margin_right = 28.0 +margin_bottom = 48.0 +texture = ExtResource( 8 ) +stretch_mode = 4 + +[node name="ShardCounter" type="Label" parent="FileExists"] +margin_left = 43.0 +margin_top = 20.0 +margin_right = 67.0 +margin_bottom = 30.0 +text = "00" + +[node name="KeyCounter" type="Label" parent="FileExists"] +margin_left = 43.0 +margin_top = 33.0 +margin_right = 64.0 +margin_bottom = 43.0 +text = "000" + +[node name="Shard" parent="FileExists" instance=ExtResource( 5 )] +position = Vector2( 32, 23 ) + +[node name="Key" parent="FileExists" instance=ExtResource( 3 )] +position = Vector2( 32, 34 ) + +[node name="FileDoesNotExist" type="Node2D" parent="."] +visible = false + +[node name="Label" type="Label" parent="FileDoesNotExist"] +margin_left = 3.0 +margin_top = 26.0 +margin_right = 69.0 +margin_bottom = 36.0 +text = "Empty!!!" +align = 1 diff --git a/menus/main_menu.gd b/menus/main_menu.gd index daae36a..0b62762 100644 --- a/menus/main_menu.gd +++ b/menus/main_menu.gd @@ -13,3 +13,4 @@ func _ready(): continue_button.visible = false $Panel/FileSelect.grab_focus() + Vector2( 0.83205, 0.5547 ) diff --git a/menus/main_menu.tscn b/menus/main_menu.tscn index 86285f2..f7fd33d 100644 --- a/menus/main_menu.tscn +++ b/menus/main_menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=7 format=2] +[gd_scene load_steps=8 format=2] [ext_resource path="res://ui/theme.tres" type="Theme" id=1] [ext_resource path="res://graphics/hud/sg_menu.png" type="Texture" id=3] @@ -8,13 +8,22 @@ [sub_resource type="ShaderMaterial" id=2] shader = ExtResource( 6 ) -shader_param/color_1 = Color( 0.952941, 0.952941, 0.952941, 1 ) -shader_param/color_2 = Color( 0.137255, 0.137255, 0.137255, 1 ) +shader_param/color_1 = Color( 1, 0.835294, 0.619608, 1 ) +shader_param/color_2 = Color( 1, 0.478431, 0.219608, 1 ) shader_param/checker_size = Vector2( 16, 16 ) shader_param/cycle_speed = Vector2( 12, 0 ) shader_param/pan_speed = Vector2( 0, 0 ) shader_param/uv_transform = Transform( 1, -2, 0, 1, 1, 0, 0, 0, 1, 0, 0, 0 ) +[sub_resource type="ShaderMaterial" id=3] +shader = ExtResource( 6 ) +shader_param/color_1 = Color( 0.62, 0.797333, 1, 1 ) +shader_param/color_2 = Color( 0.22, 0.428, 1, 1 ) +shader_param/checker_size = Vector2( 16, 16 ) +shader_param/cycle_speed = Vector2( 24, 0 ) +shader_param/pan_speed = Vector2( 0, 0 ) +shader_param/uv_transform = Transform( 1, 1, 0, 2, 1, 0, 0, 0, 1, 0, 0, 0 ) + [node name="MainMenu" type="Node"] script = ExtResource( 5 ) @@ -22,6 +31,13 @@ script = ExtResource( 5 ) material = SubResource( 2 ) anchor_right = 1.0 anchor_bottom = 1.0 +margin_top = 136.0 + +[node name="Background2" type="ColorRect" parent="."] +material = SubResource( 3 ) +anchor_right = 1.0 +anchor_bottom = 1.0 +margin_bottom = -56.0 [node name="TextureRect2" type="TextureRect" parent="."] margin_left = 176.0 @@ -60,7 +76,7 @@ margin_left = 8.0 margin_top = 9.0 margin_right = 16.0 margin_bottom = 17.0 -focus_neighbour_top = NodePath("../Augmentations") +focus_neighbour_top = NodePath("../Options") focus_neighbour_bottom = NodePath("../FileSelect") texture_focused = ExtResource( 4 ) diff --git a/objects/player/player.gd b/objects/player/player.gd index 156e9ad..4cb844f 100644 --- a/objects/player/player.gd +++ b/objects/player/player.gd @@ -54,6 +54,9 @@ onready var pushable_detector: RayCast2D = $"%PushableDetector" # OVERRIDES # func _ready() -> void: + #set palette + var palette = load("res://graphics/player/palettes/%s.png" % Game.current_palette) + sprite.material.set_shader_param("palette", palette) # death handling Game.respawn_point = global_position connect("died", Game, "_on_player_died") diff --git a/objects/player/player.tscn b/objects/player/player.tscn index 5e55e36..6ff5b60 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=43 format=2] [ext_resource path="res://objects/player/player.gd" type="Script" id=1] -[ext_resource path="res://graphics/player/pal_purplearmor.png" type="Texture" id=2] +[ext_resource path="res://graphics/player/palettes/default.png" type="Texture" id=2] [ext_resource path="res://shaders/recolor_border.shader" type="Shader" id=3] [ext_resource path="res://graphics/player/sg_idle.png" type="Texture" id=4] [ext_resource path="res://addons/godot_state_charts/parallel_state.gd" type="Script" id=5] @@ -1174,8 +1174,8 @@ script = ExtResource( 8 ) [connection signal="state_physics_processing" from="StateChart/Root/Movement" to="." method="_process_movement"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded" to="." method="_on_Grounded_state_entered"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded" to="." method="_process_grounded"] -[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_horizontal_movement_grounded"] +[connection signal="state_physics_processing" from="StateChart/Root/Movement/Grounded/CanWalk" to="." method="_process_can_walk"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Still" to="." method="_on_Still_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Walking" to="." method="_on_Walking_state_entered"] [connection signal="state_entered" from="StateChart/Root/Movement/Grounded/CanWalk/Blinking" to="." method="_on_Blinking_state_entered"]