diff --git a/scripts/Contents/Wave.gd b/scripts/Contents/Wave.gd index dbcecb3..70a7c25 100644 --- a/scripts/Contents/Wave.gd +++ b/scripts/Contents/Wave.gd @@ -22,7 +22,7 @@ func duplicate() -> Wave: wave.per = per return wave -static var current: int = startWith(10) +static var current: int = startWith(1) static var WAVE_NORMAL = [ Wave.create("Hen", 1, 3, false, 0, INF, 1), Wave.create("Cat", 1, 3, false, 0, INF, 1), diff --git a/scripts/Statemachine/BulletBase.gd b/scripts/Statemachine/BulletBase.gd index b660c6d..2f9f465 100644 --- a/scripts/Statemachine/BulletBase.gd +++ b/scripts/Statemachine/BulletBase.gd @@ -32,11 +32,11 @@ var destroying: bool = false var isChildSplit: bool = false var isChildRefract: bool = false var initialSpeed: float = 0 -var originalDamage: float = 0 +var initialDamage: float = 0 func _ready(): initialSpeed = speed - originalDamage = baseDamage + initialDamage = baseDamage if launcher.isSummon(): launcherSummoned = launcher launcher = launcher.myMaster @@ -87,7 +87,7 @@ func _physics_process(_delta: float) -> void: tryDestroy() func getDamage(): - return originalDamage * damageMultipliers[usingDamageMultiplier] + return initialDamage * damageMultipliers[usingDamageMultiplier] func hit(target: Node): var entity: EntityBase = EntityTool.fromHurtbox(target) if !entity || !launcher: return