diff --git a/project.godot b/project.godot index bd25f24..e240ad6 100644 --- a/project.godot +++ b/project.godot @@ -35,7 +35,7 @@ config/icon="res://icon.png" UserData="*res://addons/github-integration/scripts/user_data.gd" IconLoaderGithub="*res://addons/github-integration/scripts/IconLoaderGithub.gd" RestHandler="*res://addons/github-integration/scripts/RestHandler.gd" -globals="*res://script/globals.gd" +Globals="*res://script/globals.gd" [display] diff --git a/script/BasicWand.gd b/script/BasicWand.gd index 90050cf..b05faf3 100644 --- a/script/BasicWand.gd +++ b/script/BasicWand.gd @@ -1,10 +1,10 @@ extends Sprite onready var ShootDelay : Timer = $ShootDelay -onready var ProjectileSpawn : Timer = $ProjectileSpawn +onready var ProjectileSpawn : Position2D = $ProjectileSpawn onready var Player = get_parent().get_parent() -export var projectile_ps = globals.WHITE_PROJECTILE_PS +var projectile_ps = Globals.WHITE_PROJECTILE_PS func fire_projectile(rot): if ShootDelay.is_stopped() and Player.energy != 0: @@ -15,4 +15,4 @@ func fire_projectile(rot): temp.global_position = ProjectileSpawn.global_position temp.rotation_degrees = rot temp.launch() - ShootDelay.start() \ No newline at end of file + ShootDelay.start() diff --git a/script/globals.gd b/script/globals.gd index 5054da9..2d42863 100644 --- a/script/globals.gd +++ b/script/globals.gd @@ -1,4 +1,4 @@ extends Node const TILE_SIZE = 16 -const WHITE_PROJECTILE_PS = preload("res://magic/projectiles/WhiteProjectile.tscn") +var WHITE_PROJECTILE_PS = preload("res://magic/projectiles/WhiteProjectile.tscn")