From 042b7aea2b5fb050ad2ed656a4563b71ff30482f Mon Sep 17 00:00:00 2001 From: Tirith Date: Wed, 5 Nov 2025 17:10:12 +0100 Subject: [PATCH] Drobne zmiany --- scenes/planet.tscn | 8 ++++---- scenes/star.tscn | 6 ++++-- scripts/GameData.gd | 11 +++++++++++ scripts/galaxy.gd | 4 ++-- scripts/planet.gd | 4 +++- 5 files changed, 24 insertions(+), 9 deletions(-) diff --git a/scenes/planet.tscn b/scenes/planet.tscn index e307d86..985bb98 100644 --- a/scenes/planet.tscn +++ b/scenes/planet.tscn @@ -22,10 +22,10 @@ scale = Vector2(0.053333335, 0.053333335) texture = ExtResource("2_h8ms6") [node name="Label" type="Label" parent="."] -offset_left = 8.0 -offset_top = -8.0 -offset_right = 32.0 -offset_bottom = 8.0 +offset_left = -12.0 +offset_top = 6.0 +offset_right = 12.0 +offset_bottom = 22.0 theme_override_colors/font_outline_color = Color(0, 0, 0, 1) theme_override_constants/outline_size = 1 theme_override_fonts/font = ExtResource("3_ggt7d") diff --git a/scenes/star.tscn b/scenes/star.tscn index e2db952..9d891c2 100644 --- a/scenes/star.tscn +++ b/scenes/star.tscn @@ -1,6 +1,7 @@ -[gd_scene load_steps=4 format=3 uid="uid://cvc0brcqh2rhu"] +[gd_scene load_steps=5 format=3 uid="uid://cvc0brcqh2rhu"] [ext_resource type="Script" uid="uid://c7l387xor12hx" path="res://scripts/star.gd" id="1_mcqwg"] +[ext_resource type="Texture2D" uid="uid://dsfxgajg3jodv" path="res://assets/stars/s3.png" id="2_8d8bx"] [ext_resource type="Script" uid="uid://bgghdcbxp6o0k" path="res://scripts/star_sprite.gd" id="3_ef0hr"] [ext_resource type="FontFile" uid="uid://chk8jrn2ighpx" path="res://assets/fonts/main_font.ttf" id="4_8d8bx"] @@ -8,7 +9,8 @@ script = ExtResource("1_mcqwg") [node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(0.014594748, 0.013618186) +scale = Vector2(0.02, 0.02) +texture = ExtResource("2_8d8bx") script = ExtResource("3_ef0hr") [node name="Label" type="Label" parent="."] diff --git a/scripts/GameData.gd b/scripts/GameData.gd index f6baf07..4641bea 100644 --- a/scripts/GameData.gd +++ b/scripts/GameData.gd @@ -13,3 +13,14 @@ func _process(delta): update_timer += delta #* Settings.TIME_SCALE if update_timer >= Settings.UPDATE_INTERVAL: update_timer = 0.0 + +func format_number(num: int) -> String: + var s = str(int(num)) + var result = "" + var count = 0 + for i in range(s.length() - 1, -1, -1): + result = s[i] + result + count += 1 + if count % 3 == 0 and i != 0: + result = "." + result + return result diff --git a/scripts/galaxy.gd b/scripts/galaxy.gd index bd56108..834d09f 100644 --- a/scripts/galaxy.gd +++ b/scripts/galaxy.gd @@ -60,8 +60,8 @@ func _generate_galaxy(count: int): planet.get_node("Sprite2D").texture = load("res://assets/planets/p%d.png" % randi_range(1,9)) else: planet.get_node("Sprite2D").texture = load("res://assets/planets/p%d.png" % randi_range(10,18)) - planet.get_node("Sprite2D").scale = Vector2(0.053*planet.size/2, 0.053*planet.size/2) - star.add_child(planet) # Planeta należy do gwiazdy! + planet.get_node("Sprite2D").scale = Vector2(0.073*planet.size/2, 0.073*planet.size/2) + star.add_child(planet) # Planeta należy do gwiaz7 star.planets.append(planet) diff --git a/scripts/planet.gd b/scripts/planet.gd index fb6862d..12a8080 100644 --- a/scripts/planet.gd +++ b/scripts/planet.gd @@ -98,7 +98,9 @@ func print_data(): var text = "🌍 %s\n" % pname text += "Biosfera: %.2f\n" % biosfere text += "Zasobność surowców: %.2f\n" % res_rich - text += "Limit populacji: " + str(int(max_pop)).pad_decimals(0) + "\n" + text += "Limit populacji: %s\n" % GameData.format_number(max_pop) + + text += "Populacja: " + str(int(population)).pad_decimals(0) + "\n" text += "Status: " + ("Skolonizowana" if is_colonized else "Nieskolonizowana") + "\n" var has_any_resource = false