diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index f59d59e..722fe1d 100644 --- a/scripts/Contents/Wave.gd +++ b/scripts/Contents/Wave.gd @@ -8,7 +8,7 @@ var from: float = 0 var to: float = 0 var per: int = 0 -static var current: int = 9 +static var current: int = startWith(1) static var WAVE_NORMAL = [ Wave.create("Hen", 1, 5, false, 0, INF, 1), Wave.create("Chick", 0, 0, true, 9, INF, 15), @@ -16,9 +16,9 @@ static var WAVE_NORMAL = [ Wave.create("KukeMC", 0, 0, true, 14, INF, 20), ] static var WAVE_TESTBOSS_ALL = [ - Wave.create("Chick", 0, 0, true, 0, INF, 10), - Wave.create("KukeMC", 0, 0, true, 1, INF, 10), - Wave.create("Bear", 0, 0, true, 2, INF, 10), + Wave.create("Chick", 0, 0, true, 0, INF, 3), + Wave.create("KukeMC", 0, 0, true, 1, INF, 3), + Wave.create("Bear", 0, 0, true, 2, INF, 3), ] static var WAVE_TESTBOSS_KUKE = [ Wave.create("KukeMC", 0, 0, true, 0, INF, 10), @@ -73,3 +73,5 @@ static func next(): customStart() spawn() current += 1 +static func startWith(wave: int): + return wave - 1 diff --git a/scripts/Statemachine/DamageLabel.gd b/scripts/Statemachine/DamageLabel.gd index 341fc99..48d2ad4 100644 --- a/scripts/Statemachine/DamageLabel.gd +++ b/scripts/Statemachine/DamageLabel.gd @@ -17,10 +17,10 @@ func _ready(): var damageSign = sign(damage) if damageSign > 0: label.label_settings.font_color = color1 - label.text = "%s%s" % [damageValue, "!!!" if crit else ""] + label.text = "%d%s" % [damageValue, "!!!" if crit else ""] elif damageSign < 0: label.label_settings.font_color = color2 - label.text = "+%s%s" % [damageValue, "!!!" if crit else ""] + label.text = "+%d%s" % [damageValue, "!!!" if crit else ""] else: if crit: label.label_settings.font_color = color4