2ndbeam/cosmic
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewriting star system complete

Browse source
This commit is contained in:
2ndbeam 2024-04-30 20:08:07 +03:00
commit 350b9853f2
13 changed files with 118 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scenes/MainMenu.tscn
View file

@ -3,7 +3,7 @@
[ext_resource type="Script" path="res://scripts/menu/MainMenu.gd" id="1_2wax0"]
[ext_resource type="Shader" uid="uid://f6lhks6rp5jw" path="res://shaders/testicles.tres" id="1_on8wy"]
[ext_resource type="Gradient" uid="uid://c6bcjydbwm5id" path="res://scenes/SpaceGradient.tres" id="2_7racd"]
[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/StarsController.tscn" id="4_g7254"]
[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/star_generator.tscn" id="4_g7254"]
[ext_resource type="Script" path="res://scripts/menu/MainMenuButton.gd" id="5_q6x10"]
[sub_resource type="FastNoiseLite" id="FastNoiseLite_rtgkw"]

50
scenes/Ships/player_ship.tscn
View file

@ -1,4 +1,4 @@
[gd_scene load_steps=12 format=3 uid="uid://dok3i8u5t1ka4"]
[gd_scene load_steps=10 format=3 uid="uid://dok3i8u5t1ka4"]
[ext_resource type="PackedScene" uid="uid://bjkshql8ut6hk" path="res://scenes/Ships/ship.tscn" id="1_6x7bu"]
[ext_resource type="Script" path="res://scripts/Ship/player_ship.gd" id="2_oqdd7"]
@ -58,26 +58,6 @@ func _process(_delta):
text = unformatted_text.format([ship.shield.capacity, ship.shield.max_capacity])
"
[sub_resource type="Theme" id="Theme_d8vjy"]
default_font_size = 48
[sub_resource type="GDScript" id="GDScript_6uw1d"]
resource_name = "pause_controller"
script/source = "extends Control
# TODO: implement save
## Resumes game
func _on_resume_button_up():
get_tree().current_scene.unpause()
## Saves profile and exits game
func _on_exit_button_up():
get_tree().current_scene.unpause()
get_tree().change_scene_to_file(\"res://scenes/MainMenu.tscn\")
#Game.profile_save(get_tree().current_scene)
"
[node name="PlayerShip" instance=ExtResource("1_6x7bu")]
script = ExtResource("2_oqdd7")
@ -121,36 +101,8 @@ offset_bottom = 661.0
text = "Shield: {0} / {1} units"
script = SubResource("GDScript_q1sx2")
[node name="PauseController" type="Control" parent="ColorableGUI" index="4"]
process_mode = 2
layout_mode = 3
anchors_preset = 0
offset_right = 40.0
offset_bottom = 40.0
theme = SubResource("Theme_d8vjy")
script = SubResource("GDScript_6uw1d")
[node name="Resume" type="Button" parent="ColorableGUI/PauseController" index="0"]
layout_mode = 0
offset_left = 444.0
offset_top = 254.0
offset_right = 779.0
offset_bottom = 329.0
text = "Resume game"
[node name="Exit" type="Button" parent="ColorableGUI/PauseController" index="1"]
layout_mode = 0
offset_left = 449.0
offset_top = 357.0
offset_right = 763.0
offset_bottom = 432.0
text = "Save and exit"
[node name="NonColorableGUI" type="CanvasLayer" parent="." index="6"]
[node name="Camera" type="Camera2D" parent="." index="7"]
zoom = Vector2(0.5, 0.5)
script = ExtResource("5_rclap")
[connection signal="button_up" from="ColorableGUI/PauseController/Resume" to="ColorableGUI/PauseController" method="_on_resume_button_up"]
[connection signal="button_up" from="ColorableGUI/PauseController/Exit" to="ColorableGUI/PauseController" method="_on_exit_button_up"]

1
scenes/Ships/ship.tscn
View file

@ -7,6 +7,7 @@
[ext_resource type="Script" path="res://scripts/Ship/weapons.gd" id="5_ooyny"]
[node name="Ship" type="Node2D"]
process_mode = 1
script = ExtResource("2_n14ml")
[node name="HullHolder" type="Node" parent="."]

2
scenes/Space.tscn
View file

@ -2,7 +2,7 @@
[ext_resource type="PackedScene" uid="uid://ccrs28h3b2tfy" path="res://scenes/MainShip.tscn" id="1_6fvpc"]
[ext_resource type="Script" path="res://scripts/Spaceold.gd" id="1_ppaw3"]
[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/StarsController.tscn" id="3_jbyyq"]
[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/star_generator.tscn" id="3_jbyyq"]
[ext_resource type="Script" path="res://scripts/misc/ProjectilesContainer.gd" id="4_dtv2c"]
[ext_resource type="PackedScene" uid="uid://dbtrc26016xov" path="res://scenes/Base.tscn" id="5_bjt5p"]
[ext_resource type="PackedScene" uid="uid://523dme3h6d6c" path="res://scenes/npcships/NPCShipDefault.tscn" id="6_67746"]

49
scenes/Star Systems/Required Scenes/pause_controller.tscn Normal file
View file

@ -0,0 +1,49 @@
[gd_scene load_steps=3 format=3 uid="uid://c7is7y341f6wa"]
[sub_resource type="Theme" id="Theme_d8vjy"]
default_font_size = 48
[sub_resource type="GDScript" id="GDScript_6uw1d"]
resource_name = "pause_controller"
script/source = "extends Control
# TODO: implement save
## Resumes game
func _on_resume_button_up():
get_tree().current_scene.unpause()
## Saves profile and exits game
func _on_exit_button_up():
get_tree().current_scene.unpause()
get_tree().change_scene_to_file(\"res://scenes/MainMenu.tscn\")
#Game.profile_save(get_tree().current_scene)
"
[node name="PauseController" type="Control"]
process_mode = 2
layout_mode = 3
anchors_preset = 0
offset_right = 40.0
offset_bottom = 40.0
theme = SubResource("Theme_d8vjy")
script = SubResource("GDScript_6uw1d")
[node name="Resume" type="Button" parent="."]
layout_mode = 0
offset_left = 444.0
offset_top = 254.0
offset_right = 779.0
offset_bottom = 329.0
text = "Resume game"
[node name="Exit" type="Button" parent="."]
layout_mode = 0
offset_left = 449.0
offset_top = 357.0
offset_right = 763.0
offset_bottom = 432.0
text = "Save and exit"
[connection signal="button_up" from="Resume" to="." method="_on_resume_button_up"]
[connection signal="button_up" from="Exit" to="." method="_on_exit_button_up"]

0
scenes/Star Systems/Required Scenes/StarsController.tscn → scenes/Star Systems/Required Scenes/star_generator.tscn
View file

20
scenes/Star Systems/star_system_debug.tscn Normal file
View file

@ -0,0 +1,20 @@
[gd_scene load_steps=3 format=3 uid="uid://crneq2enhxsw5"]
[ext_resource type="PackedScene" uid="uid://bsnrcw64qr2hr" path="res://scenes/Star Systems/star_system_template.tscn" id="1_2ai1l"]
[ext_resource type="PackedScene" uid="uid://dok3i8u5t1ka4" path="res://scenes/Ships/player_ship.tscn" id="7_jyplv"]
[node name="StarSystem" instance=ExtResource("1_2ai1l")]
width = 16384
height = 16384
[node name="Stars" parent="." index="0"]
scroll_offset = Vector2(681.667, 317.783)
stars_amount = 4000
[node name="Nebula" parent="Background" index="0" node_paths=PackedStringArray("tracked_node")]
tracked_node = NodePath("../../PlayerShip")
color_background = Color(0.276474, 0.0962249, 0.200656, 1)
[node name="PlayerShip" parent="." index="4" instance=ExtResource("7_jyplv")]
process_mode = 0
position = Vector2(19, 10)

15
scenes/Star Systems/star_system_template.tscn
View file

@ -1,24 +1,28 @@
[gd_scene load_steps=6 format=3 uid="uid://bsnrcw64qr2hr"]
[gd_scene load_steps=7 format=3 uid="uid://bsnrcw64qr2hr"]
[ext_resource type="Script" path="res://scripts/star_system.gd" id="1_xx8w2"]
[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/StarsController.tscn" id="2_iqrn0"]
[ext_resource type="PackedScene" uid="uid://dpggye27ln436" path="res://scenes/Star Systems/Required Scenes/star_generator.tscn" id="2_iqrn0"]
[ext_resource type="Script" path="res://scripts/misc/ProjectilesContainer.gd" id="3_h5cm3"]
[ext_resource type="Material" uid="uid://bawhivm5cr2w" path="res://shaders/materials/nebula_shader.tres" id="4_o0ld7"]
[ext_resource type="Script" path="res://scripts/nebula.gd" id="5_la84n"]
[ext_resource type="PackedScene" uid="uid://c7is7y341f6wa" path="res://scenes/Star Systems/Required Scenes/pause_controller.tscn" id="6_61vq5"]
[node name="StarSystem" type="Node"]
process_mode = 3
script = ExtResource("1_xx8w2")
width = 1280
height = 720
[node name="Stars" parent="." instance=ExtResource("2_iqrn0")]
[node name="ProjectileContainer" type="Node" parent="."]
process_mode = 1
script = ExtResource("3_h5cm3")
[node name="Background" type="CanvasLayer" parent="."]
process_mode = 1
layer = -10
[node name="Nebula" type="ColorRect" parent="Background"]
z_index = -100
material = ExtResource("4_o0ld7")
anchors_preset = 15
anchor_right = 1.0
@ -27,3 +31,6 @@ grow_horizontal = 2
grow_vertical = 2
script = ExtResource("5_la84n")
color_background = Color(0.36, 0.18612, 0.1116, 1)
[node name="PauseController" parent="." instance=ExtResource("6_61vq5")]
visible = false

5
scenes/debug.tscn
View file

@ -5,7 +5,7 @@
[ext_resource type="Shader" path="res://shaders/ship.gdshader" id="2_15op6"]
[ext_resource type="Script" path="res://scripts/misc/ProjectilesContainer.gd" id="3_amh71"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_ogy53"]
[sub_resource type="ShaderMaterial" id="ShaderMaterial_qudgt"]
resource_local_to_scene = true
resource_name = "Shield Material"
shader = ExtResource("2_15op6")
@ -19,7 +19,8 @@ shader_parameter/bublic_size = 20.0
script = ExtResource("1_du5mm")
[node name="PlayerShip" parent="." instance=ExtResource("1_b1l1c")]
material = SubResource("ShaderMaterial_ogy53")
process_mode = 0
material = SubResource("ShaderMaterial_qudgt")
position = Vector2(608, 352)
scale = Vector2(0.5, 0.5)