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

Minor fixes

Browse Source
This commit is contained in:
Zenny
2025-04-30 21:46:08 -07:00
parent 68c91d8f13
commit 7ab5e32c74
9 changed files with 344 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

60
Zennysoft.Game.Ma/src/enemy/BasicEnemyAnimationTree.tscn
View File

File diff suppressed because one or more lines are too long

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

@@ -112,6 +112,7 @@ public partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLogic>
public virtual void TakeAction() public virtual void TakeAction()
{ {
_enemyModelView.PlayPrimaryAttackAnimation();
} }
public virtual void SetTarget(Vector3 target) public virtual void SetTarget(Vector3 target)

1
Zennysoft.Game.Ma/src/enemy/EnemyModelView2D.cs
View File

@@ -1,5 +1,4 @@
using Chickensoft.AutoInject; using Chickensoft.AutoInject;
using Chickensoft.GodotNodeInterfaces;
using Chickensoft.Introspection; using Chickensoft.Introspection;
using Godot; using Godot;
using System.Linq; using System.Linq;

6
Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/Sproingy.cs
View File

@@ -31,11 +31,11 @@ public partial class Sproingy : Enemy, IHasPrimaryAttack, ICanPatrol
if (_enemyLogic.Value is not EnemyLogic.State.Activated) if (_enemyLogic.Value is not EnemyLogic.State.Activated)
return; return;
if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) < 1.5f) if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) < 3f)
_enemyLogic.Input(new EnemyLogic.Input.StartAttacking()); _enemyLogic.Input(new EnemyLogic.Input.StartAttacking());
if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) > 30f) else if (_enemyLogic.Value is EnemyLogic.State.FollowPlayer && GlobalPosition.DistanceTo(_player.CurrentPosition) > 30f)
_enemyLogic.Input(new EnemyLogic.Input.LostPlayer()); _enemyLogic.Input(new EnemyLogic.Input.LostPlayer());
if (_enemyLogic.Value is EnemyLogic.State.Attacking && GlobalPosition.DistanceTo(_player.CurrentPosition) > 3f) else if (_enemyLogic.Value is EnemyLogic.State.Attacking && GlobalPosition.DistanceTo(_player.CurrentPosition) > 5f)
_enemyLogic.Input(new EnemyLogic.Input.Alerted()); _enemyLogic.Input(new EnemyLogic.Input.Alerted());
_navigationAgentClient.CalculateVelocity(GlobalPosition, true); _navigationAgentClient.CalculateVelocity(GlobalPosition, true);

324
Zennysoft.Game.Ma/src/enemy/enemy_types/01. sproingy/SproingyModelView.tscn
View File

File diff suppressed because one or more lines are too long

1
Zennysoft.Game.Ma/src/player/Player.cs
View File

@@ -341,6 +341,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<ISaveChunk<Play
HealthTimer.WaitTime = _healthTimerWaitTime; HealthTimer.WaitTime = _healthTimerWaitTime;
HealthTimer.Timeout -= OnHealthTimerTimeout; HealthTimer.Timeout -= OnHealthTimerTimeout;
SwordSlashAnimation.Stop();
SetProcessInput(false); SetProcessInput(false);
SetPhysicsProcess(false); SetPhysicsProcess(false);
//Hitbox.AreaEntered -= Hitbox_AreaEntered; //Hitbox.AreaEntered -= Hitbox_AreaEntered;

4
Zennysoft.Game.Ma/src/player/Player.tscn
View File

@@ -15,9 +15,9 @@ script = ExtResource("2_ebyyx")
RotationSpeed = 1.5 RotationSpeed = 1.5
MoveSpeed = 4.0 MoveSpeed = 4.0
Acceleration = 2.0 Acceleration = 2.0
CurrentHP = 1 CurrentHP = 100
MaximumHP = 100 MaximumHP = 100
CurrentVT = 1 CurrentVT = 100
MaximumVT = 100 MaximumVT = 100
CurrentExp = 0 CurrentExp = 0
ExpToNextLevel = 12 ExpToNextLevel = 12

8
Zennysoft.Game.Ma/src/ui/in_game_ui/UseTeleportPrompt.cs
View File

@@ -43,18 +43,26 @@ public partial class UseTeleportPrompt : Control, IUseTeleportPrompt
private void NoButton_Pressed() private void NoButton_Pressed()
{ {
YesButton.Disabled = true;
NoButton.Disabled = true;
EmitSignal(SignalName.CloseTeleportPrompt); EmitSignal(SignalName.CloseTeleportPrompt);
} }
private void YesButton_Pressed() private void YesButton_Pressed()
{ {
YesButton.Disabled = true;
NoButton.Disabled = true;
EmitSignal(SignalName.TeleportToNextFloor); EmitSignal(SignalName.TeleportToNextFloor);
} }
private void AnimationPlayer_AnimationFinished(StringName animName) private void AnimationPlayer_AnimationFinished(StringName animName)
{ {
if (animName == "fade_in") if (animName == "fade_in")
{
YesButton.Disabled = false;
NoButton.Disabled = false;
YesButton.CallDeferred(MethodName.GrabFocus); YesButton.CallDeferred(MethodName.GrabFocus);
}
if (animName == "fade_out") if (animName == "fade_out")
CallDeferred(MethodName.ReleaseFocus); CallDeferred(MethodName.ReleaseFocus);
} }

2
Zennysoft.Game.Ma/src/ui/pause_menu/PauseDebugMenu.cs
View File

@@ -48,6 +48,8 @@ public partial class PauseDebugMenu : Control, IDebugMenu
var tempEnemy = enemy.Instantiate<Enemy>(); var tempEnemy = enemy.Instantiate<Enemy>();
SpawnEnemyDropDown.AddItem(tempEnemy.Name); SpawnEnemyDropDown.AddItem(tempEnemy.Name);
} }
SpawnItemDropDown.AllowReselect = true;
SpawnEnemyDropDown.AllowReselect = true;
SpawnItemDropDown.ItemSelected += SpawnItemDropDown_ItemSelected; SpawnItemDropDown.ItemSelected += SpawnItemDropDown_ItemSelected;
SpawnEnemyDropDown.ItemSelected += SpawnEnemyDropDown_ItemSelected; SpawnEnemyDropDown.ItemSelected += SpawnEnemyDropDown_ItemSelected;