Merge branch 'master' of http://192.168.0.5:3027/admin/space_empire

Manager.gd

@@ -5,8 +5,6 @@ extends Node
 @export var SECTOR_COUNT: int = Settings.SECTOR_COUNT
 @export var PLANETS_PER_SECTOR_RANGE = Settings.PLANET_PER_SECTOR
 
-const MIN_DISTANCE = 80.0  # Minimalna odległość (promień) między środkami gwiazd
-const MAX_ATTEMPTS = 50    # Maksymalna liczba prób znalezienia miejsca
 
 # --- DANE ---
 var sectors_data: Array = []  # Każdy element: {"name", "position", "planets", "star"}
@@ -17,29 +15,7 @@ var current_sector: int = -1
 var update_timer := 0.0
 
 # Nazwy sektorów i planet
-var sector_names = [
+
-	"Aetherion", "Altaris", "Andur System", "Artemis Reach", "Astrion",
-	"Azura Prime", "Borealis Expanse", "Caldris Belt", "Canthar System", "Celion Verge",
-	"Corvax Sector", "Cygnera Rift", "Daedalus Reach", "Darnis Cluster", "Dravon Expanse",
-	"Eclipta Prime", "Erevos System", "Eryndor Belt", "Ethon Reach", "Epsilon Mare",
-	"Falcoris Rim", "Feron Cluster", "Gaelis System", "Galmar Belt", "Gryphon Reach",
-	"Halion Expanse", "Helios Verge", "Hespera Sector", "Hyden Reach", "Icarion System",
-	"Illun Belt", "Istris Cluster", "Jorath System", "Kaelor Expanse", "Kassian Reach",
-	"Koralis Rim", "Krynn Sector", "Lunaris Reach", "Lysara System", "Maelor Verge",
-	"Magnor Belt", "Mareth Cluster", "Meridian Expanse", "Morthal System", "Myrris Reach",
-	"Nadir Verge", "Naos Sector", "Nerath Cluster", "Norian Belt", "Nova Thal",
-	"Oblivis Reach", "Odessa Expanse", "Orionis Verge", "Orryx System", "Pallas Belt",
-	"Parallax Rim", "Perion Sector", "Pharos System", "Phoenix Reach", "Primis Expanse",
-	"Pyra Cluster", "Quaron Belt", "Quiris System", "Ragnar Verge", "Rathor Expanse",
-	"Ravenna Sector", "Regalis System", "Remora Reach", "Rydan Belt", "Saren Cluster",
-	"Selena Verge", "Seraphis System", "Shadow Rift", "Silvar Reach", "Solara Expanse",
-	"Starnis Belt", "Syrion Cluster", "Talion System", "Tarsis Verge", "Tauren Expanse",
-	"Tenebris Rim", "Thalassa Reach", "Tharon Belt", "Tirion Sector", "Tritonis Expanse",
-	"Umbra Verge", "Valis Reach", "Varon Cluster", "Velora System", "Verrin Belt",
-	"Veyra Expanse", "Viridis Rim", "Volnar Sector", "Vortex Reach", "Vulcaris System",
-	"Wraith Expanse", "Xandor Cluster", "Xerion Verge", "Ymir Belt", "Zephyra System",
-	"Zerath Expanse", "Zyra Prime", "Zyneth Reach", "Zorath System", "Zyphon Rim"
-]
 
 
 var planet_names = [
@@ -52,6 +28,7 @@ var planet_names = [
 
 # --- START ---
 func _ready():
+	print("test sss")
 	randomize()
 	_initialize_sectors()
 	print("[Manager] Initialized with %d sectors" % SECTOR_COUNT)
@@ -64,11 +41,11 @@ func _process(delta):
 
 # --- LOSOWANIE UNIKALNEJ NAZWY SEKTORA ---
 func get_unique_sector_name() -> String:
-	if sector_names.size() == 0:
+	if Names.sector_names.size() == 0:
 		return "Unknown Sector"
-	var index = randi() % sector_names.size()
+	var index = randi() % Names.sector_names.size()
-	var name = sector_names[index]
+	var name = Names.sector_names[index]
-	sector_names.remove_at(index)
+	Names.sector_names.remove_at(index)
 	return name
 
 # --- INICJALIZACJA SEKTORÓW ---
@@ -198,7 +175,7 @@ func _random_star_texture() -> String:
 
 func find_safe_position() -> Vector2:
 	var screen_size = get_viewport().get_visible_rect().size
-	for attempt in range(MAX_ATTEMPTS):
+	for attempt in range(Settings.MAX_ATTEMPTS):
 		# 1. Losowanie potencjalnej pozycji w obszarze (zgodnie z Twoimi marginesami)
 		var potential_pos = Vector2(
 			randf_range(50, screen_size.x - 50),
@@ -216,7 +193,7 @@ func find_safe_position() -> Vector2:
 func is_position_safe(potential_pos: Vector2) -> bool:
 	for existing_pos in placed_star_positions:
 		var distance = potential_pos.distance_to(existing_pos)
-		if distance < MIN_DISTANCE:
+		if distance < Settings.MIN_DISTANCE:
 			return false # Kolizja znaleziona
 	return true # Brak kolizji z żadną istniejącą gwiazdą
 	

project.godot

@@ -17,12 +17,13 @@ config/icon="res://icon.svg"
 
 [autoload]
 
+Names="*res://scripts/dictionary.gd"
+Settings="*res://scripts/settings.gd"
 Manager="*res://Manager.gd"
 MusicManager="*res://music_manager.gd"
-Settings="*res://scripts/settings.gd"
 
 [display]
 
-window/size/mode=2
+window/size/mode=3
 window/stretch/mode="canvas_items"
 window/stretch/aspect="ignore"

scripts/dictionary.gd

@@ -0,0 +1,24 @@
+extends Node
+var sector_names = [
+	"Aetherion", "Altaris", "Andur System", "Artemis Reach", "Astrion",
+	"Azura Prime", "Borealis Expanse", "Caldris Belt", "Canthar System", "Celion Verge",
+	"Corvax Sector", "Cygnera Rift", "Daedalus Reach", "Darnis Cluster", "Dravon Expanse",
+	"Eclipta Prime", "Erevos System", "Eryndor Belt", "Ethon Reach", "Epsilon Mare",
+	"Falcoris Rim", "Feron Cluster", "Gaelis System", "Galmar Belt", "Gryphon Reach",
+	"Halion Expanse", "Helios Verge", "Hespera Sector", "Hyden Reach", "Icarion System",
+	"Illun Belt", "Istris Cluster", "Jorath System", "Kaelor Expanse", "Kassian Reach",
+	"Koralis Rim", "Krynn Sector", "Lunaris Reach", "Lysara System", "Maelor Verge",
+	"Magnor Belt", "Mareth Cluster", "Meridian Expanse", "Morthal System", "Myrris Reach",
+	"Nadir Verge", "Naos Sector", "Nerath Cluster", "Norian Belt", "Nova Thal",
+	"Oblivis Reach", "Odessa Expanse", "Orionis Verge", "Orryx System", "Pallas Belt",
+	"Parallax Rim", "Perion Sector", "Pharos System", "Phoenix Reach", "Primis Expanse",
+	"Pyra Cluster", "Quaron Belt", "Quiris System", "Ragnar Verge", "Rathor Expanse",
+	"Ravenna Sector", "Regalis System", "Remora Reach", "Rydan Belt", "Saren Cluster",
+	"Selena Verge", "Seraphis System", "Shadow Rift", "Silvar Reach", "Solara Expanse",
+	"Starnis Belt", "Syrion Cluster", "Talion System", "Tarsis Verge", "Tauren Expanse",
+	"Tenebris Rim", "Thalassa Reach", "Tharon Belt", "Tirion Sector", "Tritonis Expanse",
+	"Umbra Verge", "Valis Reach", "Varon Cluster", "Velora System", "Verrin Belt",
+	"Veyra Expanse", "Viridis Rim", "Volnar Sector", "Vortex Reach", "Vulcaris System",
+	"Wraith Expanse", "Xandor Cluster", "Xerion Verge", "Ymir Belt", "Zephyra System",
+	"Zerath Expanse", "Zyra Prime", "Zyneth Reach", "Zorath System", "Zyphon Rim"
+]

scripts/dictionary.gd.uid

@@ -0,0 +1 @@
+uid://b4nmsakekdbwx

scripts/galaxy.gd

@@ -68,7 +68,7 @@ func _on_sector_selected(index: int):
 # --- TŁO ---
 func _init_background():
 	var background = Sprite2D.new()
-	background.texture = load("res://assets/background/galaxy_background.jpg")
+	background.texture = load(Settings.GALAXY_BACKGROUND)
 	background.centered = true
 	background.position = get_viewport_rect().size / 2
 	var screen_size = get_viewport_rect().size