Updated oven to extend Damageable and updated code to override base class properly
This commit is contained in:
1 parent
b10ad40552
commit
8974f0cc56
8 files changed
+19
-17
No files matched your search
@@ -1,4 +1,4 @@
|
||||
extends Spatial
|
||||
extends Damageable
|
||||
|
||||
const StateIdle = preload("res://scripts/oven/state/idle.gd")
|
||||
const StateCooking = preload("res://scripts/oven/state/cooking.gd")
|
||||
@@ -6,8 +6,6 @@ const StateHoldingItem = preload("res://scripts/oven/state/holding_item.gd")
|
||||
const StateBroken = preload("res://scripts/oven/state/broken.gd")
|
||||
|
||||
export var cook_time: float = 2.0
|
||||
export var start_broken: bool = false
|
||||
export var max_hp: int = 1
|
||||
var hp: int = max_hp
|
||||
|
||||
var state = null
|
||||
@@ -38,5 +36,6 @@ func _on_item_holder_item_changed(item):
|
||||
func _on_item_dump_completed():
|
||||
state.on_item_dump_completed()
|
||||
|
||||
func take_damage():
|
||||
state.take_damage()
|
||||
func take_damage(damage : int = 1):
|
||||
.take_damage(damage)
|
||||
state.on_damage_taken()
|
||||
@@ -8,7 +8,6 @@ func _init():
|
||||
pass
|
||||
|
||||
func enter_from(state):
|
||||
ctx.remove_from_group("damageable")
|
||||
ctx.get_node("item_dump").enabled = true
|
||||
ctx.get_node("item_dump").reset()
|
||||
ctx.get_node("coin_machine").enabled = false
|
||||
@@ -18,7 +17,6 @@ func enter_from(state):
|
||||
|
||||
func exit_to(state):
|
||||
assert(state.NAME != "broken")
|
||||
ctx.add_to_group("damageable")
|
||||
|
||||
func on_coin_machine_coin_requirement_met(player):
|
||||
assert(false, "should be impossible while broken")
|
||||
@@ -33,5 +31,5 @@ func on_item_dump_completed():
|
||||
ctx.full_heal()
|
||||
ctx.change_state(ctx.StateIdle.new())
|
||||
|
||||
func take_damage():
|
||||
pass # already broken
|
||||
func on_damage_taken():
|
||||
assert(false, "should be impossible while broken")
|
||||
@@ -36,8 +36,7 @@ func on_item_holder_item_changed(item):
|
||||
func on_item_dump_completed():
|
||||
assert(false, "item dump should be disabled")
|
||||
|
||||
func take_damage():
|
||||
ctx.hp -= 1
|
||||
func on_damage_taken():
|
||||
if ctx.hp <= 0:
|
||||
assert(ctx.get_node("%item_holder").has_item())
|
||||
ctx.get_node("%item_holder").destroy_item()
|
||||
|
||||
@@ -40,8 +40,7 @@ func on_item_holder_item_changed(item):
|
||||
func on_item_dump_completed():
|
||||
assert(false, "item dump should be disabled")
|
||||
|
||||
func take_damage():
|
||||
ctx.hp -= 1
|
||||
func on_damage_taken():
|
||||
if ctx.hp <= 0:
|
||||
if ctx.get_node("%item_holder").has_item():
|
||||
ctx.get_node("%item_holder").destroy_item()
|
||||
|
||||
@@ -30,7 +30,6 @@ func on_item_holder_item_changed(item):
|
||||
func on_item_dump_completed():
|
||||
assert(false, "item dump should be disabled")
|
||||
|
||||
func take_damage():
|
||||
ctx.hp -= 1
|
||||
func on_damage_taken():
|
||||
if ctx.hp <= 0:
|
||||
ctx.change_state(ctx.StateBroken.new())
|
||||
Reference in new issue
Block a user