From aa7b392edc5065d1b4bf1f579575ee41826c28e5 Mon Sep 17 00:00:00 2001 From: Ruslan Ignatov Date: Fri, 13 Feb 2026 01:21:11 +0300 Subject: [PATCH] Updated cultist jump state --- game/characters/enemies/abstract_cultist.gd | 2 +- game/characters/enemies/abstract_cultist.tscn | 8 ++++---- .../characters/enemies/state_machine/jump_state.gd | 6 +++--- game/levels/level_7.tscn | 14 -------------- 4 files changed, 8 insertions(+), 22 deletions(-) diff --git a/game/characters/enemies/abstract_cultist.gd b/game/characters/enemies/abstract_cultist.gd index f37c14d..7ef7b6a 100644 --- a/game/characters/enemies/abstract_cultist.gd +++ b/game/characters/enemies/abstract_cultist.gd @@ -5,7 +5,7 @@ extends CharacterBody2D const MAX_WALK_SPEED = 85 const MAX_CHASE_SPEED = 170 const ACCELERATION = 600.0 -const JUMP_VELOCITY = 333.0 +const JUMP_VELOCITY = 222.0 const JUMP_GRAVITY_FACTOR = 1.0 const FALL_GRAVITY_FACTOR = 1.5 diff --git a/game/characters/enemies/abstract_cultist.tscn b/game/characters/enemies/abstract_cultist.tscn index 667c8f0..f272115 100644 --- a/game/characters/enemies/abstract_cultist.tscn +++ b/game/characters/enemies/abstract_cultist.tscn @@ -143,12 +143,12 @@ jump_state = NodePath("../JumpRightState") fall_state = NodePath("../FallState") cultist = NodePath("../..") -[node name="JumpLeftState" parent="CultistStateMachine" unique_id=739226464 node_paths=PackedStringArray("fall_state", "cultist") instance=ExtResource("5_tu2pi")] +[node name="JumpLeftState" parent="CultistStateMachine" unique_id=739226464 node_paths=PackedStringArray("chase_state", "cultist") instance=ExtResource("5_tu2pi")] script = ExtResource("14_42ivi") -fall_state = NodePath("../FallLeftState") +chase_state = NodePath("../ChaseLeftState") cultist = NodePath("../..") -[node name="JumpRightState" parent="CultistStateMachine" unique_id=756126836 node_paths=PackedStringArray("fall_state", "cultist") instance=ExtResource("5_tu2pi")] +[node name="JumpRightState" parent="CultistStateMachine" unique_id=756126836 node_paths=PackedStringArray("chase_state", "cultist") instance=ExtResource("5_tu2pi")] script = ExtResource("15_cqp7f") -fall_state = NodePath("../FallRightState") +chase_state = NodePath("../ChaseRightState") cultist = NodePath("../..") diff --git a/game/characters/enemies/state_machine/jump_state.gd b/game/characters/enemies/state_machine/jump_state.gd index 63c66d9..6f68c9d 100644 --- a/game/characters/enemies/state_machine/jump_state.gd +++ b/game/characters/enemies/state_machine/jump_state.gd @@ -3,7 +3,7 @@ class_name CultistJumpState extends CultistState -@export var fall_state: CultistState +@export var chase_state: CultistState var _direction := 0 @@ -14,8 +14,8 @@ func enter() -> void: func physics_process(delta: float) -> void: - if cultist.velocity.y > 0: - switch_state.emit(fall_state) + if cultist.is_on_floor(): + switch_state.emit(chase_state) else: cultist.velocity += cultist.get_gravity() * cultist.get_gravity_factor() * delta cultist.update_x_velocity(_direction, cultist.MAX_WALK_SPEED, delta) diff --git a/game/levels/level_7.tscn b/game/levels/level_7.tscn index 0a62ec4..902c2c7 100644 --- a/game/levels/level_7.tscn +++ b/game/levels/level_7.tscn @@ -214,67 +214,53 @@ position = Vector2(2304, 2448) [node name="Right_1" parent="Cutscene/EnemyWaves/WaveThree" index="0" unique_id=1741494130 instance=ExtResource("11_6yudq")] position = Vector2(-69, 0) -animation = &"idle" [node name="Right_2" parent="Cutscene/EnemyWaves/WaveThree" index="1" unique_id=761362258 instance=ExtResource("11_6yudq")] material = ExtResource("13_x83dg") position = Vector2(-77, 0) -animation = &"idle" [node name="Right_3" parent="Cutscene/EnemyWaves/WaveThree" index="2" unique_id=418001405 instance=ExtResource("11_6yudq")] material = SubResource("ShaderMaterial_6yudq") position = Vector2(-87, 0) -animation = &"idle" [node name="Right_4" parent="Cutscene/EnemyWaves/WaveThree" index="3" unique_id=1330937276 instance=ExtResource("11_6yudq")] position = Vector2(-95, 0) -animation = &"idle" [node name="Right_5" parent="Cutscene/EnemyWaves/WaveThree" index="4" unique_id=1285782564 instance=ExtResource("11_6yudq")] material = SubResource("ShaderMaterial_8x4ch") position = Vector2(-104, 0) -animation = &"idle" [node name="Right_6" parent="Cutscene/EnemyWaves/WaveThree" index="5" unique_id=348811069 instance=ExtResource("11_6yudq")] material = ExtResource("13_x83dg") position = Vector2(-113, 0) -animation = &"idle" [node name="Right_7" parent="Cutscene/EnemyWaves/WaveThree" index="6" unique_id=1822852735 instance=ExtResource("11_6yudq")] position = Vector2(-120, 0) -animation = &"idle" [node name="Left_1" parent="Cutscene/EnemyWaves/WaveThree" index="7" unique_id=2036807955 instance=ExtResource("11_6yudq")] material = SubResource("ShaderMaterial_x83dg") position = Vector2(78, 0) -animation = &"idle" [node name="Left_2" parent="Cutscene/EnemyWaves/WaveThree" index="8" unique_id=1125192387 instance=ExtResource("11_6yudq")] position = Vector2(86, 0) -animation = &"idle" [node name="Left_3" parent="Cutscene/EnemyWaves/WaveThree" index="9" unique_id=1717461753 instance=ExtResource("11_6yudq")] material = SubResource("ShaderMaterial_jbfb3") position = Vector2(95, 0) -animation = &"idle" [node name="Left_4" parent="Cutscene/EnemyWaves/WaveThree" index="10" unique_id=1540913182 instance=ExtResource("11_6yudq")] material = ExtResource("13_x83dg") position = Vector2(105, 0) -animation = &"idle" [node name="Left_5" parent="Cutscene/EnemyWaves/WaveThree" index="11" unique_id=1177455845 instance=ExtResource("11_6yudq")] position = Vector2(115, 0) -animation = &"idle" [node name="Left_6" parent="Cutscene/EnemyWaves/WaveThree" index="12" unique_id=1103369493 instance=ExtResource("11_6yudq")] position = Vector2(123, 0) -animation = &"idle" [node name="Left_7" parent="Cutscene/EnemyWaves/WaveThree" index="13" unique_id=1686075717 instance=ExtResource("11_6yudq")] material = ExtResource("13_x83dg") position = Vector2(131, 0) -animation = &"idle" [node name="WaveOne" type="Node2D" parent="Cutscene/EnemyWaves" index="1" unique_id=122551187]