From 0a3799eee026f657bb5265f74c908a5340065d57 Mon Sep 17 00:00:00 2001 From: Jakob Feldmann Date: Tue, 30 May 2023 18:11:10 +0200 Subject: [PATCH] chore: Neues Tileset von Tatjana --- .gitignore | 2 +- savefile.tres | 22 +- src/Contraptions/Triggers/FrogFreeButton.gd | 2 +- src/Contraptions/Triggers/GateButton.gd | 2 +- src/Environment/AlienGreenHouseTilesNew.tres | 312 ++++++++++++++++++ src/Environment/{ => Grass}/ShaderGrass.gd | 0 .../{ => Grass}/ShaderGrass.gdshader | 0 src/Environment/{ => Grass}/ShaderGrass.tres | 2 +- src/Environment/{ => Grass}/ShaderGrass.tscn | 4 +- .../{ => Grass}/ShaderGrassInverse.gdshader | 0 .../{ => Grass}/ShaderGrassMaterial.tres | 2 +- src/Environment/Tileset.tres | 29 -- src/Levels/1 Tut Level.tscn | 6 +- src/Levels/2 Tut Level.tscn | 2 +- src/Levels/Actual Level 1.tscn | 2 +- src/Levels/Actual Level 2.tscn | 2 +- src/Levels/New Tiles Level.tscn | 71 ++++ src/Levels/xGrass Test Level.tscn | 2 +- .../Buttons/ChangeSceneButton.tscn | 2 +- src/UserInterface/Buttons/RetryButton.gd | 2 +- src/UserInterface/Buttons/StatsLabel.gd | 2 +- .../Screens/ControlsMenu/ControlsMenu.tscn | 2 - .../Screens/ControlsMenu/InputLine.tscn | 14 +- src/UserInterface/Screens/MainScreen.tscn | 1 - 24 files changed, 415 insertions(+), 70 deletions(-) create mode 100644 src/Environment/AlienGreenHouseTilesNew.tres rename src/Environment/{ => Grass}/ShaderGrass.gd (100%) rename src/Environment/{ => Grass}/ShaderGrass.gdshader (100%) rename src/Environment/{ => Grass}/ShaderGrass.tres (65%) rename src/Environment/{ => Grass}/ShaderGrass.tscn (96%) rename src/Environment/{ => Grass}/ShaderGrassInverse.gdshader (100%) rename src/Environment/{ => Grass}/ShaderGrassMaterial.tres (65%) delete mode 100644 src/Environment/Tileset.tres create mode 100644 src/Levels/New Tiles Level.tscn diff --git a/.gitignore b/.gitignore index d63f1cf..cb4897f 100644 --- a/.gitignore +++ b/.gitignore @@ -32,4 +32,4 @@ data_*/ */.vscode/launch.json # File specific ignores -savefile.tres +./savefile.tres diff --git a/savefile.tres b/savefile.tres index 13e27ea..4a89c5f 100644 --- a/savefile.tres +++ b/savefile.tres @@ -1,4 +1,4 @@ -[gd_resource type="Resource" load_steps=35 format=2] +[gd_resource type="Resource" load_steps=34 format=2] [ext_resource path="res://src/Utilities/GlobalStateResource.gd" type="Script" id=1] @@ -11,12 +11,12 @@ button_index = 1 [sub_resource type="InputEventMouseButton" id=3] button_index = 1 -[sub_resource type="InputEventKey" id=5] -physical_scancode = 83 - [sub_resource type="InputEventJoypadButton" id=4] button_index = 13 +[sub_resource type="InputEventKey" id=5] +physical_scancode = 83 + [sub_resource type="InputEventKey" id=6] physical_scancode = 69 @@ -26,17 +26,11 @@ button_index = 2 [sub_resource type="InputEventKey" id=8] scancode = 32 +[sub_resource type="InputEventJoypadButton" id=9] + [sub_resource type="InputEventKey" id=10] physical_scancode = 16777232 -[sub_resource type="InputEventKey" id=33] -pressed = true -scancode = 87 -physical_scancode = 87 -unicode = 119 - -[sub_resource type="InputEventJoypadButton" id=9] - [sub_resource type="InputEventKey" id=11] scancode = 65 @@ -130,9 +124,9 @@ wallet = 3 input_map = { "boost_move": [ SubResource( 1 ), SubResource( 2 ) ], "click": [ SubResource( 3 ) ], -"duck": [ SubResource( 5 ), SubResource( 4 ) ], +"duck": [ SubResource( 4 ), SubResource( 5 ) ], "interact": [ SubResource( 6 ), SubResource( 7 ) ], -"jump": [ SubResource( 8 ), SubResource( 10 ), SubResource( 33 ), SubResource( 9 ) ], +"jump": [ SubResource( 8 ), SubResource( 9 ), SubResource( 10 ) ], "move_left": [ SubResource( 11 ), SubResource( 12 ) ], "move_right": [ SubResource( 13 ), SubResource( 14 ) ], "pause": [ SubResource( 15 ), SubResource( 16 ) ], diff --git a/src/Contraptions/Triggers/FrogFreeButton.gd b/src/Contraptions/Triggers/FrogFreeButton.gd index 73f4c78..780d05c 100644 --- a/src/Contraptions/Triggers/FrogFreeButton.gd +++ b/src/Contraptions/Triggers/FrogFreeButton.gd @@ -4,7 +4,7 @@ signal button_pushed onready var activatorArea = $"%ActivatorArea" onready var indicatorPlayer = $"%IndicatorPlayer" -onready var signalManager := get_tree().root.get_child(1).get_node("%SignalManager") +onready var signalManager := get_tree().root.get_child(3).get_node("%SignalManager") onready var unactivatable_timer := $Timer var activatable = false diff --git a/src/Contraptions/Triggers/GateButton.gd b/src/Contraptions/Triggers/GateButton.gd index 1db5447..16dc4b3 100644 --- a/src/Contraptions/Triggers/GateButton.gd +++ b/src/Contraptions/Triggers/GateButton.gd @@ -2,7 +2,7 @@ extends Node2D onready var activatorArea = $"%ActivatorArea" onready var indicatorPlayer = $"%IndicatorPlayer" -onready var signalManager := get_tree().root.get_child(1).get_node("%SignalManager") +onready var signalManager := get_tree().root.get_child(3).get_node("%SignalManager") onready var unactivatable_timer := $Timer var activatable = false diff --git a/src/Environment/AlienGreenHouseTilesNew.tres b/src/Environment/AlienGreenHouseTilesNew.tres new file mode 100644 index 0000000..c650bd0 --- /dev/null +++ b/src/Environment/AlienGreenHouseTilesNew.tres @@ -0,0 +1,312 @@ +[gd_resource type="TileSet" load_steps=31 format=2] + +[ext_resource path="res://assets/environment/blocks/basic_tileset_blobb-jakob-remix.png" type="Texture" id=1] + +[sub_resource type="ConvexPolygonShape2D" id=6] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=7] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=8] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=9] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=10] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=11] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=12] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=13] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=14] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=15] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=16] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=17] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=18] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=19] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=20] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=21] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=22] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=23] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=24] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=25] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=26] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=27] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=28] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=29] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=30] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=31] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=32] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=33] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[sub_resource type="ConvexPolygonShape2D" id=34] +points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) + +[resource] +0/name = "basic_tileset_blobb-jakob-remix.png 0" +0/texture = ExtResource( 1 ) +0/tex_offset = Vector2( 0, 0 ) +0/modulate = Color( 1, 1, 1, 1 ) +0/region = Rect2( 0, 0, 128, 128 ) +0/tile_mode = 1 +0/autotile/bitmask_mode = 0 +0/autotile/bitmask_flags = [ Vector2( 0, 1 ), 1, Vector2( 0, 6 ), 321, Vector2( 1, 0 ), 256, Vector2( 1, 6 ), 320, Vector2( 2, 0 ), 320, Vector2( 3, 0 ), 64, Vector2( 4, 0 ), 260, Vector2( 5, 0 ), 65, Vector2( 5, 4 ), 324, Vector2( 5, 5 ), 321, Vector2( 6, 0 ), 4, Vector2( 6, 5 ), 64, Vector2( 7, 0 ), 5, Vector2( 7, 5 ), 65 ] +0/autotile/icon_coordinate = Vector2( 6, 5 ) +0/autotile/tile_size = Vector2( 16, 16 ) +0/autotile/spacing = 0 +0/autotile/occluder_map = [ ] +0/autotile/navpoly_map = [ ] +0/autotile/priority_map = [ ] +0/autotile/z_index_map = [ ] +0/occluder_offset = Vector2( 0, 0 ) +0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape = SubResource( 6 ) +0/shape_one_way = false +0/shape_one_way_margin = 1.0 +0/shapes = [ { +"autotile_coord": Vector2( 1, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 6 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 7 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 8 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 9 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 10 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 11 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 12 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 13 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 14 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 5 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 15 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 16 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 17 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 5 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 18 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 6 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 19 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +0/z_index = 0 +1/name = "basic_tileset_blobb-jakob-remix.png 1" +1/texture = ExtResource( 1 ) +1/tex_offset = Vector2( 0, 0 ) +1/modulate = Color( 1, 1, 1, 1 ) +1/region = Rect2( 0, 0, 128, 128 ) +1/tile_mode = 2 +1/autotile/icon_coordinate = Vector2( 5, 3 ) +1/autotile/tile_size = Vector2( 16, 16 ) +1/autotile/spacing = 0 +1/autotile/occluder_map = [ ] +1/autotile/navpoly_map = [ ] +1/autotile/priority_map = [ ] +1/autotile/z_index_map = [ ] +1/occluder_offset = Vector2( 0, 0 ) +1/navigation_offset = Vector2( 0, 0 ) +1/shape_offset = Vector2( 0, 0 ) +1/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +1/shape = SubResource( 20 ) +1/shape_one_way = false +1/shape_one_way_margin = 1.0 +1/shapes = [ { +"autotile_coord": Vector2( 1, 6 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 20 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 1, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 21 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 2, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 22 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 3, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 23 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 4, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 24 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 5, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 25 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 5 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 26 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 5 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 27 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 28 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 6, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 29 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 30 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 0 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 31 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 32 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 0, 1 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 33 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +}, { +"autotile_coord": Vector2( 7, 5 ), +"one_way": false, +"one_way_margin": 1.0, +"shape": SubResource( 34 ), +"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) +} ] +1/z_index = 0 diff --git a/src/Environment/ShaderGrass.gd b/src/Environment/Grass/ShaderGrass.gd similarity index 100% rename from src/Environment/ShaderGrass.gd rename to src/Environment/Grass/ShaderGrass.gd diff --git a/src/Environment/ShaderGrass.gdshader b/src/Environment/Grass/ShaderGrass.gdshader similarity index 100% rename from src/Environment/ShaderGrass.gdshader rename to src/Environment/Grass/ShaderGrass.gdshader diff --git a/src/Environment/ShaderGrass.tres b/src/Environment/Grass/ShaderGrass.tres similarity index 65% rename from src/Environment/ShaderGrass.tres rename to src/Environment/Grass/ShaderGrass.tres index ae2d25f..ff5c40d 100644 --- a/src/Environment/ShaderGrass.tres +++ b/src/Environment/Grass/ShaderGrass.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[ext_resource path="res://src/Environment/ShaderGrass.gdshader" type="Shader" id=1] +[ext_resource path="res://src/Environment/Grass/ShaderGrass.gdshader" type="Shader" id=1] [resource] resource_local_to_scene = true diff --git a/src/Environment/ShaderGrass.tscn b/src/Environment/Grass/ShaderGrass.tscn similarity index 96% rename from src/Environment/ShaderGrass.tscn rename to src/Environment/Grass/ShaderGrass.tscn index fa8733a..c7cde0f 100644 --- a/src/Environment/ShaderGrass.tscn +++ b/src/Environment/Grass/ShaderGrass.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=9 format=2] [ext_resource path="res://assets/environment/decor/straight_straw.png" type="Texture" id=1] -[ext_resource path="res://src/Environment/ShaderGrass.gd" type="Script" id=2] -[ext_resource path="res://src/Environment/ShaderGrassMaterial.tres" type="Material" id=3] +[ext_resource path="res://src/Environment/Grass/ShaderGrass.gd" type="Script" id=2] +[ext_resource path="res://src/Environment/Grass/ShaderGrassMaterial.tres" type="Material" id=3] [ext_resource path="res://assets/environment/decor/short_straw.png" type="Texture" id=4] [ext_resource path="res://assets/environment/decor/bent_straw.png" type="Texture" id=5] [ext_resource path="res://assets/environment/decor/bent_straw_2.png" type="Texture" id=6] diff --git a/src/Environment/ShaderGrassInverse.gdshader b/src/Environment/Grass/ShaderGrassInverse.gdshader similarity index 100% rename from src/Environment/ShaderGrassInverse.gdshader rename to src/Environment/Grass/ShaderGrassInverse.gdshader diff --git a/src/Environment/ShaderGrassMaterial.tres b/src/Environment/Grass/ShaderGrassMaterial.tres similarity index 65% rename from src/Environment/ShaderGrassMaterial.tres rename to src/Environment/Grass/ShaderGrassMaterial.tres index ae2d25f..ff5c40d 100644 --- a/src/Environment/ShaderGrassMaterial.tres +++ b/src/Environment/Grass/ShaderGrassMaterial.tres @@ -1,6 +1,6 @@ [gd_resource type="ShaderMaterial" load_steps=2 format=2] -[ext_resource path="res://src/Environment/ShaderGrass.gdshader" type="Shader" id=1] +[ext_resource path="res://src/Environment/Grass/ShaderGrass.gdshader" type="Shader" id=1] [resource] resource_local_to_scene = true diff --git a/src/Environment/Tileset.tres b/src/Environment/Tileset.tres deleted file mode 100644 index a4b3d3a..0000000 --- a/src/Environment/Tileset.tres +++ /dev/null @@ -1,29 +0,0 @@ -[gd_resource type="TileSet" load_steps=3 format=2] - -[ext_resource path="res://assets/environment/blocks/GreenhouseInner.png" type="Texture" id=1] - -[sub_resource type="ConvexPolygonShape2D" id=5] -points = PoolVector2Array( 0, 24, 24, 24, 24, 0, 0, 0 ) - -[resource] -0/name = "GreenhouseInner.png 0" -0/texture = ExtResource( 1 ) -0/tex_offset = Vector2( 0, 0 ) -0/modulate = Color( 1, 1, 1, 1 ) -0/region = Rect2( 0, 0, 24, 24 ) -0/tile_mode = 0 -0/occluder_offset = Vector2( 0, 0 ) -0/navigation_offset = Vector2( 0, 0 ) -0/shape_offset = Vector2( 0, 0 ) -0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) -0/shape = SubResource( 5 ) -0/shape_one_way = false -0/shape_one_way_margin = 1.0 -0/shapes = [ { -"autotile_coord": Vector2( 0, 0 ), -"one_way": false, -"one_way_margin": 1.0, -"shape": SubResource( 5 ), -"shape_transform": Transform2D( 1, 0, 0, 1, 0, 0 ) -} ] -0/z_index = 0 diff --git a/src/Levels/1 Tut Level.tscn b/src/Levels/1 Tut Level.tscn index cfb142d..877dc22 100644 --- a/src/Levels/1 Tut Level.tscn +++ b/src/Levels/1 Tut Level.tscn @@ -6,7 +6,7 @@ [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=4] [ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=5] [ext_resource path="res://assets/environment/blocks/basic_tileset_blobb-jakob-remix.png" type="Texture" id=6] -[ext_resource path="res://src/Environment/ShaderGrass.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/Environment/Grass/ShaderGrass.tscn" type="PackedScene" id=7] [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=8] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=9] [ext_resource path="res://src/Levels/Level 1.gd" type="Script" id=10] @@ -113,10 +113,10 @@ visible = true visible = true [node name="AnimatedSprite" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="4"] -frame = 2 +frame = 3 [node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] -frame = 5 +frame = 6 [node name="Blobby" parent="." instance=ExtResource( 9 )] unique_name_in_owner = true diff --git a/src/Levels/2 Tut Level.tscn b/src/Levels/2 Tut Level.tscn index c1ab5cf..9921a4e 100644 --- a/src/Levels/2 Tut Level.tscn +++ b/src/Levels/2 Tut Level.tscn @@ -6,7 +6,7 @@ [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=4] [ext_resource path="res://src/BenefitialObjects/SavePoint.tscn" type="PackedScene" id=5] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=6] -[ext_resource path="res://src/Environment/ShaderGrass.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/Environment/Grass/ShaderGrass.tscn" type="PackedScene" id=7] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=8] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=9] [ext_resource path="res://src/ObstacleObjects/PitArea.tscn" type="PackedScene" id=10] diff --git a/src/Levels/Actual Level 1.tscn b/src/Levels/Actual Level 1.tscn index 4e61d96..99f5783 100644 --- a/src/Levels/Actual Level 1.tscn +++ b/src/Levels/Actual Level 1.tscn @@ -17,7 +17,7 @@ [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=15] [ext_resource path="res://src/Contraptions/Portal/Portal.tscn" type="PackedScene" id=17] [ext_resource path="res://src/Levels/Templates/LevelTemplate.gd" type="Script" id=19] -[ext_resource path="res://src/Environment/ShaderGrass.tscn" type="PackedScene" id=20] +[ext_resource path="res://src/Environment/Grass/ShaderGrass.tscn" type="PackedScene" id=20] [ext_resource path="res://src/Environment/Greenhouse.tscn" type="PackedScene" id=21] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] diff --git a/src/Levels/Actual Level 2.tscn b/src/Levels/Actual Level 2.tscn index 53cc88e..01ce732 100644 --- a/src/Levels/Actual Level 2.tscn +++ b/src/Levels/Actual Level 2.tscn @@ -17,7 +17,7 @@ [ext_resource path="res://src/Platforms/FlyingLaserCutter.tscn" type="PackedScene" id=16] [ext_resource path="res://src/Platforms/FlyingPlatformClean.tscn" type="PackedScene" id=17] [ext_resource path="res://src/BenefitialObjects/Coin.tscn" type="PackedScene" id=18] -[ext_resource path="res://src/Environment/ShaderGrass.tscn" type="PackedScene" id=19] +[ext_resource path="res://src/Environment/Grass/ShaderGrass.tscn" type="PackedScene" id=19] [ext_resource path="res://src/Environment/Greenhouse.tscn" type="PackedScene" id=20] [sub_resource type="AnimationNodeStateMachinePlayback" id=4] diff --git a/src/Levels/New Tiles Level.tscn b/src/Levels/New Tiles Level.tscn new file mode 100644 index 0000000..4286d5a --- /dev/null +++ b/src/Levels/New Tiles Level.tscn @@ -0,0 +1,71 @@ +[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/Contraptions/Portal/Portal.tscn" type="PackedScene" id=2] +[ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=3] +[ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=4] +[ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/Levels/x02 Level.tscn" type="PackedScene" id=6] +[ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=7] +[ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=8] +[ext_resource path="res://src/Environment/AlienGreenHouseTilesNew.tres" type="TileSet" id=9] + +[sub_resource type="AnimationNodeStateMachinePlayback" id=4] + +[node name="LevelTemplate" type="Node2D"] +script = ExtResource( 1 ) +__meta__ = { +"_edit_horizontal_guides_": [ 464.0 ], +"_edit_vertical_guides_": [ 2880.0 ] +} + +[node name="SignalManager" parent="." instance=ExtResource( 4 )] + +[node name="LevelState" parent="." instance=ExtResource( 8 )] +unique_name_in_owner = true + +[node name="UserInterface" parent="." instance=ExtResource( 3 )] +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( 5 )] +unique_name_in_owner = true +drag_margin_bottom = 0.3 + +[node name="AnimatedSprite2" parent="BlobbyCam/ParallaxBackground/ParallaxLayer5" index="5"] +frame = 12 + +[node name="Blobby" parent="." instance=ExtResource( 7 )] +unique_name_in_owner = true +position = Vector2( -70, -1.90735e-06 ) +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( 16, 16 ) +cell_quadrant_size = 3 +cell_custom_transform = Transform2D( 16, 0, 0, 16, 0, 0 ) +collision_layer = 8 +collision_mask = 8 +bake_navigation = true +format = 1 +tile_data = PoolIntArray( -1245196, 1, 131076, -1245195, 1, 131076, -1245194, 1, 131076, -1245193, 1, 131076, -1245192, 1, 131076, -1245191, 1, 131076, -1245190, 1, 131076, -1245189, 1, 131076, -1245188, 1, 131076, -1245187, 1, 131076, -1245186, 1, 131076, -1245185, 1, 131076, -1310720, 1, 131076, -1310719, 1, 131076, -1310718, 1, 131076, -1310717, 1, 131076, -1310716, 1, 131076, -1310715, 1, 131076, -1310714, 1, 131076, -1310713, 1, 131076, -1310712, 1, 131076, -1310711, 1, 131076, -1310710, 1, 131076, -1310709, -536870911, 327681, -1310708, 536870913, 131077, -1310707, 536870913, 131077, -1310706, 536870913, 131077, -1310705, 536870913, 131077, -1310704, 536870913, 131077, -1310703, 536870913, 131077, -1310702, 536870913, 131077, -1310701, 536870913, 131077, -1310700, 536870913, 131077, -1310699, 536870913, 131077, -1310698, 536870913, 131077, -1310697, 536870913, 131077, -1310696, 536870913, 131077, -1310695, 536870913, 131077, -1310694, 536870913, 131077, -1310693, 536870913, 131077, -1310692, 536870913, 131077, -1310691, 536870913, 131077, -1310690, 536870913, 131077, -1310689, 536870913, 131077, -1310688, 536870913, 131077, -1310687, 536870913, 131077, -1310686, 536870913, 131077, -1310685, 536870913, 131077, -1310684, 1073741825, 327681, -1179660, 1, 131076, -1179659, 1, 131076, -1179658, 1, 131076, -1179657, 1, 131076, -1179656, 1, 131076, -1179655, 1, 131076, -1179654, 1, 131076, -1179653, 1, 131076, -1179652, 1, 131076, -1179651, 1, 131076, -1179650, 1, 131076, -1179649, 1, 131076, -1245184, 1, 131076, -1245183, 1, 131076, -1245182, 1, 131076, -1245181, 1, 131076, -1245180, 1, 131076, -1245179, 1, 131076, -1245178, 1, 131076, -1245177, 1, 131076, -1245176, 1, 131076, -1245175, 1, 131076, -1245174, 1, 131076, -1245173, -2147483647, 131077, -1245172, 536870913, 131079, -1245171, -536870911, 196615, -1245170, -536870911, 196615, -1245169, -536870911, 196615, -1245168, -536870911, 196615, -1245167, -536870911, 196615, -1245166, -536870911, 196615, -1245165, -536870911, 196615, -1245164, -536870911, 196615, -1245163, -536870911, 196615, -1245162, -536870911, 196615, -1245161, -536870911, 196615, -1245160, -536870911, 196615, -1245159, -536870911, 196615, -1245158, -536870911, 196615, -1245157, -536870911, 196615, -1245156, -536870911, 196615, -1245155, -536870911, 196615, -1245154, -536870911, 196615, -1245153, -536870911, 196615, -1245152, -536870911, 196615, -1245151, -536870911, 196615, -1245150, -536870911, 196615, -1245149, 536870913, 131079, -1245148, -536870911, 131077, -1114124, 1, 131076, -1114123, 1, 131076, -1114122, 1, 131076, -1114121, 1, 131076, -1114120, 1, 131076, -1114119, 1, 131076, -1114118, 1, 131076, -1114117, 1, 131076, -1114116, 1, 131076, -1114115, 1, 131076, -1114114, 1, 131076, -1114113, 1, 131076, -1179648, 1, 131076, -1179647, 1, 131076, -1179646, 1, 131076, -1179645, 1, 131076, -1179644, 1, 131076, -1179643, 1, 131076, -1179642, 1, 131076, -1179641, 1, 131076, -1179640, 1, 131076, -1179639, 1, 131076, -1179638, 1, 131076, -1179637, -2147483647, 131077, -1179636, 536870913, 196615, -1179635, 1073741825, 393216, -1179634, 536870913, 7, -1179633, 536870913, 7, -1179632, 536870913, 7, -1179631, 536870913, 7, -1179630, 536870913, 7, -1179629, 536870913, 7, -1179628, 536870913, 7, -1179627, 536870913, 7, -1179626, 536870913, 7, -1179625, 536870913, 7, -1179624, 536870913, 7, -1179623, 536870913, 7, -1179622, 536870913, 7, -1179621, 536870913, 7, -1179620, 536870913, 7, -1179619, 536870913, 7, -1179618, 536870913, 7, -1179617, 536870913, 7, -1179616, 536870913, 7, -1179615, 536870913, 7, -1179614, 536870913, 7, -1179613, -2147483647, 327685, -1179612, -536870911, 131077, -1048588, 1, 131076, -1048587, 1, 131076, -1048586, 1, 131076, -1048585, 1, 131076, -1048584, 1, 131076, -1048583, 1, 131076, -1048582, 1, 131076, -1048581, 1, 131076, -1048580, 1, 131076, -1048579, 1, 131076, -1048578, 1, 131076, -1048577, 1, 131076, -1114112, 1, 131076, -1114111, 1, 131076, -1114110, 1, 131076, -1114109, 1, 131076, -1114108, 1, 131076, -1114107, 1, 131076, -1114106, 1, 131076, -1114105, 1, 131076, -1114104, 1, 131076, -1114103, 1, 131076, -1114102, 1, 131076, -1114101, -2147483647, 131077, -1114100, 1610612737, 196615, -1114099, 1, 327687, -1114077, 1073741825, 4, -1114076, -536870911, 131077, -983052, 1, 131076, -983051, 1, 131076, -983050, 1, 131076, -983049, 1, 131076, -983048, 1, 131076, -983047, 1, 131076, -983046, 1, 131076, -983045, 1, 131076, -983044, 1, 131076, -983043, 1, 131076, -983042, 1, 131076, -983041, 1, 131076, -1048576, 1, 131076, -1048575, 1, 131076, -1048574, 1, 131076, -1048573, 1, 131076, -1048572, 1, 131076, -1048571, 1, 131076, -1048570, 1, 131076, -1048569, 1, 131076, -1048568, 1, 131076, -1048567, 1, 131076, -1048566, 1, 131076, -1048565, -2147483647, 131077, -1048564, 1610612737, 196615, -1048563, 1, 5, -1048541, 1073741825, 4, -1048540, -536870911, 131077, -917516, 1610612737, 327681, -917515, 1, 131077, -917514, 1, 131077, -917513, 1, 131077, -917512, 1, 131077, -917511, 1, 131077, -917510, 1, 131077, -917509, 1, 131077, -917508, 1, 131077, -917507, 1, 131077, -917506, 1, 131077, -917505, 1, 131077, -983040, 1, 131077, -983039, 1, 131077, -983038, 1, 131077, -983037, 1, 131077, -983036, 1, 131077, -983035, 1, 131077, -983034, 1, 131077, -983033, 1, 131077, -983032, 1, 131077, -983031, 1, 131077, -983030, 1, 131077, -983029, -536870911, 327683, -983028, 1610612737, 196615, -983027, 1, 5, -983005, 1073741825, 4, -983004, -536870911, 131077, -851980, -1073741823, 131077, -851979, 1610612737, 327682, -851978, -1073741823, 196615, -851977, -1073741823, 196615, -851976, -1073741823, 196615, -851975, -1073741823, 196615, -851974, -1073741823, 196615, -851973, -1073741823, 196615, -851972, -1073741823, 196615, -851971, -1073741823, 196615, -851970, -1073741823, 196615, -851969, -1073741823, 196615, -917504, -1073741823, 196615, -917503, -1073741823, 196615, -917502, -1073741823, 196615, -917501, -1073741823, 196615, -917500, -1073741823, 196615, -917499, -1073741823, 196615, -917498, -1073741823, 196615, -917497, -1073741823, 196615, -917496, -1073741823, 196615, -917495, -1073741823, 196615, -917494, -1073741823, 196615, -917493, -1073741823, 196615, -917492, 1610612737, 65542, -917491, 1, 5, -917469, 1073741825, 4, -917468, -536870911, 131077, -786444, -1073741823, 131077, -786443, 1610612737, 196615, -786442, -1610612735, 327685, -786441, 1, 7, -786440, 1, 7, -786439, 1, 7, -786438, 1, 7, -786437, 1, 7, -786436, 1, 7, -786435, 1, 7, -786434, 1, 7, -786433, 1, 7, -851968, 1, 7, -851967, 1, 7, -851966, 1, 7, -851965, 1, 7, -851964, 1, 7, -851963, 1, 7, -851962, 1, 7, -851961, 1, 7, -851960, 1, 7, -851959, 1, 7, -851958, 1, 7, -851957, 1, 7, -851956, 1, 7, -851955, 1, 65536, -851933, 1073741825, 4, -851932, -536870911, 131077, -720908, -1073741823, 131077, -720907, 1610612737, 196615, -720906, 1, 5, -786397, 1073741825, 4, -786396, -536870911, 131077, -655372, -1073741823, 131077, -655371, 1610612737, 196615, -655370, 1, 5, -720861, 1073741825, 4, -720860, -536870911, 131077, -589836, -1073741823, 131077, -589835, 1610612737, 196615, -589834, 1, 5, -655325, 1073741825, 4, -655324, -536870911, 131077, -524300, -1073741823, 131077, -524299, 1610612737, 196615, -524298, 1, 5, -589789, 1073741825, 4, -589788, -536870911, 131077, -458764, -1073741823, 131077, -458763, 1610612737, 196615, -458762, 1, 5, -458757, 0, 1, -458756, 0, 393217, -458755, 0, 2, -458754, 0, 327686, -524253, 1073741825, 4, -524252, -536870911, 131077, -393228, -1073741823, 131077, -393227, 1610612737, 196615, -393226, 1, 5, -393221, 0, 4, -393220, 1, 393218, -393219, 1, 393220, -393218, 0, 327687, -458717, 1073741825, 4, -458716, -536870911, 131077, -327692, -1073741823, 131077, -327691, 1610612737, 196615, -327690, 1, 5, -327685, 0, 4, -327684, 1, 393223, -327683, 1, 458753, -327682, 0, 5, -393181, 1073741825, 4, -393180, -536870911, 131077, -262156, -1073741823, 131077, -262155, 1610612737, 196615, -262154, 1, 5, -262149, 0, 6, -262148, 0, 7, -262147, 0, 7, -262146, 0, 65536, -327645, 1073741825, 4, -327644, -536870911, 131077, -196620, -1073741823, 131077, -196619, 1610612737, 196615, -196618, 1, 5, -262142, 1, 1, -262141, 1, 2, -262140, 1, 2, -262139, 1, 2, -262138, 1, 2, -262137, 1, 3, -262109, 1073741825, 4, -262108, -536870911, 131077, -131084, -1073741823, 131077, -131083, 1610612737, 196615, -131082, 1, 5, -196606, 1, 6, -196605, 1, 7, -196604, 1, 7, -196603, 1, 7, -196602, 1, 7, -196601, 1, 65536, -196573, 1073741825, 4, -196572, -536870911, 131077, -65548, -1073741823, 131077, -65547, 1610612737, 196615, -65546, 1, 5, -131037, 1073741825, 4, -131036, -536870911, 131077, -12, -1073741823, 131077, -11, 1610612737, 196615, -10, 1, 5, -65501, 1073741825, 4, -65500, -536870911, 131077, 65524, -1073741823, 131077, 65525, 1610612737, 196615, 65526, 1, 393216, 65527, 1, 2, 65528, 1, 2, 65529, 1, 2, 65530, 1, 2, 65531, 1, 2, 65532, 1, 2, 65533, 1, 2, 65534, 1, 2, 65535, 1, 2, 0, 1, 2, 1, 1, 2, 2, 1, 2, 3, 1, 2, 4, 1, 2, 5, 1, 2, 6, 1, 2, 7, 1, 2, 8, 1, 2, 9, 1, 393217, 10, 1, 393217, 11, 1, 393217, 12, 1, 393217, 13, 1, 2, 14, 1, 2, 15, 1, 2, 16, 1, 2, 17, 1, 2, 18, 1, 2, 19, 1, 2, 20, 1, 2, 21, 1, 2, 22, 1, 2, 23, 1, 2, 24, 1, 2, 25, 1, 2, 26, 1, 2, 27, 1, 2, 28, 1, 2, 29, 1, 2, 30, 1, 2, 31, 1, 2, 32, 1, 2, 33, 1, 2, 34, 1, 2, 35, 536870913, 393216, 36, -536870911, 131077, 131060, -1073741823, 131077, 131061, -1610612735, 327682, 131062, -1610612735, 196615, 131063, -1610612735, 196615, 131064, -1610612735, 196615, 131065, -1610612735, 196615, 131066, -1610612735, 196615, 131067, -1610612735, 196615, 131068, -1610612735, 196615, 131069, -1610612735, 196615, 131070, -1610612735, 196615, 131071, -1610612735, 196615, 65536, -1610612735, 196615, 65537, -1610612735, 196615, 65538, -1610612735, 196615, 65539, -1610612735, 196615, 65540, -1610612735, 196615, 65541, -1610612735, 196615, 65542, -1610612735, 196615, 65543, -1610612735, 196615, 65544, -1610612735, 196615, 65545, -1610612735, 196615, 65546, -1610612735, 196615, 65547, -1610612735, 196615, 65548, -1610612735, 196615, 65549, -1610612735, 196615, 65550, -1610612735, 196615, 65551, -1610612735, 196615, 65552, -1610612735, 196615, 65553, -1610612735, 196615, 65554, -1610612735, 196615, 65555, -1610612735, 196615, 65556, -1610612735, 196615, 65557, -1610612735, 196615, 65558, -1610612735, 196615, 65559, -1610612735, 196615, 65560, -1610612735, 196615, 65561, -1610612735, 196615, 65562, -1610612735, 196615, 65563, -1610612735, 196615, 65564, -1610612735, 196615, 65565, -1610612735, 196615, 65566, -1610612735, 196615, 65567, -1610612735, 196615, 65568, -1610612735, 196615, 65569, -1610612735, 196615, 65570, -1610612735, 196615, 65571, -2147483647, 196615, 65572, -536870911, 131077, 196596, -1610612735, 327681, 196597, 1610612737, 131077, 196598, 1610612737, 131077, 196599, 1610612737, 131077, 196600, 1610612737, 131077, 196601, 1610612737, 131077, 196602, 1610612737, 131077, 196603, 1610612737, 131077, 196604, 1610612737, 131077, 196605, 1610612737, 131077, 196606, 1610612737, 131077, 196607, 1610612737, 131077, 131072, 1610612737, 131077, 131073, 1610612737, 131077, 131074, 1610612737, 131077, 131075, 1610612737, 131077, 131076, 1610612737, 131077, 131077, 1610612737, 131077, 131078, 1610612737, 131077, 131079, 1610612737, 131077, 131080, 1610612737, 131077, 131081, 1610612737, 131077, 131082, 1610612737, 131077, 131083, 1610612737, 131077, 131084, 1610612737, 131077, 131085, 1610612737, 131077, 131086, 1, 131074, 131087, 1, 131074, 131088, 1, 131074, 131089, 1, 131074, 131090, 1, 131074, 131091, 1, 131074, 131092, 1, 131074, 131093, 1, 131074, 131094, 1, 131074, 131095, 1, 131074, 131096, 1, 131074, 131097, 1, 131074, 131098, 1, 131074, 131099, 1, 131074, 131100, 1, 131074, 131101, 1, 131074, 131102, 1, 131074, 131103, 1, 131074, 131104, 1, 131074, 131105, 1, 131074, 131106, 1, 131074, 131107, 1073741825, 131077, 131108, -2147483647, 327681 ) + +[node name="Portal" parent="." instance=ExtResource( 2 )] +position = Vector2( -123, -165 ) +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/xGrass Test Level.tscn b/src/Levels/xGrass Test Level.tscn index fe68052..de20294 100644 --- a/src/Levels/xGrass Test Level.tscn +++ b/src/Levels/xGrass Test Level.tscn @@ -3,7 +3,7 @@ [ext_resource path="res://src/Environment/AlienShipTileSet.tres" type="TileSet" id=1] [ext_resource path="res://src/Utilities/SignalManager.tscn" type="PackedScene" id=3] [ext_resource path="res://src/Utilities/LevelState.tscn" type="PackedScene" id=4] -[ext_resource path="res://src/Environment/ShaderGrass.tscn" type="PackedScene" id=5] +[ext_resource path="res://src/Environment/Grass/ShaderGrass.tscn" type="PackedScene" id=5] [ext_resource path="res://src/UserInterface/UserInterface.tscn" type="PackedScene" id=6] [ext_resource path="res://src/Actors/Blobby/Blobby.tscn" type="PackedScene" id=10] [ext_resource path="res://src/Actors/BlobbyCam.tscn" type="PackedScene" id=11] diff --git a/src/UserInterface/Buttons/ChangeSceneButton.tscn b/src/UserInterface/Buttons/ChangeSceneButton.tscn index 8118177..adb1e54 100644 --- a/src/UserInterface/Buttons/ChangeSceneButton.tscn +++ b/src/UserInterface/Buttons/ChangeSceneButton.tscn @@ -8,6 +8,6 @@ margin_bottom = 78.0 size_flags_vertical = 3 text = "Begin" script = ExtResource( 1 ) -next_scene_path = "res://src/Levels/Level on the loose.tscn" +next_scene_path = "res://src/Levels/New Tiles Level.tscn" [connection signal="button_up" from="." to="." method="_on_button_up"] diff --git a/src/UserInterface/Buttons/RetryButton.gd b/src/UserInterface/Buttons/RetryButton.gd index c428132..eaaec7a 100644 --- a/src/UserInterface/Buttons/RetryButton.gd +++ b/src/UserInterface/Buttons/RetryButton.gd @@ -1,6 +1,6 @@ extends Button -onready var levelState := get_tree().root.get_child(1).get_node("%LevelState") +onready var levelState := get_tree().root.get_child(3).get_node("%LevelState") func _on_button_up() -> void: levelState.kills = 0 diff --git a/src/UserInterface/Buttons/StatsLabel.gd b/src/UserInterface/Buttons/StatsLabel.gd index 49f80c8..25591ad 100644 --- a/src/UserInterface/Buttons/StatsLabel.gd +++ b/src/UserInterface/Buttons/StatsLabel.gd @@ -1,6 +1,6 @@ extends Label -onready var levelState := get_tree().root.get_child(1).get_node("%LevelState") +onready var levelState := get_tree().root.get_child(3).get_node("%LevelState") func _ready(): var wallet = 0 diff --git a/src/UserInterface/Screens/ControlsMenu/ControlsMenu.tscn b/src/UserInterface/Screens/ControlsMenu/ControlsMenu.tscn index 8dcf2a2..cb62f9c 100644 --- a/src/UserInterface/Screens/ControlsMenu/ControlsMenu.tscn +++ b/src/UserInterface/Screens/ControlsMenu/ControlsMenu.tscn @@ -167,8 +167,6 @@ size_flags_vertical = 3 [node name="ActionKeyList" type="VBoxContainer" parent="KeymapViewer/ScrollContainer"] unique_name_in_owner = true -margin_right = 552.0 -margin_bottom = 177.0 size_flags_horizontal = 3 size_flags_vertical = 3 script = ExtResource( 3 ) diff --git a/src/UserInterface/Screens/ControlsMenu/InputLine.tscn b/src/UserInterface/Screens/ControlsMenu/InputLine.tscn index 505eb75..1e70003 100644 --- a/src/UserInterface/Screens/ControlsMenu/InputLine.tscn +++ b/src/UserInterface/Screens/ControlsMenu/InputLine.tscn @@ -14,20 +14,20 @@ size_flags_vertical = 13 script = ExtResource( 1 ) [node name="Action" type="Label" parent="."] -margin_right = 306.0 -margin_bottom = 20.0 +margin_right = 301.0 +margin_bottom = 30.0 size_flags_horizontal = 3 size_flags_vertical = 1 text = "Up" valign = 1 [node name="Key" type="TextureRect" parent="."] -margin_left = 310.0 -margin_right = 330.0 -margin_bottom = 20.0 +margin_left = 305.0 +margin_right = 335.0 +margin_bottom = 30.0 grow_horizontal = 0 grow_vertical = 0 -rect_min_size = Vector2( 20, 20 ) +rect_min_size = Vector2( 30, 30 ) size_flags_horizontal = 0 size_flags_vertical = 0 expand = true @@ -38,7 +38,7 @@ max_width = 30 [node name="ChangeButton" type="Button" parent="."] margin_left = 582.0 margin_right = 640.0 -margin_bottom = 20.0 +margin_bottom = 30.0 grow_vertical = 2 rect_min_size = Vector2( 40, 20 ) input_pass_on_modal_close_click = false diff --git a/src/UserInterface/Screens/MainScreen.tscn b/src/UserInterface/Screens/MainScreen.tscn index 6c98e13..9ece492 100644 --- a/src/UserInterface/Screens/MainScreen.tscn +++ b/src/UserInterface/Screens/MainScreen.tscn @@ -71,7 +71,6 @@ size_flags_horizontal = 3 [node name="PlayButton" parent="MenuContainer/Buttons" instance=ExtResource( 3 )] margin_right = 296.0 margin_bottom = 30.0 -next_scene_path = "res://src/Levels/Actual Level 1.tscn" [node name="Controlls" parent="MenuContainer/Buttons" instance=ExtResource( 3 )] margin_top = 34.0