From 545da7be1f7731f70ef82f087e89dd126465b50b Mon Sep 17 00:00:00 2001 From: 2ndbeam <166764593+2ndbeam@users.noreply.github.com> Date: Tue, 14 May 2024 22:01:33 +0300 Subject: [PATCH] A little folders cleanup --- items/doublelasermk1.tres | 12 - items/food_supplies.tres | 2 +- items/hullmk2.tres | 14 - items/singlelasermk1.tres | 12 - items/singlerocketmk1.tres | 12 - items/starterengine.tres | 12 - items/starterhull.tres | 14 - items/startershield.tres | 12 - items/test_item.tres | 2 +- scenes/Base.tscn | 60 ---- scenes/{ => Base}/base_template.tscn | 2 +- scenes/MainMenu.tscn | 2 +- scenes/MainShip.tscn | 223 ------------- scenes/Ships/Modules/Hulls/hull.tscn | 2 +- scenes/Ships/Modules/Hulls/kamikaze_hull.tscn | 2 +- scenes/Ships/Modules/Hulls/shooter_hull.tscn | 2 +- .../Modules/Weapons/Projectiles}/Rocket.tscn | 8 +- .../Modules/Weapons/Projectiles/laser.tscn} | 0 scenes/Ships/Modules/Weapons/laser.tscn | 4 +- scenes/Ships/Modules/Weapons/weapon.tscn | 2 +- scenes/Space.tscn | 301 ------------------ .../Required Scenes/pause_controller.tscn | 0 .../Required Scenes/star.tscn} | 2 +- .../Required Scenes/star_generator.tscn | 4 +- .../{Star Systems => Star System}/sta2BF8.tmp | 0 .../{Star Systems => Star System}/staBCB.tmp | 0 .../star_system_debug.tscn | 8 +- .../star_system_template.tscn | 12 +- scenes/debug.tscn | 28 -- scenes/engines/starterengine.tscn | 84 ----- scenes/hulls/HullMk2.tscn | 9 - scenes/hulls/npchullt1.tscn | 13 - scenes/hulls/starterhull.tscn | 15 - scenes/menus/BaseMenu.tscn | 1 + scenes/npcships/NPCShipDefault.tscn | 89 ------ scenes/shields/npcshield.tscn | 18 -- scenes/shields/startershield.tscn | 18 -- scenes/weapons/DoubleLaser.tscn | 31 -- scenes/weapons/SingleLaser.tscn | 21 -- scenes/weapons/presets/DoubleLaserMk1.tscn | 35 -- scenes/weapons/presets/NPCSingleLaserMk1.tscn | 22 -- scenes/weapons/presets/SingleLaserMk1.tscn | 26 -- scenes/weapons/presets/SingleRocketMk1.tscn | 25 -- scripts/{ => Classes}/game.gd | 30 +- scripts/{ => Classes}/item.gd | 0 scripts/{ => Classes}/profile.gd | 0 scripts/{ => Classes}/quest.gd | 0 scripts/{ => Star System}/faction.gd | 0 scripts/{ => Star System}/nebula.gd | 0 .../projectile_container.gd} | 0 .../{objects/Star.gd => Star System/star.gd} | 0 scripts/{ => Star System}/star_system.gd | 0 .../{misc => Star System}/stars_generator.gd | 0 scripts/menu/OptionsColors.gd | 4 - scripts/menu/ResetMainShip.gd | 4 - scripts/misc/BaseCollider.gd | 3 - scripts/misc/BaseNPCRotator.gd | 5 - scripts/misc/CameraTweaks.gd | 29 -- scripts/misc/Counter.gd | 32 -- scripts/misc/EngineParticles.gd | 8 - scripts/misc/FactionRecoloring.gd | 13 - scripts/objects/Bounty.gd | 10 - scripts/objects/Hull.gd | 26 -- scripts/objects/Shield.gd | 76 ----- scripts/objects/ShipEngine.gd | 109 ------- scripts/objects/npcship.gd | 91 ------ sprites/{ => Bases}/triangle_base.png | Bin sprites/{ => Bases}/triangle_base.png.import | 6 +- .../{ => Projectiles/Rocket}/rocket mk1 1.png | Bin .../Rocket}/rocket mk1 1.png.import | 6 +- .../{ => Projectiles/Rocket}/rocket mk1 2.png | Bin .../Rocket}/rocket mk1 2.png.import | 6 +- .../{ => Projectiles/Rocket}/rocket mk1 3.png | Bin .../Rocket}/rocket mk1 3.png.import | 6 +- .../{ => Projectiles/Rocket}/rocket mk1 4.png | Bin .../Rocket}/rocket mk1 4.png.import | 6 +- sprites/{ => Ships/Parts}/laserbox.png | Bin sprites/{ => Ships/Parts}/laserbox.png.import | 6 +- sprites/{ => Ships/Parts}/lasergun.png | Bin sprites/{ => Ships/Parts}/lasergun.png.import | 6 +- sprites/{ => Ships}/kamikaze.png | Bin sprites/{ => Ships}/kamikaze.png.import | 6 +- sprites/{ => Ships}/ship.png | Bin sprites/{ => Ships}/ship.png.import | 6 +- sprites/{ => Ships}/shooter.png | Bin sprites/{ => Ships}/shooter.png.import | 6 +- sprites/tipahelp.png | Bin 17762 -> 0 bytes sprites/tipahelp.png.import | 34 -- sprites/tipahelpnomenu.png | Bin 9467 -> 0 bytes sprites/tipahelpnomenu.png.import | 34 -- 90 files changed, 68 insertions(+), 1661 deletions(-) delete mode 100644 items/doublelasermk1.tres delete mode 100644 items/hullmk2.tres delete mode 100644 items/singlelasermk1.tres delete mode 100644 items/singlerocketmk1.tres delete mode 100644 items/starterengine.tres delete mode 100644 items/starterhull.tres delete mode 100644 items/startershield.tres delete mode 100644 scenes/Base.tscn rename scenes/{ => Base}/base_template.tscn (97%) delete mode 100644 scenes/MainShip.tscn rename scenes/{projectiles => Ships/Modules/Weapons/Projectiles}/Rocket.tscn (85%) rename scenes/{projectiles/Laser.tscn => Ships/Modules/Weapons/Projectiles/laser.tscn} (100%) delete mode 100644 scenes/Space.tscn rename scenes/{Star Systems => Star System}/Required Scenes/pause_controller.tscn (100%) rename scenes/{Star.tscn => Star System/Required Scenes/star.tscn} (95%) rename scenes/{Star Systems => Star System}/Required Scenes/star_generator.tscn (79%) rename scenes/{Star Systems => Star System}/sta2BF8.tmp (100%) rename scenes/{Star Systems => Star System}/staBCB.tmp (100%) rename scenes/{Star Systems => Star System}/star_system_debug.tscn (88%) rename scenes/{Star Systems => Star System}/star_system_template.tscn (84%) delete mode 100644 scenes/debug.tscn delete mode 100644 scenes/engines/starterengine.tscn delete mode 100644 scenes/hulls/HullMk2.tscn delete mode 100644 scenes/hulls/npchullt1.tscn delete mode 100644 scenes/hulls/starterhull.tscn delete mode 100644 scenes/npcships/NPCShipDefault.tscn delete mode 100644 scenes/shields/npcshield.tscn delete mode 100644 scenes/shields/startershield.tscn delete mode 100644 scenes/weapons/DoubleLaser.tscn delete mode 100644 scenes/weapons/SingleLaser.tscn delete mode 100644 scenes/weapons/presets/DoubleLaserMk1.tscn delete mode 100644 scenes/weapons/presets/NPCSingleLaserMk1.tscn delete mode 100644 scenes/weapons/presets/SingleLaserMk1.tscn delete mode 100644 scenes/weapons/presets/SingleRocketMk1.tscn rename scripts/{ => Classes}/game.gd (88%) rename scripts/{ => Classes}/item.gd (100%) rename scripts/{ => Classes}/profile.gd (100%) rename scripts/{ => Classes}/quest.gd (100%) rename scripts/{ => Star System}/faction.gd (100%) rename scripts/{ => Star System}/nebula.gd (100%) rename scripts/{misc/ProjectilesContainer.gd => Star System/projectile_container.gd} (100%) rename scripts/{objects/Star.gd => Star System/star.gd} (100%) rename scripts/{ => Star System}/star_system.gd (100%) rename scripts/{misc => Star System}/stars_generator.gd (100%) delete mode 100644 scripts/menu/OptionsColors.gd delete mode 100644 scripts/menu/ResetMainShip.gd delete mode 100644 scripts/misc/BaseCollider.gd delete mode 100644 scripts/misc/BaseNPCRotator.gd delete mode 100644 scripts/misc/CameraTweaks.gd delete mode 100644 scripts/misc/Counter.gd delete mode 100644 scripts/misc/EngineParticles.gd delete mode 100644 scripts/misc/FactionRecoloring.gd delete mode 100644 scripts/objects/Bounty.gd delete mode 100644 scripts/objects/Hull.gd delete mode 100644 scripts/objects/Shield.gd delete mode 100644 scripts/objects/ShipEngine.gd delete mode 100644 scripts/objects/npcship.gd rename sprites/{ => Bases}/triangle_base.png (100%) rename sprites/{ => Bases}/triangle_base.png.import (70%) rename sprites/{ => Projectiles/Rocket}/rocket mk1 1.png (100%) rename sprites/{ => Projectiles/Rocket}/rocket mk1 1.png.import (69%) rename sprites/{ => Projectiles/Rocket}/rocket mk1 2.png (100%) rename sprites/{ => Projectiles/Rocket}/rocket mk1 2.png.import (69%) rename sprites/{ => Projectiles/Rocket}/rocket mk1 3.png (100%) rename sprites/{ => Projectiles/Rocket}/rocket mk1 3.png.import (69%) rename sprites/{ => Projectiles/Rocket}/rocket mk1 4.png (100%) rename sprites/{ => Projectiles/Rocket}/rocket mk1 4.png.import (69%) rename sprites/{ => Ships/Parts}/laserbox.png (100%) rename sprites/{ => Ships/Parts}/laserbox.png.import (71%) rename sprites/{ => Ships/Parts}/lasergun.png (100%) rename sprites/{ => Ships/Parts}/lasergun.png.import (71%) rename sprites/{ => Ships}/kamikaze.png (100%) rename sprites/{ => Ships}/kamikaze.png.import (72%) rename sprites/{ => Ships}/ship.png (100%) rename sprites/{ => Ships}/ship.png.import (73%) rename sprites/{ => Ships}/shooter.png (100%) rename sprites/{ => Ships}/shooter.png.import (72%) delete mode 100644 sprites/tipahelp.png delete mode 100644 sprites/tipahelp.png.import delete mode 100644 sprites/tipahelpnomenu.png delete mode 100644 sprites/tipahelpnomenu.png.import diff --git a/items/doublelasermk1.tres b/items/doublelasermk1.tres deleted file mode 100644 index ca57ada..0000000 --- a/items/doublelasermk1.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="Resource" script_class="Item" load_steps=2 format=3 uid="uid://cxbsw78sqdqyg"] - -[ext_resource type="Script" path="res://scripts/item.gd" id="1_7fodh"] - -[resource] -script = ExtResource("1_7fodh") -name = "Double Laser Mk.I" -description = "It gets twice as better than a crappy one." -min_price = 200.0 -max_price = 250.0 -weight = 0.0 -type = 1 diff --git a/items/food_supplies.tres b/items/food_supplies.tres index 9c7631e..905c16c 100644 --- a/items/food_supplies.tres +++ b/items/food_supplies.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="Item" load_steps=3 format=3 uid="uid://ca8cpmd1aluut"] -[ext_resource type="Script" path="res://scripts/item.gd" id="1_gmqal"] +[ext_resource type="Script" path="res://scripts/Classes/item.gd" id="1_gmqal"] [ext_resource type="Texture2D" uid="uid://w3aft10s2hxd" path="res://sprites/items_icons/food.png" id="1_w33w6"] [resource] diff --git a/items/hullmk2.tres b/items/hullmk2.tres deleted file mode 100644 index f6df0d6..0000000 --- a/items/hullmk2.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Resource" script_class="Item" load_steps=3 format=3 uid="uid://dcu7danm4lucy"] - -[ext_resource type="Texture2D" uid="uid://dbwvej0c5bl52" path="res://sprites/ship mk1.png" id="1_eqmv1"] -[ext_resource type="Script" path="res://scripts/item.gd" id="1_xq0fp"] - -[resource] -script = ExtResource("1_xq0fp") -name = "HullMk2" -description = "Upgraded version of standart hull." -min_price = 200.0 -max_price = 300.0 -weight = 0.0 -icon = ExtResource("1_eqmv1") -type = 2 diff --git a/items/singlelasermk1.tres b/items/singlelasermk1.tres deleted file mode 100644 index d9e7846..0000000 --- a/items/singlelasermk1.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="Resource" script_class="Item" load_steps=2 format=3 uid="uid://bh1thpb5padtm"] - -[ext_resource type="Script" path="res://scripts/item.gd" id="1_abxbi"] - -[resource] -script = ExtResource("1_abxbi") -name = "Single Laser Mk.I" -description = "This one looks nice. Definitely not that deadly as it was advertised." -min_price = 50.0 -max_price = 100.0 -weight = 0.0 -type = 1 diff --git a/items/singlerocketmk1.tres b/items/singlerocketmk1.tres deleted file mode 100644 index 2d53b84..0000000 --- a/items/singlerocketmk1.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="Resource" script_class="Item" load_steps=2 format=3 uid="uid://gg7ju73wve6w"] - -[ext_resource type="Script" path="res://scripts/item.gd" id="1_r753s"] - -[resource] -script = ExtResource("1_r753s") -name = "Single Rocket Mk.I" -description = "Erm...Still better than laser..." -min_price = 150.0 -max_price = 200.0 -weight = 0.0 -type = 1 diff --git a/items/starterengine.tres b/items/starterengine.tres deleted file mode 100644 index 2cb557d..0000000 --- a/items/starterengine.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="Resource" script_class="Item" load_steps=2 format=3 uid="uid://d365u87r3hvb5"] - -[ext_resource type="Script" path="res://scripts/item.gd" id="1_q5jvx"] - -[resource] -script = ExtResource("1_q5jvx") -name = "Starter Engine" -description = "The first one to be made." -min_price = 50.0 -max_price = 100.0 -weight = 0.0 -type = 0 diff --git a/items/starterhull.tres b/items/starterhull.tres deleted file mode 100644 index 2b90272..0000000 --- a/items/starterhull.tres +++ /dev/null @@ -1,14 +0,0 @@ -[gd_resource type="Resource" script_class="Item" load_steps=3 format=3 uid="uid://14rkvp6cksg5"] - -[ext_resource type="Texture2D" uid="uid://dbwvej0c5bl52" path="res://sprites/ship mk1.png" id="1_5dwb0"] -[ext_resource type="Script" path="res://scripts/item.gd" id="1_e4j4a"] - -[resource] -script = ExtResource("1_e4j4a") -name = "StarterHull" -description = "The very basic hull, even YOU could afford that." -min_price = 200.0 -max_price = 250.0 -weight = 0.0 -icon = ExtResource("1_5dwb0") -type = 2 diff --git a/items/startershield.tres b/items/startershield.tres deleted file mode 100644 index 1fc1814..0000000 --- a/items/startershield.tres +++ /dev/null @@ -1,12 +0,0 @@ -[gd_resource type="Resource" script_class="Item" load_steps=2 format=3 uid="uid://ceygt2ddj80sf"] - -[ext_resource type="Script" path="res://scripts/item.gd" id="1_k57go"] - -[resource] -script = ExtResource("1_k57go") -name = "Starter Shield" -description = "You needed that so desperately so you didn't think of getting a better one later." -min_price = 100.0 -max_price = 150.0 -weight = 0.0 -type = 3 diff --git a/items/test_item.tres b/items/test_item.tres index cd088b4..9c25206 100644 --- a/items/test_item.tres +++ b/items/test_item.tres @@ -1,6 +1,6 @@ [gd_resource type="Resource" script_class="Item" load_steps=4 format=3 uid="uid://bii3yrhoqcket"] -[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/laserbox.png" id="1_e5k7o"] +[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/Ships/Parts/laserbox.png" id="1_e5k7o"] [ext_resource type="Script" path="res://scripts/item.gd" id="1_s7nhb"] [ext_resource type="Texture2D" uid="uid://dbwvej0c5bl52" path="res://sprites/ship mk1.png" id="2_l1qse"] diff --git a/scenes/Base.tscn b/scenes/Base.tscn deleted file mode 100644 index 240ad08..0000000 --- a/scenes/Base.tscn +++ /dev/null @@ -1,60 +0,0 @@ -[gd_scene load_steps=8 format=3 uid="uid://dbtrc26016xov"] - -[ext_resource type="Script" path="res://scripts/objects/Base.gd" id="1_bmrsb"] -[ext_resource type="Material" uid="uid://cw0827vwv7pc1" path="res://shaders/materials/ship_material.tres" id="1_uy68o"] -[ext_resource type="Texture2D" uid="uid://deabc107bimdb" path="res://sprites/space station 1.png" id="2_tvpq1"] -[ext_resource type="Script" path="res://scripts/misc/BaseCollider.gd" id="3_vluwu"] -[ext_resource type="Script" path="res://scripts/misc/BaseMenuOpen.gd" id="4_ftno6"] -[ext_resource type="PackedScene" uid="uid://bdwk0dqcx0xhp" path="res://scenes/menus/BaseMenu.tscn" id="5_mhbys"] -[ext_resource type="Script" path="res://scripts/misc/BaseNPCRotator.gd" id="6_qn4dn"] - -[node name="Base" type="Node2D"] -process_mode = 1 -material = ExtResource("1_uy68o") -script = ExtResource("1_bmrsb") - -[node name="Sprite" type="Sprite2D" parent="."] -use_parent_material = true -rotation = -1.5708 -texture = ExtResource("2_tvpq1") - -[node name="BaseCollider" type="StaticBody2D" parent="."] -collision_layer = 2 -collision_mask = 5 -script = ExtResource("3_vluwu") - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="BaseCollider"] -polygon = PackedVector2Array(129, -32, 129, 32, 256, 63, 225, 192, 192, 225, 67, 256, -67, 256, -192, 225, -225, 192, -256, 67, -256, -67, -225, -192, -192, -225, -67, -256, 67, -256, 192, -225, 225, -192, 256, -67, 256, -63) - -[node name="BaseColliderDetector" type="Area2D" parent="BaseCollider"] -collision_layer = 2 - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="BaseCollider/BaseColliderDetector"] -polygon = PackedVector2Array(129, -32, 129, 32, 256, 63, 256, 61, 131, 30, 131, -30, 256, -61, 256, -63) - -[node name="MenuCollider" type="Area2D" parent="."] -collision_layer = 8 -script = ExtResource("4_ftno6") -menu = ExtResource("5_mhbys") - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="MenuCollider"] -polygon = PackedVector2Array(129, 32, 256, 63, 256, -63, 129, -32) - -[node name="NPCBlocker" type="StaticBody2D" parent="."] -collision_layer = 16 - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="NPCBlocker"] -polygon = PackedVector2Array(129, 32, 256, 63, 256, -63, 129, -32) - -[node name="NPCRotator" type="Area2D" parent="."] -collision_layer = 16 -monitorable = false -script = ExtResource("6_qn4dn") - -[node name="CollisionPolygon2D" type="CollisionPolygon2D" parent="NPCRotator"] -polygon = PackedVector2Array(129, -32, 129, 32, 257, 63, 226, 193, 192, 226, 67, 257, -67, 257, -193, 226, -226, 193, -257, 67, -257, -67, -226, -193, -193, -226, -67, -257, 67, -257, 193, -226, 226, -193, 257, -67, 257, -63) - -[connection signal="body_entered" from="BaseCollider/BaseColliderDetector" to="MenuCollider" method="onbcbodyentered"] -[connection signal="body_entered" from="MenuCollider" to="MenuCollider" method="_on_body_entered"] -[connection signal="body_exited" from="MenuCollider" to="MenuCollider" method="_on_body_exited"] -[connection signal="body_entered" from="NPCRotator" to="NPCRotator" method="_on_body_entered"] diff --git a/scenes/base_template.tscn b/scenes/Base/base_template.tscn similarity index 97% rename from scenes/base_template.tscn rename to scenes/Base/base_template.tscn index 183cd2f..1a0fd38 100644 --- a/scenes/base_template.tscn +++ b/scenes/Base/base_template.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://dk3nvl8f0v24e"] [ext_resource type="Script" path="res://scripts/Base/base.gd" id="1_dr4wr"] -[ext_resource type="Texture2D" uid="uid://3x77t3kd6v0x" path="res://sprites/triangle_base.png" id="1_nrkxw"] +[ext_resource type="Texture2D" uid="uid://3x77t3kd6v0x" path="res://sprites/Bases/triangle_base.png" id="1_nrkxw"] [sub_resource type="RectangleShape2D" id="RectangleShape2D_4e5h0"] size = Vector2(357, 4) diff --git a/scenes/MainMenu.tscn b/scenes/MainMenu.tscn index 48dd1e5..82a00d4 100644 --- a/scenes/MainMenu.tscn +++ b/scenes/MainMenu.tscn @@ -3,7 +3,7 @@ [ext_resource type="Script" path="res://scripts/menu/MainMenu.gd" id="1_2wax0"] [ext_resource type="Shader" uid="uid://f6lhks6rp5jw" path="res://shaders/testicles.tres" id="1_on8wy"] [ext_resource type="Gradient" uid="uid://c6bcjydbwm5id" path="res://scenes/SpaceGradient.tres" id="2_7racd"] -[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/star_generator.tscn" id="4_g7254"] +[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star System/Required Scenes/star_generator.tscn" id="4_g7254"] [ext_resource type="Script" path="res://scripts/menu/MainMenuButton.gd" id="5_q6x10"] [sub_resource type="FastNoiseLite" id="FastNoiseLite_rtgkw"] diff --git a/scenes/MainShip.tscn b/scenes/MainShip.tscn deleted file mode 100644 index e040964..0000000 --- a/scenes/MainShip.tscn +++ /dev/null @@ -1,223 +0,0 @@ -[gd_scene load_steps=14 format=3 uid="uid://ccrs28h3b2tfy"] - -[ext_resource type="Material" uid="uid://cw0827vwv7pc1" path="res://shaders/materials/ship_material.tres" id="1_6fqoi"] -[ext_resource type="Script" path="res://scripts/objects/MainShip.gd" id="1_h7kne"] -[ext_resource type="PackedScene" uid="uid://bbho4h6tg4jca" path="res://scenes/hulls/starterhull.tscn" id="2_r634y"] -[ext_resource type="PackedScene" uid="uid://20171x3gmn1j" path="res://scenes/engines/starterengine.tscn" id="3_upe7o"] -[ext_resource type="PackedScene" uid="uid://cf11711uqb42j" path="res://scenes/weapons/presets/SingleLaserMk1.tscn" id="4_s724s"] -[ext_resource type="Script" path="res://scripts/misc/SpeedLine.gd" id="6_ckx3n"] -[ext_resource type="PackedScene" uid="uid://66m5gj2ufsop" path="res://scenes/shields/startershield.tscn" id="6_nihas"] -[ext_resource type="Script" path="res://scripts/misc/CameraTweaks.gd" id="7_5jx81"] -[ext_resource type="Script" path="res://scripts/misc/Counter.gd" id="8_udmcu"] -[ext_resource type="Script" path="res://scripts/misc/VersionLabel.gd" id="10_eil8s"] -[ext_resource type="Script" path="res://scripts/misc/PlayerPauseController.gd" id="13_8y0ow"] -[ext_resource type="PackedScene" uid="uid://dsmwg1rxedi3x" path="res://scenes/Minimap.tscn" id="14_o544g"] - -[sub_resource type="LabelSettings" id="LabelSettings_hkik3"] -font_size = 48 - -[node name="MainShip" type="CharacterBody2D"] -process_mode = 1 -material = ExtResource("1_6fqoi") -collision_mask = 3 -script = ExtResource("1_h7kne") -metadata/_edit_horizontal_guides_ = [] - -[node name="Hull" parent="." instance=ExtResource("2_r634y")] - -[node name="Engine" parent="." instance=ExtResource("3_upe7o")] - -[node name="PrimaryWeapon" type="Node2D" parent="."] -use_parent_material = true - -[node name="SingleLaser" parent="PrimaryWeapon" instance=ExtResource("4_s724s")] - -[node name="SecondaryWeapon" type="Node2D" parent="."] -use_parent_material = true - -[node name="SingleLaser" parent="SecondaryWeapon" instance=ExtResource("4_s724s")] - -[node name="Shield" parent="." instance=ExtResource("6_nihas")] - -[node name="Camera" type="Camera2D" parent="."] -limit_left = -4096 -limit_top = -4096 -limit_right = 4096 -limit_bottom = 4096 -position_smoothing_speed = 200.0 -script = ExtResource("7_5jx81") - -[node name="Collision" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array(0, -16, 32, 0, 0, 16, 0, 4, -4, 4, -8, 8, -8, -8, -4, -4, 0, -4) - -[node name="GUI" type="CanvasLayer" parent="."] - -[node name="Interface" type="Control" parent="GUI"] -z_index = 78 -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 - -[node name="MainRectangle" type="Polygon2D" parent="GUI/Interface"] -position = Vector2(34, 651) -polygon = PackedVector2Array(0, 0, 175, 0, 175, 50, 0, 50) - -[node name="InnerRectangle" type="Polygon2D" parent="GUI/Interface/MainRectangle"] -color = Color(0, 0, 0, 1) -polygon = PackedVector2Array(1, 1, 174, 1, 174, 49, 1, 49) - -[node name="ZeroLine" type="Line2D" parent="GUI/Interface/MainRectangle"] -position = Vector2(-34, -651) -points = PackedVector2Array(59, 651, 59, 701) -width = 1.0 - -[node name="TurboLine" type="Line2D" parent="GUI/Interface/MainRectangle"] -position = Vector2(66, -651) -points = PackedVector2Array(59, 651, 59, 701) -width = 1.0 - -[node name="SpeedLine" type="Line2D" parent="GUI/Interface"] -position = Vector2(59, 676) -points = PackedVector2Array(0, 0, 0, 0) -width = 48.0 -script = ExtResource("6_ckx3n") - -[node name="FuelCounter" type="Label" parent="GUI/Interface"] -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = 34.0 -offset_top = 625.0 -offset_right = -1071.0 -offset_bottom = -69.0 -grow_horizontal = 2 -grow_vertical = 2 -text = "Fuel: 1000/1000 units" -script = ExtResource("8_udmcu") -counter_id = "fuel" - -[node name="AmmoCounter" type="Label" parent="GUI/Interface"] -layout_mode = 1 -anchors_preset = 3 -anchor_left = 1.0 -anchor_top = 1.0 -anchor_right = 1.0 -anchor_bottom = 1.0 -offset_left = -63.0 -offset_top = -42.0 -offset_right = -13.0 -offset_bottom = -16.0 -grow_horizontal = 0 -grow_vertical = 0 -text = "ammo" -horizontal_alignment = 2 -vertical_alignment = 2 -script = ExtResource("8_udmcu") -counter_id = "ammo" - -[node name="ShieldCounter" type="Label" parent="GUI/Interface"] -layout_mode = 0 -offset_left = 34.0 -offset_top = 580.0 -offset_right = 239.0 -offset_bottom = 606.0 -text = "Shield Capacity: 8 / 8 units" -script = ExtResource("8_udmcu") -counter_id = "shield" - -[node name="HPCounter" type="Label" parent="GUI/Interface"] -layout_mode = 0 -offset_left = 34.0 -offset_top = 602.0 -offset_right = 209.0 -offset_bottom = 625.0 -text = "Hull Strength: 30 / 30 units" -script = ExtResource("8_udmcu") -counter_id = "hp" - -[node name="MoneyCounter" type="Label" parent="GUI/Interface"] -layout_mode = 0 -offset_left = 34.0 -offset_top = 558.0 -offset_right = 250.0 -offset_bottom = 584.0 -text = "Available Money: 1000 units" -script = ExtResource("8_udmcu") -counter_id = "money" - -[node name="PauseController" type="Control" parent="GUI/Interface"] -process_mode = 2 -visible = false -layout_mode = 1 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("13_8y0ow") - -[node name="UnpauseButton" type="Button" parent="GUI/Interface/PauseController"] -layout_mode = 0 -offset_left = 311.0 -offset_top = 253.0 -offset_right = 982.0 -offset_bottom = 365.0 -mouse_filter = 1 -text = "Resume" - -[node name="ExitButton" type="Button" parent="GUI/Interface/PauseController"] -layout_mode = 0 -offset_left = 312.0 -offset_top = 378.0 -offset_right = 983.0 -offset_bottom = 492.0 -text = "Save and quit to main menu" - -[node name="Label" type="Label" parent="GUI/Interface/PauseController"] -layout_mode = 0 -offset_left = 413.0 -offset_top = 108.0 -offset_right = 881.0 -offset_bottom = 178.0 -text = "The game is paused." -label_settings = SubResource("LabelSettings_hkik3") - -[node name="VersionLabel" type="Label" parent="GUI/Interface"] -layout_mode = 1 -anchors_preset = 1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -153.0 -offset_bottom = 26.0 -grow_horizontal = 0 -text = "GammaCosmicRays version Ictar 1.1 unbuilt -This is a debug version for internal usage." -horizontal_alignment = 2 -script = ExtResource("10_eil8s") - -[node name="CanvasLayer" type="CanvasLayer" parent="."] -layer = 2 - -[node name="Control" type="Control" parent="CanvasLayer"] -layout_mode = 3 -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -mouse_filter = 2 - -[node name="Minimap" parent="CanvasLayer/Control" instance=ExtResource("14_o544g")] -layout_mode = 1 -offset_left = 543.0 -offset_top = 528.0 -offset_right = 543.0 -offset_bottom = 527.76 - -[connection signal="button_up" from="GUI/Interface/PauseController/UnpauseButton" to="GUI/Interface/PauseController" method="_on_unpause_button_button_up"] -[connection signal="button_up" from="GUI/Interface/PauseController/ExitButton" to="GUI/Interface/PauseController" method="_on_exit_button_button_up"] diff --git a/scenes/Ships/Modules/Hulls/hull.tscn b/scenes/Ships/Modules/Hulls/hull.tscn index 818072d..c0441c9 100644 --- a/scenes/Ships/Modules/Hulls/hull.tscn +++ b/scenes/Ships/Modules/Hulls/hull.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bsu4eqwdfewwi"] [ext_resource type="Script" path="res://scripts/Ship/hull.gd" id="1_7nfg8"] -[ext_resource type="Texture2D" uid="uid://beb76cssb3knp" path="res://sprites/ship.png" id="2_vhl4r"] +[ext_resource type="Texture2D" uid="uid://beb76cssb3knp" path="res://sprites/Ships/ship.png" id="2_vhl4r"] [node name="Hull" type="RigidBody2D"] position = Vector2(0.5, 0) diff --git a/scenes/Ships/Modules/Hulls/kamikaze_hull.tscn b/scenes/Ships/Modules/Hulls/kamikaze_hull.tscn index 30d7476..c102e46 100644 --- a/scenes/Ships/Modules/Hulls/kamikaze_hull.tscn +++ b/scenes/Ships/Modules/Hulls/kamikaze_hull.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bkd4gyhlota7l"] [ext_resource type="PackedScene" uid="uid://bsu4eqwdfewwi" path="res://scenes/Ships/Modules/Hulls/hull.tscn" id="1_l56rl"] -[ext_resource type="Texture2D" uid="uid://bchkncbniclhh" path="res://sprites/kamikaze.png" id="2_8ba3c"] +[ext_resource type="Texture2D" uid="uid://bchkncbniclhh" path="res://sprites/Ships/kamikaze.png" id="2_8ba3c"] [node name="Hull" instance=ExtResource("1_l56rl")] collision_mask = 3 diff --git a/scenes/Ships/Modules/Hulls/shooter_hull.tscn b/scenes/Ships/Modules/Hulls/shooter_hull.tscn index f2d4598..ce9751f 100644 --- a/scenes/Ships/Modules/Hulls/shooter_hull.tscn +++ b/scenes/Ships/Modules/Hulls/shooter_hull.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://bckgb423wsdrw"] [ext_resource type="PackedScene" uid="uid://bsu4eqwdfewwi" path="res://scenes/Ships/Modules/Hulls/hull.tscn" id="1_7i1ve"] -[ext_resource type="Texture2D" uid="uid://bxtd2ij1dc1d3" path="res://sprites/shooter.png" id="2_gvwov"] +[ext_resource type="Texture2D" uid="uid://bxtd2ij1dc1d3" path="res://sprites/Ships/shooter.png" id="2_gvwov"] [node name="Hull" instance=ExtResource("1_7i1ve")] max_hp = 10.0 diff --git a/scenes/projectiles/Rocket.tscn b/scenes/Ships/Modules/Weapons/Projectiles/Rocket.tscn similarity index 85% rename from scenes/projectiles/Rocket.tscn rename to scenes/Ships/Modules/Weapons/Projectiles/Rocket.tscn index f742db4..513dcf1 100644 --- a/scenes/projectiles/Rocket.tscn +++ b/scenes/Ships/Modules/Weapons/Projectiles/Rocket.tscn @@ -1,10 +1,10 @@ [gd_scene load_steps=8 format=3 uid="uid://qr1h87np4sn1"] [ext_resource type="Script" path="res://scripts/objects/Rocket.gd" id="1_h8tie"] -[ext_resource type="Texture2D" uid="uid://dvnqx6habw8uc" path="res://sprites/rocket mk1 1.png" id="2_g3qcb"] -[ext_resource type="Texture2D" uid="uid://dgxlnp520q1tp" path="res://sprites/rocket mk1 2.png" id="3_q1u7q"] -[ext_resource type="Texture2D" uid="uid://fqcylid4oa6b" path="res://sprites/rocket mk1 3.png" id="4_f2hwy"] -[ext_resource type="Texture2D" uid="uid://3nxmmp826b1s" path="res://sprites/rocket mk1 4.png" id="5_xas58"] +[ext_resource type="Texture2D" uid="uid://dvnqx6habw8uc" path="res://sprites/Projectiles/Rocket/rocket mk1 1.png" id="2_g3qcb"] +[ext_resource type="Texture2D" uid="uid://dgxlnp520q1tp" path="res://sprites/Projectiles/Rocket/rocket mk1 2.png" id="3_q1u7q"] +[ext_resource type="Texture2D" uid="uid://fqcylid4oa6b" path="res://sprites/Projectiles/Rocket/rocket mk1 3.png" id="4_f2hwy"] +[ext_resource type="Texture2D" uid="uid://3nxmmp826b1s" path="res://sprites/Projectiles/Rocket/rocket mk1 4.png" id="5_xas58"] [sub_resource type="SpriteFrames" id="SpriteFrames_pnkh5"] animations = [{ diff --git a/scenes/projectiles/Laser.tscn b/scenes/Ships/Modules/Weapons/Projectiles/laser.tscn similarity index 100% rename from scenes/projectiles/Laser.tscn rename to scenes/Ships/Modules/Weapons/Projectiles/laser.tscn diff --git a/scenes/Ships/Modules/Weapons/laser.tscn b/scenes/Ships/Modules/Weapons/laser.tscn index f821cb3..6a07539 100644 --- a/scenes/Ships/Modules/Weapons/laser.tscn +++ b/scenes/Ships/Modules/Weapons/laser.tscn @@ -1,9 +1,9 @@ [gd_scene load_steps=5 format=3 uid="uid://bf10g066l8grd"] [ext_resource type="PackedScene" uid="uid://ryy1tdrxmjav" path="res://scenes/Ships/Modules/Weapons/weapon.tscn" id="1_l10lx"] -[ext_resource type="Texture2D" uid="uid://1yihkbdosopx" path="res://sprites/lasergun.png" id="2_5ysch"] +[ext_resource type="Texture2D" uid="uid://1yihkbdosopx" path="res://sprites/Ships/Parts/lasergun.png" id="2_5ysch"] [ext_resource type="Script" path="res://scripts/Weapons/laser.gd" id="2_qqcrf"] -[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/laserbox.png" id="3_65sll"] +[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/Ships/Parts/laserbox.png" id="3_65sll"] [node name="Laser" node_paths=PackedStringArray("spawner_points") instance=ExtResource("1_l10lx")] script = ExtResource("2_qqcrf") diff --git a/scenes/Ships/Modules/Weapons/weapon.tscn b/scenes/Ships/Modules/Weapons/weapon.tscn index e01a58b..2b5511d 100644 --- a/scenes/Ships/Modules/Weapons/weapon.tscn +++ b/scenes/Ships/Modules/Weapons/weapon.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://ryy1tdrxmjav"] [ext_resource type="Script" path="res://scripts/Ship/weapon.gd" id="1_ga8vg"] -[ext_resource type="PackedScene" uid="uid://djmoij5kuou3j" path="res://scenes/projectiles/Laser.tscn" id="2_qo148"] +[ext_resource type="PackedScene" uid="uid://djmoij5kuou3j" path="res://scenes/Ships/Modules/Weapons/Projectiles/laser.tscn" id="2_qo148"] [node name="Weapon" type="Node2D" node_paths=PackedStringArray("shoot_timer", "spawner_points")] script = ExtResource("1_ga8vg") diff --git a/scenes/Space.tscn b/scenes/Space.tscn deleted file mode 100644 index ad097ef..0000000 --- a/scenes/Space.tscn +++ /dev/null @@ -1,301 +0,0 @@ -[gd_scene load_steps=31 format=3 uid="uid://14k35mkjwi5i"] - -[ext_resource type="PackedScene" uid="uid://ccrs28h3b2tfy" path="res://scenes/MainShip.tscn" id="1_6fvpc"] -[ext_resource type="Script" path="res://scripts/Spaceold.gd" id="1_ppaw3"] -[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/star_generator.tscn" id="3_jbyyq"] -[ext_resource type="Script" path="res://scripts/misc/ProjectilesContainer.gd" id="4_dtv2c"] -[ext_resource type="PackedScene" uid="uid://dbtrc26016xov" path="res://scenes/Base.tscn" id="5_bjt5p"] -[ext_resource type="PackedScene" uid="uid://523dme3h6d6c" path="res://scenes/npcships/NPCShipDefault.tscn" id="6_67746"] -[ext_resource type="Script" path="res://scripts/misc/FactionRecoloring.gd" id="7_w8i61"] -[ext_resource type="Shader" path="res://shaders/ship.gdshader" id="7_wqq78"] -[ext_resource type="Shader" path="res://shaders/nebula.gdshader" id="8_3swn8"] -[ext_resource type="Script" path="res://scripts/nebula.gd" id="9_utirt"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_trcbc"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array(0, 0, 0, 0, 0, 0, 0, 0, 0, 0) -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 20.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ximju"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_tyycv"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_hliu0"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_wqn82"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_bd4d5"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_stbmy"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_cni30"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_x5auq"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ucpjn"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_e24ck"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_ssd2x"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_vtqhw"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array() -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 5.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_bdvxf"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array(-1) -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 20.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_j8bi2"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array(-1) -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 20.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_pbsyb"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array(-1) -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 20.0 - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_2r73x"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("7_wqq78") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array(-1) -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 20.0 - -[sub_resource type="FastNoiseLite" id="FastNoiseLite_n2xxx"] - -[sub_resource type="NoiseTexture2D" id="NoiseTexture2D_lcrcg"] -seamless = true -noise = SubResource("FastNoiseLite_n2xxx") - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_s2aaw"] -shader = ExtResource("8_3swn8") -shader_parameter/divisor = 10000.0 -shader_parameter/offset = Vector2(0, 0) -shader_parameter/nebula_color = Color(0.0666667, 0.0666667, 0.188235, 1) -shader_parameter/noise_texture = SubResource("NoiseTexture2D_lcrcg") - -[node name="Space" type="Node2D"] -process_mode = 3 -script = ExtResource("1_ppaw3") - -[node name="MainShip" parent="." instance=ExtResource("1_6fvpc")] -material = SubResource("ShaderMaterial_trcbc") - -[node name="Stars" parent="." instance=ExtResource("3_jbyyq")] - -[node name="Projectiles" type="Node2D" parent="."] -process_mode = 1 -script = ExtResource("4_dtv2c") - -[node name="EnemyFaction" type="Node2D" parent="."] -process_mode = 1 -script = ExtResource("7_w8i61") -faction = true - -[node name="DefaultShip" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_ximju") -position = Vector2(-600, 930) - -[node name="DefaultShip2" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_tyycv") -position = Vector2(595, 956) - -[node name="DefaultShip3" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_hliu0") -position = Vector2(-28, 1361) - -[node name="DefaultShip4" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_wqn82") -position = Vector2(-588, -1151) - -[node name="DefaultShip5" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_bd4d5") -position = Vector2(46, -1625) - -[node name="DefaultShip6" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_stbmy") -position = Vector2(639, -1166) - -[node name="DefaultShip7" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_cni30") -position = Vector2(-1195, -764) - -[node name="DefaultShip8" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_x5auq") -position = Vector2(-1786, -202) - -[node name="DefaultShip9" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_ucpjn") -position = Vector2(-1254, 416) - -[node name="DefaultShip10" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_e24ck") -position = Vector2(1201, -766) - -[node name="DefaultShip11" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_ssd2x") -position = Vector2(1877, -168) - -[node name="DefaultShip12" parent="EnemyFaction" instance=ExtResource("6_67746")] -material = SubResource("ShaderMaterial_vtqhw") -position = Vector2(1212, 518) - -[node name="Bases" type="Node2D" parent="."] -script = ExtResource("7_w8i61") - -[node name="Base" parent="Bases" instance=ExtResource("5_bjt5p")] -material = SubResource("ShaderMaterial_bdvxf") -position = Vector2(-434, -343) -rotation = 0.660397 - -[node name="Base2" parent="Bases" instance=ExtResource("5_bjt5p")] -material = SubResource("ShaderMaterial_j8bi2") -position = Vector2(429, -368) -rotation = 2.41284 -type = 1 - -[node name="Base3" parent="Bases" instance=ExtResource("5_bjt5p")] -material = SubResource("ShaderMaterial_pbsyb") -position = Vector2(-428, 418) -rotation = -0.826175 -type = 3 - -[node name="Base4" parent="Bases" instance=ExtResource("5_bjt5p")] -material = SubResource("ShaderMaterial_2r73x") -position = Vector2(386, 432) -rotation = -2.31102 -type = 2 - -[node name="Background" type="CanvasLayer" parent="."] -layer = -10 - -[node name="Nebula" type="ColorRect" parent="Background"] -material = SubResource("ShaderMaterial_s2aaw") -anchors_preset = 15 -anchor_right = 1.0 -anchor_bottom = 1.0 -grow_horizontal = 2 -grow_vertical = 2 -script = ExtResource("9_utirt") - -[connection signal="updated_colors" from="." to="Background/Nebula" method="_on_space_updated_colors"] diff --git a/scenes/Star Systems/Required Scenes/pause_controller.tscn b/scenes/Star System/Required Scenes/pause_controller.tscn similarity index 100% rename from scenes/Star Systems/Required Scenes/pause_controller.tscn rename to scenes/Star System/Required Scenes/pause_controller.tscn diff --git a/scenes/Star.tscn b/scenes/Star System/Required Scenes/star.tscn similarity index 95% rename from scenes/Star.tscn rename to scenes/Star System/Required Scenes/star.tscn index b2d688c..5821196 100644 --- a/scenes/Star.tscn +++ b/scenes/Star System/Required Scenes/star.tscn @@ -8,7 +8,7 @@ [ext_resource type="Texture2D" uid="uid://bm8tx4w1irp7s" path="res://sprites/star/star6.png" id="6_uxgjf"] [ext_resource type="Texture2D" uid="uid://jbcvgid8o5f6" path="res://sprites/star/star7.png" id="7_3kjtu"] [ext_resource type="Texture2D" uid="uid://dgp48jj1knk1y" path="res://sprites/star/star8.png" id="8_5xmav"] -[ext_resource type="Script" path="res://scripts/objects/Star.gd" id="9_kew3k"] +[ext_resource type="Script" path="res://scripts/Star System/star.gd" id="9_kew3k"] [sub_resource type="SpriteFrames" id="SpriteFrames_oggfj"] animations = [{ diff --git a/scenes/Star Systems/Required Scenes/star_generator.tscn b/scenes/Star System/Required Scenes/star_generator.tscn similarity index 79% rename from scenes/Star Systems/Required Scenes/star_generator.tscn rename to scenes/Star System/Required Scenes/star_generator.tscn index c2bb3ad..b0aa612 100644 --- a/scenes/Star Systems/Required Scenes/star_generator.tscn +++ b/scenes/Star System/Required Scenes/star_generator.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=3 format=3 uid="uid://dpggye27ln436"] -[ext_resource type="Script" path="res://scripts/misc/stars_generator.gd" id="1_uxmpu"] -[ext_resource type="PackedScene" uid="uid://kyuhwil8vq7n" path="res://scenes/Star.tscn" id="2_ypr5c"] +[ext_resource type="Script" path="res://scripts/Star System/stars_generator.gd" id="1_uxmpu"] +[ext_resource type="PackedScene" uid="uid://kyuhwil8vq7n" path="res://scenes/Star System/Required Scenes/star.tscn" id="2_ypr5c"] [node name="Stars" type="ParallaxBackground"] process_mode = 1 diff --git a/scenes/Star Systems/sta2BF8.tmp b/scenes/Star System/sta2BF8.tmp similarity index 100% rename from scenes/Star Systems/sta2BF8.tmp rename to scenes/Star System/sta2BF8.tmp diff --git a/scenes/Star Systems/staBCB.tmp b/scenes/Star System/staBCB.tmp similarity index 100% rename from scenes/Star Systems/staBCB.tmp rename to scenes/Star System/staBCB.tmp diff --git a/scenes/Star Systems/star_system_debug.tscn b/scenes/Star System/star_system_debug.tscn similarity index 88% rename from scenes/Star Systems/star_system_debug.tscn rename to scenes/Star System/star_system_debug.tscn index ee49ce4..ad6ca3d 100644 --- a/scenes/Star Systems/star_system_debug.tscn +++ b/scenes/Star System/star_system_debug.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=6 format=3 uid="uid://crneq2enhxsw5"] -[ext_resource type="PackedScene" uid="uid://bsnrcw64qr2hr" path="res://scenes/Star Systems/star_system_template.tscn" id="1_2ai1l"] -[ext_resource type="PackedScene" uid="uid://dk3nvl8f0v24e" path="res://scenes/base_template.tscn" id="3_m5ica"] +[ext_resource type="PackedScene" uid="uid://bsnrcw64qr2hr" path="res://scenes/Star System/star_system_template.tscn" id="1_2ai1l"] +[ext_resource type="PackedScene" uid="uid://dk3nvl8f0v24e" path="res://scenes/Base/base_template.tscn" id="3_m5ica"] [ext_resource type="PackedScene" uid="uid://pev6k21vqaem" path="res://scenes/Ships/NPC Ships/kamikaze_ship.tscn" id="4_i6rbg"] [ext_resource type="PackedScene" uid="uid://yso8f0y5kg50" path="res://scenes/Ships/NPC Ships/shooter_ship.tscn" id="5_o3ny8"] [ext_resource type="PackedScene" uid="uid://dok3i8u5t1ka4" path="res://scenes/Ships/player_ship.tscn" id="7_jyplv"] @@ -26,7 +26,7 @@ position = Vector2(19, 10) position = Vector2(1706, -5) [node name="KamikazeShip" parent="FactionAggressive" index="0" instance=ExtResource("4_i6rbg")] -position = Vector2(-4961, -2446) +position = Vector2(-244, -914) [node name="ShooterShip" parent="FactionAggressive" index="1" instance=ExtResource("5_o3ny8")] -position = Vector2(-4905, 428) +position = Vector2(-833, 1073) diff --git a/scenes/Star Systems/star_system_template.tscn b/scenes/Star System/star_system_template.tscn similarity index 84% rename from scenes/Star Systems/star_system_template.tscn rename to scenes/Star System/star_system_template.tscn index 11106c9..c1f8eab 100644 --- a/scenes/Star Systems/star_system_template.tscn +++ b/scenes/Star System/star_system_template.tscn @@ -1,12 +1,12 @@ [gd_scene load_steps=10 format=3 uid="uid://bsnrcw64qr2hr"] -[ext_resource type="Script" path="res://scripts/star_system.gd" id="1_xx8w2"] -[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/star_generator.tscn" id="2_iqrn0"] -[ext_resource type="Script" path="res://scripts/misc/ProjectilesContainer.gd" id="3_h5cm3"] +[ext_resource type="Script" path="res://scripts/Star System/star_system.gd" id="1_xx8w2"] +[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star System/Required Scenes/star_generator.tscn" id="2_iqrn0"] +[ext_resource type="Script" path="res://scripts/Star System/projectile_container.gd" id="3_h5cm3"] [ext_resource type="Material" uid="uid://bawhivm5cr2w" path="res://shaders/materials/nebula_shader.tres" id="4_o0ld7"] -[ext_resource type="Script" path="res://scripts/nebula.gd" id="5_la84n"] -[ext_resource type="PackedScene" uid="uid://c7is7y341f6wa" path="res://scenes/Star Systems/Required Scenes/pause_controller.tscn" id="6_61vq5"] -[ext_resource type="Script" path="res://scripts/faction.gd" id="7_wm3vi"] +[ext_resource type="Script" path="res://scripts/Star System/nebula.gd" id="5_la84n"] +[ext_resource type="PackedScene" uid="uid://c7is7y341f6wa" path="res://scenes/Star System/Required Scenes/pause_controller.tscn" id="6_61vq5"] +[ext_resource type="Script" path="res://scripts/Star System/faction.gd" id="7_wm3vi"] [sub_resource type="GDScript" id="GDScript_4yoh5"] resource_name = "version_label" diff --git a/scenes/debug.tscn b/scenes/debug.tscn deleted file mode 100644 index 4ea19a0..0000000 --- a/scenes/debug.tscn +++ /dev/null @@ -1,28 +0,0 @@ -[gd_scene load_steps=6 format=3 uid="uid://ckdttdkoo1t0s"] - -[ext_resource type="PackedScene" uid="uid://dok3i8u5t1ka4" path="res://scenes/Ships/player_ship.tscn" id="1_b1l1c"] -[ext_resource type="Script" path="res://scripts/star_system.gd" id="1_du5mm"] -[ext_resource type="Shader" path="res://shaders/ship.gdshader" id="2_15op6"] -[ext_resource type="Script" path="res://scripts/misc/ProjectilesContainer.gd" id="3_amh71"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_qudgt"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("2_15op6") -shader_parameter/wave_centers = PackedVector2Array() -shader_parameter/wave_distances = PackedFloat32Array(-1) -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 20.0 - -[node name="Debug" type="Node2D"] -script = ExtResource("1_du5mm") - -[node name="PlayerShip" parent="." instance=ExtResource("1_b1l1c")] -process_mode = 0 -material = SubResource("ShaderMaterial_qudgt") -position = Vector2(608, 352) -scale = Vector2(0.5, 0.5) - -[node name="ProjectileContainer" type="Node2D" parent="."] -script = ExtResource("3_amh71") diff --git a/scenes/engines/starterengine.tscn b/scenes/engines/starterengine.tscn deleted file mode 100644 index 75758d0..0000000 --- a/scenes/engines/starterengine.tscn +++ /dev/null @@ -1,84 +0,0 @@ -[gd_scene load_steps=11 format=3 uid="uid://20171x3gmn1j"] - -[ext_resource type="Script" path="res://scripts/objects/ShipEngine.gd" id="1_jvcps"] -[ext_resource type="Texture2D" uid="uid://hpcn75jlrbr3" path="res://sprites/ship engine mk1.png" id="2_mll00"] -[ext_resource type="Script" path="res://scripts/misc/EngineParticles.gd" id="3_fxngd"] -[ext_resource type="Script" path="res://scripts/misc/TurboParticles.gd" id="4_f11x7"] - -[sub_resource type="Curve" id="Curve_grs2w"] -_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), -1.30258, 0.0, 0, 0] -point_count = 2 - -[sub_resource type="CurveTexture" id="CurveTexture_wagku"] -curve = SubResource("Curve_grs2w") - -[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_al11x"] -lifetime_randomness = 0.5 -particle_flag_disable_z = true -emission_shape = 3 -emission_box_extents = Vector3(8, 1, 1) -direction = Vector3(0, 1, 0) -spread = 15.0 -initial_velocity_min = 50.0 -initial_velocity_max = 100.0 -gravity = Vector3(0, 0, 0) -scale_min = 0.5 -scale_max = 2.0 -scale_curve = SubResource("CurveTexture_wagku") - -[sub_resource type="Curve" id="Curve_r1iqm"] -_data = [Vector2(0, 1), 0.0, 0.0, 0, 0, Vector2(1, 0), -1.7156, 0.0, 0, 0] -point_count = 2 - -[sub_resource type="CurveTexture" id="CurveTexture_ot3qw"] -curve = SubResource("Curve_r1iqm") - -[sub_resource type="ParticleProcessMaterial" id="ParticleProcessMaterial_gd3um"] -lifetime_randomness = 0.5 -particle_flag_disable_z = true -emission_shape = 1 -emission_sphere_radius = 1102.0 -direction = Vector3(0, 1, 0) -spread = 0.0 -initial_velocity_min = 500.0 -initial_velocity_max = 600.0 -gravity = Vector3(0, 0, 0) -scale_min = 1.5 -scale_max = 1.5 -scale_curve = SubResource("CurveTexture_ot3qw") - -[node name="Engine" type="Node2D" node_paths=PackedStringArray("dash_recharge_timer")] -use_parent_material = true -script = ExtResource("1_jvcps") -rotation_speed = 120 -dash_recharge_timer = NodePath("Timer") -dashes_count = 1 - -[node name="EngineSprite" type="Sprite2D" parent="."] -use_parent_material = true -position = Vector2(-4, 0) -texture = ExtResource("2_mll00") - -[node name="EngineParticles" type="GPUParticles2D" parent="."] -position = Vector2(-8, 0) -rotation = 1.5708 -emitting = false -amount = 16 -process_material = SubResource("ParticleProcessMaterial_al11x") -fixed_fps = 50 -script = ExtResource("3_fxngd") - -[node name="TurboParticles" type="GPUParticles2D" parent="."] -rotation = 1.5708 -emitting = false -amount = 64 -process_material = SubResource("ParticleProcessMaterial_gd3um") -randomness = 0.5 -fixed_fps = 50 -local_coords = true -trail_enabled = true -script = ExtResource("4_f11x7") - -[node name="Timer" type="Timer" parent="."] -wait_time = 5.0 -one_shot = true diff --git a/scenes/hulls/HullMk2.tscn b/scenes/hulls/HullMk2.tscn deleted file mode 100644 index 5f624a4..0000000 --- a/scenes/hulls/HullMk2.tscn +++ /dev/null @@ -1,9 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://c02jesitrkrm5"] - -[ext_resource type="PackedScene" uid="uid://bbho4h6tg4jca" path="res://scenes/hulls/starterhull.tscn" id="1_miiwm"] - -[node name="Hull" instance=ExtResource("1_miiwm")] -max_hp = 40.0 -max_fuel = 9000.0 -max_weight = 150.0 -id = "HullMk2" diff --git a/scenes/hulls/npchullt1.tscn b/scenes/hulls/npchullt1.tscn deleted file mode 100644 index 9d561a3..0000000 --- a/scenes/hulls/npchullt1.tscn +++ /dev/null @@ -1,13 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://dtshhww5culu4"] - -[ext_resource type="Script" path="res://scripts/objects/Hull.gd" id="1_x0f7x"] -[ext_resource type="Texture2D" uid="uid://dbwvej0c5bl52" path="res://sprites/ship mk1.png" id="2_wlkiy"] - -[node name="Hull" type="Node2D"] -script = ExtResource("1_x0f7x") -max_hp = 15 - -[node name="HullSprite" type="Sprite2D" parent="."] -use_parent_material = true -position = Vector2(16, 0) -texture = ExtResource("2_wlkiy") diff --git a/scenes/hulls/starterhull.tscn b/scenes/hulls/starterhull.tscn deleted file mode 100644 index 0806648..0000000 --- a/scenes/hulls/starterhull.tscn +++ /dev/null @@ -1,15 +0,0 @@ -[gd_scene load_steps=3 format=3 uid="uid://bbho4h6tg4jca"] - -[ext_resource type="Script" path="res://scripts/objects/Hull.gd" id="1_em4j0"] -[ext_resource type="Texture2D" uid="uid://dbwvej0c5bl52" path="res://sprites/ship mk1.png" id="2_tvpkh"] - -[node name="Hull" type="Node2D"] -use_parent_material = true -script = ExtResource("1_em4j0") -max_fuel = 6000 - -[node name="HullSprite" type="Sprite2D" parent="."] -z_index = -1 -use_parent_material = true -position = Vector2(16, 0) -texture = ExtResource("2_tvpkh") diff --git a/scenes/menus/BaseMenu.tscn b/scenes/menus/BaseMenu.tscn index 6c35bcd..1357996 100644 --- a/scenes/menus/BaseMenu.tscn +++ b/scenes/menus/BaseMenu.tscn @@ -84,6 +84,7 @@ text = "X" script = SubResource("GDScript_ovke4") [node name="TradingMenu" type="NinePatchRect" parent="."] +visible = false layout_mode = 0 offset_left = 320.0 offset_top = 40.0 diff --git a/scenes/npcships/NPCShipDefault.tscn b/scenes/npcships/NPCShipDefault.tscn deleted file mode 100644 index 21b76fb..0000000 --- a/scenes/npcships/NPCShipDefault.tscn +++ /dev/null @@ -1,89 +0,0 @@ -[gd_scene load_steps=11 format=3 uid="uid://523dme3h6d6c"] - -[ext_resource type="Shader" path="res://shaders/ship.gdshader" id="1_0qs3p"] -[ext_resource type="Script" path="res://scripts/objects/npcship.gd" id="1_wioir"] -[ext_resource type="PackedScene" uid="uid://d1bhrxmr0oo0n" path="res://scenes/Bounty.tscn" id="2_6fdps"] -[ext_resource type="PackedScene" uid="uid://cyskycafymwx" path="res://scenes/shields/npcshield.tscn" id="3_47apr"] -[ext_resource type="PackedScene" uid="uid://dtshhww5culu4" path="res://scenes/hulls/npchullt1.tscn" id="4_1ne0s"] -[ext_resource type="PackedScene" uid="uid://20171x3gmn1j" path="res://scenes/engines/starterengine.tscn" id="4_tguk3"] -[ext_resource type="PackedScene" uid="uid://dse2xxx501xuj" path="res://scenes/weapons/presets/NPCSingleLaserMk1.tscn" id="6_wnekw"] - -[sub_resource type="ShaderMaterial" id="ShaderMaterial_a6h5n"] -resource_local_to_scene = true -resource_name = "Shield Material" -shader = ExtResource("1_0qs3p") -shader_parameter/wave_centers = PackedVector2Array(0, 0) -shader_parameter/wave_distances = PackedFloat32Array(0) -shader_parameter/color = Color(1, 0, 0, 1) -shader_parameter/max_distance = 20.0 -shader_parameter/bublic_size = 15.0 - -[sub_resource type="CircleShape2D" id="CircleShape2D_k2lwx"] -radius = 64.0 - -[sub_resource type="LabelSettings" id="LabelSettings_21pok"] -font_size = 12 - -[node name="DefaultShip" type="CharacterBody2D" node_paths=PackedStringArray("destination_timer")] -process_mode = 1 -material = SubResource("ShaderMaterial_a6h5n") -collision_mask = 19 -input_pickable = true -script = ExtResource("1_wioir") -destination_timer = NodePath("DestinationTimer") -bounty = ExtResource("2_6fdps") - -[node name="Shield" parent="." instance=ExtResource("3_47apr")] - -[node name="Hull" parent="." instance=ExtResource("4_1ne0s")] -use_parent_material = true - -[node name="Engine" parent="." instance=ExtResource("4_tguk3")] - -[node name="Collision" type="CollisionPolygon2D" parent="."] -polygon = PackedVector2Array(0, -16, 32, 0, 0, 16, 0, 4, -4, 4, -8, 8, -8, -8, -4, -4, 0, -4) - -[node name="WeaponSlot" type="Node2D" parent="."] -use_parent_material = true - -[node name="SingleLaser" parent="WeaponSlot" instance=ExtResource("6_wnekw")] -use_parent_material = true -position = Vector2(8, 0) - -[node name="DestinationTimer" type="Timer" parent="."] -wait_time = 5.0 -autostart = true - -[node name="TargetSnap" type="Area2D" parent="."] - -[node name="CollisionShape2D" type="CollisionShape2D" parent="TargetSnap"] -position = Vector2(16, 0) -shape = SubResource("CircleShape2D_k2lwx") - -[node name="RemoteTransform2D" type="RemoteTransform2D" parent="."] -remote_path = NodePath("../Zalupa/ZalupaTwo") -update_rotation = false -update_scale = false - -[node name="Zalupa" type="Node" parent="."] - -[node name="ZalupaTwo" type="Node2D" parent="Zalupa"] - -[node name="Health" type="Label" parent="Zalupa/ZalupaTwo"] -layout_direction = 1 -offset_left = -43.0 -offset_top = -45.0 -offset_right = 43.0 -offset_bottom = -25.0 -size_flags_horizontal = 4 -text = "7-8 HP + 7-8 SC" -label_settings = SubResource("LabelSettings_21pok") -horizontal_alignment = 1 -vertical_alignment = 1 - -[node name="DebugLabel" type="Label" parent="."] -visible = false -offset_left = -11.0 -offset_top = -38.0 -offset_right = 29.0 -offset_bottom = -15.0 diff --git a/scenes/shields/npcshield.tscn b/scenes/shields/npcshield.tscn deleted file mode 100644 index e5c5931..0000000 --- a/scenes/shields/npcshield.tscn +++ /dev/null @@ -1,18 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://cyskycafymwx"] - -[ext_resource type="Script" path="res://scripts/objects/Shield.gd" id="1_3t0v2"] - -[node name="Shield" type="Node2D" node_paths=PackedStringArray("recharge_timer", "laser_timer")] -use_parent_material = true -script = ExtResource("1_3t0v2") -max_capacity = 5 -recharge_timer = NodePath("Timer") -laser_timer = NodePath("Timer2") - -[node name="Timer2" type="Timer" parent="."] -wait_time = 5.0 -one_shot = true - -[node name="Timer" type="Timer" parent="."] -wait_time = 5.0 -one_shot = true diff --git a/scenes/shields/startershield.tscn b/scenes/shields/startershield.tscn deleted file mode 100644 index ec88afd..0000000 --- a/scenes/shields/startershield.tscn +++ /dev/null @@ -1,18 +0,0 @@ -[gd_scene load_steps=2 format=3 uid="uid://66m5gj2ufsop"] - -[ext_resource type="Script" path="res://scripts/objects/Shield.gd" id="1_6qr86"] - -[node name="Shield" type="Node2D" node_paths=PackedStringArray("recharge_timer", "laser_timer")] -use_parent_material = true -script = ExtResource("1_6qr86") -max_capacity = 10 -recharge_timer = NodePath("Timer") -laser_timer = NodePath("Timer2") - -[node name="Timer2" type="Timer" parent="."] -wait_time = 5.0 -one_shot = true - -[node name="Timer" type="Timer" parent="."] -wait_time = 5.0 -one_shot = true diff --git a/scenes/weapons/DoubleLaser.tscn b/scenes/weapons/DoubleLaser.tscn deleted file mode 100644 index 0d4c3f8..0000000 --- a/scenes/weapons/DoubleLaser.tscn +++ /dev/null @@ -1,31 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://cb1dnh014jmpb"] - -[ext_resource type="Script" path="res://scripts/objects/weapon.gd" id="1_u8yjv"] -[ext_resource type="PackedScene" uid="uid://djmoij5kuou3j" path="res://scenes/projectiles/Laser.tscn" id="2_cewjf"] -[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/laserbox.png" id="3_14fq6"] - -[node name="DoubleLaser" type="Node2D" node_paths=PackedStringArray("shoot_timer", "spawner_points")] -script = ExtResource("1_u8yjv") -projectile = ExtResource("2_cewjf") -shoot_timer = NodePath("ShootingTimer") -spawner_points = [NodePath("SpawnerSprite1/Spawner1"), NodePath("SpawnerSprite2/Spawner2")] - -[node name="SpawnerSprite1" type="Sprite2D" parent="."] -position = Vector2(4, -12) -rotation = 0.0174533 -texture = ExtResource("3_14fq6") - -[node name="Spawner1" type="Node2D" parent="SpawnerSprite1"] -position = Vector2(4, 0) - -[node name="SpawnerSprite2" type="Sprite2D" parent="."] -position = Vector2(4, 12) -rotation = -0.0174533 -texture = ExtResource("3_14fq6") - -[node name="Spawner2" type="Node2D" parent="SpawnerSprite2"] -position = Vector2(4, 0) - -[node name="ShootingTimer" type="Timer" parent="."] -wait_time = 0.2 -one_shot = true diff --git a/scenes/weapons/SingleLaser.tscn b/scenes/weapons/SingleLaser.tscn deleted file mode 100644 index 247cbd1..0000000 --- a/scenes/weapons/SingleLaser.tscn +++ /dev/null @@ -1,21 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://do1soxs2phq3v"] - -[ext_resource type="Script" path="res://scripts/objects/weapon.gd" id="1_4ig05"] -[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/laserbox.png" id="2_7vlpw"] -[ext_resource type="PackedScene" uid="uid://djmoij5kuou3j" path="res://scenes/projectiles/Laser.tscn" id="2_w1ina"] - -[node name="SingleLaser" type="Node2D" node_paths=PackedStringArray("shoot_timer", "spawner_points")] -script = ExtResource("1_4ig05") -projectile = ExtResource("2_w1ina") -shoot_timer = NodePath("ShootingTimer") -spawner_points = [NodePath("Spawner")] - -[node name="ShootingTimer" type="Timer" parent="."] -wait_time = 0.25 -one_shot = true - -[node name="SpawnerSprite" type="Sprite2D" parent="."] -texture = ExtResource("2_7vlpw") - -[node name="Spawner" type="Node2D" parent="."] -position = Vector2(4, 0) diff --git a/scenes/weapons/presets/DoubleLaserMk1.tscn b/scenes/weapons/presets/DoubleLaserMk1.tscn deleted file mode 100644 index c474f18..0000000 --- a/scenes/weapons/presets/DoubleLaserMk1.tscn +++ /dev/null @@ -1,35 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://b5ejm8antxfsm"] - -[ext_resource type="Script" path="res://scripts/objects/weapon.gd" id="1_ugbl6"] -[ext_resource type="PackedScene" uid="uid://djmoij5kuou3j" path="res://scenes/projectiles/Laser.tscn" id="2_b52h8"] -[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/laserbox.png" id="3_ahhl5"] - -[node name="DoubleLaserMk1" type="Node2D" node_paths=PackedStringArray("shoot_timer", "spawner_points")] -position = Vector2(8, 0) -script = ExtResource("1_ugbl6") -projectile = ExtResource("2_b52h8") -ammo_type = "Laser Energy" -ammo_consumption = 2.0 -shoot_timer = NodePath("ShootingTimer") -spawner_points = [NodePath("SpawnerSprite1/Spawner1"), NodePath("SpawnerSprite2/Spawner2")] -id = "DoubleLaserMk1" - -[node name="SpawnerSprite1" type="Sprite2D" parent="."] -position = Vector2(4, -12) -rotation = 0.0174533 -texture = ExtResource("3_ahhl5") - -[node name="Spawner1" type="Node2D" parent="SpawnerSprite1"] -position = Vector2(4, 0) - -[node name="SpawnerSprite2" type="Sprite2D" parent="."] -position = Vector2(4, 12) -rotation = -0.0174533 -texture = ExtResource("3_ahhl5") - -[node name="Spawner2" type="Node2D" parent="SpawnerSprite2"] -position = Vector2(4, 0) - -[node name="ShootingTimer" type="Timer" parent="."] -wait_time = 0.15 -one_shot = true diff --git a/scenes/weapons/presets/NPCSingleLaserMk1.tscn b/scenes/weapons/presets/NPCSingleLaserMk1.tscn deleted file mode 100644 index 0856f5f..0000000 --- a/scenes/weapons/presets/NPCSingleLaserMk1.tscn +++ /dev/null @@ -1,22 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://dse2xxx501xuj"] - -[ext_resource type="Script" path="res://scripts/objects/weapon.gd" id="1_6r7e6"] -[ext_resource type="PackedScene" uid="uid://djmoij5kuou3j" path="res://scenes/projectiles/Laser.tscn" id="2_8akh2"] -[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/laserbox.png" id="3_ncnas"] - -[node name="SingleLaser" type="Node2D" node_paths=PackedStringArray("shoot_timer", "spawner_points")] -script = ExtResource("1_6r7e6") -projectile = ExtResource("2_8akh2") -shoot_timer = NodePath("ShootingTimer") -spawner_points = [NodePath("Spawner")] - -[node name="ShootingTimer" type="Timer" parent="."] -wait_time = 0.25 -one_shot = true - -[node name="SpawnerSprite" type="Sprite2D" parent="."] -use_parent_material = true -texture = ExtResource("3_ncnas") - -[node name="Spawner" type="Node2D" parent="."] -position = Vector2(4, 0) diff --git a/scenes/weapons/presets/SingleLaserMk1.tscn b/scenes/weapons/presets/SingleLaserMk1.tscn deleted file mode 100644 index cb78893..0000000 --- a/scenes/weapons/presets/SingleLaserMk1.tscn +++ /dev/null @@ -1,26 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://cf11711uqb42j"] - -[ext_resource type="Script" path="res://scripts/objects/weapon.gd" id="1_dwcuc"] -[ext_resource type="PackedScene" uid="uid://djmoij5kuou3j" path="res://scenes/projectiles/Laser.tscn" id="2_eiesu"] -[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/laserbox.png" id="3_n1sx7"] - -[node name="SingleLaser" type="Node2D" node_paths=PackedStringArray("shoot_timer", "spawner_points")] -use_parent_material = true -position = Vector2(8, 0) -script = ExtResource("1_dwcuc") -projectile = ExtResource("2_eiesu") -ammo_type = "Laser Energy" -ammo_consumption = 1.0 -shoot_timer = NodePath("ShootingTimer") -spawner_points = [NodePath("Spawner")] - -[node name="ShootingTimer" type="Timer" parent="."] -wait_time = 0.25 -one_shot = true - -[node name="SpawnerSprite" type="Sprite2D" parent="."] -use_parent_material = true -texture = ExtResource("3_n1sx7") - -[node name="Spawner" type="Node2D" parent="."] -position = Vector2(4, 0) diff --git a/scenes/weapons/presets/SingleRocketMk1.tscn b/scenes/weapons/presets/SingleRocketMk1.tscn deleted file mode 100644 index 566c9e4..0000000 --- a/scenes/weapons/presets/SingleRocketMk1.tscn +++ /dev/null @@ -1,25 +0,0 @@ -[gd_scene load_steps=4 format=3 uid="uid://bhkuvj884yyan"] - -[ext_resource type="Script" path="res://scripts/objects/weapon.gd" id="1_wdpx2"] -[ext_resource type="PackedScene" uid="uid://qr1h87np4sn1" path="res://scenes/projectiles/Rocket.tscn" id="2_fypwx"] -[ext_resource type="Texture2D" uid="uid://c3gei46k8muk3" path="res://sprites/laserbox.png" id="3_7gexv"] - -[node name="SingleRocketMk1" type="Node2D" node_paths=PackedStringArray("shoot_timer", "spawner_points")] -position = Vector2(16, 0) -script = ExtResource("1_wdpx2") -projectile = ExtResource("2_fypwx") -ammo_type = "Rockets" -ammo_consumption = 1.0 -shoot_timer = NodePath("ShootingTimer") -spawner_points = [NodePath("Spawner")] -id = "SingleRocketMk1" - -[node name="ShootingTimer" type="Timer" parent="."] -wait_time = 0.5 -one_shot = true - -[node name="SpawnerSprite" type="Sprite2D" parent="."] -texture = ExtResource("3_7gexv") - -[node name="Spawner" type="Node2D" parent="."] -position = Vector2(4, 0) diff --git a/scripts/game.gd b/scripts/Classes/game.gd similarity index 88% rename from scripts/game.gd rename to scripts/Classes/game.gd index 30b1f64..e499a13 100644 --- a/scripts/game.gd +++ b/scripts/Classes/game.gd @@ -1,16 +1,18 @@ extends Node class_name Game +## TODO: rewrite item system + enum ITEM_TYPE {VALUABLE, WEAPON, HULL, SHIELD, ENGINE, AMMUNITION} enum AMMO_TYPE {NULL, LASER_ENERGY, ROCKETS} enum BASE_TYPE {POWER, MINING, FOOD, TRADING, MODULE} enum Faction {None, Player, Peaceful, Neutral, Aggressive} -const DEFAULT_ITEM = preload("res://items/test_item.tres") -const DEFAULT_WEAPON = preload("res://scenes/weapons/presets/SingleLaserMk1.tscn") -const DEFAULT_HULL = preload("res://scenes/hulls/starterhull.tscn") -const DEFAULT_ENGINE = preload("res://scenes/engines/starterengine.tscn") -const DEFAULT_SHIELD = preload("res://scenes/shields/startershield.tscn") +#const DEFAULT_ITEM = preload("res://items/test_item.tres") +#const DEFAULT_WEAPON = preload("res://scenes/weapons/presets/SingleLaserMk1.tscn") +#const DEFAULT_HULL = preload("res://scenes/hulls/starterhull.tscn") +#const DEFAULT_ENGINE = preload("res://scenes/engines/starterengine.tscn") +#const DEFAULT_SHIELD = preload("res://scenes/shields/startershield.tscn") const salt = "2ndbeam" const gameversion = "Ifre 1.0" @@ -115,27 +117,15 @@ static func get_item(id : String) -> Item: if ResourceLoader.exists(path): var res = load(path) return res.duplicate() - return DEFAULT_ITEM + return null ## Returns weapon packed scene if it exists or DEFAULT_WEAPON instead static func get_weapon(id : String) -> PackedScene: var path = "res://scenes/weapons/presets/{name}.tscn".format({"name": id}) var res = load(path) - if res != null: - return res - else: - return DEFAULT_WEAPON + return res static func get_module(id : String, type : String) -> PackedScene: var path = "res://scenes/{type}s/{name}.tscn".format({"name": id, "type": type}) var res = load(path) - if res != null: - return res - match type: - "hull": - return DEFAULT_HULL - "engine": - return DEFAULT_ENGINE - "shield": - return DEFAULT_SHIELD - return DEFAULT_HULL + return res diff --git a/scripts/item.gd b/scripts/Classes/item.gd similarity index 100% rename from scripts/item.gd rename to scripts/Classes/item.gd diff --git a/scripts/profile.gd b/scripts/Classes/profile.gd similarity index 100% rename from scripts/profile.gd rename to scripts/Classes/profile.gd diff --git a/scripts/quest.gd b/scripts/Classes/quest.gd similarity index 100% rename from scripts/quest.gd rename to scripts/Classes/quest.gd diff --git a/scripts/faction.gd b/scripts/Star System/faction.gd similarity index 100% rename from scripts/faction.gd rename to scripts/Star System/faction.gd diff --git a/scripts/nebula.gd b/scripts/Star System/nebula.gd similarity index 100% rename from scripts/nebula.gd rename to scripts/Star System/nebula.gd diff --git a/scripts/misc/ProjectilesContainer.gd b/scripts/Star System/projectile_container.gd similarity index 100% rename from scripts/misc/ProjectilesContainer.gd rename to scripts/Star System/projectile_container.gd diff --git a/scripts/objects/Star.gd b/scripts/Star System/star.gd similarity index 100% rename from scripts/objects/Star.gd rename to scripts/Star System/star.gd diff --git a/scripts/star_system.gd b/scripts/Star System/star_system.gd similarity index 100% rename from scripts/star_system.gd rename to scripts/Star System/star_system.gd diff --git a/scripts/misc/stars_generator.gd b/scripts/Star System/stars_generator.gd similarity index 100% rename from scripts/misc/stars_generator.gd rename to scripts/Star System/stars_generator.gd diff --git a/scripts/menu/OptionsColors.gd b/scripts/menu/OptionsColors.gd deleted file mode 100644 index 7f24d6c..0000000 --- a/scripts/menu/OptionsColors.gd +++ /dev/null @@ -1,4 +0,0 @@ -extends MenuDefaultButton - -func action(): - get_tree().current_scene.recolor() diff --git a/scripts/menu/ResetMainShip.gd b/scripts/menu/ResetMainShip.gd deleted file mode 100644 index aa1cfbd..0000000 --- a/scripts/menu/ResetMainShip.gd +++ /dev/null @@ -1,4 +0,0 @@ -extends MenuDefaultButton - -func action(): - ship.destroy() diff --git a/scripts/misc/BaseCollider.gd b/scripts/misc/BaseCollider.gd deleted file mode 100644 index e9ee53b..0000000 --- a/scripts/misc/BaseCollider.gd +++ /dev/null @@ -1,3 +0,0 @@ -extends StaticBody2D - -var faction = "none" diff --git a/scripts/misc/BaseNPCRotator.gd b/scripts/misc/BaseNPCRotator.gd deleted file mode 100644 index 08496a0..0000000 --- a/scripts/misc/BaseNPCRotator.gd +++ /dev/null @@ -1,5 +0,0 @@ -extends Area2D - -func _on_body_entered(body): - if body is NPCShip: - body.switchdestination() diff --git a/scripts/misc/CameraTweaks.gd b/scripts/misc/CameraTweaks.gd deleted file mode 100644 index e5c7b6b..0000000 --- a/scripts/misc/CameraTweaks.gd +++ /dev/null @@ -1,29 +0,0 @@ -extends Camera2D - -@onready var ship = get_parent() -var engine -@onready var cur_scale = zoom.x -@onready var min_scale = cur_scale / 1.5 -@onready var max_scale = cur_scale * 2 -var rdy = false - -func _ready(): - get_tree().create_timer(0.05).timeout.connect(is_rdy) - -func is_rdy(): - rdy = true - engine = ship.engine - -func _process(_delta): - if !rdy: - return - engine = ship.engine - var speed_percentage = engine.max_speed / engine.speed - var factor : float - if get_parent().allow_shooting: - factor = clamp(speed_percentage, min_scale, max_scale) - if engine.speed < 0: - factor = max_scale - else: - factor = 1.0 - zoom = Vector2(factor, factor) diff --git a/scripts/misc/Counter.gd b/scripts/misc/Counter.gd deleted file mode 100644 index 6b217d9..0000000 --- a/scripts/misc/Counter.gd +++ /dev/null @@ -1,32 +0,0 @@ -extends Label - -@export var counter_id : String -@onready var ship = $"../../.." -var hull -var shield -var rdy = false - -func _ready(): - get_tree().create_timer(0.05).timeout.connect(is_rdy) - -func is_rdy(): - rdy = true - hull = ship.hull - shield = ship.shield - -func _process(_delta) -> void: - if !rdy: - return - hull = ship.hull - shield = ship.shield - match counter_id: - "ammo": - text = str(hull.ammunition) - "fuel": - text = "Fuel: {fuel} / {max} units".format({"fuel":hull.fuel, "max":hull.max_fuel}) - "hp": - text = "Hull Strength: {hp} / {max} units".format({"hp":"%0.2f" % hull.hp, "max":hull.max_hp}) - "money": - text = "Available Money: {money} units".format({"money":ship.money}) - "shield": - text = "Shield Capacity: {shield} / {max} units".format({"shield":"%0.2f" % shield.capacity, "max":shield.max_capacity}) diff --git a/scripts/misc/EngineParticles.gd b/scripts/misc/EngineParticles.gd deleted file mode 100644 index a993688..0000000 --- a/scripts/misc/EngineParticles.gd +++ /dev/null @@ -1,8 +0,0 @@ -extends GPUParticles2D - -@onready var engine = $".." - -func _process(_delta): - var speed_percentage = clamp(engine.speed / engine.max_speed, 0.75, 1.5) - speed_scale = speed_percentage if engine.speed > 0 else 1 - emitting = engine.speed > 0 diff --git a/scripts/misc/FactionRecoloring.gd b/scripts/misc/FactionRecoloring.gd deleted file mode 100644 index 9ad9e44..0000000 --- a/scripts/misc/FactionRecoloring.gd +++ /dev/null @@ -1,13 +0,0 @@ -extends Node2D - -@export var faction : bool - -func changeitemscolor(): - var items = get_children() - var ship = get_tree().current_scene.ship - for item in items: - #item.modulate = modulate - if item.material: - item.material.set_shader_parameter("color",modulate) - if faction: - ship.minimap.add_marker(item, "hostile") diff --git a/scripts/objects/Bounty.gd b/scripts/objects/Bounty.gd deleted file mode 100644 index 7c3bea7..0000000 --- a/scripts/objects/Bounty.gd +++ /dev/null @@ -1,10 +0,0 @@ -extends Area2D - -@export var amount: float = 20 - -@onready var text = $Label - -func _on_body_entered(body): - if body is MainShip: - body.money += amount - queue_free() diff --git a/scripts/objects/Hull.gd b/scripts/objects/Hull.gd deleted file mode 100644 index 240251c..0000000 --- a/scripts/objects/Hull.gd +++ /dev/null @@ -1,26 +0,0 @@ -extends Node2D - -#class_name Hull - -@export var max_hp : float = 30 -@export var max_fuel : float = 1000 -@export var max_weight : float = 100 -@export var id : String = "starterhull" -@onready var hp : float = max_hp -@onready var fuel : float = max_fuel - -var weight : float = 0 - -var ammunition = { - "n/a" : 0, - "Laser Energy" : 100, - "Rockets" : 10 -} - -var max_ammunition = { - "n/a" : 0, - "Laser Energy" : 100, - "Rockets" : 20 -} - -var cargo = {} diff --git a/scripts/objects/Shield.gd b/scripts/objects/Shield.gd deleted file mode 100644 index 0edceb1..0000000 --- a/scripts/objects/Shield.gd +++ /dev/null @@ -1,76 +0,0 @@ -extends Node2D - -#class_name Shield - -@export var max_capacity : int = 8 -@export var shield_charge_rate : float = 1 -@export var recharge_timer : Timer -@export var laser_timer : Timer -@export var laser_charge_rate : float = 20 -@export var id : String = "startershield" - -@onready var ship = get_parent() -@onready var capacity : float = max_capacity -var can_recharge : bool = false -var laser_recharge : bool = true - -var wave_distances = [-1,-1,-1,-1,-1,-1,-1,-1,-1,-1] -var wave_positions = [Vector2.ZERO,Vector2.ZERO,Vector2.ZERO,Vector2.ZERO,Vector2.ZERO,Vector2.ZERO,Vector2.ZERO,Vector2.ZERO,Vector2.ZERO,Vector2.ZERO] - -func _ready(): - recharge_timer.timeout.connect(recharging_timer_out) - laser_timer.timeout.connect(laser_timer_out) - material = ship.material - -func deal_damage(damage : float,hit_position : Vector2): - # Shield wave - var shield_tween = create_tween() - var wave_index = find_free_index() - shield_tween.tween_method(set_wave_distance.bind(wave_index),0,material.get_shader_parameter("max_distance"),0.5) - shield_tween.tween_callback(reset_wave_distance.bind(wave_index)) - shield_tween.custom_step(0.1) - - wave_positions[wave_index] = hit_position - - material.set_shader_parameter("wave_centers",wave_positions) - material.set_shader_parameter("wave_distances",wave_distances) - - capacity -= damage - if capacity < 0: - ship.hull.hp += capacity - capacity = 0 - can_recharge = false - recharge_timer.start() - laser_timer.start() - -func set_wave_distance(value,index): - wave_distances[index] = value - material.set_shader_parameter("wave_distances",wave_distances) - -func reset_wave_distance(index): - wave_distances[index] = -1 - material.set_shader_parameter("wave_distances",wave_distances) - -func find_free_index() -> int: - for i in range(wave_distances.size()): - if wave_distances[i] == -1: - return i - return 0 - -func recharging_timer_out(): - can_recharge = true - -func _physics_process(delta): - if can_recharge: - capacity += shield_charge_rate * delta - if capacity > max_capacity: - capacity = max_capacity - can_recharge = false - if laser_recharge: - ship.hull.ammunition["Laser Energy"] += laser_charge_rate * delta - if ship.hull.ammunition["Laser Energy"] > ship.hull.max_ammunition["Laser Energy"]: - ship.hull.ammunition["Laser Energy"] = ship.hull.max_ammunition["Laser Energy"] - laser_recharge = false - -func laser_timer_out(): - laser_recharge = true diff --git a/scripts/objects/ShipEngine.gd b/scripts/objects/ShipEngine.gd deleted file mode 100644 index 942f00f..0000000 --- a/scripts/objects/ShipEngine.gd +++ /dev/null @@ -1,109 +0,0 @@ -extends Node2D - -# TODO: rewrite movement system to be impulse based - -# class_name ShipEngine - -@export var max_speed : float = 200 -@export var max_turbo_speed : float = 300 -@export var acceleration : float = 50 -@export var fuel_consumption : float = 100 -@export var rotation_speed : int = 90 -@export var id : String = "starterengine" -@export var dash_recharge_timer : Timer -@export_range(1, 10, 1) var dashes_count : int = 3 - -@onready var ship = get_parent() -@onready var double_tap_timer = Timer.new() -@onready var dash_timer = Timer.new() - -var hull -var speed = 0 -var min_speed = max_speed / -4 -var turbo_enabled = false -var alternative_movement = false -var destination_angle : float -var destination_difference : float -var dash_direction_left = true -var is_double_tapping = false -var is_dashing = false - -func _ready(): - dash_recharge_timer.timeout.connect(dash_recharge) - add_child(double_tap_timer) - add_child(dash_timer) - double_tap_timer.one_shot = true - double_tap_timer.timeout.connect(not_double_tapping) - dash_timer.one_shot = true - dash_timer.timeout.connect(not_dashing) - -func _physics_process(delta): - hull = ship.hull - modulate = ship.material.get_shader_parameter('color') - var turbo_input = Input.get_action_raw_strength("turbo") - var acceleration_input = Input.get_axis("deccelerate", "accelerate") if ship is MainShip else 1.0 - var rotation_input = Input.get_axis("rotateleft", "rotateright") - # проверка на рывок - var left_released = Input.is_action_just_released("rotateleft") - var right_released = Input.is_action_just_released("rotateright") - if (left_released or right_released): - if !is_double_tapping and !is_dashing: - double_tap_timer.start(0.25) - is_double_tapping = true - print("first tap") - else: - dash_direction_left = left_released - is_dashing = true - is_double_tapping = false - dash_timer.start(0.1) - double_tap_timer.stop() - print("second tap") - - if destination_angle - ship.rotation_degrees == clamp(destination_angle - ship.rotation_degrees, -180, 180): - destination_difference = destination_angle - ship.rotation_degrees - else: - destination_difference = ship.rotation_degrees - destination_angle - if destination_difference != clamp(destination_difference, -1, 1): - ship.rotation_degrees += sign(destination_difference) * rotation_speed * delta - else: - ship.rotation_degrees = destination_angle - if alternative_movement: - destination_angle += rotation_input * rotation_speed * delta - if destination_angle > 180: destination_angle = -180 - if destination_angle < -180: destination_angle = 180 - if Vector2.ZERO.distance_to(global_position) >= 5800: - destination_angle = rad_to_deg(global_position.angle_to_point(Vector2.ZERO)) - elif ship is MainShip: - destination_angle = rad_to_deg(ship.global_position.angle_to_point(get_global_mouse_position())) - turbo_enabled = clamp(turbo_input * hull.fuel, 0, 1) if ship is MainShip else (ship.state == "runaway" and hull.fuel > 0) - if !turbo_enabled: - speed = clamp(speed + acceleration_input * acceleration * delta, min_speed, max(max_speed, speed)) - if speed > max_speed: - speed -= acceleration * delta if acceleration_input != -1 else 0 - else: - if hull.fuel > 0: - speed = clamp(speed + acceleration * delta, min_speed, max_turbo_speed) - if speed > max_speed: - hull.fuel -= fuel_consumption * delta - if hull.fuel < 0: - hull.fuel = 0 - var additional_rotation = 0 - var additional_speed = 0 - if is_dashing and ship is MainShip: - print("wanna dash") - additional_speed = 500 - additional_rotation = deg_to_rad(-90) if dash_direction_left else deg_to_rad(90) - ship.velocity = Vector2.from_angle(ship.rotation + additional_rotation) * (speed + additional_speed) - ship.move_and_slide() - - if Input.is_action_just_released("alternatemovement") and ship is MainShip: - alternative_movement = !alternative_movement - -func dash_recharge(): - pass - -func not_double_tapping(): - is_double_tapping = false - -func not_dashing(): - is_dashing = false diff --git a/scripts/objects/npcship.gd b/scripts/objects/npcship.gd deleted file mode 100644 index 53714d2..0000000 --- a/scripts/objects/npcship.gd +++ /dev/null @@ -1,91 +0,0 @@ -extends CharacterBody2D -# TODO: rewrite NPC to use state machine -# TODO: create class_name which is used to inherit common attributes to mainship and npc ship -class_name NPCShip - -@export var destination_timer : Timer -@export var faction = "Enemy" -@export var bounty_min : int = 20 -@export var bounty_max : int = 30 -@export var bounty : PackedScene -@onready var ship = get_tree().current_scene.get_node("MainShip") -@onready var engine = $"Engine" -@onready var hull = $"Hull" -@onready var debug_label = $DebugLabel -@onready var target_snap = $TargetSnap -@onready var healthbar = $Zalupa/ZalupaTwo/Health -@onready var shield = $Shield -var state = "idle" -var shooting = false -var allow_shooting = true -signal destroyed - -func _ready(): - destination_timer.timeout.connect(switchdestination) - target_snap.mouse_entered.connect(get_tree().current_scene.addtargetlist.bind(self)) - target_snap.mouse_exited.connect(get_tree().current_scene.removetargetlist.bind(self)) - destroyed.connect(get_tree().current_scene.enemydestroyed) - shield.material = material - material.set_shader_parameter("color",modulate) - -func _physics_process(_delta): - match state: - "idle": - idlestate() - "chase": - chasestate() - "maintaindistance": - maintaindistancestate() - "runaway": - runawaystate() - var format = {"HP" : "%0.2f" % hull.hp, "SC" : "%0.2f" % shield.capacity} - healthbar.text = "{HP} HS + {SC} SC".format(format) - if hull.hp <= 0: - destroy() - if Vector2.ZERO.distance_to(global_position) > 5800: - destroy(true) - -func switchdestination(): - engine.destination_angle = randi_range(0, 360) - -func idlestate(): - shooting = false - if global_position.distance_to(ship.global_position) <= 512 and ship.allow_shooting: - state = "chase" - -func chasestate(): - engine.destination_angle = rad_to_deg(global_position.angle_to_point(ship.global_position)) - shooting = true if abs(engine.destination_difference) <= 5 else false - if global_position.distance_to(ship.global_position) > 512 or !ship.allow_shooting: - state = "idle" - if hull.hp < hull.max_hp * 0.2: state = "runaway" - if global_position.distance_to(ship.global_position) <= 128: - state = "maintaindistance" - -func maintaindistancestate(): - engine.destination_angle += 1 - shooting = true if abs(engine.destination_difference) <= 5 else false - if global_position.distance_to(ship.global_position) > 128: - state = "chase" - if !ship.allow_shooting: - state = "idle" - -func runawaystate(): - shooting = false - engine.destination_angle = rad_to_deg(global_position.angle_to_point(ship.global_position)) - 180 - if global_position.distance_to(ship.global_position) > 1024 or !ship.allow_shooting: - state = "idle" - -func destroy(silent : bool = false): - hull.hp = hull.max_hp - hull.fuel = hull.max_fuel - shield.capacity = shield.max_capacity - state = "idle" - var bounty_inst = bounty.instantiate() - get_tree().current_scene.add_child(bounty_inst) - bounty_inst.global_position = global_position - bounty_inst.amount = randi_range(bounty_min, bounty_max) - bounty_inst.text.text = str(bounty_inst.amount) + " MU" - global_position = Vector2(randi_range(-4096, 4096), randi_range(-4096, 4096)) - if !silent: - destroyed.emit(self) diff --git a/sprites/triangle_base.png b/sprites/Bases/triangle_base.png similarity index 100% rename from sprites/triangle_base.png rename to sprites/Bases/triangle_base.png diff --git a/sprites/triangle_base.png.import b/sprites/Bases/triangle_base.png.import similarity index 70% rename from sprites/triangle_base.png.import rename to sprites/Bases/triangle_base.png.import index deece67..fe467da 100644 --- a/sprites/triangle_base.png.import +++ b/sprites/Bases/triangle_base.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://3x77t3kd6v0x" -path="res://.godot/imported/triangle_base.png-3d74a6cc4d3435c6c24f8e581c372deb.ctex" +path="res://.godot/imported/triangle_base.png-efa953667e8fc6fd51332cd2f04bae41.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/triangle_base.png" -dest_files=["res://.godot/imported/triangle_base.png-3d74a6cc4d3435c6c24f8e581c372deb.ctex"] +source_file="res://sprites/Bases/triangle_base.png" +dest_files=["res://.godot/imported/triangle_base.png-efa953667e8fc6fd51332cd2f04bae41.ctex"] [params] diff --git a/sprites/rocket mk1 1.png b/sprites/Projectiles/Rocket/rocket mk1 1.png similarity index 100% rename from sprites/rocket mk1 1.png rename to sprites/Projectiles/Rocket/rocket mk1 1.png diff --git a/sprites/rocket mk1 1.png.import b/sprites/Projectiles/Rocket/rocket mk1 1.png.import similarity index 69% rename from sprites/rocket mk1 1.png.import rename to sprites/Projectiles/Rocket/rocket mk1 1.png.import index 3d4008e..ce02378 100644 --- a/sprites/rocket mk1 1.png.import +++ b/sprites/Projectiles/Rocket/rocket mk1 1.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dvnqx6habw8uc" -path="res://.godot/imported/rocket mk1 1.png-2276d27e863a65f7c9a0b38d6d26231f.ctex" +path="res://.godot/imported/rocket mk1 1.png-b98835b926a66de5d9f57788e43963e0.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/rocket mk1 1.png" -dest_files=["res://.godot/imported/rocket mk1 1.png-2276d27e863a65f7c9a0b38d6d26231f.ctex"] +source_file="res://sprites/Projectiles/Rocket/rocket mk1 1.png" +dest_files=["res://.godot/imported/rocket mk1 1.png-b98835b926a66de5d9f57788e43963e0.ctex"] [params] diff --git a/sprites/rocket mk1 2.png b/sprites/Projectiles/Rocket/rocket mk1 2.png similarity index 100% rename from sprites/rocket mk1 2.png rename to sprites/Projectiles/Rocket/rocket mk1 2.png diff --git a/sprites/rocket mk1 2.png.import b/sprites/Projectiles/Rocket/rocket mk1 2.png.import similarity index 69% rename from sprites/rocket mk1 2.png.import rename to sprites/Projectiles/Rocket/rocket mk1 2.png.import index 189ead5..e2d5d33 100644 --- a/sprites/rocket mk1 2.png.import +++ b/sprites/Projectiles/Rocket/rocket mk1 2.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://dgxlnp520q1tp" -path="res://.godot/imported/rocket mk1 2.png-0962c544ba29b44275d4cd70a299c51d.ctex" +path="res://.godot/imported/rocket mk1 2.png-e9a023d9e3114368700d242d32b40a17.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/rocket mk1 2.png" -dest_files=["res://.godot/imported/rocket mk1 2.png-0962c544ba29b44275d4cd70a299c51d.ctex"] +source_file="res://sprites/Projectiles/Rocket/rocket mk1 2.png" +dest_files=["res://.godot/imported/rocket mk1 2.png-e9a023d9e3114368700d242d32b40a17.ctex"] [params] diff --git a/sprites/rocket mk1 3.png b/sprites/Projectiles/Rocket/rocket mk1 3.png similarity index 100% rename from sprites/rocket mk1 3.png rename to sprites/Projectiles/Rocket/rocket mk1 3.png diff --git a/sprites/rocket mk1 3.png.import b/sprites/Projectiles/Rocket/rocket mk1 3.png.import similarity index 69% rename from sprites/rocket mk1 3.png.import rename to sprites/Projectiles/Rocket/rocket mk1 3.png.import index 83a3594..0569388 100644 --- a/sprites/rocket mk1 3.png.import +++ b/sprites/Projectiles/Rocket/rocket mk1 3.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://fqcylid4oa6b" -path="res://.godot/imported/rocket mk1 3.png-7d045551ca4b335259a2e92e056f5c3c.ctex" +path="res://.godot/imported/rocket mk1 3.png-7f7ac06cf261937bbfa609fb01b88ab4.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/rocket mk1 3.png" -dest_files=["res://.godot/imported/rocket mk1 3.png-7d045551ca4b335259a2e92e056f5c3c.ctex"] +source_file="res://sprites/Projectiles/Rocket/rocket mk1 3.png" +dest_files=["res://.godot/imported/rocket mk1 3.png-7f7ac06cf261937bbfa609fb01b88ab4.ctex"] [params] diff --git a/sprites/rocket mk1 4.png b/sprites/Projectiles/Rocket/rocket mk1 4.png similarity index 100% rename from sprites/rocket mk1 4.png rename to sprites/Projectiles/Rocket/rocket mk1 4.png diff --git a/sprites/rocket mk1 4.png.import b/sprites/Projectiles/Rocket/rocket mk1 4.png.import similarity index 69% rename from sprites/rocket mk1 4.png.import rename to sprites/Projectiles/Rocket/rocket mk1 4.png.import index 9f90d64..675d311 100644 --- a/sprites/rocket mk1 4.png.import +++ b/sprites/Projectiles/Rocket/rocket mk1 4.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://3nxmmp826b1s" -path="res://.godot/imported/rocket mk1 4.png-13271166905d85866c70ce36b15c12c6.ctex" +path="res://.godot/imported/rocket mk1 4.png-3be03553398205cde9a01aa79c36fbfc.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/rocket mk1 4.png" -dest_files=["res://.godot/imported/rocket mk1 4.png-13271166905d85866c70ce36b15c12c6.ctex"] +source_file="res://sprites/Projectiles/Rocket/rocket mk1 4.png" +dest_files=["res://.godot/imported/rocket mk1 4.png-3be03553398205cde9a01aa79c36fbfc.ctex"] [params] diff --git a/sprites/laserbox.png b/sprites/Ships/Parts/laserbox.png similarity index 100% rename from sprites/laserbox.png rename to sprites/Ships/Parts/laserbox.png diff --git a/sprites/laserbox.png.import b/sprites/Ships/Parts/laserbox.png.import similarity index 71% rename from sprites/laserbox.png.import rename to sprites/Ships/Parts/laserbox.png.import index 63ef68c..c824537 100644 --- a/sprites/laserbox.png.import +++ b/sprites/Ships/Parts/laserbox.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://c3gei46k8muk3" -path="res://.godot/imported/laserbox.png-29566d3422bb4e72374db52e4ae5062b.ctex" +path="res://.godot/imported/laserbox.png-fe76301a0840b9be780811b50e80f334.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/laserbox.png" -dest_files=["res://.godot/imported/laserbox.png-29566d3422bb4e72374db52e4ae5062b.ctex"] +source_file="res://sprites/Ships/Parts/laserbox.png" +dest_files=["res://.godot/imported/laserbox.png-fe76301a0840b9be780811b50e80f334.ctex"] [params] diff --git a/sprites/lasergun.png b/sprites/Ships/Parts/lasergun.png similarity index 100% rename from sprites/lasergun.png rename to sprites/Ships/Parts/lasergun.png diff --git a/sprites/lasergun.png.import b/sprites/Ships/Parts/lasergun.png.import similarity index 71% rename from sprites/lasergun.png.import rename to sprites/Ships/Parts/lasergun.png.import index 1aa94e4..3e5f07a 100644 --- a/sprites/lasergun.png.import +++ b/sprites/Ships/Parts/lasergun.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://1yihkbdosopx" -path="res://.godot/imported/lasergun.png-6b93eff0666d2773975cf9e373c6fac8.ctex" +path="res://.godot/imported/lasergun.png-44cb4ce013be954674a4a46c4a078d50.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/lasergun.png" -dest_files=["res://.godot/imported/lasergun.png-6b93eff0666d2773975cf9e373c6fac8.ctex"] +source_file="res://sprites/Ships/Parts/lasergun.png" +dest_files=["res://.godot/imported/lasergun.png-44cb4ce013be954674a4a46c4a078d50.ctex"] [params] diff --git a/sprites/kamikaze.png b/sprites/Ships/kamikaze.png similarity index 100% rename from sprites/kamikaze.png rename to sprites/Ships/kamikaze.png diff --git a/sprites/kamikaze.png.import b/sprites/Ships/kamikaze.png.import similarity index 72% rename from sprites/kamikaze.png.import rename to sprites/Ships/kamikaze.png.import index 61d3e87..7723d4c 100644 --- a/sprites/kamikaze.png.import +++ b/sprites/Ships/kamikaze.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bchkncbniclhh" -path="res://.godot/imported/kamikaze.png-a9865d0191d172f866fc5dbf442fac7a.ctex" +path="res://.godot/imported/kamikaze.png-8caa886107490ca51617663c7ec67edb.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/kamikaze.png" -dest_files=["res://.godot/imported/kamikaze.png-a9865d0191d172f866fc5dbf442fac7a.ctex"] +source_file="res://sprites/Ships/kamikaze.png" +dest_files=["res://.godot/imported/kamikaze.png-8caa886107490ca51617663c7ec67edb.ctex"] [params] diff --git a/sprites/ship.png b/sprites/Ships/ship.png similarity index 100% rename from sprites/ship.png rename to sprites/Ships/ship.png diff --git a/sprites/ship.png.import b/sprites/Ships/ship.png.import similarity index 73% rename from sprites/ship.png.import rename to sprites/Ships/ship.png.import index cee68f9..77e11e4 100644 --- a/sprites/ship.png.import +++ b/sprites/Ships/ship.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://beb76cssb3knp" -path="res://.godot/imported/ship.png-4d5e64b785005468aa74f7ca14df1341.ctex" +path="res://.godot/imported/ship.png-31fdfa4b30d747f6c724d5b0a745aaf5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/ship.png" -dest_files=["res://.godot/imported/ship.png-4d5e64b785005468aa74f7ca14df1341.ctex"] +source_file="res://sprites/Ships/ship.png" +dest_files=["res://.godot/imported/ship.png-31fdfa4b30d747f6c724d5b0a745aaf5.ctex"] [params] diff --git a/sprites/shooter.png b/sprites/Ships/shooter.png similarity index 100% rename from sprites/shooter.png rename to sprites/Ships/shooter.png diff --git a/sprites/shooter.png.import b/sprites/Ships/shooter.png.import similarity index 72% rename from sprites/shooter.png.import rename to sprites/Ships/shooter.png.import index 08b359f..3adc097 100644 --- a/sprites/shooter.png.import +++ b/sprites/Ships/shooter.png.import @@ -3,15 +3,15 @@ importer="texture" type="CompressedTexture2D" uid="uid://bxtd2ij1dc1d3" -path="res://.godot/imported/shooter.png-dc69c2835aa11bc6878a2e4130c257c1.ctex" +path="res://.godot/imported/shooter.png-1d7ae672c8a6cec41d17794a14a1b6d5.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://sprites/shooter.png" -dest_files=["res://.godot/imported/shooter.png-dc69c2835aa11bc6878a2e4130c257c1.ctex"] +source_file="res://sprites/Ships/shooter.png" +dest_files=["res://.godot/imported/shooter.png-1d7ae672c8a6cec41d17794a14a1b6d5.ctex"] [params] diff --git a/sprites/tipahelp.png b/sprites/tipahelp.png deleted file mode 100644 index 35bc7fc0e9d9d724b65d508693cf967ddce6eab7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 17762 zcmeIaS5#A76fU|$QF@am9TAZxAkw7>iW-y-p-5LidJmnbG?iwdC|yM9h;&1VAc9C! z=>Y;Fy#%BaNY0A?8RNX1b6@Tl_u-7oOZHxMuC?Zx^P6S!*iipEBOMPN1VM~9Z(KEo zAZqYPF+g(y{Pagmnu8yhzwvc#sG^T=34(;6n^&)x24}5Kj-{05N06MzYkf15^e&AeI~?G@w>4R0uX99uP$G*^ZM$dzABEMqF*G6Z z%d{x9@Q|5YU@;U6(HD`QtRkbfy-xOE_)twrGUNgzc8{CnWO8W^^u0bPDRjPgT3$!$?e+Y${V}m}Z9Tttw z#^MwdLz`Iq9zDuhh-$@EJ`K2xSQtDw{YyhCC<%h5?Xb-s34bnb<2wH|^;8B^Pn+y7 zXrDIuzFdKhD89&>>kk%0Qlm~I{0UE*$%u}^8(xCSSc&{HHLpvXtUjOUORZR@hET5> z1uqzE4v-rd-J|g-R`TkKF@H00=n;8^D~KP=$hBBo?euH*@G{eTr9l{k;>g}X?g(#P zzDJ{7q_O=AR~QUgd|JkP@OBD0hUs^;Xv<7L)5N%k@9%_{YnWEp@Mp4hO3h{2HSfVa z1tCZ`Xb2IACnU3lpqx}raJ<5sga=NMJTCvGcw8Rvgtkqa@`Vv6<73)jH*<>|_4nIE zxFDXj&+euO)mxX&styGp)e2bRC-izxko49JQwq_%|NqHFH|d13{)>J9$+^(cGWw${BHOprSxp)_Li zWeI!PlDO&8<_XD&JK+!BiHBstvwopv{th}ELXa$5M7oP`L9=7d^$ebocTalu;B*j9 zd0}Moq)GDh?+a8OlR3s$e(d50O5~QGG{zcFZ5f!=gMO+rxa!w4xgVCs$2QAfaRkfs z$f!b>(Ou4(n*}G>MWRvVNr}rJstU6*jc^F^y`0{Zx^%?5Gur#JufQszyn5^4D}$?9 zRENe)@Ecsv@79yp{_8aIyKCaU6Umi$k1pqR4ei~CT~hh@75Zl7F1yE`qdn6|Flq-pxfCwNy*#-=bgIw?4Ms5xpX`)RuBDtk-%AHkrE z)D4+iH=qpp8l@VZwfkxY*uF{gn+BEm)p4nzy-?MusgqmZt*C>8F3d+=?)`=+8JB(E z<}&~%NY?NF@pKtdr-qytntsQA6a->Fx!aqXB3s5w@{t*is z@!O5nV0zT2&RHzT(W6?cS=~wL5c3^2bS4^sXNk z(M{u-mvB!Kaw#z$NA#y2(YKF9Itt|eOdDX4+f$e_Qy9J+E9u`(1!2n8OG+n3(u~d= z@y^}(V!EPU8}cV|@P?-_?jua-{_bb1$0-%JN-OH^mSwJe@lAk1!B1H!i)^i;gAp@U zkDoapu-(PK!^X`QeHN=dcVxABi*z96$L40Je9xs?yoG#ipmQt{P+N^=y&Ber2^LMV z?A?%Yv6gEM3thEDyX{uPy{$V|_j_Q<&&=jU?s{o#fX)4}sj+*XNpUM-WW-URDQlo& zFi5+t^?7IhphDQLz(yo@IvwVlN7O5}kFs=8)YQ;)VqGNShVWOqy)WXGzR|O6*w}%Y zPsLbCxdheDp_S2O<(@I3btOs3LJ?x%H&$~DU1J2w-f+tI{6t>L8vgWX1aHEaE&%Ok1?jcNjoYiTA4-eb_lqDNC`?{n*5db47nN^ZKc zu&G`972hEmCW>FuGbO64%OC{{AC3Y|Qz@s@;_&G;p2CN3t%j`hAdIRoX=Zgj~YeMCfKr?9BjY6QPw|4-QT z!YNzTmD@n@VO|LQ(n}n)<9Ar}ejJe<6Vy2~L%_wXw+=N*7^!!mr34`_cejul9I)vmB{Jr5=?ROdG#xNo;l|x2 z1u8_V1vPjqYPhiyeHSXH$YL7BN^3|AWcZfUCorN7r*?Q8b5oahSMq4~F~kC@yVB6w zp54E>k&@$I>*UUM9T8c7_PsxzYq0LH*zY{eMTS>*3@vx;ke^M~>#PK@?>Qp%JnH9H zs$yYPclbc9Pr(Aqh|&r_09_@ z&FuJ!o&-cj5c*lYJBW{PgB`(gQ*=XQE3UtT9u)V?mo0mLSBA#~$zfU9pO<#COs}=E zQ;;>bNCW+jqX4D+#gjtdZNm+*weK0DmrozQT}1pocD?IK+jWC}*7&~v$YWUWAU1On ziW@6gL^=5zd0w6VxK=&wL%Lj`zHs(GoZ!c4T6n?$F%(ol9hKYfuZ1XC{xGb;o&ImR z+}e+q>jxvYnOfXhb|>7rXJzl3p|%c6k^ewdj&=##0~7r&bN{K9>XDYluscsCB)SJZ z2mb54SYnPDeDg+jWXNZM2P@-yCnn0jL;&jBa3=RYR6b!^OZl#J`BPfXZu7B*sLB1R zHrXwsfBPP=$!^|JVINkzhK@*Zj#a!U2%8o%g@X*GEPRGY{s@Xw}vT!V#q>ot>j~hR*5bzoLP+s z_B)3oxO2oGd8Zzi$YW8V|L;tt3ImGL*pB$yn`ix#QUj~0+*@&YB|U4z&$Cd#-%9Zp zfQ#)#Ma*h;=tz!rsnyNK{mf(U!ks++ohb?-$*-SEx7=3(`PW+-_ptmqcH(%L*m*_> z%#UG*Ur>I=HavNJL1E)lsBNF3-r;)me8y` z*||IMvpr+(+@N^`&4;Jlp!P^G_|Zd_wx3DT7|A7PA6@6-)c971Q3wb+(V=L9j-}|ei0h(&0>J-_pjf&60b2k z3J_(qWXZs|Dq%W^j6a8kkHXR&B%qMG=7XjxR|j-o(oiD-2YPJiyA-r1wR(>U{FUN> z`YtE<4hjFvP42Fqs)(iXZe95$0lK^WS_n&ah=bCZBI?$9xzF{EI#10JIyV=pXwqomip;8gQEo(P2tABrXkxhNW!OP;A&} zrSmdOQ7em7!T)AdNKk0zt`trKdQciq%pieBuirz{#dP=!ERw8L{Ck>KJI1}sP0wd; zxyFb&bvJS*3EP*_*@AI}^izc~3KAo5nTNhZ?^t!7n$Os+My^X-){Chr_RQ?)N%ia8 z3a@qBuXM{w8h`AKsrt)ur+zUTKmgz?YhZ2}DPb|MewX-c zo zAA8PKm9=wxG37a@c-iQ)zt;RD07myaCYw0ZlTUhJ4ez%EWwtXSz?I(ZFq~D+m7eh9 zXyD(g{OfJgCjzXuu;nP&%fSF944WGQRa+$ceatJdyQ{QSIc8lbqNoGtua31HFAscL_p)MneL%_sHL|CGz}qS;v3N{SJ(itLJ` zLaIEN9NKcC(3vkFn~`mIcC06_S94vAG4H`Q)C*dUqNSy89Xpu#?Jq?7GJgKb$3R;9 zP5?}j)2x2nps5P;LxJnKq-oKq%I{$p!3q6d2k1_V*2`0JPl5 zbB8aa+TZRMKGJO@P?0UnLHnv?WHCQy>Ns)82U~jN)WPC$Pwxb(O|z@IH+88Qhz^p1 zUeU+glbQ<$#mU))GQNAN);+mB1Y%f1r&rO;)?V6}>clra4y&q(VZ-~C|IbW3EJ@7WO> zB@VmkAy|h{aO{fIi;2RL>X&i-FGVKi1f@AiHzM@A4y4pS`loeI^660n8bK$xdo4yg zG3CuwT(IEiV8ufZj={@wCk@uRLYjs98Tr44)-?g`qJEbuNOmxi z;TQ|o04#ET<-S0j(IDMS#lx3BBbLl{%ADG2(VcH=BBF=&e5+q|=?B-~b z!XoD>bZ~yAvbA^up`PzsX-!lw^d~E-?1By%E^r`MRp4c*l)HH+yYi^>ukI zKII9(1$J9mmF&a_jd?QOK%MF1%JW>RIA;XM;nr4@95XSMjfGoF@R zgMudv7VE6}a6cxRQ16?@0Lkaq+$t1~`!1J195SB~yQiW_vH%K_ z__p853m|CB#BPMi%+=SpzD;C#TkDV5hPG@`nZZ)J)@NVW!5kP@D<-ET>51aWxXP;M z)xwyXkAGOE@q4&?#b#sxhzZ_}*n8hu>t^uuSc_4Q5jI6{b9fp|yEyB0&sxVvc;Yz+ zDzm!v-2MhAMENeh*J+xi(3!dl-n3+6F5QbRGngKI{(F_jD(F9qd?Pw)@C^BEpohmU z7WpZ3v2`)sdj0=!*q2jBtZ*}@Fc){*qJK^D8k}f$2nC2R^Z(pTi>scge#k4h8^Y5! zJd5Xm3yum!p2@$kVI`61dOOy_z1ltFB*d7S-|%ECYbUTwx4(DGH+Pm(1?^^W1OPDw(PH z57TR!GsZi12#9rlth^@yrDnE8g&2UgwZ%lIvyyRWJt`EImNOWmxr?X8lL5VB8Q_iA@KVd;>zZw?Dz7M6IBUu&YDi=FJ;K2TxTDU7rFcIsugRE{L*oQ}Y9Xm^ zE_QGY^ok{_j3h`o<8p8{ci#L%eElgx(;7~4H;x+h;X_8NE7+r&kIcb-hvK61>bZrv zFL@Gr|9G6WUJjZH&+4Or9DKF4fX+T!czBku7VWWBroFmfUBI)ZZzRD@KY88D%*Dgv z74N8xIW3$Nka(ui2IcrLXj)!o+@k+YgqD9pl^ z3Ns8L^%RhPc%NgU15Wz{&fvf_*}3Q!ySz?ny}FMy`+ORmJw^jPAOUySc^a^O?LVfZ zR3?%!We!-jv`q)M^;{ad_h+i7XurGbevsmks!MCJ6;-1&xs&hCXH~*U;Fpzs$M(Q_ zjYZ~eE+QFCuz_O+f7ec~sny*0Bk`qll2}@|L&thu2%^%TyzN1F$9x6c^aRd))5Rb? zv$7bVM0N4j>N_OuD8ygBBLMw(tJ7v&)?57g1KsSx!;ⅅIm}fbkj^WQ`t=C`fjHe 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 diff --git a/sprites/tipahelp.png.import b/sprites/tipahelp.png.import deleted file mode 100644 index 510d18b..0000000 --- a/sprites/tipahelp.png.import +++ /dev/null @@ -1,34 +0,0 @@ -[remap] - -importer="texture" -type="CompressedTexture2D" -uid="uid://6kkhm3vcu3lr" -path="res://.godot/imported/tipahelp.png-f148da3a209ea953cdbfabba68f99b1a.ctex" -metadata={ -"vram_texture": false -} - -[deps] - -source_file="res://sprites/tipahelp.png" -dest_files=["res://.godot/imported/tipahelp.png-f148da3a209ea953cdbfabba68f99b1a.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/sprites/tipahelpnomenu.png b/sprites/tipahelpnomenu.png deleted file mode 100644 index ea6e5baa5487c9aad03c33b9fc31c5a8f5c738c9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9467 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