zenayi/GameJamDungeon
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix up animations for ballos

Browse Source
This commit is contained in:
Zenny
2025-03-17 19:39:30 -07:00
parent 07582d8202
commit 4f30086e52
4 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Zennysoft.Game.Ma/src/enemy/Enemy.cs
View File

@@ -91,7 +91,7 @@ public partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLogic>
return; return;
var lookDir = GlobalPosition + Velocity; var lookDir = GlobalPosition + Velocity;
if (!lookDir.IsEqualApprox(GlobalPosition) || !Velocity.IsZeroApprox()) if (!lookDir.IsEqualApprox(GlobalPosition))
LookAt(lookDir, Vector3.Up, true); LookAt(lookDir, Vector3.Up, true);
var isWalking = _enemyLogic.Value is EnemyLogic.State.Patrolling or EnemyLogic.State.FollowPlayer; var isWalking = _enemyLogic.Value is EnemyLogic.State.Patrolling or EnemyLogic.State.FollowPlayer;

6
Zennysoft.Game.Ma/src/enemy/enemy_types/02. michael/MichaelModelView.tscn
View File

@@ -628,10 +628,8 @@ switch_mode = 2
switch_mode = 2 switch_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_bmy1k"] [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_bmy1k"]
switch_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mxl7w"] [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_mxl7w"]
switch_mode = 2
[sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7jsk6"] [sub_resource type="AnimationNodeStateMachineTransition" id="AnimationNodeStateMachineTransition_7jsk6"]
advance_mode = 2 advance_mode = 2
@@ -715,9 +713,9 @@ states/idle_left/position = Vector2(77, 151.947)
states/idle_left_walk/node = SubResource("AnimationNodeAnimation_dvj10") states/idle_left_walk/node = SubResource("AnimationNodeAnimation_dvj10")
states/idle_left_walk/position = Vector2(318, 248.947) states/idle_left_walk/position = Vector2(318, 248.947)
states/primary_attack/node = SubResource("AnimationNodeAnimation_erbrx") states/primary_attack/node = SubResource("AnimationNodeAnimation_erbrx")
states/primary_attack/position = Vector2(1151, 86.9474) states/primary_attack/position = Vector2(1257, 48.9474)
transitions = ["idle_front_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_3xv6a"), "idle_left_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0h1op"), "idle_front_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_361b7"), "idle_back_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_wftla"), "idle_back_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_gqqkl"), "idle_left_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_5cj36"), "idle_front_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_4t05h"), "primary_attack", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_8hgxu"), "primary_attack", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_fq2yw"), "primary_attack", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_yqm0k"), "idle_back_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_bmy1k"), "idle_left_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_mxl7w"), "Start", "idle_front", SubResource("AnimationNodeStateMachineTransition_7jsk6"), "idle_front", "idle_back", SubResource("AnimationNodeStateMachineTransition_nntdb"), "idle_front", "idle_left", SubResource("AnimationNodeStateMachineTransition_1br6i"), "idle_left", "idle_front", SubResource("AnimationNodeStateMachineTransition_2m7tq"), "idle_back", "idle_front", SubResource("AnimationNodeStateMachineTransition_d2pq5"), "idle_back", "idle_left", SubResource("AnimationNodeStateMachineTransition_p18ld"), "idle_left", "idle_back", SubResource("AnimationNodeStateMachineTransition_8kbdd"), "idle_front", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_nb2qv"), "idle_front_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_nqbx0"), "idle_front", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_4depw"), "idle_back_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_fegyx"), "idle_front", "primary_attack", SubResource("AnimationNodeStateMachineTransition_eh46c"), "primary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_dgujy"), "idle_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_6ogef"), "primary_attack", "idle_back", SubResource("AnimationNodeStateMachineTransition_cvhi5"), "idle_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_e3x3h"), "primary_attack", "idle_left", SubResource("AnimationNodeStateMachineTransition_mqikf"), "idle_left", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_ide2k"), "idle_left_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_114qx"), "idle_left", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_smnr6"), "idle_back_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_g6ih4"), "idle_left", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_odtr7"), "idle_front_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_off5l")] transitions = ["idle_front_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_3xv6a"), "idle_left_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_0h1op"), "idle_front_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_361b7"), "idle_back_walk", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_wftla"), "idle_back_walk", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_gqqkl"), "idle_left_walk", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_5cj36"), "idle_front_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_4t05h"), "primary_attack", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_8hgxu"), "primary_attack", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_fq2yw"), "primary_attack", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_yqm0k"), "idle_back_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_bmy1k"), "idle_left_walk", "primary_attack", SubResource("AnimationNodeStateMachineTransition_mxl7w"), "Start", "idle_front", SubResource("AnimationNodeStateMachineTransition_7jsk6"), "idle_front", "idle_back", SubResource("AnimationNodeStateMachineTransition_nntdb"), "idle_front", "idle_left", SubResource("AnimationNodeStateMachineTransition_1br6i"), "idle_left", "idle_front", SubResource("AnimationNodeStateMachineTransition_2m7tq"), "idle_back", "idle_front", SubResource("AnimationNodeStateMachineTransition_d2pq5"), "idle_back", "idle_left", SubResource("AnimationNodeStateMachineTransition_p18ld"), "idle_left", "idle_back", SubResource("AnimationNodeStateMachineTransition_8kbdd"), "idle_front", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_nb2qv"), "idle_front_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_nqbx0"), "idle_front", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_4depw"), "idle_back_walk", "idle_front", SubResource("AnimationNodeStateMachineTransition_fegyx"), "idle_front", "primary_attack", SubResource("AnimationNodeStateMachineTransition_eh46c"), "primary_attack", "idle_front", SubResource("AnimationNodeStateMachineTransition_dgujy"), "idle_back", "primary_attack", SubResource("AnimationNodeStateMachineTransition_6ogef"), "primary_attack", "idle_back", SubResource("AnimationNodeStateMachineTransition_cvhi5"), "idle_left", "primary_attack", SubResource("AnimationNodeStateMachineTransition_e3x3h"), "primary_attack", "idle_left", SubResource("AnimationNodeStateMachineTransition_mqikf"), "idle_left", "idle_left_walk", SubResource("AnimationNodeStateMachineTransition_ide2k"), "idle_left_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_114qx"), "idle_left", "idle_back_walk", SubResource("AnimationNodeStateMachineTransition_smnr6"), "idle_back_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_g6ih4"), "idle_left", "idle_front_walk", SubResource("AnimationNodeStateMachineTransition_odtr7"), "idle_front_walk", "idle_left", SubResource("AnimationNodeStateMachineTransition_off5l")]
graph_offset = Vector2(-190, -100.703) graph_offset = Vector2(-154, -269.574)
[node name="EnemyModelView" type="Node3D"] [node name="EnemyModelView" type="Node3D"]
script = ExtResource("1_o4cc2") script = ExtResource("1_o4cc2")

5
Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/Ballos.tscn
View File

@@ -41,12 +41,7 @@ collision_mask = 11
axis_lock_linear_y = true axis_lock_linear_y = true
axis_lock_angular_x = true axis_lock_angular_x = true
script = ExtResource("1_v2urn") script = ExtResource("1_v2urn")
PrimaryAttackElementalType = null
PrimaryAttackElementalDamageBonus = null
SecondaryAttackElementalType = null
SecondaryAttackElementalDamageBonus = null
_enemyStatResource = SubResource("Resource_ko6aj") _enemyStatResource = SubResource("Resource_ko6aj")
_movementSpeed = null
[node name="CollisionShape" type="CollisionShape3D" parent="."] [node name="CollisionShape" type="CollisionShape3D" parent="."]
unique_name_in_owner = true unique_name_in_owner = true

45
Zennysoft.Game.Ma/src/enemy/enemy_types/05. ballos/BallosModelView.tscn
View File

File diff suppressed because one or more lines are too long