maddo/cirnogodot
1
0
Fork 0
mirror of https://gitlab.com/MaddoScientisto/cirnogodot.git synced 2026-06-22 06:13:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

Converted packed scenes to paths

Browse source
This commit is contained in:
MaddoScientisto 2024-08-25 17:06:59 +02:00
commit c4891a0d03
5 changed files with 14 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Scenes/GameOver.tscn
View file

@ -1,8 +1,6 @@
[gd_scene load_steps=4 format=3 uid="uid://kau3bi207f3e"] [gd_scene load_steps=2 format=3 uid="uid://kau3bi207f3e"]
[ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_mkcsg"] [ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_mkcsg"]
[ext_resource type="PackedScene" uid="uid://cwfaxgr8pgfga" path="res://Scenes/game.tscn" id="2_5sqk5"]
[ext_resource type="PackedScene" uid="uid://5xajclchk3my" path="res://Scenes/MainMenu.tscn" id="3_wt7j8"]
[node name="Control" type="Control"] [node name="Control" type="Control"]
layout_mode = 3 layout_mode = 3
@ -12,8 +10,8 @@ anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
script = ExtResource("1_mkcsg") script = ExtResource("1_mkcsg")
GameScene = ExtResource("2_5sqk5") GameScene = "res://Scenes/game.tscn"
MainMenuScene = ExtResource("3_wt7j8") MainMenuScene = "res://Scenes/MainMenu.tscn"
[node name="MarginContainer" type="MarginContainer" parent="."] [node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 1 layout_mode = 1

6
Scenes/MainMenu.tscn
View file

@ -1,7 +1,6 @@
[gd_scene load_steps=3 format=3 uid="uid://5xajclchk3my"] [gd_scene load_steps=2 format=3 uid="uid://5xajclchk3my"]
[ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_702nk"] [ext_resource type="Script" path="res://Scripts/MainMenu.cs" id="1_702nk"]
[ext_resource type="PackedScene" uid="uid://cwfaxgr8pgfga" path="res://Scenes/game.tscn" id="2_82hab"]
[node name="Control" type="Control"] [node name="Control" type="Control"]
layout_mode = 3 layout_mode = 3
@ -11,7 +10,8 @@ anchor_bottom = 1.0
grow_horizontal = 2 grow_horizontal = 2
grow_vertical = 2 grow_vertical = 2
script = ExtResource("1_702nk") script = ExtResource("1_702nk")
GameScene = ExtResource("2_82hab") GameScene = "res://Scenes/game.tscn"
MainMenuScene = "res://Scenes/MainMenu.tscn"
[node name="MarginContainer" type="MarginContainer" parent="."] [node name="MarginContainer" type="MarginContainer" parent="."]
layout_mode = 1 layout_mode = 1

5
Scenes/player.tscn
View file

@ -1,11 +1,10 @@
[gd_scene load_steps=28 format=3 uid="uid://bghghp5ep4w2j"] [gd_scene load_steps=27 format=3 uid="uid://bghghp5ep4w2j"]
[ext_resource type="Script" path="res://Scripts/PlayerMovement.cs" id="1_m27vu"] [ext_resource type="Script" path="res://Scripts/PlayerMovement.cs" id="1_m27vu"]
[ext_resource type="Texture2D" uid="uid://la06powu57hu" path="res://Sprites/Cirno_Big.png" id="2_bwf6x"] [ext_resource type="Texture2D" uid="uid://la06powu57hu" path="res://Sprites/Cirno_Big.png" id="2_bwf6x"]
[ext_resource type="PackedScene" uid="uid://b1qnfiuokpvsr" path="res://Scenes/bullet.tscn" id="2_ov36d"] [ext_resource type="PackedScene" uid="uid://b1qnfiuokpvsr" path="res://Scenes/bullet.tscn" id="2_ov36d"]
[ext_resource type="PackedScene" uid="uid://chkpk7erlqajg" path="res://Scenes/Selector.tscn" id="3_8wt6s"] [ext_resource type="PackedScene" uid="uid://chkpk7erlqajg" path="res://Scenes/Selector.tscn" id="3_8wt6s"]
[ext_resource type="Script" path="res://addons/smoothing/smoothing_2d.gd" id="4_j4xhu"] [ext_resource type="Script" path="res://addons/smoothing/smoothing_2d.gd" id="4_j4xhu"]
[ext_resource type="PackedScene" uid="uid://kau3bi207f3e" path="res://Scenes/GameOver.tscn" id="4_qlhb6"]
[ext_resource type="Script" path="res://Scenes/CameraTarget.gd" id="5_cxvyt"] [ext_resource type="Script" path="res://Scenes/CameraTarget.gd" id="5_cxvyt"]
[ext_resource type="PackedScene" uid="uid://cfb3nsay84xdb" path="res://Scenes/crosshair.tscn" id="6_l43rf"] [ext_resource type="PackedScene" uid="uid://cfb3nsay84xdb" path="res://Scenes/crosshair.tscn" id="6_l43rf"]
[ext_resource type="Script" path="res://Scenes/InteractionController.cs" id="7_uvgjg"] [ext_resource type="Script" path="res://Scenes/InteractionController.cs" id="7_uvgjg"]
@ -150,7 +149,7 @@ Speed = 2500
CrosshairDistance = 20.0 CrosshairDistance = 20.0
BulletScene = ExtResource("2_ov36d") BulletScene = ExtResource("2_ov36d")
SelectorScene = ExtResource("3_8wt6s") SelectorScene = ExtResource("3_8wt6s")
GameOverScene = ExtResource("4_qlhb6") GameOverScene = "res://Scenes/GameOver.tscn"
Muzzle = NodePath("Muzzle") Muzzle = NodePath("Muzzle")
Health = 32.0 Health = 32.0
RateOfFire = 0.1 RateOfFire = 0.1

8
Scripts/MainMenu.cs
View file

@ -5,10 +5,10 @@ public partial class MainMenu : Control
{ {
[Export] [Export]
public PackedScene GameScene { get; set; } public string GameScene { get; set; }
[Export] [Export]
public PackedScene MainMenuScene { get; set; } public string MainMenuScene { get; set; }
// Called when the node enters the scene tree for the first time. // Called when the node enters the scene tree for the first time.
public override void _Ready() public override void _Ready()
@ -23,7 +23,7 @@ public partial class MainMenu : Control
private void _on_start_button_pressed() private void _on_start_button_pressed()
{ {
if (GameScene != null) { if (GameScene != null) {
GetTree().ChangeSceneToPacked(GameScene); GetTree().ChangeSceneToFile(GameScene);
} }
} }
@ -35,7 +35,7 @@ public partial class MainMenu : Control
private void _on_mainmenu_button_pressed() private void _on_mainmenu_button_pressed()
{ {
if (MainMenuScene != null) { if (MainMenuScene != null) {
GetTree().ChangeSceneToPacked(MainMenuScene); GetTree().ChangeSceneToFile(MainMenuScene);
} }
} }

4
Scripts/PlayerMovement.cs
View file

@ -18,7 +18,7 @@ public partial class PlayerMovement : CharacterBody2D, IDestructible
public PackedScene SelectorScene { get; set; } public PackedScene SelectorScene { get; set; }
[Export] [Export]
public PackedScene GameOverScene { get; set; } public string GameOverScene { get; set; }
private Node2D _selector; private Node2D _selector;
@ -198,7 +198,7 @@ public partial class PlayerMovement : CharacterBody2D, IDestructible
//CreateDebris(); //CreateDebris();
if (GameOverScene != null) if (GameOverScene != null)
{ {
GetTree().ChangeSceneToPacked(GameOverScene); GetTree().ChangeSceneToFile(GameOverScene);
} }
else else
{ {