Merge remote-tracking branch 'origin/main'

This commit is contained in:
2026-08-27 21:34:23 +03:00
2 changed files with 2 additions and 2 deletions
+2 -2
View File
@@ -148,7 +148,7 @@ func _register_all() -> void:
# Stops "sword's off to the side but I still died" — you're only gored when the # Stops "sword's off to the side but I still died" — you're only gored when the
# blade is actually presented at you. # blade is actually presented at you.
_reg_f("Matador", "mat_stab_arc", 55.0, 5.0, 180.0, 5.0) _reg_f("Matador", "mat_stab_arc", 55.0, 5.0, 180.0, 5.0)
_reg_f("Matador", "mat_roll_chance", 1.5, 0.0, 1.0, 0.05) _reg_f("Matador", "mat_roll_chance", 0.8, 0.0, 1.0, 0.05)
_reg_f("Matador", "mat_roll_duration", 0.45, 0.1, 1.5, 0.05) _reg_f("Matador", "mat_roll_duration", 0.45, 0.1, 1.5, 0.05)
# Playback rate of the Draw_weapon clip used for both drawing and sheathing — # Playback rate of the Draw_weapon clip used for both drawing and sheathing —
# higher = snappier unholster/holster. # higher = snappier unholster/holster.
@@ -192,7 +192,7 @@ func _register_all() -> void:
# routine (wind-up → active → recovery); each routine plays to the end (the recovery # routine (wind-up → active → recovery); each routine plays to the end (the recovery
# is the player's punish window). Below bear_enrage_frac HP it enters phase 2: faster # is the player's punish window). Below bear_enrage_frac HP it enters phase 2: faster
# tells and recovery (× bear_enrage_scale) and longer combo chains. # tells and recovery (× bear_enrage_scale) and longer combo chains.
_reg_f("Bear", "bear_max_hp", 20.0, 1.0, 100.0, 1.0) _reg_f("Bear", "bear_max_hp", 30.0, 1.0, 100.0, 1.0)
# HP fraction at which phase 2 ("Fury") triggers, and how much it multiplies every # HP fraction at which phase 2 ("Fury") triggers, and how much it multiplies every
# wind-up / recovery timer (lower = snappier, more dangerous). # wind-up / recovery timer (lower = snappier, more dangerous).
_reg_f("Bear", "bear_enrage_frac", 0.4, 0.0, 1.0, 0.05) _reg_f("Bear", "bear_enrage_frac", 0.4, 0.0, 1.0, 0.05)