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

Refactor Enemy

Browse Source
This commit is contained in:
Zenny
2025-02-06 01:58:36 -08:00
parent badc6d2375
commit 4e6c545e81
38 changed files with 581 additions and 589 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/boss/Boss.cs
View File

@@ -3,7 +3,6 @@ using Chickensoft.Collections;
using Chickensoft.GodotNodeInterfaces;
using Chickensoft.Introspection;
using Godot;
using static System.Net.Mime.MediaTypeNames;
namespace GameJamDungeon
{
@@ -84,21 +83,21 @@ namespace GameJamDungeon
private void AttackBox_AreaEntered(Area3D area)
{
var bossHitDamage = DamageCalculator.CalculateEnemyAttackDamage(GameRepo.PlayerData.CurrentDefense.Value + GameRepo.PlayerData.BonusDefense,
BossResource,
GameRepo.PlayerData.Inventory.EquippedArmor.Value.ArmorStats,
false);
GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value - Mathf.RoundToInt(bossHitDamage));
//var bossHitDamage = DamageCalculator.CalculateEnemyAttackDamage(GameRepo.PlayerData.CurrentDefense.Value + GameRepo.PlayerData.BonusDefense,
// BossResource,
// GameRepo.PlayerData.Inventory.EquippedArmor.Value.ArmorStats,
// false);
//GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value - Mathf.RoundToInt(bossHitDamage));
}
private void SecondaryAttackBox_AreaEntered(Area3D area)
{
var bossHitDamage = DamageCalculator.CalculateEnemyAttackDamage(GameRepo.PlayerData.CurrentDefense.Value + GameRepo.PlayerData.BonusDefense,
BossResource,
GameRepo.PlayerData.Inventory.EquippedArmor.Value.ArmorStats,
false);
var nerfDamage = bossHitDamage *= 0.25f;
GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value - Mathf.RoundToInt(nerfDamage));
//var bossHitDamage = DamageCalculator.CalculateEnemyAttackDamage(GameRepo.PlayerData.CurrentDefense.Value + GameRepo.PlayerData.BonusDefense,
// BossResource,
// GameRepo.PlayerData.Inventory.EquippedArmor.Value.ArmorStats,
// false);
//var nerfDamage = bossHitDamage *= 0.25f;
//GameRepo.PlayerData.SetCurrentHP(GameRepo.PlayerData.CurrentHP.Value - Mathf.RoundToInt(nerfDamage));
Game.Player.ApplyCentralImpulseToPlayer(GlobalBasis.Z.Normalized());
}
@@ -118,9 +117,9 @@ namespace GameJamDungeon
var roll = rng.Randf();
if (roll <= GameRepo.PlayerData.Inventory.EquippedWeapon.Value.WeaponStats.Luck)
isCriticalHit = true;
var damage = DamageCalculator.CalculateWeaponAttackDamage(GameRepo.PlayerData.CurrentAttack.Value + GameRepo.PlayerData.BonusAttack, BossResource, GameRepo.PlayerData.Inventory.EquippedWeapon.Value.WeaponStats, isCriticalHit);
GD.Print($"Enemy Hit for {damage} damage.");
BossLogic.Input(new BossLogic.Input.HitByPlayer(damage));
//var damage = DamageCalculator.CalculateWeaponAttackDamage(GameRepo.PlayerData.CurrentAttack.Value + GameRepo.PlayerData.BonusAttack, BossResource, GameRepo.PlayerData.Inventory.EquippedWeapon.Value.WeaponStats, isCriticalHit);
//GD.Print($"Enemy Hit for {damage} damage.");
//BossLogic.Input(new BossLogic.Input.HitByPlayer(damage));
}
}