From 77b6ca3b7bba059ecd789653f60148847b94af4c Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Mon, 10 Apr 2023 17:05:52 +0200 Subject: [PATCH] feat: Flag & Button art, Grass FPS, State times, falling test level --- assets/contraption/FreeButton.aseprite | Bin 0 -> 1813 bytes assets/contraption/freeButton.png | Bin 0 -> 230 bytes assets/contraption/freeButton.png.import | 35 ++++++++ assets/contraption/freeButtonSlider.png | Bin 0 -> 156 bytes .../contraption/freeButtonSlider.png.import | 35 ++++++++ assets/neutral object/blobby1Flag.png | Bin 0 -> 343 bytes assets/neutral object/blobby1Flag.png.import | 35 ++++++++ .../neutral object/flagPoleAndBasePlant.png | Bin 0 -> 603 bytes .../flagPoleAndBasePlant.png.import | 35 ++++++++ assets/neutral object/saveFlag.aseprite | Bin 0 -> 2204 bytes src/Environment/ShaderGrass.gd | 7 ++ src/Levels/Falling Level.tscn | 75 ++++++++++++++++++ src/Levels/Level 1.tscn | 4 +- src/StateMachines/StateMachine.gd | 7 ++ 14 files changed, 231 insertions(+), 2 deletions(-) create mode 100644 assets/contraption/FreeButton.aseprite create mode 100644 assets/contraption/freeButton.png create mode 100644 assets/contraption/freeButton.png.import create mode 100644 assets/contraption/freeButtonSlider.png create mode 100644 assets/contraption/freeButtonSlider.png.import create mode 100644 assets/neutral object/blobby1Flag.png create mode 100644 assets/neutral object/blobby1Flag.png.import create mode 100644 assets/neutral object/flagPoleAndBasePlant.png create mode 100644 assets/neutral object/flagPoleAndBasePlant.png.import create mode 100644 assets/neutral object/saveFlag.aseprite create mode 100644 src/Levels/Falling Level.tscn diff --git a/assets/contraption/FreeButton.aseprite b/assets/contraption/FreeButton.aseprite new file mode 100644 index 0000000000000000000000000000000000000000..81697404d47bd5fbbdf9a7fb09931c9cc5054949 GIT binary patch literal 1813 zcmcJQ|4-C)9LL`Tia#JLQiP6?7)8lp5jDMid?H>Ew`*Xa%yk3vz zF*{VLzUCkm#mk_Alu~xy|6NWMB!lWvUjN5+Xu4A4-cbLlY(+)#4mJ3foU+{6V5OoB z&VNUaOnIWzw2)v;sqnBcxKO8uwz#L@g^VYm*B%Qen%{(4-xoqII9d(It}KOjYLeku zYXaPwvKYq2>foBRMX+LH3cS&1hGV`Ju)9ZQ{>+^O-`^)A`CFDiQ|eq86%!5Tr^_C) zil2wJ=5$zp-3Tvx=fmsTFl@a41GHQ_0GFS%z_g;5V4Qg&oE0If=;mg@1?vvUcy$L{ z-gXC;JP>;Skh8RRO~RTJKA2J54_BJYV5!{$UA4c!&QI^d@tgAfkyaP%+H(;$oA=7>l=9Q?jXGC`3`=3{3zV>?rvz=umKv4a>ksb zL|A8i5qc`t!<(ma;rX3XjpEf(=Ztu%u&q$)f8byy^tkikgWmnHb?_?uz$5d&dTbZW zE|gs*ypRItL`BPelFXL*vdnL5x@PQxy@8xHr$Y~H(4|K83v`1MIAtlIH9w5(kVO>yzC<={K;cAMYH{v+ILL(<2| zc3Ic=(J44MUFz17=YaO))i7TFG~|M|?XsUuB^5B>Bo!B!gIx2?9YHhypnv1SA0caUb!q9_8^J*)bi> zaU8+18@2HosWBRzaT$@Z7=`f{c`+AlaTZ~*6;<&RNvQ{V;wEBZB}(EW<;O%c#6bka zKGefIq{BFL!!<<1G8DrvM|LP<3%f;iHX*)dn_~glM`RoB-HH)Z|yO~OlHgs KQw`Q9vi|{)6sW2I literal 0 HcmV?d00001 diff --git a/assets/contraption/freeButton.png b/assets/contraption/freeButton.png new file mode 100644 index 0000000000000000000000000000000000000000..8eea055e7d2a6f57368039746180d0ea7db295b4 GIT binary patch literal 230 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|7I?ZihIn)) zr!+8yi9P$z6T-6p|DV*91R!t}E8*cti@0?8oWbPFtvb$^_rFi<&|H~vV}GJV!26Y!A|}Uj7hZzn!K52b6?CX zF}omdKI;Vst0J*SLyZ`_I literal 0 HcmV?d00001 diff --git a/assets/contraption/freeButton.png.import b/assets/contraption/freeButton.png.import new file mode 100644 index 0000000..d4f466f --- /dev/null +++ b/assets/contraption/freeButton.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/freeButton.png-2a50360c11506c59fb3dcd7e421a611d.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/contraption/freeButton.png" +dest_files=[ "res://.import/freeButton.png-2a50360c11506c59fb3dcd7e421a611d.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=false +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=false +svg/scale=1.0 diff --git a/assets/contraption/freeButtonSlider.png b/assets/contraption/freeButtonSlider.png new file mode 100644 index 0000000000000000000000000000000000000000..a13522bac7169ba035b1e8aa22388cbb24f3d24c GIT binary patch literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjjKx9jP7LeL$-D$|!aQ9ZLp(Z@ z6C_v{Cx{p*75DV?{0lyOq4@c^gJ)A6r-y`xEvF>* y8=@L~6?ZmtW~n`7aJKI-&~fkwnbE^^ijg5sN925y-MfCE4Gf;HelF{r5}E*;yfr%j literal 0 HcmV?d00001 diff --git a/assets/contraption/freeButtonSlider.png.import b/assets/contraption/freeButtonSlider.png.import new file mode 100644 index 0000000..2f3aa67 --- /dev/null +++ b/assets/contraption/freeButtonSlider.png.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="StreamTexture" +path="res://.import/freeButtonSlider.png-b94089bc85fb03cd527ec1850fb2e5a9.stex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/contraption/freeButtonSlider.png" +dest_files=[ "res://.import/freeButtonSlider.png-b94089bc85fb03cd527ec1850fb2e5a9.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=false +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=false +svg/scale=1.0 diff --git a/assets/neutral object/blobby1Flag.png b/assets/neutral object/blobby1Flag.png new file mode 100644 index 0000000000000000000000000000000000000000..608d3ca16e15ae81c4393c67968b1dda8360ad00 GIT binary patch literal 343 zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC#^NA%Cx&(BWL^Tau8sBu>II>b?XatZya+DIORCJIas%a*+0xc?!=6VIvebpJ3rQ*bQ4xM(|j|Q zK?w{N{TB)Hud&NBN>|LT>>vfyc6Sjzy@P>7vE-Z>I<$+~i zxVJewzrO7~*V?&@NkjUO6xZV8Q`|dNF)-NO^7!9Px%6-h)vRA_faTSIg3OEAi|=y;@en<)ERhiF5JYimX@5 za)j?zwCqHv48#^WXvk3pblpOM9Wa*Gjq_@q2sF@q^8$dim&dBsjX(pRkMf9`t!f>a z7-FyGM4@A50u8tuO$n$j=t!UeYnahmJY4oIBx<&nN9W(9CoK>)d(;J4dQhbEVNWYl zp+*Uvb1>B`q}$(zDGcbEhuBY}fd;&mBi)T=R9a?YVh5~YCJG%h6Z?B0R0ee3MwdIp zaCV95oP*FevDb3q_a=@56AkDbV1R|7kKa#sq&3WNyt9R<*~X{$@1oKbn!s_|8fMr{ zeFZ>7B4>Igz6b6HFa0qAXZ)f#~I(Jy1K(}`I68Aev*l4zK5U!_JP$@WyR9^WhRVxPFVgGi$*p=sIBt>}TB{4)v6KP{odgp#`2W zezKS^sTWzOb@n7JO2d36I{t2sc*B`9IEG4gDhI zt{ld@L(6{s<+Yof&G#cYe|Snd+*E!Je%pKp-fnpeOD@&I)V=bIb7QtZzo0N^?=S)S zs^s;OMY2{qb4p=FRUK@)-v%Ey$sRRama~-=T!1NY8E{5m2y}6h9UpB!94?$9_mCZt z3QwyKz?za0*itWNYj2hHue(wPf5_hfQHW?NLErQ{rr@~=2gCPTkE|dG2A1B|@Il1!7y3pmScAg+n`Jg_H8W zgSyJ-Qgh`4Gw$4--V5sH)NxT*1a~Hk^MFo{&T#fDSphe#Em4s&SzcZ;9VMC-FsWIZ zuj`J?<}Jc(Ab(kM`Hz^g8UbZrY)9sjP%_%m$Ra@`g+!425k8Vf?8qE}BW)auoDnh- zM!d)t!6H>eiaZe}l0=Ni5CI}RM2FlE8WKZX$O=IrB}9aL5Dt<-EXV|bAPq!;91sE$ zfd06T_*jqf_>SzDj^;Ry;Mk4Yc#YH;jn24?$XJZR_=~)li?%q6u+#%p@f1lh6g_d1 z@?#}R;v+I*A{yc#0%9NP;T_Up9J=8eqG1_|;TLjY7FyvHLSYjs;SmybVo-Af?jR1< zpbWks3;jeB9HElfA=S`m=mJKd1Dl~WSbzdj03ql+ZKvlnoNm)<`b?AQFvp>r*1Tk( z)YrbO1D&VY6GP(`{@1f3gnoD~+Gn%#eR`dgR#&M;Ouzwa0`r^&g#@Y9xu`Wv%4c4?HRVdsR}+|syE zRiUb=uF%`1?(uTFc4~dmQ}pRJ^#Ebc)XzJgb!ak@gx%GbfqnLEEZrdd%oGYmb;p^S zttP4MR{mz^9b<*R?VuCt7kbwfdoo9UUs}@G_DizO+y_m)lhO)JLQX1MtA4YMj6EO! z<^uDA#5rr!bpiefyURUm@9F0Z?EFc8)Y*)z&n6#S+n7D6Jo}TZteE1{qOQoxD?__4 z1?4pDwl6a=M0@1Z2A-!%yQ`y0}NIMM(B literal 0 HcmV?d00001 diff --git a/src/Environment/ShaderGrass.gd b/src/Environment/ShaderGrass.gd index 8af47be..6173f83 100644 --- a/src/Environment/ShaderGrass.gd +++ b/src/Environment/ShaderGrass.gd @@ -16,12 +16,19 @@ var saved_displacement var is_idle_swinging var start_swing_time := 0.0 var begin_idle +var time_since_last_exec := 0.0 +var fps_limit := 30.0 func _ready(): # TODO This could probably fuck something up later? For other randomness based events randomize() func _process(delta: float) -> void: + # TODO This should be in the settings and applied to all shaders + time_since_last_exec += delta + if time_since_last_exec <= 1.0/fps_limit: + return + time_since_last_exec = 0.0 var distance: float = abs(global_position.x - blobby.global_position.x + 6) var v_distance: float = abs(global_position.y - blobby.global_position.y + 11) #Velocity relative to the grass, increasing distance is - velocity diff --git a/src/Levels/Falling Level.tscn b/src/Levels/Falling Level.tscn new file mode 100644 index 0000000..58f739c --- /dev/null +++ b/src/Levels/Falling Level.tscn @@ -0,0 +1,75 @@ +[gd_scene load_steps=11 format=2] + +[ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=1] +[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/Levels/x02 Level.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=9] + +[sub_resource type="AnimationNodeStateMachinePlayback" id=4] + +[node name="FallingLevel" type="Node2D"] +script = ExtResource( 1 ) +__meta__ = { +"_edit_horizontal_guides_": [ 464.0 ], +"_edit_vertical_guides_": [ 2880.0 ] +} + +[node name="SignalManager" parent="." instance=ExtResource( 7 )] + +[node name="LevelState" parent="." instance=ExtResource( 5 )] +unique_name_in_owner = true + +[node name="UserInterface" parent="." instance=ExtResource( 4 )] +unique_name_in_owner = true + +[node name="Timer" parent="UserInterface/HUD/HUDOverlay/GetBackTimer" index="0"] +wait_time = 20.0 + +[node name="BlobbyCam" parent="." instance=ExtResource( 2 )] +unique_name_in_owner = true +drag_margin_top = 0.38 +drag_margin_bottom = 0.0 + +[node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] +frame = 1 + +[node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] +frame = 5 + +[node name="Blobby" parent="." instance=ExtResource( 3 )] +unique_name_in_owner = true +position = Vector2( -1.52588e-05, -110 ) +scale = Vector2( 0.878906, 0.936025 ) + +[node name="AnimationTree" parent="Blobby/BlobbySprite" index="0"] +parameters/playback = SubResource( 4 ) + +[node name="TileMap" type="TileMap" parent="."] +unique_name_in_owner = true +tile_set = ExtResource( 9 ) +cell_size = Vector2( 24, 24 ) +cell_quadrant_size = 3 +cell_custom_transform = Transform2D( 24, 0, 0, 24, 0, 0 ) +collision_layer = 8 +collision_mask = 8 +bake_navigation = true +format = 1 +tile_data = PoolIntArray( -786440, 1610612738, 0, -786439, 1610612738, 0, -786438, 1610612738, 0, -786437, 1610612738, 0, -786436, 1610612738, 0, -786435, 1610612738, 0, -786434, 1610612738, 0, -786433, 1610612738, 0, -851968, 1610612738, 0, -851967, 1610612738, 0, -851966, 1610612738, 0, -851965, 1610612738, 0, -851964, 1610612738, 0, -851963, 1610612738, 0, -851962, 1610612738, 0, -851961, 1610612738, 0, -720905, -1610612734, 0, -786424, -1073741822, 0, -655369, -1610612734, 0, -720888, -1073741822, 0, -589833, -1610612734, 0, -655352, -1073741822, 0, -524297, -1610612734, 0, -589816, -1073741822, 0, -458761, -1610612734, 0, -524280, -1073741822, 0, -393225, -1610612734, 0, -458744, -1073741822, 0, -327689, -1610612734, 0, -393208, -1073741822, 0, -262153, -1610612734, 0, -327672, -1073741822, 0, -196617, -1610612734, 0, -262136, -1073741822, 0, -131081, -1610612734, 0, -196600, -1073741822, 0, -65545, -1610612734, 0, -131064, -1073741822, 0, -9, -1610612734, 0, -65528, -1073741822, 0, 65527, -1610612734, 0, 8, -1073741822, 0, 131063, -1610612734, 0, 65544, -1073741822, 0, 196599, -1610612734, 0, 131080, -1073741822, 0, 262135, -1610612734, 0, 196616, -1073741822, 0, 327671, -1610612734, 0, 262152, -1073741822, 0, 393207, -1610612734, 0, 327688, -1073741822, 0, 458743, -1610612734, 0, 393224, -1073741822, 0, 524279, -1610612734, 0, 458760, -1073741822, 0, 589815, -1610612734, 0, 524296, -1073741822, 0, 655351, -1610612734, 0, 589832, -1073741822, 0, 720887, -1610612734, 0, 655368, -1073741822, 0, 786423, -1610612734, 0, 720904, -1073741822, 0, 851959, -1610612734, 0, 786440, -1073741822, 0, 917495, -1610612734, 0, 851976, -1073741822, 0, 983031, -1610612734, 0, 917512, -1073741822, 0, 1048567, -1610612734, 0, 983048, -1073741822, 0, 1114103, -1610612734, 0, 1048584, -1073741822, 0, 1179639, -1610612734, 0, 1114120, -1073741822, 0, 1245175, -1610612734, 0, 1179656, -1073741822, 0, 1310711, -1610612734, 0, 1245192, -1073741822, 0, 1376247, -1610612734, 0, 1310728, -1073741822, 0, 1441783, -1610612734, 0, 1376264, -1073741822, 0, 1507319, -1610612734, 0, 1441800, -1073741822, 0, 1572855, -1610612734, 0, 1507336, -1073741822, 0, 1638391, -1610612734, 0, 1572872, -1073741822, 0, 1703927, -1610612734, 0, 1638408, -1073741822, 0, 1769463, -1610612734, 0, 1703944, -1073741822, 0, 1834999, -1610612734, 0, 1769480, -1073741822, 0, 1900535, -1610612734, 0, 1835016, -1073741822, 0, 1966071, -1610612734, 0, 1900552, -1073741822, 0, 2031607, -1610612734, 0, 1966088, -1073741822, 0, 2097143, -1610612734, 0, 2031624, -1073741822, 0, 2162679, -1610612734, 0, 2097160, -1073741822, 0, 2228215, -1610612734, 0, 2162696, -1073741822, 0, 2293751, -1610612734, 0, 2228232, -1073741822, 0, 2359287, -1610612734, 0, 2293768, -1073741822, 0, 2424823, -1610612734, 0, 2359304, -1073741822, 0, 2490359, -1610612734, 0, 2424840, -1073741822, 0, 2555895, -1610612734, 0, 2490376, -1073741822, 0, 2621431, -1610612734, 0, 2555912, -1073741822, 0, 2686967, -1610612734, 0, 2621448, -1073741822, 0, 2752503, -1610612734, 0, 2686984, -1073741822, 0, 2818039, -1610612734, 0, 2752520, -1073741822, 0, 2883575, -1610612734, 0, 2818056, -1073741822, 0, 2949111, -1610612734, 0, 2883592, -1073741822, 0, 3014647, -1610612734, 0, 2949128, -1073741822, 0, 3080183, -1610612734, 0, 3014664, -1073741822, 0, 3145719, -1610612734, 0, 3080200, -1073741822, 0, 3211255, -1610612734, 0, 3145736, -1073741822, 0, 3276791, -1610612734, 0, 3211272, -1073741822, 0, 3342327, -1610612734, 0, 3276808, -1073741822, 0, 3407863, -1610612734, 0, 3342344, -1073741822, 0, 3473399, -1610612734, 0, 3407880, -1073741822, 0, 3538935, -1610612734, 0, 3473416, -1073741822, 0, 3604471, -1610612734, 0, 3538952, -1073741822, 0, 3670007, -1610612734, 0, 3604488, -1073741822, 0, 3735543, -1610612734, 0, 3670024, -1073741822, 0, 3801079, -1610612734, 0, 3735560, -1073741822, 0, 3866615, -1610612734, 0, 3801096, -1073741822, 0, 3932151, -1610612734, 0, 3866632, -1073741822, 0, 3997687, -1610612734, 0, 3932168, -1073741822, 0, 4063223, -1610612734, 0, 3997704, -1073741822, 0, 4128759, -1610612734, 0, 4063240, -1073741822, 0, 4194295, -1610612734, 0, 4128776, -1073741822, 0, 4259831, -1610612734, 0, 4194312, -1073741822, 0, 4325367, -1610612734, 0, 4259848, -1073741822, 0, 4390903, -1610612734, 0, 4325384, -1073741822, 0, 4456439, -1610612734, 0, 4390920, -1073741822, 0, 4521975, -1610612734, 0, 4456456, -1073741822, 0, 4587511, -1610612734, 0, 4521992, -1073741822, 0, 4653047, -1610612734, 0, 4587528, -1073741822, 0, 4718583, -1610612734, 0, 4653064, -1073741822, 0, 4784119, -1610612734, 0, 4718600, -1073741822, 0, 4849655, -1610612734, 0, 4784136, -1073741822, 0, 4915191, -1610612734, 0, 4849672, -1073741822, 0, 4980727, -1610612734, 0, 4915208, -1073741822, 0, 5046263, -1610612734, 0, 4980744, -1073741822, 0, 5111799, -1610612734, 0, 5046280, -1073741822, 0, 5177335, -1610612734, 0, 5111816, -1073741822, 0, 5242871, -1610612734, 0, 5177352, -1073741822, 0, 5308407, -1610612734, 0, 5242888, -1073741822, 0, 5373943, -1610612734, 0, 5308424, -1073741822, 0, 5439479, -1610612734, 0, 5373960, -1073741822, 0, 5505015, -1610612734, 0, 5439496, -1073741822, 0, 5570551, -1610612734, 0, 5505032, -1073741822, 0, 5636087, -1610612734, 0, 5570568, -1073741822, 0, 5701623, -1610612734, 0, 5636104, -1073741822, 0, 5767159, -1610612734, 0, 5701640, -1073741822, 0, 5832695, -1610612734, 0, 5767176, -1073741822, 0, 5898231, -1610612734, 0, 5832712, -1073741822, 0, 5963767, -1610612734, 0, 5898248, -1073741822, 0, 6029303, -1610612734, 0, 5963784, -1073741822, 0, 6094839, -1610612734, 0, 6029320, -1073741822, 0, 6160375, -1610612734, 0, 6094856, -1073741822, 0, 6225911, -1610612734, 0, 6160392, -1073741822, 0, 6291447, -1610612734, 0, 6225928, -1073741822, 0, 6356983, -1610612734, 0, 6291464, -1073741822, 0, 6422519, -1610612734, 0, 6357000, -1073741822, 0, 6488055, -1610612734, 0, 6422536, -1073741822, 0, 6553591, -1610612734, 0, 6488072, -1073741822, 0, 6619127, -1610612734, 0, 6553608, -1073741822, 0, 6684663, -1610612734, 0, 6619144, -1073741822, 0, 6750199, -1610612734, 0, 6684680, -1073741822, 0, 6815735, -1610612734, 0, 6750216, -1073741822, 0, 6881271, -1610612734, 0, 6815752, -1073741822, 0, 6946807, -1610612734, 0, 6881288, -1073741822, 0, 7012343, -1610612734, 0, 6946824, -1073741822, 0, 7077879, -1610612734, 0, 7012360, -1073741822, 0, 7143415, -1610612734, 0, 7077896, -1073741822, 0, 7208951, -1610612734, 0, 7143432, -1073741822, 0, 7274487, -1610612734, 0, 7208968, -1073741822, 0, 7340023, -1610612734, 0, 7274504, -1073741822, 0, 7405559, -1610612734, 0, 7340040, -1073741822, 0, 7471095, -1610612734, 0, 7405576, -1073741822, 0, 7536631, -1610612734, 0, 7471112, -1073741822, 0, 7602167, -1610612734, 0, 7536648, -1073741822, 0, 7667703, -1610612734, 0, 7602184, -1073741822, 0, 7733239, -1610612734, 0, 7667720, -1073741822, 0, 7798775, -1610612734, 0, 7733256, -1073741822, 0, 7864311, -1610612734, 0, 7798792, -1073741822, 0, 7929847, -1610612734, 0, 7864328, -1073741822, 0, 7995383, -1610612734, 0, 7929864, -1073741822, 0, 8060919, -1610612734, 0, 7995400, -1073741822, 0, 8126455, -1610612734, 0, 8060936, -1073741822, 0, 8191991, -1610612734, 0, 8126472, -1073741822, 0, 8257527, -1610612734, 0, 8192008, -1073741822, 0, 8323063, -1610612734, 0, 8257544, -1073741822, 0, 8388599, -1610612734, 0, 8323080, -1073741822, 0, 8454135, -1610612734, 0, 8388616, -1073741822, 0, 8519671, -1610612734, 0, 8454152, -1073741822, 0, 8585207, -1610612734, 0, 8519688, -1073741822, 0, 8650743, -1610612734, 0, 8585224, -1073741822, 0, 8716279, -1610612734, 0, 8650760, -1073741822, 0, 8781815, -1610612734, 0, 8716296, -1073741822, 0, 8847351, -1610612734, 0, 8781832, -1073741822, 0, 8912887, -1610612734, 0, 8847368, -1073741822, 0, 8978423, -1610612734, 0, 8912904, -1073741822, 0, 9043959, -1610612734, 0, 8978440, -1073741822, 0, 9109495, -1610612734, 0, 9043976, -1073741822, 0, 9175031, -1610612734, 0, 9109512, -1073741822, 0, 9240567, -1610612734, 0, 9175048, -1073741822, 0, 9306103, -1610612734, 0, 9240584, -1073741822, 0, 9371639, -1610612734, 0, 9306120, -1073741822, 0, 9437175, -1610612734, 0, 9371656, -1073741822, 0, 9502711, -1610612734, 0, 9437192, -1073741822, 0, 9568247, -1610612734, 0, 9502728, -1073741822, 0, 9633783, -1610612734, 0, 9568264, -1073741822, 0, 9699319, -1610612734, 0, 9633800, -1073741822, 0, 9764855, -1610612734, 0, 9699336, -1073741822, 0, 9830391, -1610612734, 0, 9764872, -1073741822, 0, 9895927, -1610612734, 0, 9830408, -1073741822, 0, 9961463, -1610612734, 0, 9895944, -1073741822, 0, 10026999, -1610612734, 0, 9961480, -1073741822, 0, 10092535, -1610612734, 0, 10027016, -1073741822, 0, 10158071, -1610612734, 0, 10092552, -1073741822, 0, 10223607, -1610612734, 0, 10158088, -1073741822, 0, 10289143, -1610612734, 0, 10223624, -1073741822, 0, 10354679, -1610612734, 0, 10289160, -1073741822, 0, 10420215, -1610612734, 0, 10354696, -1073741822, 0, 10485751, -1610612734, 0, 10420232, -1073741822, 0, 10551287, -1610612734, 0, 10485768, -1073741822, 0, 10616823, -1610612734, 0, 10551304, -1073741822, 0, 10682359, -1610612734, 0, 10616840, -1073741822, 0, 10747895, -1610612734, 0, 10682376, -1073741822, 0, 10813431, -1610612734, 0, 10747912, -1073741822, 0, 10878967, -1610612734, 0, 10813448, -1073741822, 0, 10944503, -1610612734, 0, 10878984, -1073741822, 0, 11010039, -1610612734, 0, 10944520, -1073741822, 0, 11075575, -1610612734, 0, 11010056, -1073741822, 0, 11141111, -1610612734, 0, 11075592, -1073741822, 0, 11206647, -1610612734, 0, 11141128, -1073741822, 0, 11272183, -1610612734, 0, 11206664, -1073741822, 0, 11337719, -1610612734, 0, 11272200, -1073741822, 0, 11403255, -1610612734, 0, 11337736, -1073741822, 0, 11468791, -1610612734, 0, 11403272, -1073741822, 0, 11534327, -1610612734, 0, 11468808, -1073741822, 0, 11599863, -1610612734, 0, 11534344, -1073741822, 0, 11665399, -1610612734, 0, 11599880, -1073741822, 0, 11730935, -1610612734, 0, 11665416, -1073741822, 0, 11796471, -1610612734, 0, 11730952, -1073741822, 0, 11862007, -1610612734, 0, 11796488, -1073741822, 0, 11927543, -1610612734, 0, 11862024, -1073741822, 0, 11993079, -1610612734, 0, 11927560, -1073741822, 0, 12058615, -1610612734, 0, 11993096, -1073741822, 0, 12124151, -1610612734, 0, 12058632, -1073741822, 0, 12189687, -1610612734, 0, 12124168, -1073741822, 0, 12255223, -1610612734, 0, 12189704, -1073741822, 0, 12320759, -1610612734, 0, 12255240, -1073741822, 0, 12386295, -1610612734, 0, 12320776, -1073741822, 0, 12451831, -1610612734, 0, 12386312, -1073741822, 0, 12517367, -1610612734, 0, 12451848, -1073741822, 0, 12582903, -1610612734, 0, 12517384, -1073741822, 0, 12648439, -1610612734, 0, 12582920, -1073741822, 0, 12713975, -1610612734, 0, 12648456, -1073741822, 0, 12779511, -1610612734, 0, 12713992, -1073741822, 0, 12845047, -1610612734, 0, 12779528, -1073741822, 0, 12910583, -1610612734, 0, 12845064, -1073741822, 0, 12976119, -1610612734, 0, 12910600, -1073741822, 0, 13041655, -1610612734, 0, 12976136, -1073741822, 0, 13107191, -1610612734, 0, 13041672, -1073741822, 0, 13172727, -1610612734, 0, 13107208, -1073741822, 0, 13238263, -1610612734, 0, 13172744, -1073741822, 0, 13303799, -1610612734, 0, 13238280, -1073741822, 0, 13369335, -1610612734, 0, 13303816, -1073741822, 0, 13434871, -1610612734, 0, 13369352, -1073741822, 0, 13500407, -1610612734, 0, 13434888, -1073741822, 0, 13565943, -1610612734, 0, 13500424, -1073741822, 0, 13631479, -1610612734, 0, 13565960, -1073741822, 0, 13697015, -1610612734, 0, 13631496, -1073741822, 0, 13762551, -1610612734, 0, 13697032, -1073741822, 0, 13828087, -1610612734, 0, 13762568, -1073741822, 0, 13893623, -1610612734, 0, 13828104, -1073741822, 0, 13959159, -1610612734, 0, 13893640, -1073741822, 0, 14024695, -1610612734, 0, 13959176, -1073741822, 0, 14090231, -1610612734, 0, 14024712, -1073741822, 0, 14155767, -1610612734, 0, 14090248, -1073741822, 0, 14221303, -1610612734, 0, 14155784, -1073741822, 0, 14286839, -1610612734, 0, 14221320, -1073741822, 0, 14352375, -1610612734, 0, 14286856, -1073741822, 0, 14417911, -1610612734, 0, 14352392, -1073741822, 0, 14483447, -1610612734, 0, 14417928, -1073741822, 0, 14548983, -1610612734, 0, 14483464, -1073741822, 0, 14614519, -1610612734, 0, 14549000, -1073741822, 0, 14680055, -1610612734, 0, 14614536, -1073741822, 0, 14745591, -1610612734, 0, 14680072, -1073741822, 0, 14811127, -1610612734, 0, 14745608, -1073741822, 0, 14876663, -1610612734, 0, 14811144, -1073741822, 0, 14942199, -1610612734, 0, 14876680, -1073741822, 0, 15007735, -1610612734, 0, 14942216, -1073741822, 0, 15073271, -1610612734, 0, 15007752, -1073741822, 0, 15138807, -1610612734, 0, 15073288, -1073741822, 0, 15204343, -1610612734, 0, 15138824, -1073741822, 0, 15269879, -1610612734, 0, 15204360, -1073741822, 0, 15335415, -1610612734, 0, 15269896, -1073741822, 0, 15400951, -1610612734, 0, 15335432, -1073741822, 0, 15466487, -1610612734, 0, 15400968, -1073741822, 0, 15532023, -1610612734, 0, 15466504, -1073741822, 0, 15597559, -1610612734, 0, 15532040, -1073741822, 0, 15663095, -1610612734, 0, 15597576, -1073741822, 0, 15728631, -1610612734, 0, 15663112, -1073741822, 0, 15794167, -1610612734, 0, 15728648, -1073741822, 0, 15859703, -1610612734, 0, 15794184, -1073741822, 0, 15925239, -1610612734, 0, 15859720, -1073741822, 0, 15990775, -1610612734, 0, 15925256, -1073741822, 0, 16056311, -1610612734, 0, 15990792, -1073741822, 0, 16121847, -1610612734, 0, 16056328, -1073741822, 0, 16187383, -1610612734, 0, 16121864, -1073741822, 0, 16252919, -1610612734, 0, 16187400, -1073741822, 0, 16318455, -1610612734, 0, 16252936, -1073741822, 0, 16383991, -1610612734, 0, 16318472, -1073741822, 0, 16449527, -1610612734, 0, 16384008, -1073741822, 0, 16515063, -1610612734, 0, 16449544, -1073741822, 0, 16580599, -1610612734, 0, 16515080, -1073741822, 0, 16646135, -1610612734, 0, 16580616, -1073741822, 0, 16711671, -1610612734, 0, 16646152, -1073741822, 0, 16777207, -1610612734, 0, 16711688, -1073741822, 0, 16842743, -1610612734, 0, 16777224, -1073741822, 0, 16908279, -1610612734, 0, 16842760, -1073741822, 0, 16973815, -1610612734, 0, 16908296, -1073741822, 0, 17039351, -1610612734, 0, 16973832, -1073741822, 0, 17104887, -1610612734, 0, 17039368, -1073741822, 0, 17170423, -1610612734, 0, 17104904, -1073741822, 0, 17235959, -1610612734, 0, 17170440, -1073741822, 0, 17301495, -1610612734, 0, 17235976, -1073741822, 0, 17367031, -1610612734, 0, 17301512, -1073741822, 0, 17432567, -1610612734, 0, 17367048, -1073741822, 0, 17498103, -1610612734, 0, 17432584, -1073741822, 0, 17563639, -1610612734, 0, 17498120, -1073741822, 0, 17629175, -1610612734, 0, 17563656, -1073741822, 0, 17694711, -1610612734, 0, 17629192, -1073741822, 0, 17760247, -1610612734, 0, 17694728, -1073741822, 0, 17825783, -1610612734, 0, 17760264, -1073741822, 0, 17891319, -1610612734, 0, 17825800, -1073741822, 0, 17956855, -1610612734, 0, 17891336, -1073741822, 0, 18022391, -1610612734, 0, 17956872, -1073741822, 0, 18087927, -1610612734, 0, 18022408, -1073741822, 0, 18153463, -1610612734, 0, 18087944, -1073741822, 0, 18218999, -1610612734, 0, 18153480, -1073741822, 0, 18284535, -1610612734, 0, 18219016, -1073741822, 0, 18350071, -1610612734, 0, 18284552, -1073741822, 0, 18415607, -1610612734, 0, 18350088, -1073741822, 0, 18481143, -1610612734, 0, 18415624, -1073741822, 0, 18546679, -1610612734, 0, 18481160, -1073741822, 0, 18612215, -1610612734, 0, 18546696, -1073741822, 0, 18677751, -1610612734, 0, 18612232, -1073741822, 0, 18743287, -1610612734, 0, 18677768, -1073741822, 0, 18808823, -1610612734, 0, 18743304, -1073741822, 0, 18874359, -1610612734, 0, 18808840, -1073741822, 0, 18939895, -1610612734, 0, 18874376, -1073741822, 0, 19005431, -1610612734, 0, 18939912, -1073741822, 0, 19070967, -1610612734, 0, 19005448, -1073741822, 0, 19136503, -1610612734, 0, 19070984, -1073741822, 0, 19202039, -1610612734, 0, 19136520, -1073741822, 0, 19267575, -1610612734, 0, 19202056, -1073741822, 0, 19333111, -1610612734, 0, 19267592, -1073741822, 0, 19398647, -1610612734, 0, 19333128, -1073741822, 0, 19464183, -1610612734, 0, 19398664, -1073741822, 0, 19529719, -1610612734, 0, 19464200, -1073741822, 0, 19595255, -1610612734, 0, 19529736, -1073741822, 0, 19660791, -1610612734, 0, 19595272, -1073741822, 0, 19726327, -1610612734, 0, 19660808, -1073741822, 0, 19791863, -1610612734, 0, 19726344, -1073741822, 0, 19857399, -1610612734, 0, 19791880, -1073741822, 0, 19922935, -1610612734, 0, 19857416, -1073741822, 0, 19988471, -1610612734, 0, 19922952, -1073741822, 0, 20054007, -1610612734, 0, 19988488, -1073741822, 0, 20119543, -1610612734, 0, 20054024, -1073741822, 0, 20185079, -1610612734, 0, 20119560, -1073741822, 0, 20250615, -1610612734, 0, 20185096, -1073741822, 0, 20316151, -1610612734, 0, 20250632, -1073741822, 0, 20381687, -1610612734, 0, 20316168, -1073741822, 0, 20447223, -1610612734, 0, 20381704, -1073741822, 0, 20512759, -1610612734, 0, 20447240, -1073741822, 0, 20578295, -1610612734, 0, 20512776, -1073741822, 0, 20643831, -1610612734, 0, 20578312, -1073741822, 0, 20709367, -1610612734, 0, 20643848, -1073741822, 0, 20774903, -1610612734, 0, 20709384, -1073741822, 0, 20840439, -1610612734, 0, 20774920, -1073741822, 0, 20905975, -1610612734, 0, 20840456, -1073741822, 0, 20971511, -1610612734, 0, 20905992, -1073741822, 0, 21037047, -1610612734, 0, 20971528, -1073741822, 0, 21102583, -1610612734, 0, 21037064, -1073741822, 0, 21168119, -1610612734, 0, 21102600, -1073741822, 0, 21233655, -1610612734, 0, 21168136, -1073741822, 0, 21299191, -1610612734, 0, 21233672, -1073741822, 0, 21364727, -1610612734, 0, 21299208, -1073741822, 0, 21430263, -1610612734, 0, 21364744, -1073741822, 0, 21495799, -1610612734, 0, 21430280, -1073741822, 0, 21561335, -1610612734, 0, 21495816, -1073741822, 0, 21626871, -1610612734, 0, 21561352, -1073741822, 0, 21692407, -1610612734, 0, 21626888, -1073741822, 0, 21757943, -1610612734, 0, 21692424, -1073741822, 0, 21823479, -1610612734, 0, 21757960, -1073741822, 0, 21889015, -1610612734, 0, 21823496, -1073741822, 0, 21954551, -1610612734, 0, 21889032, -1073741822, 0, 22020087, -1610612734, 0, 21954568, -1073741822, 0, 22085623, -1610612734, 0, 22020104, -1073741822, 0, 22151159, -1610612734, 0, 22085640, -1073741822, 0, 22216695, -1610612734, 0, 22151176, -1073741822, 0, 22282231, -1610612734, 0, 22216712, -1073741822, 0, 22347767, -1610612734, 0, 22282248, -1073741822, 0, 22413303, -1610612734, 0, 22347784, -1073741822, 0, 22478839, -1610612734, 0, 22413320, -1073741822, 0, 22544375, -1610612734, 0, 22478856, -1073741822, 0, 22609911, -1610612734, 0, 22544392, -1073741822, 0, 22675447, -1610612734, 0, 22609928, -1073741822, 0, 22740983, -1610612734, 0, 22675464, -1073741822, 0, 22806519, -1610612734, 0, 22741000, -1073741822, 0, 22872055, -1610612734, 0, 22806536, -1073741822, 0, 22937591, -1610612734, 0, 22872072, -1073741822, 0, 23003127, -1610612734, 0, 22937608, -1073741822, 0, 23068663, -1610612734, 0, 23003144, -1073741822, 0, 23134199, -1610612734, 0, 23068680, -1073741822, 0, 23199735, -1610612734, 0, 23134216, -1073741822, 0, 23265271, -1610612734, 0, 23199752, -1073741822, 0, 23330807, -1610612734, 0, 23265288, -1073741822, 0, 23396343, -1610612734, 0, 23330824, -1073741822, 0, 23461879, -1610612734, 0, 23396360, -1073741822, 0, 23527415, -1610612734, 0, 23461896, -1073741822, 0, 23592951, -1610612734, 0, 23527432, -1073741822, 0, 23658487, -1610612734, 0, 23592968, -1073741822, 0, 23724023, -1610612734, 0, 23658504, -1073741822, 0, 23789559, -1610612734, 0, 23724040, -1073741822, 0, 23855095, -1610612734, 0, 23789576, -1073741822, 0, 23920631, -1610612734, 0, 23855112, -1073741822, 0, 23986167, -1610612734, 0, 23920648, -1073741822, 0, 24051703, -1610612734, 0, 23986184, -1073741822, 0, 24117239, -1610612734, 0, 24051720, -1073741822, 0, 24182775, -1610612734, 0, 24117256, -1073741822, 0, 24248311, -1610612734, 0, 24182792, -1073741822, 0, 24313847, -1610612734, 0, 24248328, -1073741822, 0, 24379383, -1610612734, 0, 24313864, -1073741822, 0, 24444919, -1610612734, 0, 24379400, -1073741822, 0, 24510455, -1610612734, 0, 24444936, -1073741822, 0, 24575991, -1610612734, 0, 24510472, -1073741822, 0, 24641527, -1610612734, 0, 24576008, -1073741822, 0, 24707063, -1610612734, 0, 24641544, -1073741822, 0, 24772599, -1610612734, 0, 24707080, -1073741822, 0, 24838135, -1610612734, 0, 24772616, -1073741822, 0, 24903671, -1610612734, 0, 24838152, -1073741822, 0, 24969207, -1610612734, 0, 24903688, -1073741822, 0, 25034743, -1610612734, 0, 24969224, -1073741822, 0, 25100279, -1610612734, 0, 25034760, -1073741822, 0, 25165815, -1610612734, 0, 25100296, -1073741822, 0, 25231351, -1610612734, 0, 25165832, -1073741822, 0, 25296887, -1610612734, 0, 25231368, -1073741822, 0, 25362423, -1610612734, 0, 25296904, -1073741822, 0, 25427959, -1610612734, 0, 25362440, -1073741822, 0, 25493495, -1610612734, 0, 25427976, -1073741822, 0, 25559031, -1610612734, 0, 25493512, -1073741822, 0, 25624567, -1610612734, 0, 25559048, -1073741822, 0, 25690103, -1610612734, 0, 25624584, -1073741822, 0, 25755639, -1610612734, 0, 25690120, -1073741822, 0, 25821175, -1610612734, 0, 25755656, -1073741822, 0, 25886711, -1610612734, 0, 25821192, -1073741822, 0, 25952247, -1610612734, 0, 25886728, -1073741822, 0, 26017783, -1610612734, 0, 25952264, -1073741822, 0, 26083319, -1610612734, 0, 26017800, -1073741822, 0, 26148855, -1610612734, 0, 26083336, -1073741822, 0, 26214391, -1610612734, 0, 26148872, -1073741822, 0, 26279927, -1610612734, 0, 26214408, -1073741822, 0, 26345463, -1610612734, 0, 26279944, -1073741822, 0, 26410999, -1610612734, 0, 26345480, -1073741822, 0, 26476535, -1610612734, 0, 26411016, -1073741822, 0, 26542071, -1610612734, 0, 26476552, -1073741822, 0, 26607607, -1610612734, 0, 26542088, -1073741822, 0, 26673144, 2, 0, 26673145, 2, 0, 26673146, 2, 0, 26673147, 2, 0, 26673148, 2, 0, 26673149, 2, 0, 26673150, 2, 0, 26673151, 2, 0, 26607616, 2, 0, 26607617, 2, 0, 26607618, 2, 0, 26607619, 2, 0, 26607620, 2, 0, 26607621, 2, 0, 26607622, 2, 0, 26607623, 2, 0 ) + +[node name="Portal" parent="." instance=ExtResource( 8 )] +position = Vector2( 1488, -120 ) +next_scene = ExtResource( 6 ) + +[connection signal="body_exited" from="Blobby/BlobbySkin" to="Blobby" method="_on_BlobbySkin_body_exited"] + +[editable path="SignalManager"] +[editable path="LevelState"] +[editable path="UserInterface"] +[editable path="UserInterface/HUD"] +[editable path="BlobbyCam"] +[editable path="Blobby"] diff --git a/src/Levels/Level 1.tscn b/src/Levels/Level 1.tscn index 9da4446..c62b09d 100644 --- a/src/Levels/Level 1.tscn +++ b/src/Levels/Level 1.tscn @@ -36,10 +36,10 @@ unique_name_in_owner = true drag_margin_bottom = 0.3 [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 3 +frame = 1 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 3 +frame = 1 [node name="Blobby" parent="." instance=ExtResource( 8 )] unique_name_in_owner = true diff --git a/src/StateMachines/StateMachine.gd b/src/StateMachines/StateMachine.gd index cb0fe90..c7de971 100644 --- a/src/StateMachines/StateMachine.gd +++ b/src/StateMachines/StateMachine.gd @@ -2,7 +2,9 @@ extends Node class_name StateMachine var state = null setget set_state +var state_time := 0.0 var previous_state = null +var previous_state_time := 0.0 var states = {} # Parent Node that uses these states @@ -19,7 +21,12 @@ func _physics_process(delta): _state_logic(delta) var transition = _get_transition(delta) if transition != null: + previous_state_time = state_time + state_time = 0.0 set_state(transition) + else: + state_time += delta + func state_matching_method_exists(state_string: String) -> bool: return parent.has_method(state_string)