CommonParrot/Blobby
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

chore: Neues Tileset von Tatjana

Browse Source
This commit is contained in:
Jakob Feldmann 2023-05-30 18:11:10 +02:00
parent 25845bfc99
commit 0a3799eee0
24 changed files with 415 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -32,4 +32,4 @@ data_*/
*/.vscode/launch.json
# File specific ignores
savefile.tres
./savefile.tres

22
savefile.tres
View File

@ -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 ) ],

2
src/Contraptions/Triggers/FrogFreeButton.gd
View File

@ -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

2
src/Contraptions/Triggers/GateButton.gd
View File

@ -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

312
src/Environment/AlienGreenHouseTilesNew.tres Normal file
View File

@ -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

0
src/Environment/ShaderGrass.gd → src/Environment/Grass/ShaderGrass.gd
View File

0
src/Environment/ShaderGrass.gdshader → src/Environment/Grass/ShaderGrass.gdshader
View File

2
src/Environment/ShaderGrass.tres → src/Environment/Grass/ShaderGrass.tres
View File

@ -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

4
src/Environment/ShaderGrass.tscn → src/Environment/Grass/ShaderGrass.tscn
View File

@ -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]

0
src/Environment/ShaderGrassInverse.gdshader → src/Environment/Grass/ShaderGrassInverse.gdshader
View File

2
src/Environment/ShaderGrassMaterial.tres → src/Environment/Grass/ShaderGrassMaterial.tres
View File

@ -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

29
src/Environment/Tileset.tres
View File

@ -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

6
src/Levels/1 Tut Level.tscn
View File

@ -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

2
src/Levels/2 Tut Level.tscn
View File

@ -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]

2
src/Levels/Actual Level 1.tscn
View File

@ -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]

2
src/Levels/Actual Level 2.tscn
View File

@ -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]

71
src/Levels/New Tiles Level.tscn Normal file
View File

File diff suppressed because one or more lines are too long

2
src/Levels/xGrass Test Level.tscn
View File

@ -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]

2
src/UserInterface/Buttons/ChangeSceneButton.tscn
View File

@ -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"]

2
src/UserInterface/Buttons/RetryButton.gd
View File

@ -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

2
src/UserInterface/Buttons/StatsLabel.gd
View File

@ -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

2
src/UserInterface/Screens/ControlsMenu/ControlsMenu.tscn
View File

@ -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 )

14
src/UserInterface/Screens/ControlsMenu/InputLine.tscn
View File

@ -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

1
src/UserInterface/Screens/MainScreen.tscn
View File

@ -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