diff --git a/galaxy/star_system/scenes/sol.tscn b/galaxy/star_system/scenes/sol.tscn index 4c36fa88..623bacaa 100644 --- a/galaxy/star_system/scenes/sol.tscn +++ b/galaxy/star_system/scenes/sol.tscn @@ -95,10 +95,10 @@ rigid_body_direction = NodePath("../RigidBodyDirection") destination = Vector3(12.5408, 0, 0.72235) [editable path="Mercury"] -[editable path="Mercury/Sprite3D/TargetOverlay"] +[editable path="Mercury/TargetOverlay"] [editable path="Venus"] -[editable path="Venus/Sprite3D/TargetOverlay"] +[editable path="Venus/TargetOverlay"] [editable path="Mars"] -[editable path="Mars/Sprite3D/TargetOverlay"] +[editable path="Mars/TargetOverlay"] [editable path="Freighter"] [editable path="Freighter/CombatObject/TargetOverlay"] diff --git a/galaxy/star_system/scenes/thalassa.tscn b/galaxy/star_system/scenes/thalassa.tscn index 665e6d9e..64280762 100644 --- a/galaxy/star_system/scenes/thalassa.tscn +++ b/galaxy/star_system/scenes/thalassa.tscn @@ -22,7 +22,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -2.34809, 2.08165e-12, 1.5688 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 5.4962, 2.08165e-12, 3.09616) [node name="Gaia Prime" parent="." instance=ExtResource("5_p806y")] -transform = Transform3D(1.5, 0, 0, 0, 1, 0, 0, 0, 1.5, -2.88144, 0, -12.6529) +transform = Transform3D(1.5, 0, 0, 0, 1, 0, 0, 0, 1.5, -2.33977, 0, -9.75337) planet = ExtResource("6_a1qqt") [node name="Sprite3D" parent="Gaia Prime" index="1"] @@ -30,7 +30,7 @@ transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -1, 0) texture = ExtResource("7_ih7yq") [node name="Proteus" parent="." instance=ExtResource("5_p806y")] -transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -21.0507, 1.90735e-06, -6.91139) +transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, -17.4024, 1.36424e-12, -5.03147) [node name="Sprite3D" parent="Proteus" index="1"] transform = Transform3D(-0.403865, 0, 0.914819, 0, 1, 0, -0.914819, 0, -0.403865, 0, -1, 0) @@ -38,7 +38,7 @@ pixel_size = 0.002 texture = ExtResource("8_o1nyb") [node name="Aeolus" parent="." instance=ExtResource("5_p806y")] -transform = Transform3D(1.2, 0, 0, 0, 1, 0, 0, 0, 1.2, -18.983, 3.8147e-06, -18.8635) +transform = Transform3D(1.2, 0, 0, 0, 1, 0, 0, 0, 1.2, -15.733, 3.8147e-06, -15.8206) planet = ExtResource("7_ffl6i") [node name="Sprite3D" parent="Aeolus" index="1"] @@ -46,8 +46,8 @@ transform = Transform3D(-0.439641, 0, 0.898174, 0, 1, 0, -0.898173, 0, -0.439641 texture = ExtResource("10_7gbi5") [editable path="Gaia Prime"] -[editable path="Gaia Prime/Sprite3D/TargetOverlay"] +[editable path="Gaia Prime/TargetOverlay"] [editable path="Proteus"] -[editable path="Proteus/Sprite3D/TargetOverlay"] +[editable path="Proteus/TargetOverlay"] [editable path="Aeolus"] -[editable path="Aeolus/Sprite3D/TargetOverlay"] +[editable path="Aeolus/TargetOverlay"] diff --git a/galaxy/star_system/scenes/zephyria.tscn b/galaxy/star_system/scenes/zephyria.tscn index 593aa7b2..101b78aa 100644 --- a/galaxy/star_system/scenes/zephyria.tscn +++ b/galaxy/star_system/scenes/zephyria.tscn @@ -23,4 +23,4 @@ transform = Transform3D(-0.210267, 0, -0.977644, 0, 1, 0, 0.977644, 0, -0.210267 texture = ExtResource("6_lxy5c") [editable path="Aethoria"] -[editable path="Aethoria/Sprite3D/TargetOverlay"] +[editable path="Aethoria/TargetOverlay"] diff --git a/galaxy/star_system/star_systems/thalassa.tres b/galaxy/star_system/star_systems/thalassa.tres index e8c47dc4..7dcd8d5b 100644 --- a/galaxy/star_system/star_systems/thalassa.tres +++ b/galaxy/star_system/star_systems/thalassa.tres @@ -1,6 +1,28 @@ -[gd_resource type="Resource" script_class="StarSystem" load_steps=2 format=3 uid="uid://cu1wn7ldbgeej"] +[gd_resource type="Resource" script_class="StarSystem" load_steps=12 format=3 uid="uid://cu1wn7ldbgeej"] [ext_resource type="Script" path="res://galaxy/star_system/star_system.gd" id="1_0hn02"] +[ext_resource type="Resource" uid="uid://b764gd8q3il6s" path="res://mechanics/economy/currencies/credits.tres" id="1_add1a"] +[ext_resource type="Script" path="res://mechanics/economy/market.gd" id="2_xwx77"] +[ext_resource type="Resource" uid="uid://dd63q3wg4vrk" path="res://mechanics/economy/commodities/biological_samples.tres" id="3_fb44d"] +[ext_resource type="Resource" uid="uid://bnw61s2hj8a0m" path="res://mechanics/economy/commodities/water.tres" id="4_56h02"] +[ext_resource type="Resource" uid="uid://dnutrj5jdgiaj" path="res://mechanics/economy/commodities/food.tres" id="5_20rsd"] +[ext_resource type="Resource" uid="uid://n8yvfo8aytg" path="res://mechanics/economy/commodities/luxury_goods.tres" id="6_gbnx7"] +[ext_resource type="Resource" uid="uid://dhxbtnaoc1nuo" path="res://mechanics/economy/commodities/medical_supplies.tres" id="7_s2brr"] +[ext_resource type="Resource" uid="uid://ccvds2nloqvwn" path="res://mechanics/economy/commodities/industrial_equipment.tres" id="8_ei3p8"] +[ext_resource type="Resource" uid="uid://dl132ceubbcos" path="res://mechanics/economy/commodities/rare_earth_elements.tres" id="9_vsdb2"] + +[sub_resource type="Resource" id="Resource_h1m1b"] +script = ExtResource("2_xwx77") +money = ExtResource("1_add1a") +trade_assets = { +ExtResource("3_fb44d"): 3143.0, +ExtResource("4_56h02"): 10.0, +ExtResource("5_20rsd"): 68.0, +ExtResource("6_gbnx7"): 5211.0, +ExtResource("7_s2brr"): 2973.0, +ExtResource("8_ei3p8"): 973.0, +ExtResource("9_vsdb2"): 4121.0 +} [resource] script = ExtResource("1_0hn02") @@ -8,4 +30,6 @@ name = &"Thalassa" connections = Array[StringName]([&"Sol"]) position = Vector3(-0.5, -0.1, 2.7) scene_path = "res://galaxy/star_system/scenes/thalassa.tscn" +market = SubResource("Resource_h1m1b") +refueling_money = ExtResource("1_add1a") refueling_cost = 0 diff --git a/planet/planets/aeolus.tres b/planet/planets/aeolus.tres index f406eaf8..a696059c 100644 --- a/planet/planets/aeolus.tres +++ b/planet/planets/aeolus.tres @@ -1,9 +1,17 @@ -[gd_resource type="Resource" script_class="Planet" load_steps=2 format=3 uid="uid://dlabxdxx15pp7"] +[gd_resource type="Resource" script_class="Planet" load_steps=3 format=3 uid="uid://dlabxdxx15pp7"] +[ext_resource type="Texture2D" uid="uid://rknl8aley68c" path="res://screens/landing/images/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg" id="1_1ky27"] [ext_resource type="Script" path="res://planet/planet.gd" id="1_5srmt"] [resource] script = ExtResource("1_5srmt") -name = "" -facilities = 39 -description = "" +name = "Aeolus" +facilities = 0 +landscape_image = ExtResource("1_1ky27") +description = "As your ship touches down on Aeolus, you're greeted by a world of pristine, unforgiving ice. The planet's surface stretches out before you in an endless expanse of white and pale blue, broken only by jagged crystalline formations that catch and refract the dim light of the distant sun. + +The atmosphere is thin and bitterly cold, your suit's environmental systems working overtime to keep you warm. Howling winds sweep across the barren landscape, carrying fine particles of ice that patter against your viewport like ethereal sand. + +There are no signs of permanent habitation or facilities here. Aeolus remains untamed, a frozen frontier at the edge of civilized space. Your sensors detect pockets of valuable minerals trapped beneath the ice, hinting at the planet's potential wealth – and the reason why the occasional prospector or explorer might brave its hostile conditions. + +As you survey the desolate beauty of Aeolus, you can't help but feel a sense of isolation. This is a place where the unprepared could vanish without a trace, swallowed by the endless white. Yet for those with the right equipment and a spirit of adventure, Aeolus offers a glimpse into the raw, untouched wonders of the galaxy." diff --git a/planet/planets/gaia_prime.tres b/planet/planets/gaia_prime.tres index 51aa6171..f42f2f54 100644 --- a/planet/planets/gaia_prime.tres +++ b/planet/planets/gaia_prime.tres @@ -1,9 +1,19 @@ -[gd_resource type="Resource" script_class="Planet" load_steps=2 format=3 uid="uid://bcxt6a254xlc6"] +[gd_resource type="Resource" script_class="Planet" load_steps=3 format=3 uid="uid://bcxt6a254xlc6"] [ext_resource type="Script" path="res://planet/planet.gd" id="1_c5n72"] +[ext_resource type="Texture2D" uid="uid://be88oaodfcwre" path="res://screens/landing/images/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg" id="1_vxq07"] [resource] script = ExtResource("1_c5n72") -name = "" -facilities = 39 -description = "" +name = "Gaia Prime" +facilities = 35 +landscape_image = ExtResource("1_vxq07") +description = "As your ship descends through wisps of opalescent clouds, the true majesty of Gaia Prime unfolds before you. This super-Earth, 1.5 times the size of humanity's cradle, is a breathtaking tapestry of deep azures and rich emeralds. + +Vast oceans dominate the landscape, their surfaces occasionally broken by archipelagos of lush, tropical islands and sprawling continents with terrain ranging from verdant rainforests to towering mountain ranges. The air is thick but breathable, carrying the scent of alien flora and the promise of undiscovered life. + +Despite its beauty, Gaia Prime is not without its dangers. Frequent electrical storms illuminate the skies, and seismic activity hints at a tumultuous core. The planet's heightened gravity makes movement more challenging, but also allows for richer mineral deposits, beckoning to prospectors and miners alike. + +Scattered across the habitable zones are the fledgling colonies of various factions – research outposts, mining operations, and budding settlements. Their diversity speaks to the planet's potential, but also to the brewing conflicts as different groups vie for control of this promising world. + +As a newcomer, you'll find no shortage of opportunities here, whether you seek to trade, explore, or carve out your own piece of this new frontier. But tread carefully – Gaia Prime's riches and secrets are coveted by many, and not all are willing to share." diff --git a/screens/landing/images/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg b/screens/landing/images/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg new file mode 100644 index 00000000..ed12872c Binary files /dev/null and b/screens/landing/images/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg differ diff --git a/screens/landing/images/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg.import b/screens/landing/images/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg.import new file mode 100644 index 00000000..71f8c4af --- /dev/null +++ b/screens/landing/images/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://rknl8aley68c" +path.s3tc="res://.godot/imported/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg-ef11cf5c1cb5589fb55b0b366ce47619.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://screens/landing/images/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg" +dest_files=["res://.godot/imported/1e3db4b9-0718-4ea2-8714-4f74c61c2b4f.jpg-ef11cf5c1cb5589fb55b0b366ce47619.s3tc.ctex"] + +[params] + +compress/mode=2 +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=1 +roughness/src_normal="" +process/fix_alpha_border=false +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=0 diff --git a/screens/landing/images/54db2464-304b-42f9-9309-c77fa8420cbd.jpg.import b/screens/landing/images/54db2464-304b-42f9-9309-c77fa8420cbd.jpg.import index b018725d..364a4233 100644 --- a/screens/landing/images/54db2464-304b-42f9-9309-c77fa8420cbd.jpg.import +++ b/screens/landing/images/54db2464-304b-42f9-9309-c77fa8420cbd.jpg.import @@ -22,7 +22,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=1 roughness/src_normal="" diff --git a/screens/landing/images/5bca230e-a0cb-4bbb-ab00-f13001ec54cd.jpg.import b/screens/landing/images/5bca230e-a0cb-4bbb-ab00-f13001ec54cd.jpg.import index 0b758e9b..05b02475 100644 --- a/screens/landing/images/5bca230e-a0cb-4bbb-ab00-f13001ec54cd.jpg.import +++ b/screens/landing/images/5bca230e-a0cb-4bbb-ab00-f13001ec54cd.jpg.import @@ -22,7 +22,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=1 roughness/src_normal="" diff --git a/screens/landing/images/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg b/screens/landing/images/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg new file mode 100644 index 00000000..0928962f Binary files /dev/null and b/screens/landing/images/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg differ diff --git a/screens/landing/images/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg.import b/screens/landing/images/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg.import new file mode 100644 index 00000000..12b33153 --- /dev/null +++ b/screens/landing/images/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg.import @@ -0,0 +1,35 @@ +[remap] + +importer="texture" +type="CompressedTexture2D" +uid="uid://be88oaodfcwre" +path.s3tc="res://.godot/imported/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg-cded3156d9b9499a813556bcbd33bebd.s3tc.ctex" +metadata={ +"imported_formats": ["s3tc_bptc"], +"vram_texture": true +} + +[deps] + +source_file="res://screens/landing/images/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg" +dest_files=["res://.godot/imported/8df40317-6bcb-49ce-8696-ba54def0e9b8.jpg-cded3156d9b9499a813556bcbd33bebd.s3tc.ctex"] + +[params] + +compress/mode=2 +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=1 +roughness/src_normal="" +process/fix_alpha_border=false +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=0 diff --git a/screens/landing/images/e44babbc-77e8-45dc-912f-a73b967e9724.jpg.import b/screens/landing/images/e44babbc-77e8-45dc-912f-a73b967e9724.jpg.import index aaeaccc3..d7e4ab4e 100644 --- a/screens/landing/images/e44babbc-77e8-45dc-912f-a73b967e9724.jpg.import +++ b/screens/landing/images/e44babbc-77e8-45dc-912f-a73b967e9724.jpg.import @@ -22,7 +22,7 @@ compress/lossy_quality=0.7 compress/hdr_compression=1 compress/normal_map=0 compress/channel_pack=0 -mipmaps/generate=true +mipmaps/generate=false mipmaps/limit=-1 roughness/mode=1 roughness/src_normal=""