From bedeee894a597fe125f361e2aa57562ec5461aa0 Mon Sep 17 00:00:00 2001
From: 2ndbeam <166764593+2ndbeam@users.noreply.github.com>
Date: Sun, 19 May 2024 23:33:24 +0300
Subject: [PATCH] A little cleanup

---
 items/energy_cell.tres                        |  2 +-
 items/raw_materials.tres                      |  2 +-
 items/test_item.tres                          | 16 ---------
 items/water_barrel.tres                       |  2 +-
 .../Modules/Weapons/Projectiles/laser.tscn    |  2 +-
 scenes/Star System/star_system_template.tscn  |  1 +
 scripts/Base/base.gd                          | 25 ++++++-------
 scripts/Classes/game.gd                       |  6 ++--
 scripts/{objects => Ship}/projectile.gd       |  4 ---
 scripts/Star System/star_system.gd            |  2 --
 scripts/misc/BaseMenuOpen.gd                  | 35 -------------------
 scripts/misc/PlayerPauseController.gd         | 12 -------
 scripts/misc/SpeedLine.gd                     | 20 -----------
 scripts/misc/TurboParticles.gd                |  7 ----
 scripts/misc/VersionLabel.gd                  |  9 -----
 15 files changed, 21 insertions(+), 124 deletions(-)
 delete mode 100644 items/test_item.tres
 rename scripts/{objects => Ship}/projectile.gd (97%)
 delete mode 100644 scripts/misc/BaseMenuOpen.gd
 delete mode 100644 scripts/misc/PlayerPauseController.gd
 delete mode 100644 scripts/misc/SpeedLine.gd
 delete mode 100644 scripts/misc/TurboParticles.gd
 delete mode 100644 scripts/misc/VersionLabel.gd

diff --git a/items/energy_cell.tres b/items/energy_cell.tres
index 6aed219..5aa91e9 100644
--- a/items/energy_cell.tres
+++ b/items/energy_cell.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" script_class="Item" load_steps=3 format=3 uid="uid://16xqvcrmuga6"]
 
 [ext_resource type="Texture2D" uid="uid://daojdy0tpvsoh" path="res://sprites/items_icons/energy.png" id="1_1ocvl"]
-[ext_resource type="Script" path="res://scripts/item.gd" id="1_wdaj0"]
+[ext_resource type="Script" path="res://scripts/Classes/item.gd" id="1_wdaj0"]
 
 [resource]
 script = ExtResource("1_wdaj0")
diff --git a/items/raw_materials.tres b/items/raw_materials.tres
index 322d984..2e5078d 100644
--- a/items/raw_materials.tres
+++ b/items/raw_materials.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" script_class="Item" load_steps=3 format=3 uid="uid://dlnl6w416qylo"]
 
 [ext_resource type="Texture2D" uid="uid://dlh6eyywjrsk4" path="res://sprites/items_icons/raw_materials.png" id="1_an4j4"]
-[ext_resource type="Script" path="res://scripts/item.gd" id="1_l7wcw"]
+[ext_resource type="Script" path="res://scripts/Classes/item.gd" id="1_l7wcw"]
 
 [resource]
 script = ExtResource("1_l7wcw")
diff --git a/items/test_item.tres b/items/test_item.tres
deleted file mode 100644
index 9c25206..0000000
--- a/items/test_item.tres
+++ /dev/null
@@ -1,16 +0,0 @@
-[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/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"]
-
-[resource]
-script = ExtResource("1_s7nhb")
-name = "Test Item"
-description = "This is an debug item"
-min_price = 10.0
-max_price = 100.0
-weight = 10.0
-icon = ExtResource("1_e5k7o")
-image = ExtResource("2_l1qse")
-type = 0
diff --git a/items/water_barrel.tres b/items/water_barrel.tres
index 75e3a59..e51a2f4 100644
--- a/items/water_barrel.tres
+++ b/items/water_barrel.tres
@@ -1,7 +1,7 @@
 [gd_resource type="Resource" script_class="Item" load_steps=3 format=3 uid="uid://b4jy8uknltolk"]
 
 [ext_resource type="Texture2D" uid="uid://cova10yh1rlk1" path="res://sprites/items_icons/water.png" id="1_fv1u8"]
-[ext_resource type="Script" path="res://scripts/item.gd" id="1_w7v0g"]
+[ext_resource type="Script" path="res://scripts/Classes/item.gd" id="1_w7v0g"]
 
 [resource]
 script = ExtResource("1_w7v0g")
diff --git a/scenes/Ships/Modules/Weapons/Projectiles/laser.tscn b/scenes/Ships/Modules/Weapons/Projectiles/laser.tscn
index 772e33d..21b2b02 100644
--- a/scenes/Ships/Modules/Weapons/Projectiles/laser.tscn
+++ b/scenes/Ships/Modules/Weapons/Projectiles/laser.tscn
@@ -1,6 +1,6 @@
 [gd_scene load_steps=3 format=3 uid="uid://djmoij5kuou3j"]
 
-[ext_resource type="Script" path="res://scripts/objects/projectile.gd" id="1_6nacn"]
+[ext_resource type="Script" path="res://scripts/Ship/projectile.gd" id="1_6nacn"]
 
 [sub_resource type="RectangleShape2D" id="RectangleShape2D_mo2if"]
 size = Vector2(4, 32)
diff --git a/scenes/Star System/star_system_template.tscn b/scenes/Star System/star_system_template.tscn
index f233ecb..c16757d 100644
--- a/scenes/Star System/star_system_template.tscn	
+++ b/scenes/Star System/star_system_template.tscn	
@@ -60,6 +60,7 @@ offset_top = 6.0
 offset_right = 1280.0
 offset_bottom = 29.0
 theme = ExtResource("5_ag247")
+theme_override_font_sizes/font_size = 16
 text = "cosmic {version}"
 horizontal_alignment = 1
 script = SubResource("GDScript_4yoh5")
diff --git a/scripts/Base/base.gd b/scripts/Base/base.gd
index 5bbcb36..f9e4cca 100644
--- a/scripts/Base/base.gd
+++ b/scripts/Base/base.gd
@@ -77,31 +77,32 @@ func _process(_delta):
 ## Sets dock state to Ready
 func dock_ready():
 	dock_state = DockState.Ready
-	gate_static.visible = true
-	gate_static.process_mode = Node.PROCESS_MODE_INHERIT
-	gate_area.visible = false
-	dock_area.visible = false
+	enable_gate()
 ## Sets dock state to Process
 func dock_process():
 	dock_state = DockState.Process
-	gate_static.visible = false
-	gate_static.process_mode = Node.PROCESS_MODE_DISABLED
-	gate_area.visible = true
-	dock_area.visible = true
+	disable_gate()
 ## Sets dock state to Busy
 func dock_busy():
 	dock_state = DockState.Busy
-	gate_static.visible = true
-	gate_static.process_mode = Node.PROCESS_MODE_INHERIT
-	gate_area.visible = false
-	dock_area.visible = false
+	enable_gate()
 	# opening base menu
 	var menu_instance = menu.instantiate()
 	menu_instance.base = self
 	player_ship.non_colorable_gui.add_child(menu_instance)
 
+## Sets dock state to Leave
 func dock_leave():
 	dock_state = DockState.Leave
+	disable_gate()
+
+func enable_gate():
+	gate_static.visible = true
+	gate_static.process_mode = Node.PROCESS_MODE_INHERIT
+	gate_area.visible = false
+	dock_area.visible = false
+
+func disable_gate():
 	gate_static.visible = false
 	gate_static.process_mode = Node.PROCESS_MODE_DISABLED
 	gate_area.visible = true
diff --git a/scripts/Classes/game.gd b/scripts/Classes/game.gd
index e499a13..4d1746d 100644
--- a/scripts/Classes/game.gd
+++ b/scripts/Classes/game.gd
@@ -3,9 +3,9 @@ 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 ItemType {Valuable, Weapon, Hull, Shield, Engine, Ammunition}
+enum AmmoType {None, LaserEnergy, Rockets}
+enum BaseType {Power, Mining, Food, Trading, Module}
 enum Faction {None, Player, Peaceful, Neutral, Aggressive}
 
 #const DEFAULT_ITEM = preload("res://items/test_item.tres")
diff --git a/scripts/objects/projectile.gd b/scripts/Ship/projectile.gd
similarity index 97%
rename from scripts/objects/projectile.gd
rename to scripts/Ship/projectile.gd
index 24e548a..386c73e 100644
--- a/scripts/objects/projectile.gd
+++ b/scripts/Ship/projectile.gd
@@ -15,7 +15,6 @@ var target : Node2D = self
 func _ready():
 	get_tree().create_timer(lifetime).timeout.connect(queue_free)
 	collider.body_entered.connect(_on_collision)
-	areyouready()
 
 func _physics_process(delta):
 	if rotation_speed == 0: destination_angle = global_rotation_degrees
@@ -43,6 +42,3 @@ func _on_collision(body):
 			if target != self:
 				target.queue_free()
 			queue_free()
-
-func areyouready():
-	pass
diff --git a/scripts/Star System/star_system.gd b/scripts/Star System/star_system.gd
index 6148561..6df9e1f 100644
--- a/scripts/Star System/star_system.gd	
+++ b/scripts/Star System/star_system.gd	
@@ -39,8 +39,6 @@ func _ready():
 	else:
 		# or add it to root node lol
 		add_child(pause_controller)
-	
-	
 	pause_controller.visible = false
 
 ## Pause the game. Remember to unpause it when switching scenes!
diff --git a/scripts/misc/BaseMenuOpen.gd b/scripts/misc/BaseMenuOpen.gd
deleted file mode 100644
index 56a303b..0000000
--- a/scripts/misc/BaseMenuOpen.gd
+++ /dev/null
@@ -1,35 +0,0 @@
-extends Area2D
-
-@export var menu : PackedScene
-@onready var base_collider = $"../BaseCollider/BaseColliderDetector"
-var menu_inst
-var ship_in_menu = false
-
-func onbcbodyentered(body):
-	if body is MainShip:
-		body.engine.speed = 0
-
-func _input(event):
-	if event is InputEventKey and ship_in_menu:
-		if Input.is_action_just_released("hide_menu"):
-			menu_inst.visible = !menu_inst.visible
-
-func _on_body_entered(body):
-	if body is MainShip:
-		ship_in_menu = true
-		body.allow_shooting = false
-		menu_inst = menu.instantiate()
-		menu_inst.modulate = get_parent().material.get_shader_parameter('color')
-		menu_inst.base = get_parent()
-		body.find_child("GUI").add_child(menu_inst)
-		body.minimap.visible = false
-		if body.quest.type == Quest.TYPE.DELIVERY:
-			if body.quest.data['destination'] == get_parent():
-				body.quest.do_progress()
-
-func _on_body_exited(body):
-	if body is MainShip:
-		body.allow_shooting = true
-		body.minimap.visible = true
-		menu_inst.queue_free()
-		ship_in_menu = false
diff --git a/scripts/misc/PlayerPauseController.gd b/scripts/misc/PlayerPauseController.gd
deleted file mode 100644
index 67f9209..0000000
--- a/scripts/misc/PlayerPauseController.gd
+++ /dev/null
@@ -1,12 +0,0 @@
-extends Control
-
-@onready var ship = $"../../.."
-
-func _on_unpause_button_button_up():
-	get_tree().current_scene.unpause()
-
-
-func _on_exit_button_button_up():
-	get_tree().current_scene.unpause()
-	Game.profile_save(get_tree().current_scene)
-	get_tree().change_scene_to_file("res://scenes/MainMenu.tscn")
diff --git a/scripts/misc/SpeedLine.gd b/scripts/misc/SpeedLine.gd
deleted file mode 100644
index d81b156..0000000
--- a/scripts/misc/SpeedLine.gd
+++ /dev/null
@@ -1,20 +0,0 @@
-extends Line2D
-
-@onready var ship = $"../../.."
-var engine
-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 : float = engine.speed / engine.max_speed * 100
-	var new_points = [Vector2.ZERO, Vector2(speed_percentage, 0)]
-	points = PackedVector2Array(new_points)
diff --git a/scripts/misc/TurboParticles.gd b/scripts/misc/TurboParticles.gd
deleted file mode 100644
index 4d756c9..0000000
--- a/scripts/misc/TurboParticles.gd
+++ /dev/null
@@ -1,7 +0,0 @@
-extends GPUParticles2D
-
-@onready var engine = $".."
-
-func _process(_delta):
-	var speed_percentage = engine.speed / engine.max_speed if engine.ship is MainShip else 0
-	emitting = speed_percentage > 1
diff --git a/scripts/misc/VersionLabel.gd b/scripts/misc/VersionLabel.gd
deleted file mode 100644
index 1c3530c..0000000
--- a/scripts/misc/VersionLabel.gd
+++ /dev/null
@@ -1,9 +0,0 @@
-extends Label
-
-func _ready():
-	text = "GammaCosmicRays version {version}".format({"version" : Game.gameversion})
-	if OS.has_feature("editor"):
-		text += " uncompiled\nThis is a debug/prerelease version."
-	else:
-		if Game.beta:
-			text += " beta\nThis is a closed beta version."