diff --git a/Assets/bear_level.tscn b/Assets/bear_level.tscn index dea7d30..cb95cae 100644 --- a/Assets/bear_level.tscn +++ b/Assets/bear_level.tscn @@ -1,8 +1,6 @@ [gd_scene format=3 uid="uid://by4ifsgxlv0gj"] [ext_resource type="PackedScene" uid="uid://bm6rmt3xprhjs" path="res://Assets/bear_level_arena.glb" id="1_beararena"] -[ext_resource type="Script" path="res://matador_spawn.gd" id="2_spawn"] -[ext_resource type="PackedScene" path="res://Bear.tscn" id="3_bear"] [sub_resource type="BoxShape3D" id="BoxShape3D_floor"] @@ -20,8 +18,6 @@ shape = SubResource("BoxShape3D_floor") transform = Transform3D(2.875, 0, 0, 0, 2.875, 0, 0, 0, 2.875, 0, 0, 0) [node name="MatadorSpawner" type="Node3D" parent="." unique_id=1869467620] -script = ExtResource("2_spawn") -enemy_scene = ExtResource("3_bear") [node name="Lights" type="Node3D" parent="." unique_id=1435665429] diff --git a/Player.tscn b/Player.tscn index 197f0fe..ee4f79c 100644 --- a/Player.tscn +++ b/Player.tscn @@ -35,7 +35,7 @@ script = ExtResource("2_camera_iso") [node name="bull" parent="." unique_id=1386495166 instance=ExtResource("4_e80uo")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, -0.655, 0.23) -[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 547304299) index="0" unique_id=2096877109] +[node name="Skeleton3D" parent="bull/Armature" parent_id_path=PackedInt32Array(1386495166, 1883464126) index="0" unique_id=72207798] bones/0/position = Vector3(0, 0, 0.009963839) bones/0/rotation = Quaternion(-0.733504, -0.0036974847, 0.0013620416, -0.67967373) bones/0/scale = Vector3(1, 0.99999994, 0.99999994) diff --git a/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll b/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll new file mode 100644 index 0000000..31e7384 Binary files /dev/null and b/addons/rider-plugin/bin/windows/~rider-gdextension.windows.editor.x86_64.dll differ diff --git a/debug_params.gd b/debug_params.gd index 6f8e5d9..53dfef5 100644 --- a/debug_params.gd +++ b/debug_params.gd @@ -191,7 +191,7 @@ func _register_all() -> void: # 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 # tells and recovery (× bear_enrage_scale) and longer combo chains. - _reg_f("Bear", "bear_max_hp", 10.0, 1.0, 40.0, 1.0) + _reg_f("Bear", "bear_max_hp", 50.0, 1.0, 100.0, 1.0) # HP fraction at which phase 2 ("Fury") triggers, and how much it multiplies every # wind-up / recovery timer (lower = snappier, more dangerous). _reg_f("Bear", "bear_enrage_frac", 0.4, 0.0, 1.0, 0.05) @@ -305,7 +305,7 @@ func _register_all() -> void: _reg_f("Abilities", "kick_cooldown", 1.5, 0.2, 10.0, 0.1) _reg_f("Abilities", "kick_range", 6.0, 0.5, 8.0, 0.1) _reg_f("Abilities", "kick_strength", 12.0, 1.0, 30.0) - _reg_f("Abilities", "slam_cooldown", 4.0, 0.5, 15.0, 0.1) + _reg_f("Abilities", "slam_cooldown", 12, 0.5, 600, 0.1) _reg_f("Abilities", "slam_jump_velocity", 7.0, 2.0, 20.0) # Descent gravity multiplier — higher = faster crash, less airtime. _reg_f("Abilities", "slam_fall_mult", 3.0, 1.0, 8.0, 0.5) @@ -325,7 +325,7 @@ func _register_all() -> void: # closest matador; on slamming one the ball POPS it (launched skyward via # roll_knockup) then CHAINS to the next closest, up to roll_chain_count times. # roll_turn is the homing turn rate. When no chain targets remain, the roll ends. - _reg_f("Roll", "roll_cooldown", 3.0, 0.5, 15.0, 0.1) + _reg_f("Roll", "roll_cooldown", 20, 0.5, 600, 0.1) _reg_f("Roll", "roll_duration", 2.5, 0.5, 6.0, 0.1) # max roll time _reg_f("Roll", "roll_chain_count", 2.0, 0.0, 8.0, 1.0) # extra matadors chained after the first _reg_f("Roll", "roll_base_speed", 28.0, 5.0, 120.0) # speed at the start of the roll diff --git a/scene.tscn b/scene.tscn index f985c92..9389923 100644 --- a/scene.tscn +++ b/scene.tscn @@ -1,10 +1,10 @@ -[gd_scene load_steps=8 format=3 uid="uid://b7afbx36ltb3f"] +[gd_scene format=3 uid="uid://b7afbx36ltb3f"] [ext_resource type="PackedScene" uid="uid://crtm0xtiql3r8" path="res://Player.tscn" id="1_ulcgi"] [ext_resource type="Shader" uid="uid://d3xyyy5bh0ma" path="res://ps1_filter.gdshader" id="4_ps1shader"] [ext_resource type="Script" uid="uid://butd6b3tdwxrv" path="res://hud.gd" id="10_hud"] [ext_resource type="Script" uid="uid://ce5n4qu88mhyx" path="res://ps1_filter.gd" id="12_ps1ctl"] -[ext_resource type="Script" path="res://levels/game_shell.gd" id="13_shell"] +[ext_resource type="Script" uid="uid://ptsfs3wq5bje" path="res://levels/game_shell.gd" id="13_shell"] [sub_resource type="CameraAttributesPractical" id="CameraAttributesPractical_73fnb"] dof_blur_far_enabled = true @@ -24,19 +24,19 @@ shader_parameter/scanline_strength = 0.2 shader_parameter/roll_speed = 3.0 shader_parameter/roll_strength = 1.0 -[node name="scene" type="Node3D"] +[node name="scene" type="Node3D" unique_id=118294681] script = ExtResource("13_shell") -[node name="Player" parent="." instance=ExtResource("1_ulcgi")] +[node name="Player" parent="." unique_id=332720469 instance=ExtResource("1_ulcgi")] transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 2.2416196, 5.1711025, -4.841382) -[node name="Camera3D" parent="Player" index="3"] +[node name="Camera3D" parent="Player" index="3" unique_id=1120161087] attributes = SubResource("CameraAttributesPractical_73fnb") fov = 50.0 near = 2.636 far = 0.01 -[node name="Skeleton3D" parent="Player/bull/Armature" index="0"] +[node name="Skeleton3D" parent="Player/bull/Armature" parent_id_path=PackedInt32Array(332720469, 1386495166, 1883464126) index="0" unique_id=72207798] 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) @@ -86,13 +86,13 @@ bones/24/position = Vector3(7.092306e-11, 0.003274492, 4.6413304e-10) bones/24/rotation = Quaternion(0.52910197, -0.15997829, -0.12024502, 0.82462066) bones/24/scale = Vector3(1, 1.0000001, 1.0000001) -[node name="HUD" type="CanvasLayer" parent="."] +[node name="HUD" type="CanvasLayer" parent="." unique_id=475750379] script = ExtResource("10_hud") -[node name="CanvasLayer" type="CanvasLayer" parent="."] +[node name="CanvasLayer" type="CanvasLayer" parent="." unique_id=998765394] layer = 10 -[node name="PS1Filter" type="ColorRect" parent="CanvasLayer"] +[node name="PS1Filter" type="ColorRect" parent="CanvasLayer" unique_id=1660776144] material = SubResource("ShaderMaterial_ps1") anchors_preset = 15 anchor_right = 1.0 @@ -101,7 +101,7 @@ grow_horizontal = 2 grow_vertical = 2 script = ExtResource("12_ps1ctl") -[node name="LevelRoot" type="Node3D" parent="."] +[node name="LevelRoot" type="Node3D" parent="." unique_id=5023050] [editable path="Player"] [editable path="Player/bull"]