merge with main

This commit is contained in:
2021-12-08 23:06:13 -06:00
106 changed files with 1735 additions and 1277 deletions

View File

@@ -2,5 +2,5 @@ extends Node2D
func _ready() -> void:
$YSort/Player.load_hud($HUD)
return
$YSort/Player.load_hud($HUD)
return

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Sprites/Assets/resources_basic.png" type="Texture" id=1]
[ext_resource path="res://Levels/Objects/Gem.gd" type="Script" id=2]
[ext_resource path="res://Levels/Interactables/Gem.gd" type="Script" id=2]
[sub_resource type="Animation" id=3]
resource_name = "rise"

View File

@@ -0,0 +1,17 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Sprites/Assets/blue_star.png" type="Texture" id=1]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 7.95021, 8.07351 )
[node name="Star" type="RigidBody2D"]
collision_layer = 4
collision_mask = 0
mode = 1
[node name="CollisionShape2D" type="CollisionShape2D" parent="."]
shape = SubResource( 1 )
[node name="Sprite" type="Sprite" parent="."]
texture = ExtResource( 1 )

View File

@@ -27,7 +27,7 @@ func _on_Player_Detector_area_entered(area: Area2D) -> void:
$chestClosed.visible = false
$chestOpened.visible = true
$Gem.visible = true
$Gem/AnimationPlayer.play("rise")
$Gem/AnimationPlayer.play('rise')
is_opened = true
has_gem = false
emit_signal("gem_collected")
emit_signal('gem_collected')

View File

@@ -1,9 +1,9 @@
[gd_scene load_steps=6 format=2]
[ext_resource path="res://Sprites/Levels/Interactables/treasureChestOpen.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Interactables/treasureChest.png" type="Texture" id=2]
[ext_resource path="res://Levels/Objects/Gem.tscn" type="PackedScene" id=3]
[ext_resource path="res://Levels/Objects/TreasureChest.gd" type="Script" id=4]
[ext_resource path="res://Sprites/Levels/Interactables/Treasure_Chest_Open.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Interactables/Treasure_Chest_Closed.png" type="Texture" id=2]
[ext_resource path="res://Levels/Interactables/Gem.tscn" type="PackedScene" id=3]
[ext_resource path="res://Levels/Interactables/Treasure Chest.gd" type="Script" id=4]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 21.3333, 17.3333 )

17
Levels/Level 1.gd Normal file
View File

@@ -0,0 +1,17 @@
extends Node2D
# Declare member variables here. Examples:
# var a = 2
# var b = "text"
# Called when the node enters the scene tree for the first time.
func _ready() -> void:
$YSort/Player.load_hud($HUD)
return
# Called every frame. 'delta' is the elapsed time since the previous frame.
#func _process(delta):
# pass

66
Levels/Level 1.tscn Normal file
View File

@@ -0,0 +1,66 @@
[gd_scene load_steps=8 format=2]
[ext_resource path="res://Sprites/Assets/galaxy_background.png" type="Texture" id=1]
[ext_resource path="res://GUI/HUD.tscn" type="PackedScene" id=2]
[ext_resource path="res://GUI/Pause Screen.tscn" type="PackedScene" id=3]
[ext_resource path="res://Player/Player.tscn" type="PackedScene" id=4]
[ext_resource path="res://Levels/Level 1.gd" type="Script" id=5]
[ext_resource path="res://Enemies/Dark Matter.tscn" type="PackedScene" id=6]
[ext_resource path="res://Levels/Interactables/Star.tscn" type="PackedScene" id=7]
[node name="Space Level" type="Node2D"]
script = ExtResource( 5 )
[node name="TextureRect" type="TextureRect" parent="."]
margin_right = 160.0
margin_bottom = 90.0
rect_scale = Vector2( 2.5, 2.5 )
texture = ExtResource( 1 )
__meta__ = {
"_edit_use_anchors_": false
}
[node name="YSort" type="YSort" parent="."]
[node name="Player" parent="YSort" instance=ExtResource( 4 )]
position = Vector2( 178.673, 89.1493 )
[node name="Camera2D" type="Camera2D" parent="YSort/Player"]
current = true
limit_left = 0
limit_top = 0
limit_right = 400
limit_bottom = 225
[node name="Enemies" type="YSort" parent="YSort"]
[node name="Dark Matter" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 97.0154, 82.0323 )
collision_mask = 0
[node name="Dark Matter2" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 205.006, 50.8542 )
[node name="Dark Matter3" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 321.547, 98.5301 )
[node name="Dark Matter4" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 72.0435, 202.887 )
[node name="Dark Matter5" parent="YSort/Enemies" instance=ExtResource( 6 )]
position = Vector2( 289.233, 198.649 )
[node name="Stars" type="YSort" parent="YSort"]
[node name="Star" parent="YSort/Stars" instance=ExtResource( 7 )]
position = Vector2( 140.092, 133.724 )
[node name="Star2" parent="YSort/Stars" instance=ExtResource( 7 )]
position = Vector2( 278.639, 33.3731 )
[node name="Star3" parent="YSort/Stars" instance=ExtResource( 7 )]
position = Vector2( 323.666, 161.038 )
[node name="HUD" parent="." instance=ExtResource( 2 )]
[node name="Pause Screen" parent="." instance=ExtResource( 3 )]

View File

@@ -10,43 +10,43 @@ var screensize
var score = 0
func _ready() -> void:
$YSort/Player.load_hud($HUD)
screensize = get_viewport_rect().size
spawn_coins(8)
return
$YSort/Player.load_hud($HUD)
screensize = get_viewport_rect().size
spawn_coins(8)
return
func spawn_coins(num):
for i in range(num):
var g = coin.instance()
$'coin_container'.add_child(g)
g.connect("coin_grabbed", self, "_on_coin_grabbed")
#g.set_pos(Vector2(rand_range(0, screensize.x-40), rand_range(0, screensize.y-40)))
g.position = Vector2(rand_range(0, screensize.x-40), rand_range(0, screensize.y-40))
for i in range(num):
var g = coin.instance()
$'coin_container'.add_child(g)
g.connect("coin_grabbed", self, "_on_coin_grabbed")
#g.set_pos(Vector2(rand_range(0, screensize.x-40), rand_range(0, screensize.y-40)))
g.position = Vector2(rand_range(0, screensize.x-40), rand_range(0, screensize.y-40))
func _on_coin_grabbed():
score+=1
print(score)
score_label.set_text(str(score) + "/5")
score+=1
print(score)
score_label.set_text(str(score) + "/5")
func _timer_out():
get_tree().change_scene('res://Levels/Hub World.tscn')
get_tree().change_scene('res://Levels/Hub World.tscn')
func _on_TreasureChest_ice_key_collected() -> void:
$YSort/Door/doorClosed.visible = false
$YSort/Door/doorOpened.visible = true
$YSort/DoorCollision.layers = 5
$YSort/Door/doorClosed.visible = false
$YSort/Door/doorOpened.visible = true
$YSort/DoorCollision.layers = 5
func _on_DoorDetector_body_entered(body: Node) -> void:
if body.get_parent().name == 'Player':
print('WIN WIN WIN')
get_tree().change_scene('res://Levels/Hub World.tscn')
if body.get_parent().name == 'Player':
print('WIN WIN WIN')
get_tree().change_scene('res://Levels/Hub World.tscn')
func _on_DoorDetector_area_entered(area: Area2D) -> void:
if area.get_parent().name == 'Player':
print('WIN WIN WIN')
get_tree().change_scene('res://Levels/Hub World.tscn') # Replace with function body.
if area.get_parent().name == 'Player':
print('WIN WIN WIN')
get_tree().change_scene('res://Levels/Hub World.tscn') # Replace with function body.

View File

@@ -127,31 +127,23 @@ position = Vector2( 250.562, 86.6365 )
[node name="Enemies" type="YSort" parent="YSort"]
[node name="Snowman 1" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 4 )]
[node name="Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )]
position = Vector2( 268.977, 221.859 )
collision_layer = 4
collision_mask = 5
[node name="Snowman 2" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 4 )]
[node name="Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 4 )]
position = Vector2( 124.417, 123.977 )
collision_layer = 4
collision_mask = 5
[node name="Blue Snowman 1" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 6 )]
[node name="Blue Snowman 1" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )]
position = Vector2( 252.747, 40.9419 )
collision_layer = 4
collision_mask = 5
script = ExtResource( 7 )
[node name="Blue Snowman 2" parent="YSort/Enemies" groups=[
"enemies",
] instance=ExtResource( 6 )]
[node name="Blue Snowman 2" parent="YSort/Enemies" groups=["enemies"] instance=ExtResource( 6 )]
position = Vector2( 105.053, 195.4 )
collision_layer = 4
collision_mask = 5

View File

@@ -3,22 +3,22 @@ extends Node2D
var gems: int = 4
func _ready() -> void:
#$YSort/Player.position = get_viewport_rect().size / 2
$YSort/Player.load_hud($HUD)
return
#$YSort/Player.position = get_viewport_rect().size / 2
$YSort/Player.load_hud($HUD)
return
func _on_TreasureChest_gem_collected() -> void:
gems -= 1
gems -= 1
if gems == 0:
$YSort/Items/Door/doorClosed.visible = false
$YSort/Items/Door/doorOpened.visible = true
$DoorCollision.layers = 5
if gems == 0:
$YSort/Items/Door/doorClosed.visible = false
$YSort/Items/Door/doorOpened.visible = true
$DoorCollision.layers = 5
func _on_NextArea_area_entered(area: Area2D) -> void:
if area.get_parent().name == 'Player':
$YSort/Player.position.x = 195
$YSort/Player.position.y = -335
if area.get_parent().name == 'Player':
$YSort/Player.position.x = 195
$YSort/Player.position.y = -335

File diff suppressed because one or more lines are too long

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Sprites/Levels/Objects/DoorOpen.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Objects/DoorClosed.png" type="Texture" id=2]
[ext_resource path="res://Sprites/Levels/Objects/Gate_Open.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Objects/Gate_Closed.png" type="Texture" id=2]
[node name="Door" type="Sprite"]

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=3 format=2]
[ext_resource path="res://Sprites/Levels/Objects/DoorOpen.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Objects/DoorClosed.png" type="Texture" id=2]
[ext_resource path="res://Sprites/Levels/Objects/Gate_Open.png" type="Texture" id=1]
[ext_resource path="res://Sprites/Levels/Objects/Gate_Closed.png" type="Texture" id=2]
[node name="IceDoor" type="Sprite"]

View File

@@ -1,7 +1,7 @@
[gd_scene load_steps=4 format=2]
[ext_resource path="res://Levels/Objects/icekey.png" type="Texture" id=1]
[ext_resource path="res://Levels/Objects/Gem.gd" type="Script" id=2]
[ext_resource path="res://Levels/Interactables/Gem.gd" type="Script" id=2]
[sub_resource type="Animation" id=1]
resource_name = "rise"

View File

@@ -1,17 +1,15 @@
[gd_scene load_steps=7 format=2]
[ext_resource path="res://Levels/Objects/TreasureChest.gd" type="Script" id=1]
[ext_resource path="res://Levels/Interactables/Treasure Chest.gd" type="Script" id=1]
[ext_resource path="res://Levels/Objects/Key.tscn" type="PackedScene" id=2]
[ext_resource path="res://Sprites/Levels/Interactables/treasureChest.png" type="Texture" id=3]
[ext_resource path="res://Sprites/Levels/Interactables/treasureChestOpen.png" type="Texture" id=4]
[ext_resource path="res://Sprites/Levels/Interactables/Treasure_Chest_Closed.png" type="Texture" id=3]
[ext_resource path="res://Sprites/Levels/Interactables/Treasure_Chest_Open.png" type="Texture" id=4]
[ext_resource path="res://Levels/Objects/Key.gd" type="Script" id=5]
[sub_resource type="RectangleShape2D" id=1]
extents = Vector2( 21.3333, 17.3333 )
[node name="TreasureChest" type="Sprite" groups=[
"enemies",
]]
[node name="TreasureChest" type="Sprite" groups=["enemies"]]
script = ExtResource( 1 )
[node name="chestOpened" type="Sprite" parent="."]
@@ -26,10 +24,10 @@ visible = false
script = ExtResource( 5 )
[node name="Player Detector" type="Area2D" parent="."]
input_pickable = false
monitorable = false
collision_layer = 0
collision_mask = 2
input_pickable = false
monitorable = false
[node name="CollisionShape2D" type="CollisionShape2D" parent="Player Detector"]
visible = false

View File

@@ -28,6 +28,7 @@ process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
process/normal_map_invert_y=false
stream=false
size_limit=0
detect_3d=false