diff --git a/collectables/crystal/collectableCrystal.tscn b/collectables/crystal/collectableCrystal.tscn index 6506628..a54ae31 100644 --- a/collectables/crystal/collectableCrystal.tscn +++ b/collectables/crystal/collectableCrystal.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=9 format=3 uid="uid://darxbklsgh23m"] [ext_resource type="Script" uid="uid://dmyoo12ntx27" path="res://collectables/crystal/collect_crystal.gd" id="1_ttvq1"] -[ext_resource type="Texture2D" uid="uid://igfk66vn3kwf" path="res://collectables/crystal/Sprites/Crystal_0001.png" id="2_s8vun"] -[ext_resource type="Texture2D" uid="uid://bw0jnkq6ypol7" path="res://collectables/crystal/Sprites/Crystal_0002.png" id="3_1n2qm"] -[ext_resource type="Texture2D" uid="uid://7xtq4worgob7" path="res://collectables/crystal/Sprites/Crystal_0003.png" id="4_m1y8f"] -[ext_resource type="Texture2D" uid="uid://d1rloqj508hvg" path="res://collectables/crystal/Sprites/Crystal_0004.png" id="5_dnjya"] +[ext_resource type="Texture2D" uid="uid://igfk66vn3kwf" path="res://collectables/crystal/sprites/Crystal_0001.png" id="2_s8vun"] +[ext_resource type="Texture2D" uid="uid://bw0jnkq6ypol7" path="res://collectables/crystal/sprites/Crystal_0002.png" id="3_1n2qm"] +[ext_resource type="Texture2D" uid="uid://7xtq4worgob7" path="res://collectables/crystal/sprites/Crystal_0003.png" id="4_m1y8f"] +[ext_resource type="Texture2D" uid="uid://d1rloqj508hvg" path="res://collectables/crystal/sprites/Crystal_0004.png" id="5_dnjya"] [sub_resource type="SpriteFrames" id="SpriteFrames_4nrqi"] animations = [{ diff --git a/collectables/crystal/Template mew 1 front-4.png.png b/collectables/crystal/placeholderCrystal.png similarity index 100% rename from collectables/crystal/Template mew 1 front-4.png.png rename to collectables/crystal/placeholderCrystal.png diff --git a/collectables/crystal/Template mew 1 front-4.png.png.import b/collectables/crystal/placeholderCrystal.png.import similarity index 66% rename from collectables/crystal/Template mew 1 front-4.png.png.import rename to collectables/crystal/placeholderCrystal.png.import index 4ae60c9..5915e2e 100644 --- a/collectables/crystal/Template mew 1 front-4.png.png.import +++ b/collectables/crystal/placeholderCrystal.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bm245ox8exhlr" -path="res://.godot/imported/Template mew 1 front-4.png.png-440d84f7fa435035f10a33de9b42f97c.ctex" +path="res://.godot/imported/placeholderCrystal.png-0d7e5840f5250e6d1cfa030ba7f2e91f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://collectables/crystal/Template mew 1 front-4.png.png" -dest_files=["res://.godot/imported/Template mew 1 front-4.png.png-440d84f7fa435035f10a33de9b42f97c.ctex"] +source_file="res://collectables/crystal/placeholderCrystal.png" +dest_files=["res://.godot/imported/placeholderCrystal.png-0d7e5840f5250e6d1cfa030ba7f2e91f.ctex"] [params] diff --git a/collectables/crystal/sounds/Picked Coin Echo 2.wav b/collectables/crystal/sounds/Picked Coin Echo 2.wav new file mode 100644 index 0000000..0e06374 Binary files /dev/null and b/collectables/crystal/sounds/Picked Coin Echo 2.wav differ diff --git a/collectables/crystal/sounds/Picked Coin Echo 2.wav.import b/collectables/crystal/sounds/Picked Coin Echo 2.wav.import new file mode 100644 index 0000000..c5fd00d --- /dev/null +++ b/collectables/crystal/sounds/Picked Coin Echo 2.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://bj2elbcgnkhkl" +path="res://.godot/imported/Picked Coin Echo 2.wav-976a1623d49495deec40b6ed165444a7.sample" + +[deps] + +source_file="res://collectables/crystal/sounds/Picked Coin Echo 2.wav" +dest_files=["res://.godot/imported/Picked Coin Echo 2.wav-976a1623d49495deec40b6ed165444a7.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/collectables/crystal/sounds/Picked Coin Echo.wav b/collectables/crystal/sounds/Picked Coin Echo.wav new file mode 100644 index 0000000..b6f9f2c Binary files /dev/null and b/collectables/crystal/sounds/Picked Coin Echo.wav differ diff --git a/collectables/crystal/sounds/Picked Coin Echo.wav.import b/collectables/crystal/sounds/Picked Coin Echo.wav.import new file mode 100644 index 0000000..8d048c5 --- /dev/null +++ b/collectables/crystal/sounds/Picked Coin Echo.wav.import @@ -0,0 +1,24 @@ +[remap] + +importer="wav" +type="AudioStreamWAV" +uid="uid://birua4ldxarek" +path="res://.godot/imported/Picked Coin Echo.wav-f51560c9770ade4f59db2a32bc80ed3a.sample" + +[deps] + +source_file="res://collectables/crystal/sounds/Picked Coin Echo.wav" +dest_files=["res://.godot/imported/Picked Coin Echo.wav-f51560c9770ade4f59db2a32bc80ed3a.sample"] + +[params] + +force/8_bit=false +force/mono=false +force/max_rate=false +force/max_rate_hz=44100 +edit/trim=false +edit/normalize=false +edit/loop_mode=0 +edit/loop_begin=0 +edit/loop_end=-1 +compress/mode=2 diff --git a/collectables/crystal/Sprites/Crystal_0001.png b/collectables/crystal/sprites/Crystal_0001.png similarity index 100% rename from collectables/crystal/Sprites/Crystal_0001.png rename to collectables/crystal/sprites/Crystal_0001.png diff --git a/collectables/crystal/Sprites/Crystal_0001.png.import b/collectables/crystal/sprites/Crystal_0001.png.import similarity index 69% rename from collectables/crystal/Sprites/Crystal_0001.png.import rename to collectables/crystal/sprites/Crystal_0001.png.import index c36fb75..bc2f9a0 100644 --- a/collectables/crystal/Sprites/Crystal_0001.png.import +++ b/collectables/crystal/sprites/Crystal_0001.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://igfk66vn3kwf" -path="res://.godot/imported/Crystal_0001.png-5e3220c74eb2ab8b7d939d53be5b0314.ctex" +path="res://.godot/imported/Crystal_0001.png-baee1aa45c26107341bca7ffb4e8cbee.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://collectables/crystal/Sprites/Crystal_0001.png" -dest_files=["res://.godot/imported/Crystal_0001.png-5e3220c74eb2ab8b7d939d53be5b0314.ctex"] +source_file="res://collectables/crystal/sprites/Crystal_0001.png" +dest_files=["res://.godot/imported/Crystal_0001.png-baee1aa45c26107341bca7ffb4e8cbee.ctex"] [params] diff --git a/collectables/crystal/Sprites/Crystal_0002.png b/collectables/crystal/sprites/Crystal_0002.png similarity index 100% rename from collectables/crystal/Sprites/Crystal_0002.png rename to collectables/crystal/sprites/Crystal_0002.png diff --git a/collectables/crystal/Sprites/Crystal_0002.png.import b/collectables/crystal/sprites/Crystal_0002.png.import similarity index 69% rename from collectables/crystal/Sprites/Crystal_0002.png.import rename to collectables/crystal/sprites/Crystal_0002.png.import index 53d90b1..841aeab 100644 --- a/collectables/crystal/Sprites/Crystal_0002.png.import +++ b/collectables/crystal/sprites/Crystal_0002.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bw0jnkq6ypol7" -path="res://.godot/imported/Crystal_0002.png-1ac755f2be68db4eb63c66fc00c4dab1.ctex" +path="res://.godot/imported/Crystal_0002.png-e68661c7e7921addbf2bea7ce5635de1.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://collectables/crystal/Sprites/Crystal_0002.png" -dest_files=["res://.godot/imported/Crystal_0002.png-1ac755f2be68db4eb63c66fc00c4dab1.ctex"] +source_file="res://collectables/crystal/sprites/Crystal_0002.png" +dest_files=["res://.godot/imported/Crystal_0002.png-e68661c7e7921addbf2bea7ce5635de1.ctex"] [params] diff --git a/collectables/crystal/Sprites/Crystal_0003.png b/collectables/crystal/sprites/Crystal_0003.png similarity index 100% rename from collectables/crystal/Sprites/Crystal_0003.png rename to collectables/crystal/sprites/Crystal_0003.png diff --git a/collectables/crystal/Sprites/Crystal_0003.png.import b/collectables/crystal/sprites/Crystal_0003.png.import similarity index 69% rename from collectables/crystal/Sprites/Crystal_0003.png.import rename to collectables/crystal/sprites/Crystal_0003.png.import index 4474f63..fa2265e 100644 --- a/collectables/crystal/Sprites/Crystal_0003.png.import +++ b/collectables/crystal/sprites/Crystal_0003.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://7xtq4worgob7" -path="res://.godot/imported/Crystal_0003.png-b5df41bd995a7962f5d54d2be6f262d3.ctex" +path="res://.godot/imported/Crystal_0003.png-4efec2a5c3551c8cb7139e37bbe2da61.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://collectables/crystal/Sprites/Crystal_0003.png" -dest_files=["res://.godot/imported/Crystal_0003.png-b5df41bd995a7962f5d54d2be6f262d3.ctex"] +source_file="res://collectables/crystal/sprites/Crystal_0003.png" +dest_files=["res://.godot/imported/Crystal_0003.png-4efec2a5c3551c8cb7139e37bbe2da61.ctex"] [params] diff --git a/collectables/crystal/Sprites/Crystal_0004.png b/collectables/crystal/sprites/Crystal_0004.png similarity index 100% rename from collectables/crystal/Sprites/Crystal_0004.png rename to collectables/crystal/sprites/Crystal_0004.png diff --git a/collectables/crystal/Sprites/Crystal_0004.png.import b/collectables/crystal/sprites/Crystal_0004.png.import similarity index 69% rename from collectables/crystal/Sprites/Crystal_0004.png.import rename to collectables/crystal/sprites/Crystal_0004.png.import index 2cd44b9..c0fb50b 100644 --- a/collectables/crystal/Sprites/Crystal_0004.png.import +++ b/collectables/crystal/sprites/Crystal_0004.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://d1rloqj508hvg" -path="res://.godot/imported/Crystal_0004.png-ac8a1d955146b7cd50202213567fa90e.ctex" +path="res://.godot/imported/Crystal_0004.png-87f16be31082f0f578bcb50700e91618.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://collectables/crystal/Sprites/Crystal_0004.png" -dest_files=["res://.godot/imported/Crystal_0004.png-ac8a1d955146b7cd50202213567fa90e.ctex"] +source_file="res://collectables/crystal/sprites/Crystal_0004.png" +dest_files=["res://.godot/imported/Crystal_0004.png-87f16be31082f0f578bcb50700e91618.ctex"] [params] diff --git a/credits/GodotCredits.gd b/credits/GodotCredits.gd new file mode 100644 index 0000000..4f85e8c --- /dev/null +++ b/credits/GodotCredits.gd @@ -0,0 +1,158 @@ +extends Control + +@export var bg_color : Color = Color.BLACK +@export var to_scene : PackedScene = null +@export var title_color := Color.BLUE_VIOLET +@export var text_color := Color.WHITE +@export var title_font : FontFile = null +@export var text_font : FontFile = null +@export var Music : AudioStream = null +@export var Use_Video_Audio : bool = false +@export var Video : VideoStream = null + +const section_time := 2.0 +const line_time := 0.3 +const base_speed := 70 +const speed_up_multiplier := 10.0 + +var scroll_speed : float = base_speed +var speed_up := false + +@onready var colorrect := $ColorRect +@onready var videoplayer := $VideoPlayer +@onready var line := $CreditsContainer/Line +var started := false +var finished := false + +var section +var section_next := true +var section_timer := 0.0 +var line_timer := 0.0 +var curr_line := 0 +var lines := [] + +var credits = [ + [ + "A game by Dragonfocus" + ],[ + "Programming", + "MewTheNekomata", + "TheSkyWinds" + ],[ + "Art", + "MewTheNekomata", + "TheSkyWinds" + ],[ + "Music", + "PLACEHOLDER" + ],[ + "Sound Effects", + "\"Picked Coin Echo\" 1 & 2 by NenadSimic licensed CC-BY 3.0", + "https://opengameart.org/users/nenadsimic" + ],[ + "Testers", + "Name 1", + "Name 2", + "Name 3" + ],[ + "Tools used", + "Developed with Godot Engine", + "https://godotengine.org/license", + "", + "Art created with Pixelorama", + "https://orama-interactive.itch.io/pixelorama" + ],[ + "Special thanks", + "The Game Smith for the tileset", + "", + "Johnvince53, a cool friend" + ] +] + +func _ready(): + colorrect.color = bg_color + videoplayer.set_stream(Video) + if !Use_Video_Audio: + var stream = AudioStreamPlayer.new() + stream.set_stream(Music) + add_child(stream) + videoplayer.set_volume_db(-80) + stream.play() + else: + videoplayer.set_volume_db(0) + videoplayer.play() + + +func _process(delta): + scroll_speed = base_speed * delta + + if section_next: + section_timer += delta * speed_up_multiplier if speed_up else delta + if section_timer >= section_time: + section_timer -= section_time + + if credits.size() > 0: + started = true + section = credits.pop_front() + curr_line = 0 + add_line() + + else: + line_timer += delta * speed_up_multiplier if speed_up else delta + if line_timer >= line_time: + line_timer -= line_time + add_line() + + if speed_up: + scroll_speed *= speed_up_multiplier + + if lines.size() > 0: + for l in lines: + l.set_global_position(l.get_global_position() - Vector2(0, scroll_speed)) + if l.get_global_position().y < l.get_line_height(): + lines.erase(l) + l.queue_free() + elif started: + finish() + + +func finish(): + if not finished: + finished = true + if to_scene != null: + var path = to_scene.get_path() + get_tree().change_scene_to_file(path) + else: + get_tree().quit() + + +func add_line(): + var new_line = line.duplicate() + new_line.text = section.pop_front() + lines.append(new_line) + if curr_line == 0: + if title_font != null: + new_line.set("theme_override_fonts/font", title_font) + new_line.set("theme_override_colors/font_color", title_color) + + else: + if text_font != null: + new_line.set("theme_override_fonts/font", text_font) + new_line.set("theme_override_colors/font_color", text_color) + + $CreditsContainer.add_child(new_line) + + if section.size() > 0: + curr_line += 1 + section_next = false + else: + section_next = true + + +func _unhandled_input(event): + if event.is_action_pressed("ui_cancel"): + finish() + if event.is_action_pressed("ui_down") and !event.is_echo(): + speed_up = true + if event.is_action_released("ui_down") and !event.is_echo(): + speed_up = false diff --git a/credits/GodotCredits.gd.uid b/credits/GodotCredits.gd.uid new file mode 100644 index 0000000..55b2cfd --- /dev/null +++ b/credits/GodotCredits.gd.uid @@ -0,0 +1 @@ +uid://d2wygnqaxggu5 diff --git a/credits/GodotCredits.tscn b/credits/GodotCredits.tscn new file mode 100644 index 0000000..9d0c16b --- /dev/null +++ b/credits/GodotCredits.tscn @@ -0,0 +1,43 @@ +[gd_scene load_steps=3 format=3 uid="uid://cmmk31d282i46"] + +[ext_resource type="Script" uid="uid://d2wygnqaxggu5" path="res://credits/GodotCredits.gd" id="1"] + +[sub_resource type="Resource" id="Resource_nf6lq"] +metadata/__load_path__ = "res://main.tscn" + +[node name="Credits" type="Control"] +layout_mode = 3 +anchors_preset = 15 +anchor_right = 1.0 +anchor_bottom = 1.0 +grow_horizontal = 2 +grow_vertical = 2 +script = ExtResource("1") +to_scene = SubResource("Resource_nf6lq") + +[node name="ColorRect" type="ColorRect" parent="."] +layout_mode = 0 +anchor_right = 1.0 +anchor_bottom = 1.0 +color = Color(0, 0, 0, 1) + +[node name="VideoPlayer" type="VideoStreamPlayer" parent="."] +layout_mode = 0 +anchor_right = 1.0 +anchor_bottom = 1.0 +expand = true + +[node name="CreditsContainer" type="Control" parent="."] +anchors_preset = 0 +anchor_right = 1.0 +anchor_bottom = 1.0 + +[node name="Line" type="Label" parent="CreditsContainer"] +layout_mode = 1 +anchors_preset = 10 +anchor_right = 1.0 +offset_top = 625.0 +offset_bottom = 648.0 +grow_horizontal = 2 +size_flags_horizontal = 3 +horizontal_alignment = 1 diff --git a/credits/logo64.png b/credits/logo64.png new file mode 100644 index 0000000..e56ae70 Binary files /dev/null and b/credits/logo64.png differ diff --git a/credits/logo64.png.import b/credits/logo64.png.import new file mode 100644 index 0000000..f3f760a --- /dev/null +++ b/credits/logo64.png.import @@ -0,0 +1,34 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://ddfldmnux0rto" +path="res://.godot/imported/logo64.png-0a726e0b041a36a1438ec9c7e3601eaf.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://credits/logo64.png" +dest_files=["res://.godot/imported/logo64.png-0a726e0b041a36a1438ec9c7e3601eaf.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/hdr_compression=1 +compress/normal_map=0 +compress/channel_pack=0 +mipmaps/generate=false +mipmaps/limit=-1 +roughness/mode=0 +roughness/src_normal="" +process/fix_alpha_border=true +process/premult_alpha=false +process/normal_map_invert_y=false +process/hdr_as_srgb=false +process/hdr_clamp_exposure=false +process/size_limit=0 +detect_3d/compress_to=1 diff --git a/levelFinal/core/core.gd b/levelFinal/core/core.gd deleted file mode 100644 index 1aa06ca..0000000 --- a/levelFinal/core/core.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Area2D - -func _on_body_entered(body: Node2D) -> void: - if body.name == "player": - #get_tree().change_scene_to_file("") - print("entered credits") diff --git a/levels/levelFinal/core/core.gd b/levels/levelFinal/core/core.gd new file mode 100644 index 0000000..6ad20fa --- /dev/null +++ b/levels/levelFinal/core/core.gd @@ -0,0 +1,7 @@ +extends Area2D + +var credits = preload("res://credits/GodotCredits.tscn") + +func _on_body_entered(body: Node2D) -> void: + if body.name == "player": + get_tree().change_scene_to_packed(credits) diff --git a/levelFinal/core/core.gd.uid b/levels/levelFinal/core/core.gd.uid similarity index 100% rename from levelFinal/core/core.gd.uid rename to levels/levelFinal/core/core.gd.uid diff --git a/levelFinal/core/core.tscn b/levels/levelFinal/core/core.tscn similarity index 72% rename from levelFinal/core/core.tscn rename to levels/levelFinal/core/core.tscn index 3ff0bc6..1db6617 100644 --- a/levelFinal/core/core.tscn +++ b/levels/levelFinal/core/core.tscn @@ -1,12 +1,12 @@ -[gd_scene load_steps=10 format=3 uid="uid://df6xmsx4rav7n"] +[gd_scene load_steps=10 format=3 uid="uid://bdd6q3m06bnn3"] -[ext_resource type="Script" uid="uid://enxayokme5rs" path="res://levelFinal/core/core.gd" id="1_6sogb"] -[ext_resource type="Texture2D" uid="uid://c54p5kdrt1r71" path="res://levelFinal/core/coreSprites/planetCore_0001.png" id="1_macrm"] -[ext_resource type="Texture2D" uid="uid://b6qm6xu5ojpww" path="res://levelFinal/core/coreSprites/planetCore_0002.png" id="2_6sogb"] -[ext_resource type="Texture2D" uid="uid://bbt2g8bk7kke8" path="res://levelFinal/core/coreSprites/planetCore_0003.png" id="3_fpp5w"] -[ext_resource type="Texture2D" uid="uid://ch6720bqxcsmf" path="res://levelFinal/core/coreSprites/planetCore_0004.png" id="4_c0dob"] -[ext_resource type="Texture2D" uid="uid://cd3n7wtnkho61" path="res://levelFinal/core/coreSprites/planetCore_0005.png" id="5_v2s1a"] -[ext_resource type="Texture2D" uid="uid://bykh05626og5c" path="res://levelFinal/core/coreSprites/planetCore_0006.png" id="6_in0ky"] +[ext_resource type="Script" uid="uid://enxayokme5rs" path="res://levels/levelFinal/core/core.gd" id="1_6sogb"] +[ext_resource type="Texture2D" uid="uid://c54p5kdrt1r71" path="res://levels/levelFinal/core/coreSprites/planetCore_0001.png" id="1_macrm"] +[ext_resource type="Texture2D" uid="uid://b6qm6xu5ojpww" path="res://levels/levelFinal/core/coreSprites/planetCore_0002.png" id="2_6sogb"] +[ext_resource type="Texture2D" uid="uid://bbt2g8bk7kke8" path="res://levels/levelFinal/core/coreSprites/planetCore_0003.png" id="3_fpp5w"] +[ext_resource type="Texture2D" uid="uid://ch6720bqxcsmf" path="res://levels/levelFinal/core/coreSprites/planetCore_0004.png" id="4_c0dob"] +[ext_resource type="Texture2D" uid="uid://cd3n7wtnkho61" path="res://levels/levelFinal/core/coreSprites/planetCore_0005.png" id="5_v2s1a"] +[ext_resource type="Texture2D" uid="uid://bykh05626og5c" path="res://levels/levelFinal/core/coreSprites/planetCore_0006.png" id="6_in0ky"] [sub_resource type="SpriteFrames" id="SpriteFrames_macrm"] animations = [{ diff --git a/levelFinal/core/coreSprites/planetCore_0001.png b/levels/levelFinal/core/coreSprites/planetCore_0001.png similarity index 100% rename from levelFinal/core/coreSprites/planetCore_0001.png rename to levels/levelFinal/core/coreSprites/planetCore_0001.png diff --git a/levelFinal/core/coreSprites/planetCore_0001.png.import b/levels/levelFinal/core/coreSprites/planetCore_0001.png.import similarity index 68% rename from levelFinal/core/coreSprites/planetCore_0001.png.import rename to levels/levelFinal/core/coreSprites/planetCore_0001.png.import index c2d3105..7f8d8c4 100644 --- a/levelFinal/core/coreSprites/planetCore_0001.png.import +++ b/levels/levelFinal/core/coreSprites/planetCore_0001.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c54p5kdrt1r71" -path="res://.godot/imported/planetCore_0001.png-c74d338b976e7441d9fa4be07dc2b052.ctex" +path="res://.godot/imported/planetCore_0001.png-6a75512a1e76094e980bd08c3d0da10e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://levelFinal/core/coreSprites/planetCore_0001.png" -dest_files=["res://.godot/imported/planetCore_0001.png-c74d338b976e7441d9fa4be07dc2b052.ctex"] +source_file="res://levels/levelFinal/core/coreSprites/planetCore_0001.png" +dest_files=["res://.godot/imported/planetCore_0001.png-6a75512a1e76094e980bd08c3d0da10e.ctex"] [params] diff --git a/levelFinal/core/coreSprites/planetCore_0002.png b/levels/levelFinal/core/coreSprites/planetCore_0002.png similarity index 100% rename from levelFinal/core/coreSprites/planetCore_0002.png rename to levels/levelFinal/core/coreSprites/planetCore_0002.png diff --git a/levelFinal/core/coreSprites/planetCore_0002.png.import b/levels/levelFinal/core/coreSprites/planetCore_0002.png.import similarity index 68% rename from levelFinal/core/coreSprites/planetCore_0002.png.import rename to levels/levelFinal/core/coreSprites/planetCore_0002.png.import index 81da672..ec16e95 100644 --- a/levelFinal/core/coreSprites/planetCore_0002.png.import +++ b/levels/levelFinal/core/coreSprites/planetCore_0002.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://b6qm6xu5ojpww" -path="res://.godot/imported/planetCore_0002.png-c96234dff4e4c4cedb4eb866a9101913.ctex" +path="res://.godot/imported/planetCore_0002.png-5d9d6c57481b30fa1d9f4313d75c288f.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://levelFinal/core/coreSprites/planetCore_0002.png" -dest_files=["res://.godot/imported/planetCore_0002.png-c96234dff4e4c4cedb4eb866a9101913.ctex"] +source_file="res://levels/levelFinal/core/coreSprites/planetCore_0002.png" +dest_files=["res://.godot/imported/planetCore_0002.png-5d9d6c57481b30fa1d9f4313d75c288f.ctex"] [params] diff --git a/levelFinal/core/coreSprites/planetCore_0003.png b/levels/levelFinal/core/coreSprites/planetCore_0003.png similarity index 100% rename from levelFinal/core/coreSprites/planetCore_0003.png rename to levels/levelFinal/core/coreSprites/planetCore_0003.png diff --git a/levelFinal/core/coreSprites/planetCore_0003.png.import b/levels/levelFinal/core/coreSprites/planetCore_0003.png.import similarity index 68% rename from levelFinal/core/coreSprites/planetCore_0003.png.import rename to levels/levelFinal/core/coreSprites/planetCore_0003.png.import index f3581c7..b93695d 100644 --- a/levelFinal/core/coreSprites/planetCore_0003.png.import +++ b/levels/levelFinal/core/coreSprites/planetCore_0003.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bbt2g8bk7kke8" -path="res://.godot/imported/planetCore_0003.png-f12ff0aded1ddbda8e86c1f5dafdc44f.ctex" +path="res://.godot/imported/planetCore_0003.png-79c032bf1b5bc985ef7703fdb2fdc18d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://levelFinal/core/coreSprites/planetCore_0003.png" -dest_files=["res://.godot/imported/planetCore_0003.png-f12ff0aded1ddbda8e86c1f5dafdc44f.ctex"] +source_file="res://levels/levelFinal/core/coreSprites/planetCore_0003.png" +dest_files=["res://.godot/imported/planetCore_0003.png-79c032bf1b5bc985ef7703fdb2fdc18d.ctex"] [params] diff --git a/levelFinal/core/coreSprites/planetCore_0004.png b/levels/levelFinal/core/coreSprites/planetCore_0004.png similarity index 100% rename from levelFinal/core/coreSprites/planetCore_0004.png rename to levels/levelFinal/core/coreSprites/planetCore_0004.png diff --git a/levelFinal/core/coreSprites/planetCore_0004.png.import b/levels/levelFinal/core/coreSprites/planetCore_0004.png.import similarity index 68% rename from levelFinal/core/coreSprites/planetCore_0004.png.import rename to levels/levelFinal/core/coreSprites/planetCore_0004.png.import index cc52d33..038abf6 100644 --- a/levelFinal/core/coreSprites/planetCore_0004.png.import +++ b/levels/levelFinal/core/coreSprites/planetCore_0004.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://ch6720bqxcsmf" -path="res://.godot/imported/planetCore_0004.png-4949f5518322e8acd9d5716d452ea090.ctex" +path="res://.godot/imported/planetCore_0004.png-72969b73b0aa034201df6d9094c5fab4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://levelFinal/core/coreSprites/planetCore_0004.png" -dest_files=["res://.godot/imported/planetCore_0004.png-4949f5518322e8acd9d5716d452ea090.ctex"] +source_file="res://levels/levelFinal/core/coreSprites/planetCore_0004.png" +dest_files=["res://.godot/imported/planetCore_0004.png-72969b73b0aa034201df6d9094c5fab4.ctex"] [params] diff --git a/levelFinal/core/coreSprites/planetCore_0005.png b/levels/levelFinal/core/coreSprites/planetCore_0005.png similarity index 100% rename from levelFinal/core/coreSprites/planetCore_0005.png rename to levels/levelFinal/core/coreSprites/planetCore_0005.png diff --git a/levelFinal/core/coreSprites/planetCore_0005.png.import b/levels/levelFinal/core/coreSprites/planetCore_0005.png.import similarity index 68% rename from levelFinal/core/coreSprites/planetCore_0005.png.import rename to levels/levelFinal/core/coreSprites/planetCore_0005.png.import index db31f84..72078f6 100644 --- a/levelFinal/core/coreSprites/planetCore_0005.png.import +++ b/levels/levelFinal/core/coreSprites/planetCore_0005.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cd3n7wtnkho61" -path="res://.godot/imported/planetCore_0005.png-e08d5d91dcf4d62e4c5e2c7b982e69e7.ctex" +path="res://.godot/imported/planetCore_0005.png-8bc97f5096a2e3d0d1c3115c2bbbce9a.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://levelFinal/core/coreSprites/planetCore_0005.png" -dest_files=["res://.godot/imported/planetCore_0005.png-e08d5d91dcf4d62e4c5e2c7b982e69e7.ctex"] +source_file="res://levels/levelFinal/core/coreSprites/planetCore_0005.png" +dest_files=["res://.godot/imported/planetCore_0005.png-8bc97f5096a2e3d0d1c3115c2bbbce9a.ctex"] [params] diff --git a/levelFinal/core/coreSprites/planetCore_0006.png b/levels/levelFinal/core/coreSprites/planetCore_0006.png similarity index 100% rename from levelFinal/core/coreSprites/planetCore_0006.png rename to levels/levelFinal/core/coreSprites/planetCore_0006.png diff --git a/levelFinal/core/coreSprites/planetCore_0006.png.import b/levels/levelFinal/core/coreSprites/planetCore_0006.png.import similarity index 68% rename from levelFinal/core/coreSprites/planetCore_0006.png.import rename to levels/levelFinal/core/coreSprites/planetCore_0006.png.import index 022d402..943a66f 100644 --- a/levelFinal/core/coreSprites/planetCore_0006.png.import +++ b/levels/levelFinal/core/coreSprites/planetCore_0006.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bykh05626og5c" -path="res://.godot/imported/planetCore_0006.png-e6a1c3566f84b6f717c5b9ae21174c65.ctex" +path="res://.godot/imported/planetCore_0006.png-41fbfbd38494b8fdde87637d4b042cb0.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://levelFinal/core/coreSprites/planetCore_0006.png" -dest_files=["res://.godot/imported/planetCore_0006.png-e6a1c3566f84b6f717c5b9ae21174c65.ctex"] +source_file="res://levels/levelFinal/core/coreSprites/planetCore_0006.png" +dest_files=["res://.godot/imported/planetCore_0006.png-41fbfbd38494b8fdde87637d4b042cb0.ctex"] [params] diff --git a/levelFinal/final_level.tscn b/levels/levelFinal/levelFinal.tscn similarity index 99% rename from levelFinal/final_level.tscn rename to levels/levelFinal/levelFinal.tscn index f155e74..63f4a69 100644 --- a/levelFinal/final_level.tscn +++ b/levels/levelFinal/levelFinal.tscn @@ -1,8 +1,8 @@ [gd_scene load_steps=4 format=4 uid="uid://cbrkijjcxph15"] -[ext_resource type="TileSet" uid="uid://cfq716af1nhqm" path="res://levelFinal/tileSet/coreTiles.tres" id="1_sp6x8"] +[ext_resource type="TileSet" uid="uid://cfq716af1nhqm" path="res://levels/levelFinal/tileSet/coreTiles.tres" id="1_sp6x8"] [ext_resource type="PackedScene" uid="uid://c1xy5bf2p6vmh" path="res://player/smallPlayer/player.tscn" id="2_js4h8"] -[ext_resource type="PackedScene" uid="uid://df6xmsx4rav7n" path="res://levelFinal/core/core.tscn" id="3_vttxq"] +[ext_resource type="PackedScene" uid="uid://bdd6q3m06bnn3" path="res://levels/levelFinal/core/core.tscn" id="3_vttxq"] [node name="finalLevel" type="Node2D"] diff --git a/levelFinal/tileSet/coreTiles.tres b/levels/levelFinal/tileSet/coreTiles.tres similarity index 98% rename from levelFinal/tileSet/coreTiles.tres rename to levels/levelFinal/tileSet/coreTiles.tres index 565bbe2..22f926c 100644 --- a/levelFinal/tileSet/coreTiles.tres +++ b/levels/levelFinal/tileSet/coreTiles.tres @@ -1,6 +1,6 @@ [gd_resource type="TileSet" load_steps=3 format=3 uid="uid://cfq716af1nhqm"] -[ext_resource type="Texture2D" uid="uid://c2wogqdxqbv64" path="res://levelFinal/tileSet/sprCave fire addition.png" id="1_28e7j"] +[ext_resource type="Texture2D" uid="uid://c2wogqdxqbv64" path="res://levels/levelFinal/tileSet/sprCave fire addition.png" id="1_28e7j"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_dxyvv"] texture = ExtResource("1_28e7j") diff --git a/levelFinal/tileSet/sprCave fire addition.png b/levels/levelFinal/tileSet/sprCave fire addition.png similarity index 100% rename from levelFinal/tileSet/sprCave fire addition.png rename to levels/levelFinal/tileSet/sprCave fire addition.png diff --git a/levelFinal/tileSet/sprCave fire addition.png.import b/levels/levelFinal/tileSet/sprCave fire addition.png.import similarity index 67% rename from levelFinal/tileSet/sprCave fire addition.png.import rename to levels/levelFinal/tileSet/sprCave fire addition.png.import index 45cfd91..2343242 100644 --- a/levelFinal/tileSet/sprCave fire addition.png.import +++ b/levels/levelFinal/tileSet/sprCave fire addition.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c2wogqdxqbv64" -path="res://.godot/imported/sprCave fire addition.png-c9ee4e2c2dda08d98bc8e2e0a7191681.ctex" +path="res://.godot/imported/sprCave fire addition.png-e853f68f8d9c1281c24448e71175667c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://levelFinal/tileSet/sprCave fire addition.png" -dest_files=["res://.godot/imported/sprCave fire addition.png-c9ee4e2c2dda08d98bc8e2e0a7191681.ctex"] +source_file="res://levels/levelFinal/tileSet/sprCave fire addition.png" +dest_files=["res://.godot/imported/sprCave fire addition.png-e853f68f8d9c1281c24448e71175667c.ctex"] [params] diff --git a/triggers/exitZone.tscn b/levels/levelOne/exitZone.tscn similarity index 92% rename from triggers/exitZone.tscn rename to levels/levelOne/exitZone.tscn index 13af3ed..67fd7f1 100644 --- a/triggers/exitZone.tscn +++ b/levels/levelOne/exitZone.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://dxojtfoa4jbe"] -[ext_resource type="Script" uid="uid://c3qi2ffmxsl8i" path="res://triggers/exit_zone.gd" id="1_2uwmc"] +[ext_resource type="Script" uid="uid://c3qi2ffmxsl8i" path="res://levels/levelOne/exit_zone.gd" id="1_2uwmc"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_jhhth"] size = Vector2(32, 29) diff --git a/triggers/exit_zone.gd b/levels/levelOne/exit_zone.gd similarity index 74% rename from triggers/exit_zone.gd rename to levels/levelOne/exit_zone.gd index b3d63b7..9054ebd 100644 --- a/triggers/exit_zone.gd +++ b/levels/levelOne/exit_zone.gd @@ -1,5 +1,6 @@ extends Area2D +var planetOne = preload("res://planets/planetOne/planetOne.tscn") var activated: bool = false func _ready() -> void: @@ -12,4 +13,4 @@ func levelComplete(): func _on_body_entered(body: Node2D) -> void: if activated: - get_tree().change_scene_to_file("res://planetScene/planetOne/planetOne.tscn") + get_tree().change_scene_to_packed(planetOne) diff --git a/triggers/exit_zone.gd.uid b/levels/levelOne/exit_zone.gd.uid similarity index 100% rename from triggers/exit_zone.gd.uid rename to levels/levelOne/exit_zone.gd.uid diff --git a/levelOne/startLevel.tscn b/levels/levelOne/levelOne.tscn similarity index 97% rename from levelOne/startLevel.tscn rename to levels/levelOne/levelOne.tscn index cb01ad9..e4511d2 100644 --- a/levelOne/startLevel.tscn +++ b/levels/levelOne/levelOne.tscn @@ -1,10 +1,9 @@ -[gd_scene load_steps=6 format=4 uid="uid://ccjb75bercbw8"] +[gd_scene load_steps=5 format=4 uid="uid://ccjb75bercbw8"] -[ext_resource type="TileSet" uid="uid://xnedi1edel2b" path="res://levelOne/tileMaps/baseTileset.tres" id="1_s5r4n"] +[ext_resource type="TileSet" uid="uid://xnedi1edel2b" path="res://levels/levelOne/tileMaps/baseTileset.tres" id="1_s5r4n"] [ext_resource type="PackedScene" uid="uid://c1xy5bf2p6vmh" path="res://player/smallPlayer/player.tscn" id="2_r1egm"] [ext_resource type="PackedScene" uid="uid://darxbklsgh23m" path="res://collectables/crystal/collectableCrystal.tscn" id="3_56573"] -[ext_resource type="PackedScene" uid="uid://chpqjpcexhd3t" path="res://rock/Rock.tscn" id="4_1l7e8"] -[ext_resource type="PackedScene" uid="uid://dxojtfoa4jbe" path="res://triggers/exitZone.tscn" id="5_r1egm"] +[ext_resource type="PackedScene" uid="uid://dxojtfoa4jbe" path="res://levels/levelOne/exitZone.tscn" id="5_r1egm"] [node name="levelOne" type="Node2D"] @@ -22,9 +21,6 @@ collision_enabled = false [node name="player" parent="." instance=ExtResource("2_r1egm")] position = Vector2(373, 125) -[node name="rock" parent="." instance=ExtResource("4_1l7e8")] -position = Vector2(73, -309) - [node name="crystals" type="Node2D" parent="."] position = Vector2(304, 494) @@ -65,6 +61,3 @@ offset_bottom = 1246.0 text = "collect all the crystals to open the exit" horizontal_alignment = 1 - -[editable path="player"] -[editable path="player/Control"] diff --git a/levelOne/tileMaps/baseTileset.tres b/levels/levelOne/tileMaps/baseTileset.tres similarity index 98% rename from levelOne/tileMaps/baseTileset.tres rename to levels/levelOne/tileMaps/baseTileset.tres index 311a273..bf5d044 100644 --- a/levelOne/tileMaps/baseTileset.tres +++ b/levels/levelOne/tileMaps/baseTileset.tres @@ -1,6 +1,6 @@ [gd_resource type="TileSet" load_steps=3 format=3 uid="uid://xnedi1edel2b"] -[ext_resource type="Texture2D" uid="uid://crq1khxt7g4f" path="res://levelOne/tileMaps/sprCave.png" id="1_eg6gv"] +[ext_resource type="Texture2D" uid="uid://crq1khxt7g4f" path="res://levels/levelOne/tileMaps/sprCave.png" id="1_eg6gv"] [sub_resource type="TileSetAtlasSource" id="TileSetAtlasSource_kjlji"] texture = ExtResource("1_eg6gv") diff --git a/levelOne/tileMaps/sprCave.png b/levels/levelOne/tileMaps/sprCave.png similarity index 100% rename from levelOne/tileMaps/sprCave.png rename to levels/levelOne/tileMaps/sprCave.png diff --git a/levelOne/tileMaps/sprCave.png.import b/levels/levelOne/tileMaps/sprCave.png.import similarity index 71% rename from levelOne/tileMaps/sprCave.png.import rename to levels/levelOne/tileMaps/sprCave.png.import index 89bfed9..cbd63f5 100644 --- a/levelOne/tileMaps/sprCave.png.import +++ b/levels/levelOne/tileMaps/sprCave.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://crq1khxt7g4f" -path="res://.godot/imported/sprCave.png-b3ab94739c0d777d15e40c72933233c3.ctex" +path="res://.godot/imported/sprCave.png-f0f0a10a0ecc9fc6db2b7270814e7435.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://levelOne/tileMaps/sprCave.png" -dest_files=["res://.godot/imported/sprCave.png-b3ab94739c0d777d15e40c72933233c3.ctex"] +source_file="res://levels/levelOne/tileMaps/sprCave.png" +dest_files=["res://.godot/imported/sprCave.png-f0f0a10a0ecc9fc6db2b7270814e7435.ctex"] [params] diff --git a/triggers/exitZone3.tscn b/levels/levelThree/exitZone3.tscn similarity index 83% rename from triggers/exitZone3.tscn rename to levels/levelThree/exitZone3.tscn index 582e2f3..c4d8a00 100644 --- a/triggers/exitZone3.tscn +++ b/levels/levelThree/exitZone3.tscn @@ -1,6 +1,6 @@ -[gd_scene load_steps=3 format=3 uid="uid://8f5ju5hv8elk"] +[gd_scene load_steps=3 format=3 uid="uid://iui8sgglpc55"] -[ext_resource type="Script" uid="uid://b0brgicfdcox0" path="res://triggers/exit_zone3.gd" id="1_pekjb"] +[ext_resource type="Script" uid="uid://b0brgicfdcox0" path="res://levels/levelThree/exit_zone3.gd" id="1_pekjb"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_jhhth"] size = Vector2(32, 29) diff --git a/triggers/exit_zone3.gd b/levels/levelThree/exit_zone3.gd similarity index 72% rename from triggers/exit_zone3.gd rename to levels/levelThree/exit_zone3.gd index 072b506..a191df3 100644 --- a/triggers/exit_zone3.gd +++ b/levels/levelThree/exit_zone3.gd @@ -1,5 +1,6 @@ extends Area2D +var planetThree = preload("res://planets/planetThree/planetThree.tscn") var activated: bool = false func _ready() -> void: @@ -12,4 +13,4 @@ func levelComplete(): func _on_body_entered(body: Node2D) -> void: if activated: - get_tree().change_scene_to_file(" ") + get_tree().change_scene_to_packed(planetThree) diff --git a/triggers/exit_zone3.gd.uid b/levels/levelThree/exit_zone3.gd.uid similarity index 100% rename from triggers/exit_zone3.gd.uid rename to levels/levelThree/exit_zone3.gd.uid diff --git a/levelThree/levelThree.tscn b/levels/levelThree/levelThree.tscn similarity index 98% rename from levelThree/levelThree.tscn rename to levels/levelThree/levelThree.tscn index 3be4120..5d19103 100644 --- a/levelThree/levelThree.tscn +++ b/levels/levelThree/levelThree.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=4 uid="uid://fnblp2yeolag"] -[ext_resource type="TileSet" uid="uid://xnedi1edel2b" path="res://levelOne/tileMaps/baseTileset.tres" id="1_cg7oj"] +[ext_resource type="TileSet" uid="uid://xnedi1edel2b" path="res://levels/levelOne/tileMaps/baseTileset.tres" id="1_cg7oj"] [ext_resource type="PackedScene" uid="uid://darxbklsgh23m" path="res://collectables/crystal/collectableCrystal.tscn" id="2_gc6ab"] [ext_resource type="PackedScene" uid="uid://c1xy5bf2p6vmh" path="res://player/smallPlayer/player.tscn" id="2_kpb6v"] -[ext_resource type="PackedScene" uid="uid://8f5ju5hv8elk" path="res://triggers/exitZone3.tscn" id="3_eac2n"] +[ext_resource type="PackedScene" uid="uid://iui8sgglpc55" path="res://levels/levelThree/exitZone3.tscn" id="3_eac2n"] [node name="LevelThree" type="Node2D"] diff --git a/triggers/exitZone2.tscn b/levels/levelTwo/exitZone2.tscn similarity index 87% rename from triggers/exitZone2.tscn rename to levels/levelTwo/exitZone2.tscn index fc9f094..e829a41 100644 --- a/triggers/exitZone2.tscn +++ b/levels/levelTwo/exitZone2.tscn @@ -1,6 +1,6 @@ [gd_scene load_steps=3 format=3 uid="uid://c0h3r0ot5jeds"] -[ext_resource type="Script" uid="uid://b2wo3pho6jsk3" path="res://triggers/exit_zone2.gd" id="1_u53oi"] +[ext_resource type="Script" uid="uid://b2wo3pho6jsk3" path="res://levels/levelTwo/exit_zone2.gd" id="1_i04ng"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_jhhth"] size = Vector2(32, 29) @@ -9,7 +9,7 @@ size = Vector2(32, 29) [node name="exitZone" type="Area2D" parent="."] position = Vector2(14, -18) -script = ExtResource("1_u53oi") +script = ExtResource("1_i04ng") [node name="CollisionShape2D" type="CollisionShape2D" parent="exitZone"] position = Vector2(-14, 18) diff --git a/triggers/exit_zone2.gd b/levels/levelTwo/exit_zone2.gd similarity index 74% rename from triggers/exit_zone2.gd rename to levels/levelTwo/exit_zone2.gd index 798c920..6e04202 100644 --- a/triggers/exit_zone2.gd +++ b/levels/levelTwo/exit_zone2.gd @@ -1,5 +1,6 @@ extends Area2D +var planetTwo = preload("res://planets/planetTwo/planetTwo.tscn") var activated: bool = false func _ready() -> void: @@ -12,4 +13,4 @@ func levelComplete(): func _on_body_entered(body: Node2D) -> void: if activated: - get_tree().change_scene_to_file("res://planetScene/planetTwo/planetTwo.tscn") + get_tree().change_scene_to_packed(planetTwo) diff --git a/triggers/exit_zone2.gd.uid b/levels/levelTwo/exit_zone2.gd.uid similarity index 100% rename from triggers/exit_zone2.gd.uid rename to levels/levelTwo/exit_zone2.gd.uid diff --git a/levelTwo/levelTwo.tscn b/levels/levelTwo/levelTwo.tscn similarity index 99% rename from levelTwo/levelTwo.tscn rename to levels/levelTwo/levelTwo.tscn index c0dbf63..49f2beb 100644 --- a/levelTwo/levelTwo.tscn +++ b/levels/levelTwo/levelTwo.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=4 uid="uid://dyw7tstsgsla5"] -[ext_resource type="TileSet" uid="uid://xnedi1edel2b" path="res://levelOne/tileMaps/baseTileset.tres" id="1_o24rn"] +[ext_resource type="TileSet" uid="uid://xnedi1edel2b" path="res://levels/levelOne/tileMaps/baseTileset.tres" id="1_o24rn"] [ext_resource type="PackedScene" uid="uid://c1xy5bf2p6vmh" path="res://player/smallPlayer/player.tscn" id="2_6qs84"] [ext_resource type="PackedScene" uid="uid://darxbklsgh23m" path="res://collectables/crystal/collectableCrystal.tscn" id="3_34lfb"] -[ext_resource type="PackedScene" uid="uid://c0h3r0ot5jeds" path="res://triggers/exitZone2.tscn" id="4_34lfb"] +[ext_resource type="PackedScene" uid="uid://c0h3r0ot5jeds" path="res://levels/levelTwo/exitZone2.tscn" id="4_34lfb"] [node name="LevelTwo" type="Node2D"] diff --git a/planetScene/planetOne/caveEntranceOne.gd b/planetScene/planetOne/caveEntranceOne.gd deleted file mode 100644 index e3d9205..0000000 --- a/planetScene/planetOne/caveEntranceOne.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Area2D - - -func _on_body_entered(body: Node2D) -> void: - get_tree().change_scene_to_file("res://levelTwo/levelTwo.tscn") diff --git a/planetScene/planetThree/caveEntranceThree.gd b/planetScene/planetThree/caveEntranceThree.gd deleted file mode 100644 index 2a9d4da..0000000 --- a/planetScene/planetThree/caveEntranceThree.gd +++ /dev/null @@ -1,6 +0,0 @@ -extends Area2D - - -func _on_body_entered(body: Node2D) -> void: - print ("Entering levelFINAL") - # get_tree().change_scene_to_file("res://levelTwo/levelTwo.tscn") diff --git a/planetScene/planetTwo/caveEntranceTwo.gd b/planetScene/planetTwo/caveEntranceTwo.gd deleted file mode 100644 index 9ee9cbd..0000000 --- a/planetScene/planetTwo/caveEntranceTwo.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Area2D - - -func _on_body_entered(body: Node2D) -> void: - get_tree().change_scene_to_file("res://levelThree/levelThree.tscn") diff --git a/planetScene/background/space-seamless.png b/planets/background/space-seamless.png similarity index 100% rename from planetScene/background/space-seamless.png rename to planets/background/space-seamless.png diff --git a/planetScene/background/space-seamless.png.import b/planets/background/space-seamless.png.import similarity index 69% rename from planetScene/background/space-seamless.png.import rename to planets/background/space-seamless.png.import index b78d50e..a094ff6 100644 --- a/planetScene/background/space-seamless.png.import +++ b/planets/background/space-seamless.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cuv6yxysv620e" -path="res://.godot/imported/space-seamless.png-71e9f1988090d7c148f99574986241e4.ctex" +path="res://.godot/imported/space-seamless.png-a0253cc358d301494381f5297b4ab03c.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/background/space-seamless.png" -dest_files=["res://.godot/imported/space-seamless.png-71e9f1988090d7c148f99574986241e4.ctex"] +source_file="res://planets/background/space-seamless.png" +dest_files=["res://.godot/imported/space-seamless.png-a0253cc358d301494381f5297b4ab03c.ctex"] [params] diff --git a/planetScene/background/textureRotate.gd b/planets/background/textureRotate.gd similarity index 100% rename from planetScene/background/textureRotate.gd rename to planets/background/textureRotate.gd diff --git a/planetScene/background/textureRotate.gd.uid b/planets/background/textureRotate.gd.uid similarity index 100% rename from planetScene/background/textureRotate.gd.uid rename to planets/background/textureRotate.gd.uid diff --git a/planets/planetOne/caveEntranceOne.gd b/planets/planetOne/caveEntranceOne.gd new file mode 100644 index 0000000..6d0a932 --- /dev/null +++ b/planets/planetOne/caveEntranceOne.gd @@ -0,0 +1,6 @@ +extends Area2D + +var levelTwo = preload("res://levels/levelTwo/levelTwo.tscn") + +func _on_body_entered(body: Node2D) -> void: + get_tree().change_scene_to_packed(levelTwo) diff --git a/planetScene/planetOne/caveEntranceOne.gd.uid b/planets/planetOne/caveEntranceOne.gd.uid similarity index 100% rename from planetScene/planetOne/caveEntranceOne.gd.uid rename to planets/planetOne/caveEntranceOne.gd.uid diff --git a/planetScene/planetOne/planetOne.tscn b/planets/planetOne/planetOne.tscn similarity index 92% rename from planetScene/planetOne/planetOne.tscn rename to planets/planetOne/planetOne.tscn index 55feb88..db38039 100644 --- a/planetScene/planetOne/planetOne.tscn +++ b/planets/planetOne/planetOne.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=20 format=3 uid="uid://dh0lvt4eb1x5s"] -[ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planetScene/background/space-seamless.png" id="1_pfjy3"] -[ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planetScene/background/textureRotate.gd" id="2_tvkms"] -[ext_resource type="Texture2D" uid="uid://btgsbvc7gidjq" path="res://planetScene/sprites/planet.png" id="3_6eyof"] -[ext_resource type="Script" uid="uid://b8kcef36xwy7k" path="res://planetScene/planetOne/planet_sprite.gd" id="4_1nrd0"] -[ext_resource type="Script" uid="uid://bxsyec5gcnavv" path="res://planetScene/planetOne/caveEntranceOne.gd" id="5_a476e"] -[ext_resource type="Texture2D" uid="uid://cw30f2tjaigg4" path="res://planetScene/sprites/caveEntrance.png" id="6_qiaui"] +[ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planets/background/space-seamless.png" id="1_pfjy3"] +[ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planets/background/textureRotate.gd" id="2_tvkms"] +[ext_resource type="Texture2D" uid="uid://btgsbvc7gidjq" path="res://planets/sprites/planet.png" id="3_6eyof"] +[ext_resource type="Script" uid="uid://b8kcef36xwy7k" path="res://planets/planetOne/planet_sprite.gd" id="4_1nrd0"] +[ext_resource type="Script" uid="uid://bxsyec5gcnavv" path="res://planets/planetOne/caveEntranceOne.gd" id="5_a476e"] +[ext_resource type="Texture2D" uid="uid://cw30f2tjaigg4" path="res://planets/sprites/caveEntrance.png" id="6_qiaui"] [ext_resource type="Texture2D" uid="uid://dimdd34ldpix5" path="res://player/smallPlayer/playerSprites/playerSprite_0001.png" id="7_7l4lm"] [ext_resource type="Texture2D" uid="uid://cmga6fl4uer1m" path="res://player/smallPlayer/playerSprites/playerSprite_0002.png" id="8_nnmca"] [ext_resource type="Texture2D" uid="uid://cw0ntcoynkr0w" path="res://player/smallPlayer/playerSprites/playerSprite_0003.png" id="9_mofbo"] diff --git a/planetScene/planetOne/planet_sprite.gd b/planets/planetOne/planet_sprite.gd similarity index 100% rename from planetScene/planetOne/planet_sprite.gd rename to planets/planetOne/planet_sprite.gd diff --git a/planetScene/planetOne/planet_sprite.gd.uid b/planets/planetOne/planet_sprite.gd.uid similarity index 100% rename from planetScene/planetOne/planet_sprite.gd.uid rename to planets/planetOne/planet_sprite.gd.uid diff --git a/planets/planetThree/caveEntranceThree.gd b/planets/planetThree/caveEntranceThree.gd new file mode 100644 index 0000000..2aa6481 --- /dev/null +++ b/planets/planetThree/caveEntranceThree.gd @@ -0,0 +1,7 @@ +extends Area2D + +var levelFinal = preload("res://levels/levelFinal/levelFinal.tscn") + +func _on_body_entered(body: Node2D) -> void: + print ("Entering levelFINAL") + get_tree().change_scene_to_packed(levelFinal) diff --git a/planetScene/planetThree/caveEntranceThree.gd.uid b/planets/planetThree/caveEntranceThree.gd.uid similarity index 100% rename from planetScene/planetThree/caveEntranceThree.gd.uid rename to planets/planetThree/caveEntranceThree.gd.uid diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0001.png b/planets/planetThree/finalEntranceSprites/finalEntrance_0001.png similarity index 100% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0001.png rename to planets/planetThree/finalEntranceSprites/finalEntrance_0001.png diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0001.png.import b/planets/planetThree/finalEntranceSprites/finalEntrance_0001.png.import similarity index 66% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0001.png.import rename to planets/planetThree/finalEntranceSprites/finalEntrance_0001.png.import index b043ccf..7ef7685 100644 --- a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0001.png.import +++ b/planets/planetThree/finalEntranceSprites/finalEntrance_0001.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://ccnvk58hhdefa" -path="res://.godot/imported/finalEntrance_0001.png-71e0fc5973c7ed7227796449137227d1.ctex" +path="res://.godot/imported/finalEntrance_0001.png-41070078e3adb6a0e56f8a7eb9ff32ac.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0001.png" -dest_files=["res://.godot/imported/finalEntrance_0001.png-71e0fc5973c7ed7227796449137227d1.ctex"] +source_file="res://planets/planetThree/finalEntranceSprites/finalEntrance_0001.png" +dest_files=["res://.godot/imported/finalEntrance_0001.png-41070078e3adb6a0e56f8a7eb9ff32ac.ctex"] [params] diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0002.png b/planets/planetThree/finalEntranceSprites/finalEntrance_0002.png similarity index 100% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0002.png rename to planets/planetThree/finalEntranceSprites/finalEntrance_0002.png diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0002.png.import b/planets/planetThree/finalEntranceSprites/finalEntrance_0002.png.import similarity index 66% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0002.png.import rename to planets/planetThree/finalEntranceSprites/finalEntrance_0002.png.import index e3e72af..483593c 100644 --- a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0002.png.import +++ b/planets/planetThree/finalEntranceSprites/finalEntrance_0002.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dv14bou2l4rxt" -path="res://.godot/imported/finalEntrance_0002.png-0e028d2ef973d812ed9d63adf84f4631.ctex" +path="res://.godot/imported/finalEntrance_0002.png-196eda2a6bf38cfe0daac55a28824147.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0002.png" -dest_files=["res://.godot/imported/finalEntrance_0002.png-0e028d2ef973d812ed9d63adf84f4631.ctex"] +source_file="res://planets/planetThree/finalEntranceSprites/finalEntrance_0002.png" +dest_files=["res://.godot/imported/finalEntrance_0002.png-196eda2a6bf38cfe0daac55a28824147.ctex"] [params] diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0003.png b/planets/planetThree/finalEntranceSprites/finalEntrance_0003.png similarity index 100% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0003.png rename to planets/planetThree/finalEntranceSprites/finalEntrance_0003.png diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0003.png.import b/planets/planetThree/finalEntranceSprites/finalEntrance_0003.png.import similarity index 66% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0003.png.import rename to planets/planetThree/finalEntranceSprites/finalEntrance_0003.png.import index a7836de..84b4f15 100644 --- a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0003.png.import +++ b/planets/planetThree/finalEntranceSprites/finalEntrance_0003.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cfeejuj82yn4f" -path="res://.godot/imported/finalEntrance_0003.png-099dd88966b9f9f5c1c0837b0583994e.ctex" +path="res://.godot/imported/finalEntrance_0003.png-9924ce2956f99ac11fa303c41c02dcc7.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0003.png" -dest_files=["res://.godot/imported/finalEntrance_0003.png-099dd88966b9f9f5c1c0837b0583994e.ctex"] +source_file="res://planets/planetThree/finalEntranceSprites/finalEntrance_0003.png" +dest_files=["res://.godot/imported/finalEntrance_0003.png-9924ce2956f99ac11fa303c41c02dcc7.ctex"] [params] diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0004.png b/planets/planetThree/finalEntranceSprites/finalEntrance_0004.png similarity index 100% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0004.png rename to planets/planetThree/finalEntranceSprites/finalEntrance_0004.png diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0004.png.import b/planets/planetThree/finalEntranceSprites/finalEntrance_0004.png.import similarity index 66% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0004.png.import rename to planets/planetThree/finalEntranceSprites/finalEntrance_0004.png.import index 1974bed..a6e6e5e 100644 --- a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0004.png.import +++ b/planets/planetThree/finalEntranceSprites/finalEntrance_0004.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://clm5uidp5crng" -path="res://.godot/imported/finalEntrance_0004.png-c170a51a5857a4ef832dde61a1c3945c.ctex" +path="res://.godot/imported/finalEntrance_0004.png-eb9b9145a4f3b2cfb9ba654fcd21339d.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0004.png" -dest_files=["res://.godot/imported/finalEntrance_0004.png-c170a51a5857a4ef832dde61a1c3945c.ctex"] +source_file="res://planets/planetThree/finalEntranceSprites/finalEntrance_0004.png" +dest_files=["res://.godot/imported/finalEntrance_0004.png-eb9b9145a4f3b2cfb9ba654fcd21339d.ctex"] [params] diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0005.png b/planets/planetThree/finalEntranceSprites/finalEntrance_0005.png similarity index 100% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0005.png rename to planets/planetThree/finalEntranceSprites/finalEntrance_0005.png diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0005.png.import b/planets/planetThree/finalEntranceSprites/finalEntrance_0005.png.import similarity index 66% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0005.png.import rename to planets/planetThree/finalEntranceSprites/finalEntrance_0005.png.import index 16dc33a..202bc3e 100644 --- a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0005.png.import +++ b/planets/planetThree/finalEntranceSprites/finalEntrance_0005.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://n0yxuloamnl3" -path="res://.godot/imported/finalEntrance_0005.png-ea90fa085cb0c6f6c2968d5f208ff555.ctex" +path="res://.godot/imported/finalEntrance_0005.png-b4c772029f3dc6ba391f9a111253e66e.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0005.png" -dest_files=["res://.godot/imported/finalEntrance_0005.png-ea90fa085cb0c6f6c2968d5f208ff555.ctex"] +source_file="res://planets/planetThree/finalEntranceSprites/finalEntrance_0005.png" +dest_files=["res://.godot/imported/finalEntrance_0005.png-b4c772029f3dc6ba391f9a111253e66e.ctex"] [params] diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0006.png b/planets/planetThree/finalEntranceSprites/finalEntrance_0006.png similarity index 100% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0006.png rename to planets/planetThree/finalEntranceSprites/finalEntrance_0006.png diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0006.png.import b/planets/planetThree/finalEntranceSprites/finalEntrance_0006.png.import similarity index 66% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0006.png.import rename to planets/planetThree/finalEntranceSprites/finalEntrance_0006.png.import index 9c57ce3..2e9b695 100644 --- a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0006.png.import +++ b/planets/planetThree/finalEntranceSprites/finalEntrance_0006.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cp2danr5fkc7p" -path="res://.godot/imported/finalEntrance_0006.png-970950cb7dce90b6e765de113f65e5bc.ctex" +path="res://.godot/imported/finalEntrance_0006.png-25c726db0873146021d4e039e7f1e9d5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0006.png" -dest_files=["res://.godot/imported/finalEntrance_0006.png-970950cb7dce90b6e765de113f65e5bc.ctex"] +source_file="res://planets/planetThree/finalEntranceSprites/finalEntrance_0006.png" +dest_files=["res://.godot/imported/finalEntrance_0006.png-25c726db0873146021d4e039e7f1e9d5.ctex"] [params] diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0007.png b/planets/planetThree/finalEntranceSprites/finalEntrance_0007.png similarity index 100% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0007.png rename to planets/planetThree/finalEntranceSprites/finalEntrance_0007.png diff --git a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0007.png.import b/planets/planetThree/finalEntranceSprites/finalEntrance_0007.png.import similarity index 66% rename from planetScene/planetThree/finalEntranceSprites/finalEntrance_0007.png.import rename to planets/planetThree/finalEntranceSprites/finalEntrance_0007.png.import index a07957b..acef017 100644 --- a/planetScene/planetThree/finalEntranceSprites/finalEntrance_0007.png.import +++ b/planets/planetThree/finalEntranceSprites/finalEntrance_0007.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://ban1l5iyt10eo" -path="res://.godot/imported/finalEntrance_0007.png-9c1d79c0119ed8cb8f911e531144408b.ctex" +path="res://.godot/imported/finalEntrance_0007.png-388321654ff9cec03127fb9e3f895cc7.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0007.png" -dest_files=["res://.godot/imported/finalEntrance_0007.png-9c1d79c0119ed8cb8f911e531144408b.ctex"] +source_file="res://planets/planetThree/finalEntranceSprites/finalEntrance_0007.png" +dest_files=["res://.godot/imported/finalEntrance_0007.png-388321654ff9cec03127fb9e3f895cc7.ctex"] [params] diff --git a/planetScene/planetThree/planetThree.tscn b/planets/planetThree/planetThree.tscn similarity index 84% rename from planetScene/planetThree/planetThree.tscn rename to planets/planetThree/planetThree.tscn index 12a9dba..68d35e9 100644 --- a/planetScene/planetThree/planetThree.tscn +++ b/planets/planetThree/planetThree.tscn @@ -1,24 +1,24 @@ [gd_scene load_steps=28 format=3 uid="uid://bw0pg86y720j"] -[ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planetScene/background/space-seamless.png" id="1_baac1"] -[ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planetScene/background/textureRotate.gd" id="2_y1spn"] -[ext_resource type="Texture2D" uid="uid://btgsbvc7gidjq" path="res://planetScene/sprites/planet.png" id="3_43s7y"] -[ext_resource type="Script" uid="uid://b8kcef36xwy7k" path="res://planetScene/planetOne/planet_sprite.gd" id="4_yousq"] -[ext_resource type="Script" uid="uid://cqqxyv3c0ou2l" path="res://planetScene/planetThree/caveEntranceThree.gd" id="5_mm2nt"] -[ext_resource type="Texture2D" uid="uid://cw30f2tjaigg4" path="res://planetScene/sprites/caveEntrance.png" id="6_803x4"] -[ext_resource type="Texture2D" uid="uid://ccnvk58hhdefa" path="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0001.png" id="6_mm2nt"] -[ext_resource type="Texture2D" uid="uid://dv14bou2l4rxt" path="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0002.png" id="7_e4obg"] +[ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planets/background/space-seamless.png" id="1_baac1"] +[ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planets/background/textureRotate.gd" id="2_y1spn"] +[ext_resource type="Texture2D" uid="uid://btgsbvc7gidjq" path="res://planets/sprites/planet.png" id="3_43s7y"] +[ext_resource type="Script" uid="uid://b8kcef36xwy7k" path="res://planets/planetOne/planet_sprite.gd" id="4_yousq"] +[ext_resource type="Script" uid="uid://cqqxyv3c0ou2l" path="res://planets/planetThree/caveEntranceThree.gd" id="5_mm2nt"] +[ext_resource type="Texture2D" uid="uid://cw30f2tjaigg4" path="res://planets/sprites/caveEntrance.png" id="6_803x4"] +[ext_resource type="Texture2D" uid="uid://ccnvk58hhdefa" path="res://planets/planetThree/finalEntranceSprites/finalEntrance_0001.png" id="6_mm2nt"] +[ext_resource type="Texture2D" uid="uid://dv14bou2l4rxt" path="res://planets/planetThree/finalEntranceSprites/finalEntrance_0002.png" id="7_e4obg"] [ext_resource type="Texture2D" uid="uid://dimdd34ldpix5" path="res://player/smallPlayer/playerSprites/playerSprite_0001.png" id="7_rknhx"] -[ext_resource type="Texture2D" uid="uid://cfeejuj82yn4f" path="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0003.png" id="8_bkq8h"] +[ext_resource type="Texture2D" uid="uid://cfeejuj82yn4f" path="res://planets/planetThree/finalEntranceSprites/finalEntrance_0003.png" id="8_bkq8h"] [ext_resource type="Texture2D" uid="uid://cmga6fl4uer1m" path="res://player/smallPlayer/playerSprites/playerSprite_0002.png" id="8_mm2nt"] -[ext_resource type="Texture2D" uid="uid://clm5uidp5crng" path="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0004.png" id="9_0a5f7"] +[ext_resource type="Texture2D" uid="uid://clm5uidp5crng" path="res://planets/planetThree/finalEntranceSprites/finalEntrance_0004.png" id="9_0a5f7"] [ext_resource type="Texture2D" uid="uid://cw0ntcoynkr0w" path="res://player/smallPlayer/playerSprites/playerSprite_0003.png" id="9_e4obg"] -[ext_resource type="Texture2D" uid="uid://n0yxuloamnl3" path="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0005.png" id="10_abjb2"] +[ext_resource type="Texture2D" uid="uid://n0yxuloamnl3" path="res://planets/planetThree/finalEntranceSprites/finalEntrance_0005.png" id="10_abjb2"] [ext_resource type="Texture2D" uid="uid://dt3rv4x30n4ru" path="res://player/smallPlayer/playerSprites/playerSprite_0004.png" id="10_bkq8h"] [ext_resource type="Texture2D" uid="uid://bvnodga8epycb" path="res://player/smallPlayer/playerSprites/playerSprite_0005.png" id="11_0a5f7"] -[ext_resource type="Texture2D" uid="uid://cp2danr5fkc7p" path="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0006.png" id="11_0olys"] +[ext_resource type="Texture2D" uid="uid://cp2danr5fkc7p" path="res://planets/planetThree/finalEntranceSprites/finalEntrance_0006.png" id="11_0olys"] [ext_resource type="Texture2D" uid="uid://d5qpoa8wadrp" path="res://player/smallPlayer/playerSprites/playerSprite_0006.png" id="12_abjb2"] -[ext_resource type="Texture2D" uid="uid://ban1l5iyt10eo" path="res://planetScene/planetThree/finalEntranceSprites/finalEntrance_0007.png" id="12_s7fta"] +[ext_resource type="Texture2D" uid="uid://ban1l5iyt10eo" path="res://planets/planetThree/finalEntranceSprites/finalEntrance_0007.png" id="12_s7fta"] [ext_resource type="Texture2D" uid="uid://jfhpkm78lqyx" path="res://player/smallPlayer/playerSprites/playerSprite_0007.png" id="13_0olys"] [ext_resource type="Texture2D" uid="uid://jssqmb4832pr" path="res://player/smallPlayer/playerSprites/playerSprite_0008.png" id="14_s7fta"] [ext_resource type="Texture2D" uid="uid://dxeg6715vly1v" path="res://player/smallPlayer/playerSprites/playerSprite_0009.png" id="15_hrtuk"] diff --git a/planetScene/planetThree/planet_sprite.gd b/planets/planetThree/planet_sprite.gd similarity index 100% rename from planetScene/planetThree/planet_sprite.gd rename to planets/planetThree/planet_sprite.gd diff --git a/planetScene/planetThree/planet_sprite.gd.uid b/planets/planetThree/planet_sprite.gd.uid similarity index 100% rename from planetScene/planetThree/planet_sprite.gd.uid rename to planets/planetThree/planet_sprite.gd.uid diff --git a/planets/planetTwo/caveEntranceTwo.gd b/planets/planetTwo/caveEntranceTwo.gd new file mode 100644 index 0000000..c935565 --- /dev/null +++ b/planets/planetTwo/caveEntranceTwo.gd @@ -0,0 +1,6 @@ +extends Area2D + +var levelThree = preload("res://levels/levelThree/levelThree.tscn") + +func _on_body_entered(body: Node2D) -> void: + get_tree().change_scene_to_packed(levelThree) diff --git a/planetScene/planetTwo/caveEntranceTwo.gd.uid b/planets/planetTwo/caveEntranceTwo.gd.uid similarity index 100% rename from planetScene/planetTwo/caveEntranceTwo.gd.uid rename to planets/planetTwo/caveEntranceTwo.gd.uid diff --git a/planetScene/planetTwo/planetTwo.tscn b/planets/planetTwo/planetTwo.tscn similarity index 92% rename from planetScene/planetTwo/planetTwo.tscn rename to planets/planetTwo/planetTwo.tscn index 8605ff6..982f8c1 100644 --- a/planetScene/planetTwo/planetTwo.tscn +++ b/planets/planetTwo/planetTwo.tscn @@ -1,11 +1,11 @@ [gd_scene load_steps=20 format=3 uid="uid://djwdtavyh4ts1"] -[ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planetScene/background/space-seamless.png" id="1_qoowv"] -[ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planetScene/background/textureRotate.gd" id="2_kt3hf"] -[ext_resource type="Texture2D" uid="uid://btgsbvc7gidjq" path="res://planetScene/sprites/planet.png" id="3_v8bam"] -[ext_resource type="Script" uid="uid://b8kcef36xwy7k" path="res://planetScene/planetOne/planet_sprite.gd" id="4_ondy7"] -[ext_resource type="Script" uid="uid://dv7jbphcsma8q" path="res://planetScene/planetTwo/caveEntranceTwo.gd" id="5_gqxmi"] -[ext_resource type="Texture2D" uid="uid://cw30f2tjaigg4" path="res://planetScene/sprites/caveEntrance.png" id="6_y8axt"] +[ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planets/background/space-seamless.png" id="1_qoowv"] +[ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planets/background/textureRotate.gd" id="2_kt3hf"] +[ext_resource type="Texture2D" uid="uid://btgsbvc7gidjq" path="res://planets/sprites/planet.png" id="3_v8bam"] +[ext_resource type="Script" uid="uid://b8kcef36xwy7k" path="res://planets/planetOne/planet_sprite.gd" id="4_ondy7"] +[ext_resource type="Script" uid="uid://dv7jbphcsma8q" path="res://planets/planetTwo/caveEntranceTwo.gd" id="5_gqxmi"] +[ext_resource type="Texture2D" uid="uid://cw30f2tjaigg4" path="res://planets/sprites/caveEntrance.png" id="6_y8axt"] [ext_resource type="Texture2D" uid="uid://dimdd34ldpix5" path="res://player/smallPlayer/playerSprites/playerSprite_0001.png" id="7_40t4w"] [ext_resource type="Texture2D" uid="uid://cmga6fl4uer1m" path="res://player/smallPlayer/playerSprites/playerSprite_0002.png" id="8_jdc1j"] [ext_resource type="Texture2D" uid="uid://cw0ntcoynkr0w" path="res://player/smallPlayer/playerSprites/playerSprite_0003.png" id="9_we8pr"] diff --git a/planetScene/planetTwo/planet_sprite.gd b/planets/planetTwo/planet_sprite.gd similarity index 100% rename from planetScene/planetTwo/planet_sprite.gd rename to planets/planetTwo/planet_sprite.gd diff --git a/planetScene/planetTwo/planet_sprite.gd.uid b/planets/planetTwo/planet_sprite.gd.uid similarity index 100% rename from planetScene/planetTwo/planet_sprite.gd.uid rename to planets/planetTwo/planet_sprite.gd.uid diff --git a/planetScene/sprites/caveEntrance.png b/planets/sprites/caveEntrance.png similarity index 100% rename from planetScene/sprites/caveEntrance.png rename to planets/sprites/caveEntrance.png diff --git a/planetScene/sprites/caveEntrance.png.import b/planets/sprites/caveEntrance.png.import similarity index 70% rename from planetScene/sprites/caveEntrance.png.import rename to planets/sprites/caveEntrance.png.import index 6ae9dcd..831bc96 100644 --- a/planetScene/sprites/caveEntrance.png.import +++ b/planets/sprites/caveEntrance.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cw30f2tjaigg4" -path="res://.godot/imported/caveEntrance.png-f17020c2575bf3e45bc088cb96565c91.ctex" +path="res://.godot/imported/caveEntrance.png-bc35003457cf75a546b67144fee0f4c7.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/sprites/caveEntrance.png" -dest_files=["res://.godot/imported/caveEntrance.png-f17020c2575bf3e45bc088cb96565c91.ctex"] +source_file="res://planets/sprites/caveEntrance.png" +dest_files=["res://.godot/imported/caveEntrance.png-bc35003457cf75a546b67144fee0f4c7.ctex"] [params] diff --git a/planetScene/sprites/planet.png b/planets/sprites/planet.png similarity index 100% rename from planetScene/sprites/planet.png rename to planets/sprites/planet.png diff --git a/planetScene/sprites/planet.png.import b/planets/sprites/planet.png.import similarity index 72% rename from planetScene/sprites/planet.png.import rename to planets/sprites/planet.png.import index 7615355..9fd619b 100644 --- a/planetScene/sprites/planet.png.import +++ b/planets/sprites/planet.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://btgsbvc7gidjq" -path="res://.godot/imported/planet.png-5f359934615d3bf0d215cab13dfc7ead.ctex" +path="res://.godot/imported/planet.png-d3b919ff75b70152475cb6c0d6a10ad4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/sprites/planet.png" -dest_files=["res://.godot/imported/planet.png-5f359934615d3bf0d215cab13dfc7ead.ctex"] +source_file="res://planets/sprites/planet.png" +dest_files=["res://.godot/imported/planet.png-d3b919ff75b70152475cb6c0d6a10ad4.ctex"] [params] diff --git a/player/smallPlayer/player.tscn b/player/smallPlayer/player.tscn index 6397e22..fcdf7f9 100644 --- a/player/smallPlayer/player.tscn +++ b/player/smallPlayer/player.tscn @@ -67,6 +67,7 @@ frame_progress = 0.910845 shape = SubResource("RectangleShape2D_i3pqv") [node name="Camera2D" type="Camera2D" parent="."] +zoom = Vector2(1.885, 1.885) position_smoothing_enabled = true position_smoothing_speed = 10.0 diff --git a/startMenu/start_game.gd b/startMenu/start_game.gd index 518b829..1b8c448 100644 --- a/startMenu/start_game.gd +++ b/startMenu/start_game.gd @@ -1,4 +1,6 @@ extends Button +@onready var levelOne = preload("res://levels/levelOne/levelOne.tscn") + func _on_pressed() -> void: - get_tree().change_scene_to_file("res://levelOne/startLevel.tscn") + get_tree().change_scene_to_packed(levelOne)