From 2038b5ca7a561e3ad5bcb4b1f558426d61204082 Mon Sep 17 00:00:00 2001 From: Haze Weathers Date: Thu, 17 Jul 2025 16:49:56 -0600 Subject: [PATCH] some more stuff :O --- .../future/mountain_clouds_future.png | Bin 6013 -> 6024 bytes graphics/enemy/eel_body.png | Bin 4326 -> 4583 bytes graphics/enemy/eel_head.png | Bin 4745 -> 4962 bytes graphics/enemy/eel_tail.png | Bin 4327 -> 4619 bytes maps/future/mountain_future.gd | 13 +++ maps/future/mountain_future.tscn | 74 +++++++++++++----- maps/station.gd | 9 +-- objects/player/player.gd | 3 +- objects/player/player.tscn | 4 + project.godot | 2 +- 10 files changed, 76 insertions(+), 29 deletions(-) diff --git a/graphics/backgrounds/future/mountain_clouds_future.png b/graphics/backgrounds/future/mountain_clouds_future.png index 45b6fbbe894dc7559784e7b670e5cd028a5927aa..b9cd95bd315693044d3107e3f771398585b150c8 100644 GIT binary patch delta 1682 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 LNkvXXu0mjf0OKt{ diff --git a/graphics/enemy/eel_body.png b/graphics/enemy/eel_body.png index 58588acd204db6c71082405d2cd48c1f8e825802..29c09d033998d33e211285c9f202d658d3a6445b 100644 GIT binary patch delta 1045 zcmaE+_*{8{ay_F+YJ_K+r>7PJ2Ll5GHvKJl^ikA2t`E?DL&Z09zB1$5BeXNr6H}7F;U{WzNF;BHLGfvhu zG)+p;H8C(Y)wN7YP1ZFsO)@mMG%+wYNim+Bz}mxaZfaz1VQFDuXliU=YHT+7H>)J0 z#bi;oEJtYa2!SOJT?1e`F;L=CP*AAIEwJ*1$&W3`+ueoX1;Y}CImh&6L0N{gz$3C47y|o2n9+hY7?e=iOFVsD*4@Jgp`DYgo=$R=jz#jpwQE^W5H%~Wnn#83)Kh- mAkd55aqa*REI95E&%j`PfNkTh&ag^Q^7nN0b6Mw<&;$T>Y(zx> delta 940 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 HDWM4fg!5g* diff --git a/graphics/enemy/eel_tail.png b/graphics/enemy/eel_tail.png index dd08a768c9c83966cddccef9d779cd8f7b8c3625..89892aef91416fc0046db6c55c02e09d6f5e43b9 100644 GIT binary patch delta 1080 zcmaE^*sU@_xt>uZHNrE^(^HFqgMop8n}LCmg@F;s;sRnuD4Pe!W@2P!U@wDK?KM+0mPZ@ z5R2~s*&x6HhR#K)i6yBi3gww484B*6z5xu=fpRQB45LAU3PyT{271O8KqC!|Osx#e ztqjc-49%E^Cb2U}0`>d?V#Wms2Qx6J07akx(<-KObwDpNwoF!Jl&xQ? z^p)GXqvS-u+&7Dq`nGbpt`Nv-4U_fJ``e_(>)F-4_(4>`hvbc~9z0sJx_Pw%M_t1X zZoe+Qphy2FIdwlQq@jp8`;+k! zXI^Tbj#)10#?&3r#3IPGN@F39bYN6zkj|0}`+EoNU;R=o(tM)TI5C+~G-E=n{SWy+ z@2;Kl_pPt;JZN#@?;{KOWQPRtj4LwFf8QvSQg8S#x#LpwKQGxCe^vHgyQJiP;DA{{ z;oVD9Y#$V{OH>-A1edAW`zp?7zjyw{>`ezg=w8_U?CZ5V$6qo}ShjAG`GJFq25}4C zeC2!pF7y4{`^IPg)iLA-6)o{Q^6MHfokeGcM3hAM`dB6BZ{EYy$fRsymSSjTV62;B zY;2%wVrpTaYhi3*u4`ayU}$P-l$va4WHvd0wTIu_)X3bz(!$)_(8S2h%wY0wR!K&S z$)apoj?mN*0!tmb2Eb%upv0x1piq%pVC9>il9^WN0!(wZN{FaB^>EX>4U6ba`-PAZ2)IW&i+q+Ko}!ZNo4O z{nr#7ftL=BBgYQV4KjY7B`U596et1lc%&XFDjl!yXZkutnk37$6)%M#=H}AjG@7yv z&16GQ>0$YfCwfFe04c1_&?WE#IDC%SqY1D24^cSW;pHpQqkl7RcYF&%X}^ggp*%a& z9v6a0B_^^NKVqWdt=^utucs|(*DVGFdVBowk{1X*oBIu=j(N{j$vpTy74Z*}^)n`=jZ$bX)d-pMU? z`Zzc1(*OVgg@0*7Lr_UWLm+T+Z)Rz1WdHzpoPCi!NW(xJ#a~mkA{B=g5pl>+oh*VC zajaD+LWNK(wCZ4T>4(syAxUv@6kH1qek@iUT%2`va1{i>4-i)uCq)-2@qbC7MXU$M z{djlparX`o>Sd-`U2#CuZ8M!rh}qnV7yfK1PASF3_ks z&iAq7G)@5jGjOH1{FOQ|^GSNGrA3Z_fo`H!`LZJY>pV2qv zfY2?_x9auQ+{ftykfE+pH^9LmFjl1OwGQv@Z4~eA-!skregFkta^dxCiJkxe4S2KF z0*eA8H!?J3F=06^HDP09Ei_|cWG!MdH)Sn2WM()pF)%SPH)S)Eg9VHaHaIslHZwLh zGchnUH8eJp9tIf!G?O?6YC$tPFg7|eGE^}&IyE#pGBYhOG&(RaA_^cNAb4$XI!$k6 zX=ZsuVRU6ZA~G;CGdeIfIx;d;F*Q0hG&(XfEig2*;|2}^v(yM+2p07ta#H{R00v@9 zM??Vs0RI60puMM)lS&aD3g-qE6E+tq2zBCN*>5u2cap2mL$ z1_p-XEB-SuFfcH1YTaaHL6^h@;0iBXy1|G~6AL!oFij86DE?;{LI42I9S_=efYO=( O0000 void: sprite.global_position = graphics.global_position.round() + Vector2(0.0, -10.0) # update transition guard properties # whether player can currently shoot an arrow - var can_shoot = Game.arrows > 0 and get_tree().get_nodes_in_group("player_arrow").size() == 0 + var can_shoot = Game.stars >= 5 +# var can_shoot = Game.arrows > 0 and get_tree().get_nodes_in_group("player_arrow").size() == 0 state_chart.set_guard_property("can_shoot", can_shoot) # check for and propagate input events diff --git a/objects/player/player.tscn b/objects/player/player.tscn index a143bfd..f38a5eb 100644 --- a/objects/player/player.tscn +++ b/objects/player/player.tscn @@ -1007,6 +1007,7 @@ texture = ExtResource( 4 ) unique_name_in_owner = true position = Vector2( 9, -6 ) collision_mask = 5 +monitoring = false [node name="CollisionShape2D" type="CollisionShape2D" parent="Graphics/ShootHitbox"] position = Vector2( -8.5, 0.5 ) @@ -1148,6 +1149,7 @@ initial_state = NodePath("Still") script = ExtResource( 10 ) to = NodePath("../../../Airborne/AirDash") event = "shoot" +guard_expression = "can_shoot" [node name="On PushStart" type="Node" parent="StateChart/Root/Movement/Grounded/CanWalk"] script = ExtResource( 10 ) @@ -1227,6 +1229,7 @@ event = "duck_released" script = ExtResource( 10 ) to = NodePath("../../../Airborne/AirDash") event = "shoot" +guard_expression = "can_shoot" [node name="On Jump" type="Node" parent="StateChart/Root/Movement/Grounded/Ducking"] script = ExtResource( 10 ) @@ -1279,6 +1282,7 @@ event = "grounded" script = ExtResource( 10 ) to = NodePath("../AirDash") event = "shoot" +guard_expression = "can_shoot" [node name="On LadderTouched" type="Node" parent="StateChart/Root/Movement/Airborne"] script = ExtResource( 10 ) diff --git a/project.godot b/project.godot index f9aa96b..f8386a9 100644 --- a/project.godot +++ b/project.godot @@ -87,7 +87,7 @@ _global_script_class_icons={ [application] config/name="Revolution 2083" -run/main_scene="res://menus/splash_screen.tscn" +run/main_scene="res://maps/future/mountain_future.tscn" config/use_custom_user_dir=true config/custom_user_dir_name="heromark2" boot_splash/show_image=false