From 1741293959da72b9a417c9f67c678bb5f982a244 Mon Sep 17 00:00:00 2001 From: Logan Date: Fri, 17 Jul 2020 19:43:30 -0500 Subject: [PATCH] Fixed my dumb mistakes --- meta/DungeonTilemap.tres | 5 +++++ project.godot | 2 +- script/BasicWand.gd | 6 +++--- script/globals.gd | 2 +- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/meta/DungeonTilemap.tres b/meta/DungeonTilemap.tres index c0e7ee5..3c172d8 100644 --- a/meta/DungeonTilemap.tres +++ b/meta/DungeonTilemap.tres @@ -302,6 +302,11 @@ points = PoolVector2Array( 0, 0, 16, 0, 16, 16, 0, 16 ) 0/autotile/z_index_map = [ ] 0/occluder_offset = Vector2( 0, 0 ) 0/navigation_offset = Vector2( 0, 0 ) +0/shape_offset = Vector2( 0, 0 ) +0/shape_transform = Transform2D( 1, 0, 0, 1, 0, 0 ) +0/shape = SubResource( 48 ) +0/shape_one_way = false +0/shape_one_way_margin = 1.0 0/shapes = [ { "autotile_coord": Vector2( 0, 0 ), "one_way": false, diff --git a/project.godot b/project.godot index 3872479..868d5b5 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" [debug] 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")