diff --git a/planetScene/cave_entrance.gd b/planetScene/planetOne/caveEntranceOne.gd similarity index 100% rename from planetScene/cave_entrance.gd rename to planetScene/planetOne/caveEntranceOne.gd diff --git a/planetScene/cave_entrance.gd.uid b/planetScene/planetOne/caveEntranceOne.gd.uid similarity index 100% rename from planetScene/cave_entrance.gd.uid rename to planetScene/planetOne/caveEntranceOne.gd.uid diff --git a/planetScene/planet.tscn b/planetScene/planetOne/planetOne.tscn similarity index 75% rename from planetScene/planet.tscn rename to planetScene/planetOne/planetOne.tscn index 8cff3ca..55feb88 100644 --- a/planetScene/planet.tscn +++ b/planetScene/planetOne/planetOne.tscn @@ -1,21 +1,21 @@ [gd_scene load_steps=20 format=3 uid="uid://dh0lvt4eb1x5s"] -[ext_resource type="Texture2D" uid="uid://btgsbvc7gidjq" path="res://planetScene/planet.png" id="1_6j83a"] -[ext_resource type="Texture2D" uid="uid://cuv6yxysv620e" path="res://planetScene/background/space-seamless.png" id="1_icdcw"] -[ext_resource type="Script" uid="uid://d4crfwu1s5wm1" path="res://planetScene/background/textureRotate.gd" id="2_dp0ko"] -[ext_resource type="Script" uid="uid://b8kcef36xwy7k" path="res://planetScene/planet_sprite.gd" id="2_jgijx"] -[ext_resource type="Texture2D" uid="uid://dimdd34ldpix5" path="res://player/smallPlayer/playerSprites/playerSprite_0001.png" id="3_5cujh"] -[ext_resource type="Texture2D" uid="uid://cmga6fl4uer1m" path="res://player/smallPlayer/playerSprites/playerSprite_0002.png" id="4_icdcw"] -[ext_resource type="Texture2D" uid="uid://cw30f2tjaigg4" path="res://planetScene/caveEntrance.png" id="5_3xb1h"] -[ext_resource type="Texture2D" uid="uid://cw0ntcoynkr0w" path="res://player/smallPlayer/playerSprites/playerSprite_0003.png" id="5_dp0ko"] -[ext_resource type="Script" uid="uid://bxsyec5gcnavv" path="res://planetScene/cave_entrance.gd" id="5_l113b"] -[ext_resource type="Texture2D" uid="uid://dt3rv4x30n4ru" path="res://player/smallPlayer/playerSprites/playerSprite_0004.png" id="6_s4scv"] -[ext_resource type="Texture2D" uid="uid://bvnodga8epycb" path="res://player/smallPlayer/playerSprites/playerSprite_0005.png" id="7_l113b"] -[ext_resource type="Texture2D" uid="uid://d5qpoa8wadrp" path="res://player/smallPlayer/playerSprites/playerSprite_0006.png" id="8_4mgjw"] -[ext_resource type="Texture2D" uid="uid://jfhpkm78lqyx" path="res://player/smallPlayer/playerSprites/playerSprite_0007.png" id="9_e363o"] -[ext_resource type="Texture2D" uid="uid://jssqmb4832pr" path="res://player/smallPlayer/playerSprites/playerSprite_0008.png" id="10_ahaa2"] -[ext_resource type="Texture2D" uid="uid://dxeg6715vly1v" path="res://player/smallPlayer/playerSprites/playerSprite_0009.png" id="11_6fiqi"] -[ext_resource type="Texture2D" uid="uid://b8eut6fnru722" path="res://player/smallPlayer/playerSprites/playerSprite_0010.png" id="12_up3d5"] +[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://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"] +[ext_resource type="Texture2D" uid="uid://dt3rv4x30n4ru" path="res://player/smallPlayer/playerSprites/playerSprite_0004.png" id="10_8w80w"] +[ext_resource type="Texture2D" uid="uid://bvnodga8epycb" path="res://player/smallPlayer/playerSprites/playerSprite_0005.png" id="11_j1p6g"] +[ext_resource type="Texture2D" uid="uid://d5qpoa8wadrp" path="res://player/smallPlayer/playerSprites/playerSprite_0006.png" id="12_8xbhm"] +[ext_resource type="Texture2D" uid="uid://jfhpkm78lqyx" path="res://player/smallPlayer/playerSprites/playerSprite_0007.png" id="13_da24w"] +[ext_resource type="Texture2D" uid="uid://jssqmb4832pr" path="res://player/smallPlayer/playerSprites/playerSprite_0008.png" id="14_lept3"] +[ext_resource type="Texture2D" uid="uid://dxeg6715vly1v" path="res://player/smallPlayer/playerSprites/playerSprite_0009.png" id="15_4smcn"] +[ext_resource type="Texture2D" uid="uid://b8eut6fnru722" path="res://player/smallPlayer/playerSprites/playerSprite_0010.png" id="16_r40ym"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_3xb1h"] size = Vector2(40, 36.5) @@ -24,34 +24,34 @@ size = Vector2(40, 36.5) animations = [{ "frames": [{ "duration": 1.0, -"texture": ExtResource("3_5cujh") +"texture": ExtResource("7_7l4lm") }, { "duration": 1.0, -"texture": ExtResource("4_icdcw") +"texture": ExtResource("8_nnmca") }, { "duration": 1.0, -"texture": ExtResource("5_dp0ko") +"texture": ExtResource("9_mofbo") }, { "duration": 1.0, -"texture": ExtResource("6_s4scv") +"texture": ExtResource("10_8w80w") }, { "duration": 1.0, -"texture": ExtResource("7_l113b") +"texture": ExtResource("11_j1p6g") }, { "duration": 1.0, -"texture": ExtResource("8_4mgjw") +"texture": ExtResource("12_8xbhm") }, { "duration": 1.0, -"texture": ExtResource("9_e363o") +"texture": ExtResource("13_da24w") }, { "duration": 1.0, -"texture": ExtResource("10_ahaa2") +"texture": ExtResource("14_lept3") }, { "duration": 1.0, -"texture": ExtResource("11_6fiqi") +"texture": ExtResource("15_4smcn") }, { "duration": 1.0, -"texture": ExtResource("12_up3d5") +"texture": ExtResource("16_r40ym") }], "loop": true, "name": &"default", @@ -68,32 +68,37 @@ offset_top = -538.0 offset_right = 2088.0 offset_bottom = 2077.0 pivot_offset = Vector2(1411, 1294) -texture = ExtResource("1_icdcw") +texture = ExtResource("1_pfjy3") stretch_mode = 1 -script = ExtResource("2_dp0ko") +script = ExtResource("2_tvkms") [node name="planetSprite" type="Sprite2D" parent="."] position = Vector2(575, 786) scale = Vector2(4.53252, 4.53252) -texture = ExtResource("1_6j83a") +texture = ExtResource("3_6eyof") offset = Vector2(0.2, 0.23) -script = ExtResource("2_jgijx") +script = ExtResource("4_1nrd0") [node name="caveEntrance" type="Area2D" parent="planetSprite"] position = Vector2(-126.861, -173.413) scale = Vector2(0.220628, 0.220628) -script = ExtResource("5_l113b") +script = ExtResource("5_a476e") [node name="Sprite2D" type="Sprite2D" parent="planetSprite/caveEntrance"] position = Vector2(88, 652) rotation = -1.36127 scale = Vector2(0.528808, 0.528808) -texture = ExtResource("5_3xb1h") +texture = ExtResource("6_qiaui") [node name="CollisionShape2D" type="CollisionShape2D" parent="planetSprite/caveEntrance"] position = Vector2(99, 653) shape = SubResource("RectangleShape2D_3xb1h") +[node name="caveExit" type="Sprite2D" parent="planetSprite"] +position = Vector2(-0.220625, -110.976) +scale = Vector2(0.105828, 0.105828) +texture = ExtResource("6_qiaui") + [node name="playerModel" type="StaticBody2D" parent="."] position = Vector2(573, 300) diff --git a/planetScene/planet_sprite.gd b/planetScene/planetOne/planet_sprite.gd similarity index 100% rename from planetScene/planet_sprite.gd rename to planetScene/planetOne/planet_sprite.gd diff --git a/planetScene/planet_sprite.gd.uid b/planetScene/planetOne/planet_sprite.gd.uid similarity index 100% rename from planetScene/planet_sprite.gd.uid rename to planetScene/planetOne/planet_sprite.gd.uid diff --git a/planetScene/planetTwo/caveEntranceTwo.gd b/planetScene/planetTwo/caveEntranceTwo.gd new file mode 100644 index 0000000..e3d9205 --- /dev/null +++ b/planetScene/planetTwo/caveEntranceTwo.gd @@ -0,0 +1,5 @@ +extends Area2D + + +func _on_body_entered(body: Node2D) -> void: + get_tree().change_scene_to_file("res://levelTwo/levelTwo.tscn") diff --git a/planetScene/planetTwo/caveEntranceTwo.gd.uid b/planetScene/planetTwo/caveEntranceTwo.gd.uid new file mode 100644 index 0000000..b212bb0 --- /dev/null +++ b/planetScene/planetTwo/caveEntranceTwo.gd.uid @@ -0,0 +1 @@ +uid://dv7jbphcsma8q diff --git a/planetScene/planetTwo/planetTwo.tscn b/planetScene/planetTwo/planetTwo.tscn new file mode 100644 index 0000000..8d23f9e --- /dev/null +++ b/planetScene/planetTwo/planetTwo.tscn @@ -0,0 +1,115 @@ +[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://bxsyec5gcnavv" path="res://planetScene/planetOne/caveEntranceOne.gd" id="5_ouwh6"] +[ext_resource type="Texture2D" uid="uid://cw30f2tjaigg4" path="res://planetScene/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"] +[ext_resource type="Texture2D" uid="uid://dt3rv4x30n4ru" path="res://player/smallPlayer/playerSprites/playerSprite_0004.png" id="10_g7n13"] +[ext_resource type="Texture2D" uid="uid://bvnodga8epycb" path="res://player/smallPlayer/playerSprites/playerSprite_0005.png" id="11_vdufh"] +[ext_resource type="Texture2D" uid="uid://d5qpoa8wadrp" path="res://player/smallPlayer/playerSprites/playerSprite_0006.png" id="12_iiywj"] +[ext_resource type="Texture2D" uid="uid://jfhpkm78lqyx" path="res://player/smallPlayer/playerSprites/playerSprite_0007.png" id="13_6kw41"] +[ext_resource type="Texture2D" uid="uid://jssqmb4832pr" path="res://player/smallPlayer/playerSprites/playerSprite_0008.png" id="14_byiy2"] +[ext_resource type="Texture2D" uid="uid://dxeg6715vly1v" path="res://player/smallPlayer/playerSprites/playerSprite_0009.png" id="15_1oi7f"] +[ext_resource type="Texture2D" uid="uid://b8eut6fnru722" path="res://player/smallPlayer/playerSprites/playerSprite_0010.png" id="16_7tw6i"] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_3xb1h"] +size = Vector2(40, 36.5) + +[sub_resource type="SpriteFrames" id="SpriteFrames_i6oun"] +animations = [{ +"frames": [{ +"duration": 1.0, +"texture": ExtResource("7_40t4w") +}, { +"duration": 1.0, +"texture": ExtResource("8_jdc1j") +}, { +"duration": 1.0, +"texture": ExtResource("9_we8pr") +}, { +"duration": 1.0, +"texture": ExtResource("10_g7n13") +}, { +"duration": 1.0, +"texture": ExtResource("11_vdufh") +}, { +"duration": 1.0, +"texture": ExtResource("12_iiywj") +}, { +"duration": 1.0, +"texture": ExtResource("13_6kw41") +}, { +"duration": 1.0, +"texture": ExtResource("14_byiy2") +}, { +"duration": 1.0, +"texture": ExtResource("15_1oi7f") +}, { +"duration": 1.0, +"texture": ExtResource("16_7tw6i") +}], +"loop": true, +"name": &"default", +"speed": 5.0 +}] + +[sub_resource type="RectangleShape2D" id="RectangleShape2D_dp0ko"] + +[node name="planetScene" type="Node2D"] + +[node name="background" type="TextureRect" parent="."] +offset_left = -835.0 +offset_top = -538.0 +offset_right = 2088.0 +offset_bottom = 2077.0 +pivot_offset = Vector2(1411, 1294) +texture = ExtResource("1_qoowv") +stretch_mode = 1 +script = ExtResource("2_kt3hf") + +[node name="planetSprite" type="Sprite2D" parent="."] +position = Vector2(572, 615) +scale = Vector2(2.90981, 2.90981) +texture = ExtResource("3_v8bam") +offset = Vector2(0.2, 0.23) +script = ExtResource("4_ondy7") + +[node name="caveEntrance" type="Area2D" parent="planetSprite"] +position = Vector2(112.722, 20.9636) +rotation = 3.14159 +scale = Vector2(0.341, 0.341) +script = ExtResource("5_ouwh6") + +[node name="caveSprite" type="Sprite2D" parent="planetSprite/caveEntrance"] +position = Vector2(-1.55765, -6.10352e-05) +rotation = -1.36127 +scale = Vector2(0.528808, 0.528808) +texture = ExtResource("6_y8axt") + +[node name="CollisionShape2D" type="CollisionShape2D" parent="planetSprite/caveEntrance"] +position = Vector2(10.9037, 1.55767) +rotation = 0.220474 +shape = SubResource("RectangleShape2D_3xb1h") + +[node name="caveExit" type="Sprite2D" parent="planetSprite"] +position = Vector2(-74.5753, -77.6683) +rotation = -0.785398 +scale = Vector2(0.0528251, 0.0528251) +texture = ExtResource("6_y8axt") + +[node name="playerModel" type="StaticBody2D" parent="."] +position = Vector2(573, 300) + +[node name="playerSprite" type="AnimatedSprite2D" parent="playerModel"] +sprite_frames = SubResource("SpriteFrames_i6oun") +autoplay = "default" + +[node name="CollisionShape2D" type="CollisionShape2D" parent="playerModel"] +shape = SubResource("RectangleShape2D_dp0ko") + +[connection signal="body_entered" from="planetSprite/caveEntrance" to="planetSprite/caveEntrance" method="_on_body_entered"] diff --git a/planetScene/planetTwo/planet_sprite.gd b/planetScene/planetTwo/planet_sprite.gd new file mode 100644 index 0000000..87966ba --- /dev/null +++ b/planetScene/planetTwo/planet_sprite.gd @@ -0,0 +1,9 @@ +extends Sprite2D + + +# Called when the node enters the scene tree for the first time. +func _physics_process(delta: float): + if Input.is_action_pressed("moveLeft"): + rotate(0.01) + if Input.is_action_pressed("moveRight"): + rotate(-0.01) diff --git a/planetScene/planetTwo/planet_sprite.gd.uid b/planetScene/planetTwo/planet_sprite.gd.uid new file mode 100644 index 0000000..673307c --- /dev/null +++ b/planetScene/planetTwo/planet_sprite.gd.uid @@ -0,0 +1 @@ +uid://cnnp4k3mjj20p diff --git a/planetScene/caveEntrance.png b/planetScene/sprites/caveEntrance.png similarity index 100% rename from planetScene/caveEntrance.png rename to planetScene/sprites/caveEntrance.png diff --git a/planetScene/caveEntrance.png.import b/planetScene/sprites/caveEntrance.png.import similarity index 70% rename from planetScene/caveEntrance.png.import rename to planetScene/sprites/caveEntrance.png.import index 9c39d50..6ae9dcd 100644 --- a/planetScene/caveEntrance.png.import +++ b/planetScene/sprites/caveEntrance.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://cw30f2tjaigg4" -path="res://.godot/imported/caveEntrance.png-b74e5de47ef9f4ee237940ec65d193fa.ctex" +path="res://.godot/imported/caveEntrance.png-f17020c2575bf3e45bc088cb96565c91.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/caveEntrance.png" -dest_files=["res://.godot/imported/caveEntrance.png-b74e5de47ef9f4ee237940ec65d193fa.ctex"] +source_file="res://planetScene/sprites/caveEntrance.png" +dest_files=["res://.godot/imported/caveEntrance.png-f17020c2575bf3e45bc088cb96565c91.ctex"] [params] diff --git a/planetScene/planet.png b/planetScene/sprites/planet.png similarity index 100% rename from planetScene/planet.png rename to planetScene/sprites/planet.png diff --git a/planetScene/planet.png.import b/planetScene/sprites/planet.png.import similarity index 72% rename from planetScene/planet.png.import rename to planetScene/sprites/planet.png.import index 800412b..7615355 100644 --- a/planetScene/planet.png.import +++ b/planetScene/sprites/planet.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://btgsbvc7gidjq" -path="res://.godot/imported/planet.png-e822bf70e388ca590b75493654bc8bdc.ctex" +path="res://.godot/imported/planet.png-5f359934615d3bf0d215cab13dfc7ead.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://planetScene/planet.png" -dest_files=["res://.godot/imported/planet.png-e822bf70e388ca590b75493654bc8bdc.ctex"] +source_file="res://planetScene/sprites/planet.png" +dest_files=["res://.godot/imported/planet.png-5f359934615d3bf0d215cab13dfc7ead.ctex"] [params]