From 8eb87f9c79027f344878e424ad2906d477eac91f Mon Sep 17 00:00:00 2001 From: Varylios Date: Tue, 16 Sep 2025 22:14:22 +0200 Subject: [PATCH] upgrade: godot 4.5 --- Enemies/enemy.gd | 7 ++++--- Globals/Game.gd | 2 +- Globals/Helper.gd | 4 ++-- Globals/transition.gd | 4 ++-- Projectiles/Draft/projectile_pierre.gd | 2 +- UI/InfoPanel.gd | 4 ++-- UI/gui.gd | 4 ++-- Upgrades/Upgrade.gd | 2 +- VFX/paint_brush_particles.gd | 2 +- VFX/pixel_rain.gd | 4 ++-- addons/LevelEditor/LevelEditor.gd | 2 +- addons/LevelEditor/WaveMaker.gd | 2 +- project.godot | 2 +- 13 files changed, 21 insertions(+), 20 deletions(-) diff --git a/Enemies/enemy.gd b/Enemies/enemy.gd index d5d0073..0859d94 100644 --- a/Enemies/enemy.gd +++ b/Enemies/enemy.gd @@ -5,8 +5,9 @@ class_name Enemy signal died -@onready var death_vfx_packed : PackedScene = preload("res://VFX/death_particles.tscn") -@onready var sad_vfx_packed : PackedScene = preload("res://VFX/sad_particles.tscn") +const DEATH_PARTICLE : PackedScene = preload("uid://ddm57pv5ox171") +const SAD_PARTICLE : PackedScene = preload("uid://m0vj2ac5oesx") + @export var speed : float = 1 @export var base_attack_damage : int = 1 @@ -62,7 +63,7 @@ func death() -> void: died.emit() Game.money += money $Sprite3D.visible = false - var death_vfx : CPUParticles3D = death_vfx_packed.instantiate() + var death_vfx : CPUParticles3D = DEATH_PARTICLE.instantiate() get_tree().current_scene.add_child(death_vfx) death_vfx.global_position = global_position path.queue_free() diff --git a/Globals/Game.gd b/Globals/Game.gd index d82f1a2..b0051d1 100644 --- a/Globals/Game.gd +++ b/Globals/Game.gd @@ -9,7 +9,7 @@ signal lose signal allowed_tower_has_change -var upgrades : Array[CubeUpgrade] = load("res://Upgrades/cube_upgrades.tres").upgrades +var upgrades : Array[CubeUpgrade] = load("uid://py454tq2ghgx").upgrades var towerPackedScenes : Dictionary var enmies : Dictionary var towers : Dictionary diff --git a/Globals/Helper.gd b/Globals/Helper.gd index d9f48ef..bdacbe7 100644 --- a/Globals/Helper.gd +++ b/Globals/Helper.gd @@ -2,7 +2,7 @@ class_name Helper -const confirmPopupScene : PackedScene = preload("res://UI/confirm_popup.tscn") +const CONFIRM_POPUP : PackedScene = preload("uid://cxn3x8dq8vawa") const SCENE_DIR_PATTERN : String = "res://\\w+/(Scenes|Map \\d+)/$" @@ -75,7 +75,7 @@ static func showConfirmPopup( confirmCallback : Callable, cancelCallback : Callable = func(): null ) -> void: - var confirmPopup : ConfirmPopup = confirmPopupScene.instantiate() + var confirmPopup : ConfirmPopup = CONFIRM_POPUP.instantiate() nodeToAppend.add_child(confirmPopup) confirmPopup.label.text = text confirmPopup.confirmed.connect(confirmCallback) diff --git a/Globals/transition.gd b/Globals/transition.gd index 408535d..df59fa5 100644 --- a/Globals/transition.gd +++ b/Globals/transition.gd @@ -2,7 +2,7 @@ extends ColorRect enum LOAD_STATE { NO_LOAD, BASIC_LOAD, MAP_LOAD, MAP_LOADED } -const worldManager = preload("res://Levels/world_manager.tscn") +const WORLD_MANAGER = preload("uid://bph5gpic1arod") @export var opaque := 0.0 @export var transparent := 11.0 @@ -78,7 +78,7 @@ func _process(_delta: float) -> void: var scene = ResourceLoader.load_threaded_get(target_scene_path) if loadState == LOAD_STATE.MAP_LOAD: mapScene = scene - get_tree().change_scene_to_packed(worldManager) + get_tree().change_scene_to_packed(WORLD_MANAGER) loadState = LOAD_STATE.MAP_LOADED if loadState == LOAD_STATE.BASIC_LOAD: get_tree().change_scene_to_packed(scene) diff --git a/Projectiles/Draft/projectile_pierre.gd b/Projectiles/Draft/projectile_pierre.gd index 986cb4b..aed4ca1 100644 --- a/Projectiles/Draft/projectile_pierre.gd +++ b/Projectiles/Draft/projectile_pierre.gd @@ -1,6 +1,6 @@ extends Sprite3D -var impact : GPUParticles3D = preload("res://Projectiles/Draft/ImpactPierre.tscn").instantiate() +var impact : GPUParticles3D = preload("uid://c5rx5scnkh3fb").instantiate() func _ready() -> void: $SFXCreate.play() diff --git a/UI/InfoPanel.gd b/UI/InfoPanel.gd index 4305cfb..fccf979 100644 --- a/UI/InfoPanel.gd +++ b/UI/InfoPanel.gd @@ -1,7 +1,7 @@ extends HBoxContainer -const upgradeBtnScene : PackedScene = preload("res://UI/upgrade_button.tscn") +const UPGRADE_BTN : PackedScene = preload("uid://dfp5q5gek4ve7") var tower : Tower @@ -59,7 +59,7 @@ func createTowerUpgradeButtons(upgrades : Array) -> void: %UpgradeContainer.visible = true %UpgradeContainer.get_children().map(func(btn): btn.queue_free()) for upgrade in upgrades: - var btn : UpgradeButton = upgradeBtnScene.instantiate() + var btn : UpgradeButton = UPGRADE_BTN.instantiate() %UpgradeContainer.add_child(btn) btn.setUpgrade(upgrade) if tower: diff --git a/UI/gui.gd b/UI/gui.gd index 533cc9d..962cc8a 100644 --- a/UI/gui.gd +++ b/UI/gui.gd @@ -3,7 +3,7 @@ extends Control const BUTTON_QTY = 4 -const guiButton : PackedScene = preload("res://UI/gui_button.tscn") +const GUI_BUTTON : PackedScene = preload("uid://dqb5o8w7u50hc") @onready var buttonContainer : GridContainer = %ButtonContainer @onready var cubeIntegrity : ProgressBar = %CubeIntegrity @@ -77,7 +77,7 @@ func addTowerButtonNodes() -> void: func createTowerButton(towerType : Tower.TYPE) -> void: - var btn : GuiButton = guiButton.instantiate() + var btn : GuiButton = GUI_BUTTON.instantiate() btn.set_meta("dynamicButton", true) if towerType: diff --git a/Upgrades/Upgrade.gd b/Upgrades/Upgrade.gd index a3270e1..f3db407 100644 --- a/Upgrades/Upgrade.gd +++ b/Upgrades/Upgrade.gd @@ -6,7 +6,7 @@ enum SCALE_TYPE { LINEAR, EXP, LOG } enum UPGRADE_DIRECTION { INCREASE = 1, DECREASE = -1 } -@export var icon : Texture2D = preload("res://Assets/Icones/medal2.png") +@export var icon : Texture2D = preload("uid://dqvou7t7o1t5d") @export var text : String @export var baseCost : int : set(value): diff --git a/VFX/paint_brush_particles.gd b/VFX/paint_brush_particles.gd index fe7d229..e2fada2 100644 --- a/VFX/paint_brush_particles.gd +++ b/VFX/paint_brush_particles.gd @@ -1,6 +1,6 @@ extends Path3D -var particle_np := preload("res://VFX/paint_brush_particle.tscn") +var particle_np := preload("uid://drnc0eus8n2oy") @export var duration : float = 6.0 @export var spawn_timer : float = 0.1 diff --git a/VFX/pixel_rain.gd b/VFX/pixel_rain.gd index 498c2ea..b65cc3b 100644 --- a/VFX/pixel_rain.gd +++ b/VFX/pixel_rain.gd @@ -10,7 +10,7 @@ extends Node2D var time := 0.0 -var rain_drop_packed := preload("res://VFX/pixel_drop.tscn") +const RAIN_DROP : PackedScene = preload("uid://cqn4xrehqnuso") func _physics_process(delta: float) -> void: @@ -21,7 +21,7 @@ func _physics_process(delta: float) -> void: func make_it_rain() -> void: - var rain_drop : RainDrop = rain_drop_packed.instantiate() + var rain_drop : RainDrop = RAIN_DROP.instantiate() var screen_width = get_viewport().get_camera_2d().position.x + get_viewport().size.x/2 var screen_height = get_viewport().get_camera_2d().position.y - get_viewport().size.y/2 - 100 #Offset rain_drop.speed = speed diff --git a/addons/LevelEditor/LevelEditor.gd b/addons/LevelEditor/LevelEditor.gd index e5e1911..89f920f 100644 --- a/addons/LevelEditor/LevelEditor.gd +++ b/addons/LevelEditor/LevelEditor.gd @@ -3,7 +3,7 @@ extends EditorPlugin # Replace this value with a PascalCase autoload name, as per the GDScript style guide. #const AUTOLOAD_NAME = "LevelEditorAutoload" -const ui = preload("res://addons/LevelEditor/wave_maker.tscn") +const ui = preload("uid://dh24t8804isms") var main_panel_instance diff --git a/addons/LevelEditor/WaveMaker.gd b/addons/LevelEditor/WaveMaker.gd index 84f2d4f..8791e6f 100644 --- a/addons/LevelEditor/WaveMaker.gd +++ b/addons/LevelEditor/WaveMaker.gd @@ -6,7 +6,7 @@ class_name WaveMaker signal spawnQtyChanged(newQty : int) -const TROOP_SCENE = preload("res://addons/LevelEditor/UI/Troop/Troop.tscn") +const TROOP_SCENE = preload("uid://djrbvm8gmhly3") var level : Level diff --git a/project.godot b/project.godot index 26ef7df..ac7f125 100644 --- a/project.godot +++ b/project.godot @@ -25,7 +25,7 @@ resources_spreadsheet_view/freeze_first_column=true config/name="Pole Pixel Defense Force" run/main_scene="uid://2xw1yn1tmlcy" -config/features=PackedStringArray("4.4") +config/features=PackedStringArray("4.5") config/icon="res://icon.svg" [audio]