From c4891a0d03ec70c1f45405f2535a5202caaae49a Mon Sep 17 00:00:00 2001 From: MaddoScientisto Date: Sun, 25 Aug 2024 17:06:59 +0200 Subject: [PATCH] Converted packed scenes to paths --- Scenes/GameOver.tscn | 8 +++----- Scenes/MainMenu.tscn | 6 +++--- Scenes/player.tscn | 5 ++--- Scripts/MainMenu.cs | 8 ++++---- Scripts/PlayerMovement.cs | 4 ++-- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/Scenes/GameOver.tscn b/Scenes/GameOver.tscn index 8e743470..37639552 100644 --- a/Scenes/GameOver.tscn +++ b/Scenes/GameOver.tscn @@ -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="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"] layout_mode = 3 @@ -12,8 +10,8 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_mkcsg") -GameScene = ExtResource("2_5sqk5") -MainMenuScene = ExtResource("3_wt7j8") +GameScene = "res://Scenes/game.tscn" +MainMenuScene = "res://Scenes/MainMenu.tscn" [node name="MarginContainer" type="MarginContainer" parent="."] layout_mode = 1 diff --git a/Scenes/MainMenu.tscn b/Scenes/MainMenu.tscn index 8a67d2c7..1c1b888f 100644 --- a/Scenes/MainMenu.tscn +++ b/Scenes/MainMenu.tscn @@ -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="PackedScene" uid="uid://cwfaxgr8pgfga" path="res://Scenes/game.tscn" id="2_82hab"] [node name="Control" type="Control"] layout_mode = 3 @@ -11,7 +10,8 @@ anchor_bottom = 1.0 grow_horizontal = 2 grow_vertical = 2 script = ExtResource("1_702nk") -GameScene = ExtResource("2_82hab") +GameScene = "res://Scenes/game.tscn" +MainMenuScene = "res://Scenes/MainMenu.tscn" [node name="MarginContainer" type="MarginContainer" parent="."] layout_mode = 1 diff --git a/Scenes/player.tscn b/Scenes/player.tscn index f3799802..a88e208c 100644 --- a/Scenes/player.tscn +++ b/Scenes/player.tscn @@ -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="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://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="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="PackedScene" uid="uid://cfb3nsay84xdb" path="res://Scenes/crosshair.tscn" id="6_l43rf"] [ext_resource type="Script" path="res://Scenes/InteractionController.cs" id="7_uvgjg"] @@ -150,7 +149,7 @@ Speed = 2500 CrosshairDistance = 20.0 BulletScene = ExtResource("2_ov36d") SelectorScene = ExtResource("3_8wt6s") -GameOverScene = ExtResource("4_qlhb6") +GameOverScene = "res://Scenes/GameOver.tscn" Muzzle = NodePath("Muzzle") Health = 32.0 RateOfFire = 0.1 diff --git a/Scripts/MainMenu.cs b/Scripts/MainMenu.cs index a631b711..9e7151a2 100644 --- a/Scripts/MainMenu.cs +++ b/Scripts/MainMenu.cs @@ -5,10 +5,10 @@ public partial class MainMenu : Control { [Export] - public PackedScene GameScene { get; set; } + public string GameScene { get; set; } [Export] - public PackedScene MainMenuScene { get; set; } + public string MainMenuScene { get; set; } // Called when the node enters the scene tree for the first time. public override void _Ready() @@ -23,7 +23,7 @@ public partial class MainMenu : Control private void _on_start_button_pressed() { if (GameScene != null) { - GetTree().ChangeSceneToPacked(GameScene); + GetTree().ChangeSceneToFile(GameScene); } } @@ -35,7 +35,7 @@ public partial class MainMenu : Control private void _on_mainmenu_button_pressed() { if (MainMenuScene != null) { - GetTree().ChangeSceneToPacked(MainMenuScene); + GetTree().ChangeSceneToFile(MainMenuScene); } } diff --git a/Scripts/PlayerMovement.cs b/Scripts/PlayerMovement.cs index 4eb8ecb4..ebd4423f 100644 --- a/Scripts/PlayerMovement.cs +++ b/Scripts/PlayerMovement.cs @@ -18,7 +18,7 @@ public partial class PlayerMovement : CharacterBody2D, IDestructible public PackedScene SelectorScene { get; set; } [Export] - public PackedScene GameOverScene { get; set; } + public string GameOverScene { get; set; } private Node2D _selector; @@ -198,7 +198,7 @@ public partial class PlayerMovement : CharacterBody2D, IDestructible //CreateDebris(); if (GameOverScene != null) { - GetTree().ChangeSceneToPacked(GameOverScene); + GetTree().ChangeSceneToFile(GameOverScene); } else {