logan/the-crypt
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Diego 2020-07-17 19:46:37 -05:00
parent cb945f17a0 1741293959
commit 5cb53ec360
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
project.godot
View file

@ -35,7 +35,7 @@ config/icon="res://icon.png"
UserData="*res://addons/github-integration/scripts/user_data.gd" UserData="*res://addons/github-integration/scripts/user_data.gd"
IconLoaderGithub="*res://addons/github-integration/scripts/IconLoaderGithub.gd" IconLoaderGithub="*res://addons/github-integration/scripts/IconLoaderGithub.gd"
RestHandler="*res://addons/github-integration/scripts/RestHandler.gd" RestHandler="*res://addons/github-integration/scripts/RestHandler.gd"
globals="*res://script/globals.gd" Globals="*res://script/globals.gd"
[display] [display]

4
script/BasicWand.gd
View file

@ -1,10 +1,10 @@
extends Sprite extends Sprite
onready var ShootDelay : Timer = $ShootDelay onready var ShootDelay : Timer = $ShootDelay
onready var ProjectileSpawn : Timer = $ProjectileSpawn onready var ProjectileSpawn : Position2D = $ProjectileSpawn
onready var Player = get_parent().get_parent() 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): func fire_projectile(rot):
if ShootDelay.is_stopped() and Player.energy != 0: if ShootDelay.is_stopped() and Player.energy != 0:

2
script/globals.gd
View file

@ -1,4 +1,4 @@
extends Node extends Node
const TILE_SIZE = 16 const TILE_SIZE = 16
const WHITE_PROJECTILE_PS = preload("res://magic/projectiles/WhiteProjectile.tscn") var WHITE_PROJECTILE_PS = preload("res://magic/projectiles/WhiteProjectile.tscn")