diff --git a/Assets/bull.fbx b/Assets/bull.fbx index 3f0d5df..5e5b712 100644 Binary files a/Assets/bull.fbx and b/Assets/bull.fbx differ diff --git a/levels/bear_hud.gd b/levels/bear_hud.gd index e280faf..3009a1c 100644 --- a/levels/bear_hud.gd +++ b/levels/bear_hud.gd @@ -3,7 +3,7 @@ extends CanvasLayer const _GOLD := Color(1.00, 0.78, 0.22) const _CREAM := Color(0.93, 0.88, 0.72) -const _BAR_W: float = 260.0 +const _BAR_W: float = 1260.0 const _BAR_H: float = 18.0 const _BAR_BG: Color = Color(0.12, 0.04, 0.04, 0.88) const _BAR_FILL: Color = Color(0.65, 0.08, 0.06) @@ -52,7 +52,8 @@ func _update_bar() -> void: var enrage_frac: float = DP.f("bear_enrage_frac") _fill.color = _BAR_FILL.lerp(_BAR_ENRAGE, 1.0 - frac / enrage_frac if frac < enrage_frac else 0.0) if _label != null: - _label.text = "BEAR %d / %d" % [maxi(_current_hp, 0), _max_hp] + _label.text = "BEAR" % [maxi(_current_hp, 0), _max_hp] + ## for hp display in numbers write %d / %d func _build_ui() -> void: @@ -80,7 +81,7 @@ func _build_ui() -> void: _label.add_theme_color_override("font_color", _GOLD) _label.add_theme_color_override("font_outline_color", Color(0, 0, 0, 0.85)) _label.add_theme_constant_override("outline_size", 3) - _label.add_theme_font_size_override("font_size", 13) + _label.add_theme_font_size_override("font_size", 30) _label.mouse_filter = Control.MOUSE_FILTER_IGNORE col.add_child(_label) diff --git a/player.gd b/player.gd index 977cdb9..8fdda27 100644 --- a/player.gd +++ b/player.gd @@ -306,7 +306,7 @@ func _play_idle() -> void: return _bull_anim.speed_scale = 1.0 if _bull_anim.has_animation(_ANIM_IDLE): - _bull_anim.play(_ANIM_IDLE, 0.2) + _bull_anim.play(_ANIM_IDLE, 0.05) # Drive the WASD locomotion clip: the looping DASH doubles as the run cycle while a diff --git a/project.godot b/project.godot index d200742..4052322 100644 --- a/project.godot +++ b/project.godot @@ -96,13 +96,13 @@ ability_kick={ ability_slam={ "deadzone": 0.2, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":72,"key_label":0,"unicode":104,"location":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":true,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":false,"script":null) ] } ability_dash={ "deadzone": 0.2, "events": [Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":-1,"window_id":0,"alt_pressed":false,"shift_pressed":false,"ctrl_pressed":false,"meta_pressed":false,"pressed":false,"keycode":0,"physical_keycode":71,"key_label":0,"unicode":103,"location":0,"echo":false,"script":null) -, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":1,"pressure":0.0,"pressed":true,"script":null) +, Object(InputEventJoypadButton,"resource_local_to_scene":false,"resource_name":"","device":-1,"button_index":0,"pressure":0.0,"pressed":false,"script":null) ] } ability_roll={ diff --git a/scene.tscn b/scene.tscn index 9389923..f447d63 100644 --- a/scene.tscn +++ b/scene.tscn @@ -36,7 +36,7 @@ fov = 50.0 near = 2.636 far = 0.01 -[node name="Skeleton3D" parent="Player/bull/Armature" parent_id_path=PackedInt32Array(332720469, 1386495166, 1883464126) index="0" unique_id=72207798] +[node name="Skeleton3D" parent="Player/bull/Armature" parent_id_path=PackedInt32Array(332720469, 1386495166, 565505995) index="0" unique_id=934355288] bones/0/position = Vector3(0, 0, 0.0074015963) bones/0/rotation = Quaternion(-0.36922705, 0.6030517, -0.6030517, -0.36922705) bones/0/scale = Vector3(1, 1, 1)