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

Elemental resistance calculation changes

Browse Source
This commit is contained in:
Zenny
2026-01-13 21:25:09 -08:00
parent 0591dccc31
commit 1e97eb9ede
8 changed files with 22 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
using Chickensoft.AutoInject;
using Chickensoft.Introspection;
using Godot;
using Godot.Collections;
using System;
using System.Collections.Immutable;
using System.Linq;
@@ -45,6 +46,18 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
[Export] public int ExpGiven { get; set; } = 10;
[Export] public double AeolicResistance { get; set; }
[Export] public double HydricResistance { get; set; }
[Export] public double IgenousResistance { get; set; }
[Export] public double FerrumResistance { get; set; }
[Export] public double TelluricResistance { get; set; }
public ElementalResistanceSet ElementalResistanceSet => new ElementalResistanceSet(AeolicResistance, HydricResistance, IgenousResistance, FerrumResistance, TelluricResistance);
[Node] private AudioStreamPlayer3D _absorbSFX { get; set; } = default!;
[Node] private AudioStreamPlayer3D _hitSFX { get; set; } = default!;
[Node] private AudioStreamPlayer3D _morphSFX { get; set; } = default!;

2
Zennysoft.Game.Ma/src/items/EffectService.cs
View File

@@ -127,7 +127,7 @@ public class EffectService
var currentEnemies = currentRoom.EnemiesInRoom;
foreach (var enemy in currentEnemies)
{
var damageDealt = DamageCalculator.CalculateDamage(new AttackData(20, elementType), 10, ElementalResistanceSet.None);
var damageDealt = DamageCalculator.CalculateDamage(new AttackData(20, elementType), 10, enemy.ElementalResistanceSet);
enemy.HealthComponent.Damage(damageDealt);
}
}

4
Zennysoft.Game.Ma/src/items/thrown/ThrownItem.cs
View File

@@ -116,14 +116,14 @@ public partial class ThrownItem : RigidBody3D, IThrownItem
_effectService.TeleportToRandomRoom(enemy);
break;
default:
var damageDealt = DamageCalculator.CalculateDamage(new AttackData(throwableItem.ThrowDamage, throwableItem.ElementType), 10, ElementalResistanceSet.None);
var damageDealt = DamageCalculator.CalculateDamage(new AttackData(throwableItem.ThrowDamage, throwableItem.ElementType), 10, enemy.ElementalResistanceSet);
enemy.HealthComponent.Damage(damageDealt);
break;
}
}
else
{
var damageDealt = DamageCalculator.CalculateDamage(new AttackData(ItemThatIsThrown.ThrowDamage, ElementType.None), 10, ElementalResistanceSet.None);
var damageDealt = DamageCalculator.CalculateDamage(new AttackData(ItemThatIsThrown.ThrowDamage, ElementType.None), 10, enemy.ElementalResistanceSet);
enemy.HealthComponent.Damage(damageDealt);
}
}

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

@@ -407,7 +407,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
}
var baseAttack = new AttackData(totalDamage, element, ignoreDefense, ignoreElementalResistance);
var damageDealt = DamageCalculator.CalculateDamage(baseAttack, enemy.DefenseComponent.CurrentDefense.Value, ElementalResistanceSet.None);
var damageDealt = DamageCalculator.CalculateDamage(baseAttack, enemy.DefenseComponent.CurrentDefense.Value, enemy.ElementalResistanceSet);
enemy.HealthComponent.Damage(damageDealt);
if (((Weapon)EquipmentComponent.EquippedWeapon.Value).WeaponTag == WeaponTag.Knockback && enemy is IKnockbackable knockbackable)