diff --git a/scripts/Modules/Cannon.gd b/scripts/Modules/Cannon.gd index e1f498c..c8dc6ab 100644 --- a/scripts/Modules/Cannon.gd +++ b/scripts/Modules/Cannon.gd @@ -22,19 +22,17 @@ func interact(player): if player.getResource() == 0: if currentStashValue < maxStashValue: currentStashValue += 1 + player.clearInventory() return return if player.getResource() == 1: if currentPowderStashValue < maxPowderStashValue: currentPowderStashValue += 1 + player.clearInventory() return return func shoot(): - if not CAN_ENGAGE: - return false - CAN_ENGAGE = false - create_tween().tween_callback(func(): CAN_ENGAGE = true).set_delay(2) if currentStashValue >= 1 and currentPowderStashValue >= 1 and currentState == STATE.INACTIVE: currentState = STATE.SHOOTING currentStashValue -= 1 diff --git a/scripts/Modules/Engine.gd b/scripts/Modules/Engine.gd index 6db0403..e75716f 100644 --- a/scripts/Modules/Engine.gd +++ b/scripts/Modules/Engine.gd @@ -34,5 +34,6 @@ func _process(delta): if not train.is_dead(): train.current_speed -= 0.1 * delta print(train.current_speed) + diff --git a/scripts/Modules/Module.gd b/scripts/Modules/Module.gd index 6feadaa..2576f2a 100644 --- a/scripts/Modules/Module.gd +++ b/scripts/Modules/Module.gd @@ -34,9 +34,9 @@ func _set_currentStashValue(newValue): func _get_currentStashValue(): return currentStashValue func _set_maxStashValue(newValue): - currentStashValue = newValue + maxStashValue = newValue func _get_maxStashValue(): - return currentStashValue + return maxStashValue func _set_level(newValue): level = newValue func _get_level(): diff --git a/scripts/Player.gd b/scripts/Player.gd index d812e2f..d547757 100644 --- a/scripts/Player.gd +++ b/scripts/Player.gd @@ -95,6 +95,7 @@ func getResource(): func clearInventory(): inventory = 0 + print("cleared") walking = "walking" idle = "idle" - $AnimatedSprite3D.play(idle) +