diff --git a/assets/background/galback1.jpg b/assets/background/galback1.jpg new file mode 100644 index 0000000..596d55d Binary files /dev/null and b/assets/background/galback1.jpg differ diff --git a/assets/background/galback1.jpg.import b/assets/background/galback1.jpg.import new file mode 100644 index 0000000..c235740 --- /dev/null +++ b/assets/background/galback1.jpg.import @@ -0,0 +1,40 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://bvucvdvh00uaw" +path="res://.godot/imported/galback1.jpg-08efd132e2b869bffb428a8ee4147345.ctex" +metadata={ +"vram_texture": false +} + +[deps] + +source_file="res://assets/background/galback1.jpg" +dest_files=["res://.godot/imported/galback1.jpg-08efd132e2b869bffb428a8ee4147345.ctex"] + +[params] + +compress/mode=0 +compress/high_quality=false +compress/lossy_quality=0.7 +compress/uastc_level=0 +compress/rdo_quality_loss=0.0 +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/channel_remap/red=0 +process/channel_remap/green=1 +process/channel_remap/blue=2 +process/channel_remap/alpha=3 +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/assets/buildings/aluminium_ore_mine.png b/assets/buildings/aluminium_ore_mine.png index d381117..5797b69 100644 Binary files a/assets/buildings/aluminium_ore_mine.png and b/assets/buildings/aluminium_ore_mine.png differ diff --git a/assets/buildings/copper_mine.png b/assets/buildings/copper_mine.png index c7ece88..b22cea8 100644 Binary files a/assets/buildings/copper_mine.png and b/assets/buildings/copper_mine.png differ diff --git a/assets/buildings/iron_mine.png b/assets/buildings/iron_mine.png index 071b59c..1a87976 100644 Binary files a/assets/buildings/iron_mine.png and b/assets/buildings/iron_mine.png differ diff --git a/assets/buildings/residential_zone.png b/assets/buildings/residential_zone.png index d431c32..265c0e4 100644 Binary files a/assets/buildings/residential_zone.png and b/assets/buildings/residential_zone.png differ diff --git a/assets/buildings/terraforming_center.png b/assets/buildings/terraforming_center.png index 05424d0..2f591d4 100644 Binary files a/assets/buildings/terraforming_center.png and b/assets/buildings/terraforming_center.png differ diff --git a/assets/buildings/uran_mine.png b/assets/buildings/uran_mine.png index 526911b..1a01708 100644 Binary files a/assets/buildings/uran_mine.png and b/assets/buildings/uran_mine.png differ diff --git a/assets/buildings/water_purifier.png b/assets/buildings/water_purifier.png index 868b4e5..a0c5a4d 100644 Binary files a/assets/buildings/water_purifier.png and b/assets/buildings/water_purifier.png differ diff --git a/assets/planets/p1.png.import b/assets/planets/p1.png.import index f5e86b7..c245de4 100644 --- a/assets/planets/p1.png.import +++ b/assets/planets/p1.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://3b5i4k54e2uw" +uid="uid://jrrrdbusn4mw" path="res://.godot/imported/p1.png-c42c3e40721fc6fe437938de585480cd.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p10.png.import b/assets/planets/p10.png.import index 7d6328c..998f8e3 100644 --- a/assets/planets/p10.png.import +++ b/assets/planets/p10.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cced5uw5k4if1" +uid="uid://bfjiu6gvn2msl" path="res://.godot/imported/p10.png-eb46ef667e70ba9df6a4dbacc6709925.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p11.png.import b/assets/planets/p11.png.import index 13c74b6..3aadb00 100644 --- a/assets/planets/p11.png.import +++ b/assets/planets/p11.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cdrc5iefs1bn7" +uid="uid://e13d2cukyvdx" path="res://.godot/imported/p11.png-40f511c796ef38e6f2dc1d6ce8c6dcc1.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p12.png.import b/assets/planets/p12.png.import index 5e8b4a2..594a2ea 100644 --- a/assets/planets/p12.png.import +++ b/assets/planets/p12.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bvnmkhnr1f85y" +uid="uid://b2iopee4im0at" path="res://.godot/imported/p12.png-6346e34cd32a168f5869989e8c974f5a.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p13.png.import b/assets/planets/p13.png.import index 1a37eaf..78655eb 100644 --- a/assets/planets/p13.png.import +++ b/assets/planets/p13.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bltomtb30wvqd" +uid="uid://vm6csbtc5bxq" path="res://.godot/imported/p13.png-4d7623696829ebbf329c027e02f35262.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p14.png.import b/assets/planets/p14.png.import index 8f5f61e..ba08311 100644 --- a/assets/planets/p14.png.import +++ b/assets/planets/p14.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cdcp1nrkpgd0j" +uid="uid://da6uiusxao104" path="res://.godot/imported/p14.png-62146a691c78fe48b52ce92ace152029.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p15.png.import b/assets/planets/p15.png.import index 7a29319..2461b9f 100644 --- a/assets/planets/p15.png.import +++ b/assets/planets/p15.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://jqb2acykwsg3" +uid="uid://buxv8tpwvtaey" path="res://.godot/imported/p15.png-1d9dc7e436e8054302dc10c56dafe4f6.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p16.png.import b/assets/planets/p16.png.import index 5127ad7..78d7da4 100644 --- a/assets/planets/p16.png.import +++ b/assets/planets/p16.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cr2y361nxcybp" +uid="uid://b7iawobp4kghl" path="res://.godot/imported/p16.png-37255585be8a1d1ca338f4b53c5b7bd5.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p17.png.import b/assets/planets/p17.png.import index 70ccfb7..152793b 100644 --- a/assets/planets/p17.png.import +++ b/assets/planets/p17.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://cmish1dvp30tw" +uid="uid://d2w7eg66pvoy2" path="res://.godot/imported/p17.png-4ec0c958a41097207878a3f69431c3eb.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p18.png.import b/assets/planets/p18.png.import index 7c53d85..16583ea 100644 --- a/assets/planets/p18.png.import +++ b/assets/planets/p18.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://dw5ngwisrbuym" +uid="uid://vijfoksvs1r8" path="res://.godot/imported/p18.png-ae13acf38f064d372f95b0ce9091814f.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p2.png.import b/assets/planets/p2.png.import index 8cccb55..0752723 100644 --- a/assets/planets/p2.png.import +++ b/assets/planets/p2.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bjxy76yh7f0v7" +uid="uid://dovg8k2mmd23h" path="res://.godot/imported/p2.png-4ac3d58689143f5132a9012c89a0fbae.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p3.png.import b/assets/planets/p3.png.import index 2fd2823..0ca6a75 100644 --- a/assets/planets/p3.png.import +++ b/assets/planets/p3.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://qs7ys0e5aahu" +uid="uid://b1n351g52jvfm" path="res://.godot/imported/p3.png-2d30cfbfeec8bca778c6cd027f163bb1.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p4.png.import b/assets/planets/p4.png.import index e1ef325..37aebcc 100644 --- a/assets/planets/p4.png.import +++ b/assets/planets/p4.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://uv1teou02vsw" +uid="uid://3lypab822baw" path="res://.godot/imported/p4.png-9964b13870cffc622e37a2b6896c7cf1.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p5.png.import b/assets/planets/p5.png.import index 3e8584e..c38f7cd 100644 --- a/assets/planets/p5.png.import +++ b/assets/planets/p5.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bmu7jwnvu7ob2" +uid="uid://cwjee3thi5rfu" path="res://.godot/imported/p5.png-68ab4cc45e4d08d164da276c3ff7b785.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p6.png.import b/assets/planets/p6.png.import index c2cada6..3a37fe7 100644 --- a/assets/planets/p6.png.import +++ b/assets/planets/p6.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bps7a80bxe641" +uid="uid://cy1qe3g2e6jhe" path="res://.godot/imported/p6.png-febdf0f58c8ef1fb1ede562a4060468a.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p7.png.import b/assets/planets/p7.png.import index 2f68dc0..da9e0eb 100644 --- a/assets/planets/p7.png.import +++ b/assets/planets/p7.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bbvf0l0mak6pt" +uid="uid://b5511kavwbf48" path="res://.godot/imported/p7.png-ddd667980fc6e83e7c1d5387c3063563.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p8.png.import b/assets/planets/p8.png.import index 4f96696..ba9a10a 100644 --- a/assets/planets/p8.png.import +++ b/assets/planets/p8.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://hun546m51ov8" +uid="uid://gqhc87677lax" path="res://.godot/imported/p8.png-8986b535a1202d2c734eaf2aa2a0e649.ctex" metadata={ "vram_texture": false diff --git a/assets/planets/p9.png.import b/assets/planets/p9.png.import index 63effbd..29e3885 100644 --- a/assets/planets/p9.png.import +++ b/assets/planets/p9.png.import @@ -2,7 +2,7 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bbej1soqcgn5x" +uid="uid://bragncjfur5p6" path="res://.godot/imported/p9.png-62dc16a69062b00a41056d31b9f878c5.ctex" metadata={ "vram_texture": false diff --git a/project.godot b/project.godot index 1220b78..6f8d304 100644 --- a/project.godot +++ b/project.godot @@ -26,7 +26,9 @@ BuildingsList="*res://scripts/BuildingsList.gd" [display] -window/size/mode=2 +window/size/viewport_width=2560 +window/size/viewport_height=1440 +window/size/mode=3 window/stretch/mode="canvas_items" window/stretch/aspect="ignore" mouse_cursor/custom_image="uid://cy2skrncnaxwt" diff --git a/scenes/galaxy.tscn b/scenes/galaxy.tscn index 2da7cf5..4075203 100644 --- a/scenes/galaxy.tscn +++ b/scenes/galaxy.tscn @@ -4,7 +4,7 @@ [ext_resource type="PackedScene" uid="uid://bbgymc0drqpbx" path="res://scenes/ui/time_display.tscn" id="3_fmtwf"] [ext_resource type="AudioStream" uid="uid://c8xg32p8lbltw" path="res://assets/sounds/music/game_music.mp3" id="3_mlxib"] [ext_resource type="Script" uid="uid://b4cmg63daeo7g" path="res://scripts/camera_2d.gd" id="4_5xxpo"] -[ext_resource type="Texture2D" uid="uid://baxj0b3uih6jx" path="res://assets/background/Nebulas/n1.png" id="5_kdehn"] +[ext_resource type="Texture2D" uid="uid://bvucvdvh00uaw" path="res://assets/background/galback1.jpg" id="5_xhm0b"] [ext_resource type="Script" uid="uid://dpwk3ruw8mx6k" path="res://scripts/background.gd" id="6_xhm0b"] [ext_resource type="PackedScene" uid="uid://dgxm8txsiukwf" path="res://scenes/planet_panel.tscn" id="7_xhm0b"] @@ -22,31 +22,21 @@ autoplay = true [node name="Camera2D" type="Camera2D" parent="."] position = Vector2(904, 512) zoom = Vector2(0.81, 0.81) +limit_smoothed = true script = ExtResource("4_5xxpo") -[node name="CanvasLayer2" type="CanvasLayer" parent="."] -layer = 10 - -[node name="TimeDisplay" parent="CanvasLayer2" instance=ExtResource("3_fmtwf")] -top_level = true -z_index = 1 -z_as_relative = false -offset_left = 896.0 -offset_top = 8.0 -offset_bottom = -616.0 - [node name="ParallaxBackground" type="ParallaxBackground" parent="."] scroll_ignore_camera_zoom = true [node name="ParallaxLayer" type="ParallaxLayer" parent="ParallaxBackground"] position = Vector2(-72, -32) motion_scale = Vector2(0.1, 0.1) -motion_mirroring = Vector2(1024, 1024) [node name="Background" type="Sprite2D" parent="ParallaxBackground/ParallaxLayer"] z_index = -10 -position = Vector2(456, 416) -texture = ExtResource("5_kdehn") +position = Vector2(2560, 1328) +scale = Vector2(0.7135999, 0.76515555) +texture = ExtResource("5_xhm0b") script = ExtResource("6_xhm0b") [node name="UI" type="CanvasLayer" parent="."] @@ -55,15 +45,29 @@ transform = Transform2D(1, 0, 0, 1, 50, 50) [node name="PlanetPanel" parent="UI" instance=ExtResource("7_xhm0b")] visible = false +show_behind_parent = true anchors_preset = 0 anchor_left = 0.0 anchor_top = 0.0 anchor_right = 0.0 anchor_bottom = 0.0 -offset_left = 790.0 -offset_top = 14.0 -offset_right = 1090.0 -offset_bottom = 398.0 +offset_left = 1814.0 +offset_top = 38.0 +offset_right = 2422.0 +offset_bottom = 774.0 grow_vertical = 1 size_flags_horizontal = 4 size_flags_vertical = 4 + +[node name="CanvasLayer2" type="CanvasLayer" parent="UI"] +layer = 10 + +[node name="TimeDisplay" parent="UI/CanvasLayer2" instance=ExtResource("3_fmtwf")] +unique_name_in_owner = true +top_level = true +z_index = 13 +z_as_relative = false +offset_left = 2144.0 +offset_top = 8.0 +offset_right = -80.0 +offset_bottom = -1384.0 diff --git a/scenes/menu.tscn b/scenes/menu.tscn index 1eff553..e993f3c 100644 --- a/scenes/menu.tscn +++ b/scenes/menu.tscn @@ -1,4 +1,4 @@ -[gd_scene load_steps=28 format=3 uid="uid://sxae8i12io4y"] +[gd_scene load_steps=31 format=3 uid="uid://sxae8i12io4y"] [ext_resource type="Script" uid="uid://ol6efor868gk" path="res://scripts/menu.gd" id="1_vjb58"] [ext_resource type="Texture2D" uid="uid://c2bmun1bugix" path="res://assets/background/menubg2.jpg" id="2_70i5f"] @@ -52,18 +52,6 @@ _data = { [sub_resource type="Animation" id="Animation_i6lef"] length = 0.001 -tracks/0/type = "value" -tracks/0/imported = false -tracks/0/enabled = true -tracks/0/path = NodePath(".:modulate") -tracks/0/interp = 1 -tracks/0/loop_wrap = true -tracks/0/keys = { -"times": PackedFloat32Array(0), -"transitions": PackedFloat32Array(1), -"update": 0, -"values": [Color(1, 1, 1, 0)] -} [sub_resource type="Animation" id="Animation_13sgg"] resource_name = "anim_logo" @@ -88,7 +76,7 @@ _data = { } [sub_resource type="Animation" id="Animation_6cdou"] -length = 0.001 +length = 360.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -99,7 +87,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(711, 356)] +"values": [Vector2(1604, 727)] } [sub_resource type="Animation" id="Animation_ufwb2"] @@ -115,7 +103,7 @@ tracks/0/keys = { "times": PackedFloat32Array(0, 360), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [Vector2(711, 356), Vector2(1204, 356)] +"values": [Vector2(1604, 727), Vector2(2708, 727)] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_i42df"] @@ -129,14 +117,26 @@ length = 0.001 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true -tracks/0/path = NodePath(".:position") +tracks/0/path = NodePath("../moon:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { "times": PackedFloat32Array(0), "transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(211, 274)] +"values": [Vector2(1609, 712)] +} +tracks/1/type = "value" +tracks/1/imported = false +tracks/1/enabled = true +tracks/1/path = NodePath(".:position") +tracks/1/interp = 1 +tracks/1/loop_wrap = true +tracks/1/keys = { +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), +"update": 0, +"values": [Vector2(159, 559)] } [sub_resource type="Animation" id="Animation_i42df"] @@ -155,9 +155,43 @@ tracks/0/keys = { "values": [Vector2(334, 276), Vector2(627.99994, 274)] } +[sub_resource type="Animation" id="Animation_3dmrc"] +resource_name = "moon_move" +length = 360.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath("../moon:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 360), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(1609, 712), Vector2(2700, 712)] +} + +[sub_resource type="Animation" id="Animation_mxgkd"] +resource_name = "ship1" +length = 200.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 200), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(159, 559), Vector2(1580, 544)] +} + [sub_resource type="AnimationLibrary" id="AnimationLibrary_mxgkd"] _data = { &"RESET": SubResource("Animation_7jp70"), +&"moon_move": SubResource("Animation_3dmrc"), +&"ship1": SubResource("Animation_mxgkd"), &"ship_move": SubResource("Animation_i42df") } @@ -170,15 +204,15 @@ tracks/0/path = NodePath(".:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 200), -"transitions": PackedFloat32Array(1, 1), +"times": PackedFloat32Array(0), +"transitions": PackedFloat32Array(1), "update": 0, -"values": [Vector2(197.00002, 124.999985), Vector2(687.99994, 194.00002)] +"values": [Vector2(267, 282)] } -[sub_resource type="Animation" id="Animation_mxgkd"] -resource_name = "ship_move" -length = 250.0 +[sub_resource type="Animation" id="Animation_81l6r"] +resource_name = "ship2" +length = 400.0 tracks/0/type = "value" tracks/0/imported = false tracks/0/enabled = true @@ -186,21 +220,39 @@ tracks/0/path = NodePath(".:position") tracks/0/interp = 1 tracks/0/loop_wrap = true tracks/0/keys = { -"times": PackedFloat32Array(0, 250), +"times": PackedFloat32Array(0, 400), "transitions": PackedFloat32Array(1, 1), "update": 0, -"values": [Vector2(119.5, 295.5), Vector2(629.50006, 295.49997)] +"values": [Vector2(284.99997, 485.00003), Vector2(1700, 485)] +} + +[sub_resource type="Animation" id="Animation_rsfmq"] +resource_name = "ship3" +length = 200.0 +tracks/0/type = "value" +tracks/0/imported = false +tracks/0/enabled = true +tracks/0/path = NodePath(".:position") +tracks/0/interp = 1 +tracks/0/loop_wrap = true +tracks/0/keys = { +"times": PackedFloat32Array(0, 200), +"transitions": PackedFloat32Array(1, 1), +"update": 0, +"values": [Vector2(267, 282), Vector2(2287, 282)] } [sub_resource type="AnimationLibrary" id="AnimationLibrary_3dmrc"] _data = { &"RESET": SubResource("Animation_g6gyw"), -&"ship_move": SubResource("Animation_mxgkd") +&"ship2": SubResource("Animation_81l6r"), +&"ship3": SubResource("Animation_rsfmq") } [node name="MainMenu" type="Control"] process_mode = 3 top_level = true +z_index = 100 layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 @@ -235,10 +287,10 @@ autoplay = "blink" [node name="exit" type="TextureButton" parent="TextureRect"] layout_mode = 0 -offset_left = 7.0 -offset_top = 580.0 -offset_right = 1257.0 -offset_bottom = 810.0 +offset_left = 39.0 +offset_top = 1329.0 +offset_right = 2039.0 +offset_bottom = 1629.0 scale = Vector2(0.15, 0.15) texture_normal = ExtResource("3_v86rl") texture_hover = ExtResource("4_13sgg") @@ -248,24 +300,25 @@ stretch_mode = 0 layout_mode = 0 offset_left = 6.6666603 offset_top = 6.6665955 -offset_right = 1246.6665 -offset_bottom = 219.99985 -theme_override_colors/font_color = Color(3.008172e-09, 0.06855638, 0.14010939, 1) +offset_right = 1986.6665 +offset_bottom = 293.3331 +theme_override_colors/font_color = Color(0.073123895, 0.0037705752, 0.025873708, 1) theme_override_colors/font_shadow_color = Color(0.7570387, 0.75415635, 0.7885611, 0) -theme_override_colors/font_outline_color = Color(0.9954526, 0.93959796, 0.9103491, 1) +theme_override_colors/font_outline_color = Color(0.02877314, 0.7656168, 0.72319645, 0.53333336) +theme_override_constants/shadow_offset_y = 0 theme_override_constants/outline_size = 23 theme_override_fonts/font = ExtResource("6_i6lef") -theme_override_font_sizes/font_size = 120 +theme_override_font_sizes/font_size = 200 text = "menu_exit" horizontal_alignment = 1 vertical_alignment = 1 [node name="option" type="TextureButton" parent="TextureRect"] layout_mode = 0 -offset_left = 7.0 -offset_top = 537.0 -offset_right = 1257.0 -offset_bottom = 767.0 +offset_left = 39.0 +offset_top = 1272.0 +offset_right = 2039.0 +offset_bottom = 1572.0 scale = Vector2(0.15, 0.15) texture_normal = ExtResource("3_v86rl") texture_hover = ExtResource("4_13sgg") @@ -275,24 +328,25 @@ stretch_mode = 0 layout_mode = 0 offset_left = 6.6666718 offset_top = 6.6664734 -offset_right = 1246.6665 -offset_bottom = 226.66647 -theme_override_colors/font_color = Color(3.008172e-09, 0.06855638, 0.14010939, 1) +offset_right = 1999.9999 +offset_bottom = 293.33298 +theme_override_colors/font_color = Color(0.073123895, 0.0037705752, 0.025873708, 1) theme_override_colors/font_shadow_color = Color(0.7570387, 0.75415635, 0.7885611, 0) -theme_override_colors/font_outline_color = Color(0.9954526, 0.93959796, 0.9103491, 1) +theme_override_colors/font_outline_color = Color(0.02877314, 0.7656168, 0.72319645, 0.53333336) +theme_override_constants/shadow_offset_y = 0 theme_override_constants/outline_size = 23 theme_override_fonts/font = ExtResource("6_i6lef") -theme_override_font_sizes/font_size = 120 +theme_override_font_sizes/font_size = 200 text = "menu_options" horizontal_alignment = 1 vertical_alignment = 1 [node name="start" type="TextureButton" parent="TextureRect"] layout_mode = 0 -offset_left = 7.0 -offset_top = 449.0 -offset_right = 1257.0 -offset_bottom = 679.0 +offset_left = 39.0 +offset_top = 1153.0 +offset_right = 2039.0 +offset_bottom = 1453.0 scale = Vector2(0.15, 0.15) texture_normal = ExtResource("3_v86rl") texture_hover = ExtResource("4_13sgg") @@ -305,28 +359,28 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -618.3333 -offset_top = -108.33362 -offset_right = 621.6665 -offset_bottom = 111.66638 +offset_left = -993.33325 +offset_top = -136.66663 +offset_right = 993.33325 +offset_bottom = 143.33337 grow_horizontal = 2 grow_vertical = 2 -theme_override_colors/font_color = Color(3.008172e-09, 0.06855638, 0.14010939, 1) -theme_override_colors/font_shadow_color = Color(0.7570387, 0.75415635, 0.7885611, 0) -theme_override_colors/font_outline_color = Color(0.9954526, 0.93959796, 0.9103491, 1) +theme_override_colors/font_color = Color(0.073123895, 0.0037705752, 0.025873708, 1) +theme_override_colors/font_shadow_color = Color(0, 0, 0, 0) +theme_override_colors/font_outline_color = Color(0.02877314, 0.7656168, 0.72319645, 0.53333336) theme_override_constants/outline_size = 23 theme_override_fonts/font = ExtResource("6_i6lef") -theme_override_font_sizes/font_size = 120 +theme_override_font_sizes/font_size = 200 text = "menu_start" horizontal_alignment = 1 vertical_alignment = 1 [node name="back" type="TextureButton" parent="TextureRect"] layout_mode = 0 -offset_left = 7.0 -offset_top = 332.0 -offset_right = 1257.0 -offset_bottom = 562.0 +offset_left = 39.0 +offset_top = 975.00006 +offset_right = 2039.0 +offset_bottom = 1275.0 scale = Vector2(0.15, 0.15) texture_normal = ExtResource("3_v86rl") texture_hover = ExtResource("4_13sgg") @@ -339,28 +393,29 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -618.3333 -offset_top = -115.00012 -offset_right = 621.6665 -offset_bottom = 104.99988 +offset_left = -1000.0 +offset_top = -150.00012 +offset_right = 986.6666 +offset_bottom = 143.33337 grow_horizontal = 2 grow_vertical = 2 -theme_override_colors/font_color = Color(3.008172e-09, 0.06855638, 0.14010939, 1) +theme_override_colors/font_color = Color(0.073123895, 0.0037705752, 0.025873708, 1) theme_override_colors/font_shadow_color = Color(0.7570387, 0.75415635, 0.7885611, 0) -theme_override_colors/font_outline_color = Color(0.9954526, 0.93959796, 0.9103491, 1) +theme_override_colors/font_outline_color = Color(0.02877314, 0.7656168, 0.72319645, 0.53333336) +theme_override_constants/shadow_offset_y = 0 theme_override_constants/outline_size = 23 theme_override_fonts/font = ExtResource("6_i6lef") -theme_override_font_sizes/font_size = 120 +theme_override_font_sizes/font_size = 200 text = "menu_back" horizontal_alignment = 1 vertical_alignment = 1 [node name="save" type="TextureButton" parent="TextureRect"] layout_mode = 0 -offset_left = 7.0 -offset_top = 376.0 -offset_right = 1257.0 -offset_bottom = 606.0 +offset_left = 39.0 +offset_top = 1035.0 +offset_right = 2039.0 +offset_bottom = 1335.0 scale = Vector2(0.15, 0.15) texture_normal = ExtResource("3_v86rl") texture_hover = ExtResource("4_13sgg") @@ -373,28 +428,29 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -618.3333 -offset_top = -115.00012 -offset_right = 621.6665 -offset_bottom = 104.99988 +offset_left = -993.3333 +offset_top = -150.00012 +offset_right = 993.33325 +offset_bottom = 143.33337 grow_horizontal = 2 grow_vertical = 2 -theme_override_colors/font_color = Color(3.008172e-09, 0.06855638, 0.14010939, 1) +theme_override_colors/font_color = Color(0.073123895, 0.0037705752, 0.025873708, 1) theme_override_colors/font_shadow_color = Color(0.7570387, 0.75415635, 0.7885611, 0) -theme_override_colors/font_outline_color = Color(0.9954526, 0.93959796, 0.9103491, 1) +theme_override_colors/font_outline_color = Color(0.02877314, 0.7656168, 0.72319645, 0.53333336) +theme_override_constants/shadow_offset_y = 0 theme_override_constants/outline_size = 23 theme_override_fonts/font = ExtResource("6_i6lef") -theme_override_font_sizes/font_size = 120 +theme_override_font_sizes/font_size = 200 text = "menu_save" horizontal_alignment = 1 vertical_alignment = 1 [node name="load" type="TextureButton" parent="TextureRect"] layout_mode = 0 -offset_left = 7.050003 -offset_top = 494.10004 -offset_right = 1257.05 -offset_bottom = 724.1 +offset_left = 39.0 +offset_top = 1210.0 +offset_right = 2039.0 +offset_bottom = 1510.0 scale = Vector2(0.15, 0.15) texture_normal = ExtResource("3_v86rl") texture_hover = ExtResource("4_13sgg") @@ -407,26 +463,27 @@ anchor_left = 0.5 anchor_top = 0.5 anchor_right = 0.5 anchor_bottom = 0.5 -offset_left = -618.6667 -offset_top = -115.66679 -offset_right = 621.3331 -offset_bottom = 104.333206 +offset_left = -993.3333 +offset_top = -143.33328 +offset_right = 993.33325 +offset_bottom = 156.66672 grow_horizontal = 2 grow_vertical = 2 -theme_override_colors/font_color = Color(3.008172e-09, 0.06855638, 0.14010939, 1) +theme_override_colors/font_color = Color(0.073123895, 0.0037705752, 0.025873708, 1) theme_override_colors/font_shadow_color = Color(0.7570387, 0.75415635, 0.7885611, 0) -theme_override_colors/font_outline_color = Color(0.9954526, 0.93959796, 0.9103491, 1) +theme_override_colors/font_outline_color = Color(0.02877314, 0.7656168, 0.72319645, 0.53333336) +theme_override_constants/shadow_offset_y = 0 theme_override_constants/outline_size = 23 theme_override_fonts/font = ExtResource("6_i6lef") -theme_override_font_sizes/font_size = 120 +theme_override_font_sizes/font_size = 200 text = "menu_load" horizontal_alignment = 1 vertical_alignment = 1 [node name="Sprite2D" type="Sprite2D" parent="TextureRect"] modulate = Color(1, 1, 1, 0) -position = Vector2(563.00006, 477) -scale = Vector2(0.27148017, 0.2616161) +position = Vector2(1206.1, 1019.35) +scale = Vector2(0.66823107, 0.5971381) texture = ExtResource("5_4ytvr") [node name="AnimationPlayer" type="AnimationPlayer" parent="TextureRect/Sprite2D"] @@ -436,8 +493,8 @@ libraries = { autoplay = "anim_logo" [node name="moon" type="Sprite2D" parent="TextureRect"] -position = Vector2(711, 356) -scale = Vector2(0.1, 0.1) +position = Vector2(1609, 712) +scale = Vector2(0.31873378, 0.30559945) texture = ExtResource("8_70i5f") [node name="AnimationPlayer" type="AnimationPlayer" parent="TextureRect/moon"] @@ -447,18 +504,18 @@ libraries = { autoplay = "move_moon" [node name="ship" type="Sprite2D" parent="TextureRect"] -position = Vector2(211, 274) -scale = Vector2(0.1123348, 0.10526316) +position = Vector2(159, 559) +scale = Vector2(0.30121145, 0.32456148) texture = ExtResource("9_mj5lg") [node name="AnimationPlayer" type="AnimationPlayer" parent="TextureRect/ship"] libraries = { &"": SubResource("AnimationLibrary_mxgkd") } -autoplay = "ship_move" +autoplay = "ship1" [node name="Sprite2D2" type="Sprite2D" parent="TextureRect"] -position = Vector2(197.00002, 124.999985) +position = Vector2(267, 282) scale = Vector2(0.16519824, 0.20175439) texture = ExtResource("9_mj5lg") @@ -466,18 +523,18 @@ texture = ExtResource("9_mj5lg") libraries = { &"": SubResource("AnimationLibrary_3dmrc") } -autoplay = "ship_move" +autoplay = "ship2" [node name="Sprite2D3" type="Sprite2D" parent="TextureRect"] -position = Vector2(197.00002, 124.999985) -scale = Vector2(0.3381723, 0.35923466) +position = Vector2(267, 282) +scale = Vector2(0.70308614, 0.82761735) texture = ExtResource("10_ufwb2") [node name="AnimationPlayer" type="AnimationPlayer" parent="TextureRect/Sprite2D3"] libraries = { &"": SubResource("AnimationLibrary_3dmrc") } -autoplay = "RESET" +autoplay = "ship3" [node name="VBoxContainer" type="GridContainer" parent="."] visible = false diff --git a/scenes/planet.tscn b/scenes/planet.tscn index 985bb98..fe77217 100644 --- a/scenes/planet.tscn +++ b/scenes/planet.tscn @@ -1,7 +1,7 @@ [gd_scene load_steps=5 format=3 uid="uid://cynwjsqox5eqx"] [ext_resource type="Script" uid="uid://bdmoi05k2qhjs" path="res://scripts/planet.gd" id="1_cktii"] -[ext_resource type="Texture2D" uid="uid://bmu7jwnvu7ob2" path="res://assets/planets/p5.png" id="2_h8ms6"] +[ext_resource type="Texture2D" uid="uid://cwjee3thi5rfu" path="res://assets/planets/p5.png" id="2_h8ms6"] [ext_resource type="FontFile" uid="uid://chk8jrn2ighpx" path="res://assets/fonts/main_font.ttf" id="3_ggt7d"] [sub_resource type="CircleShape2D" id="CircleShape2D_h8ms6"] @@ -22,14 +22,15 @@ scale = Vector2(0.053333335, 0.053333335) texture = ExtResource("2_h8ms6") [node name="Label" type="Label" parent="."] -offset_left = -12.0 -offset_top = 6.0 -offset_right = 12.0 -offset_bottom = 22.0 +offset_left = -53.0 +offset_top = 10.0 +offset_right = 53.0 +offset_bottom = 31.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") -theme_override_font_sizes/font_size = 8 +theme_override_font_sizes/font_size = 12 +text = "dasdad" horizontal_alignment = 1 vertical_alignment = 1 diff --git a/scenes/planet_panel.tscn b/scenes/planet_panel.tscn index 05932b9..c3a15f7 100644 --- a/scenes/planet_panel.tscn +++ b/scenes/planet_panel.tscn @@ -21,10 +21,10 @@ anchor_left = 0.499 anchor_top = 0.37300003 anchor_right = 0.499 anchor_bottom = 0.37300003 -offset_left = -574.848 +offset_left = -612.44006 offset_top = -241.70401 -offset_right = -274.84802 -offset_bottom = 255.29599 +offset_right = -186.44006 +offset_bottom = 259.87994 grow_vertical = 2 size_flags_horizontal = 0 size_flags_vertical = 0 @@ -35,10 +35,10 @@ script = ExtResource("1_b1d0p") layout_mode = 0 offset_left = 5.0 offset_top = 3.0 -offset_right = 296.0 -offset_bottom = 19.0 +offset_right = 393.0 +offset_bottom = 24.0 theme_override_fonts/font = ExtResource("2_sqypy") -theme_override_font_sizes/font_size = 11 +theme_override_font_sizes/font_size = 16 text = "Nazwa planety" horizontal_alignment = 1 @@ -46,10 +46,10 @@ horizontal_alignment = 1 layout_mode = 0 offset_left = 5.0 offset_top = 23.0 -offset_right = 297.0 -offset_bottom = 58.0 +offset_right = 419.0 +offset_bottom = 305.58395 theme_override_fonts/font = ExtResource("2_sqypy") -theme_override_font_sizes/font_size = 8 +theme_override_font_sizes/font_size = 16 text = "Informacje o planecie..." autowrap_mode = 2 @@ -65,14 +65,18 @@ offset_right = -11.0 offset_bottom = -8.0 grow_horizontal = 2 grow_vertical = 0 -columns = 7 +columns = 3 [node name="Button" type="Button" parent="."] -layout_mode = 0 -offset_left = 279.0 -offset_top = 1.0 -offset_right = 298.0 -offset_bottom = 20.0 +layout_mode = 1 +anchors_preset = 1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -22.0 +offset_top = 3.0 +offset_right = -3.0 +offset_bottom = 22.0 +grow_horizontal = 0 theme_override_font_sizes/font_size = 7 text = "X" diff --git a/scenes/star.tscn b/scenes/star.tscn index 9d891c2..821ae5e 100644 --- a/scenes/star.tscn +++ b/scenes/star.tscn @@ -9,18 +9,18 @@ script = ExtResource("1_mcqwg") [node name="Sprite2D" type="Sprite2D" parent="."] -scale = Vector2(0.02, 0.02) +scale = Vector2(0.0371471, 0.0371471) texture = ExtResource("2_8d8bx") script = ExtResource("3_ef0hr") [node name="Label" type="Label" parent="."] -offset_left = -40.0 -offset_top = 15.0 -offset_right = 40.0 -offset_bottom = 29.0 +offset_left = -53.0 +offset_top = 34.0 +offset_right = 54.0 +offset_bottom = 56.0 theme_override_colors/font_outline_color = Color(0, 0, 0, 1) theme_override_constants/outline_size = 3 theme_override_fonts/font = ExtResource("4_8d8bx") -theme_override_font_sizes/font_size = 10 +theme_override_font_sizes/font_size = 17 horizontal_alignment = 1 vertical_alignment = 1 diff --git a/scenes/ui/time_display.tscn b/scenes/ui/time_display.tscn index 54713b6..6ec7ef1 100644 --- a/scenes/ui/time_display.tscn +++ b/scenes/ui/time_display.tscn @@ -5,10 +5,14 @@ [ext_resource type="FontFile" uid="uid://drp85tpfncq5m" path="res://assets/fonts/font2.ttf" id="3_aosp1"] [node name="TimeDisplay" type="Control"] +show_behind_parent = true +z_index = -1 layout_mode = 3 anchors_preset = 15 anchor_right = 1.0 anchor_bottom = 1.0 +offset_right = -2114.0 +offset_bottom = -1395.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_3uj10") @@ -16,52 +20,54 @@ script = ExtResource("1_3uj10") [node name="TimeLabel" type="Label" parent="."] layout_mode = 0 offset_left = 39.0 -offset_right = 164.0 -offset_bottom = 20.0 +offset_right = 261.0 +offset_bottom = 29.0 theme_override_fonts/font = ExtResource("2_742oq") +theme_override_font_sizes/font_size = 22 text = "time_display" [node name="pause" type="Button" parent="."] layout_mode = 0 -offset_left = 12.0 +offset_left = 7.0 offset_top = 2.0 -offset_right = 32.0 -offset_bottom = 24.0 +offset_right = 34.0 +offset_bottom = 55.0 scale = Vector2(0.5, 0.5) theme_override_colors/font_color = Color(0.80287457, 0.40096578, 0.15050122, 1) theme_override_fonts/font = ExtResource("3_aosp1") -theme_override_font_sizes/font_size = 16 +theme_override_font_sizes/font_size = 35 text = "II" [node name="faster" type="Button" parent="."] layout_mode = 0 -offset_left = 23.0 +offset_left = 24.0 offset_top = 2.0 -offset_right = 41.0 -offset_bottom = 24.0 +offset_right = 50.0 +offset_bottom = 55.0 scale = Vector2(0.5, 0.5) theme_override_colors/font_color = Color(0.80287457, 0.40096578, 0.15050122, 1) theme_override_fonts/font = ExtResource("3_aosp1") -theme_override_font_sizes/font_size = 16 +theme_override_font_sizes/font_size = 35 text = ">" [node name="slower" type="Button" parent="."] layout_mode = 0 -offset_left = 2.0 +offset_left = -8.0 offset_top = 2.0 -offset_right = 20.0 -offset_bottom = 24.0 +offset_right = 18.0 +offset_bottom = 55.0 scale = Vector2(0.5, 0.5) theme_override_colors/font_color = Color(0.80287457, 0.40096578, 0.15050122, 1) theme_override_fonts/font = ExtResource("3_aosp1") -theme_override_font_sizes/font_size = 16 +theme_override_font_sizes/font_size = 35 text = "<" [node name="MenuButton" type="Button" parent="."] layout_mode = 0 -offset_left = 198.0 -offset_right = 246.0 -offset_bottom = 23.0 +offset_left = 265.0 +offset_top = 3.0 +offset_right = 313.0 +offset_bottom = 26.0 theme_override_fonts/font = ExtResource("2_742oq") theme_override_font_sizes/font_size = 11 text = "Menu" diff --git a/scripts/background.gd b/scripts/background.gd index 7a39e46..5aca448 100644 --- a/scripts/background.gd +++ b/scripts/background.gd @@ -1,6 +1,6 @@ extends Sprite2D -func _ready(): - randomize() # upewniamy się, że losowanie nie powtarza się - var tex_id = randi_range(1, 13) # losujemy liczbę od 1 do 14 - texture = load("res://assets/background/Nebulas/n%d.png" % tex_id) +#func _ready(): + #randomize() # upewniamy się, że losowanie nie powtarza się + #var tex_id = randi_range(1, 13) # losujemy liczbę od 1 do 14 + #texture = load("res://assets/background/Nebulas/n%d.png" % tex_id) diff --git a/scripts/galaxy.gd b/scripts/galaxy.gd index 32c3b84..246700b 100644 --- a/scripts/galaxy.gd +++ b/scripts/galaxy.gd @@ -14,7 +14,7 @@ const PLANET_HIDE_ZOOM = 0.6 # powyżej tego zoomu planety się chowają func _ready(): if GameData.game_lunched == false: _generate_galaxy(Settings.NUMBER_OF_SYSTEMS) - TimeDispaly.visible = true + GameData.game_lunched = true @@ -47,7 +47,7 @@ func _generate_galaxy(count: int): for j in range(star.planet_count): var planet = PlanetScene.instantiate() planet.pname = Names.planet_names[randi() % Names.planet_names.size()] - planet.orbit_radius = 45 + j * 40 + planet.orbit_radius = 55 + j * 40 planet.orbit_speed = randf_range(0.004, 0.01) planet.size = randi_range(1, 3) #assign_max_population(planet) @@ -60,7 +60,7 @@ 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.073*planet.size/2, 0.073*planet.size/2) + planet.get_node("Sprite2D").scale = Vector2(0.093*planet.size/2, 0.093*planet.size/2) star.add_child(planet) # Planeta należy do gwiaz7 star.planets.append(planet) @@ -106,12 +106,12 @@ func show_menu(): if cam: cam.enabled = false var menu_instance = MenuScene.instantiate() - TimeDispaly.visible = false + #TimeDispaly.visible = false add_child(menu_instance) menu_instance.z_index = 100 # na wierzchu wszystkiego get_tree().paused = true # pauzuje grę, jeśli chcesz - #Te zmienne muszą być zadeklarowane poza funkcją (np. na początku skryptu) + ## Funkcja zwracająca bezpieczną pozycję lub Vector2.ZERO po niepowodzeniu diff --git a/scripts/menu.gd b/scripts/menu.gd index e73552a..892f1f1 100644 --- a/scripts/menu.gd +++ b/scripts/menu.gd @@ -2,12 +2,13 @@ extends Control @onready var option_popup = $OptionPopup @onready var back_button = $TextureRect/back @onready var save_button = $TextureRect/save + func _ready(): $TextureRect/start.connect("pressed", Callable(self, "_on_start_pressed")) $TextureRect/exit.connect("pressed", Callable(self, "_on_exit_pressed")) $TextureRect/option.connect("pressed", Callable(self, "_on_opcje_pressed")) $TextureRect/back.connect("pressed", Callable(self, "_on_back_pressed")) - + Engine.time_scale = 1.0 if GameData.game_lunched == true: @@ -36,6 +37,7 @@ func _on_back_pressed(): if cam: cam.enabled = true cam.make_current() # ustawia kamerę jako aktywną + get_tree().paused = false queue_free() # usuwa menu z ekranu diff --git a/scripts/planet.gd b/scripts/planet.gd index 22167f9..34a32cc 100644 --- a/scripts/planet.gd +++ b/scripts/planet.gd @@ -139,11 +139,11 @@ func _pop_growth(delta): max_pop = check_max_pop() if pop_timer >= Settings.UPDATE_INTERVAL: if resources["water"]["amount"] > 0: - var growth = int(max(1, population * 0.05 * biosfere)) + var growth = int(max(1, population * 0.05 * (biosfere + bonuses["biosfere"]))) population = min(population + growth, max_pop) pop_timer = 0.0 else: - population = max(population - 10, 100) + population = max(population - 1000, 100) pop_timer = 0.0 func _res_growth(delta): res_timer += delta @@ -179,7 +179,7 @@ func check_growth() -> float: func _res_consumption(delta): - var water_usage = population * 0.0002 # np. 0.002 jednostki wody na osobę + var water_usage = population * 0.000001 # np. 0.002 jednostki wody na osobę cons_timer += delta if cons_timer >= Settings.UPDATE_INTERVAL: if "water" in resources: diff --git a/scripts/planet_panel.gd b/scripts/planet_panel.gd index f6aeab9..0c5cc9c 100644 --- a/scripts/planet_panel.gd +++ b/scripts/planet_panel.gd @@ -24,7 +24,8 @@ func _update_info(): # Tekst informacji wzorowany na print_data z Planet.gd var text = "🌍 %s\n" % planet.pname - text += "Biosfera: %.2f\n" % planet.biosfere + text += "Biosfera: %.2f (+%.2f)\n" % [planet.biosfere, planet.bonuses.get("biosfere", 0.0)] + text += "Zasobność surowców: %.2f\n" % planet.res_rich text += "Limit populacji: %s\n" % GameData.format_number(planet.max_pop) text += "Populacja: %d\n" % int(planet.population) @@ -65,9 +66,9 @@ func _create_building_buttons(): var b_data = BuildingsList.BUILDINGS[b_id] var btn = TextureButton.new() btn.texture_normal = load(b_data.texture) - btn.scale = Vector2(0.22,0.22) + #btn.stretch_mode = TextureButton.STRETCH_KEEP_ASPECT_COVERED - # Możesz ustawić skalowanie lub minimalny rozmiar: + #btn.ignore_texture_size = true diff --git a/scripts/settings.gd b/scripts/settings.gd index 2964b5b..d7f3c2d 100644 --- a/scripts/settings.gd +++ b/scripts/settings.gd @@ -1,20 +1,20 @@ extends Node const LANGUAGE = 'pl' var number_of_players = 1 -var map_speed = 0.04 +var map_speed = 0.02 #ustawienia mapy -var x = 8000 -var y = 8000 -const MIN_DISTANCE: float = 1000 +var x = 12000 +var y = 12000 +const MIN_DISTANCE: float = 900 const MAX_PLACEMENT_ATTEMPTS: int = 50 const MARGIN: float = 50.0 -var NUMBER_OF_SYSTEMS: int = 300 +var NUMBER_OF_SYSTEMS: int = 100 #Ilosc systemów -var min_planet = 5 +var min_planet = 1 var max_planet = 7 #Zmiana upływu czasu diff --git a/scripts/star.gd b/scripts/star.gd index 10a84fa..229243a 100644 --- a/scripts/star.gd +++ b/scripts/star.gd @@ -1,7 +1,7 @@ extends Node2D class_name Star # Parametry ustawiane w Inspektorze (łatwe do edycji!) -@export var radius: float = 300.0 # Promień okręgu +@export var radius: float = 400.0 # Promień okręgu @export var color: Color = Color.GRAY @export var thickness: float = 0.5 # Grubość linii konturu @export var segments: int = 64