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

Implement plasma sword instakill

Browse Source
This commit is contained in:
Zenny
2026-02-09 23:01:52 -08:00
parent bfaa324e6a
commit aba325ff2b
12 changed files with 273 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Zennysoft.Game.Ma.Implementation/Player/IPlayer.cs
View File

@@ -46,6 +46,10 @@ public interface IPlayer : IKillable, ICharacterBody3D
public bool CanEquipState { get; set; }
public int TotalAttack { get; }
public int TotalDefense { get; }
public int TotalLuck { get; }
public event Action PlayerDied;
public delegate InventoryItem RerollItem(InventoryItem item);
}

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

@@ -80,7 +80,7 @@ public class EffectService
var rng = new RandomNumberGenerator();
rng.Randomize();
var randomResource = resourceFiles[rng.RandiRange(0, resourceFiles.Length - 1)];
var randomFile = ResourceLoader.Load<ConsumableItemStats>($"{consumableFolder}/resources/{randomResource}");
var randomFile = ResourceLoader.Load<ConsumableItemStats>($"{consumableFolder}/resources/{randomResource}".TrimSuffix(".remap"));
consumable.Stats = randomFile;
_game.AddChild(consumable);
consumable.GlobalPosition = vector;

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

@@ -29,7 +29,7 @@ public abstract partial class InventoryItemStats : Resource
[Export]
[Save("weapon_luck")]
public double BonusLuck { get; set; } = 0.05;
public int BonusLuck { get; set; } = 5;
[Export]
[Save("equipment_bonus_hp")]

5
Zennysoft.Game.Ma/src/items/accessory/Accessory.cs
View File

@@ -36,6 +36,8 @@ public partial class Accessory : EquipableItem
public override int BonusVT => Stats.BonusVT;
public override int BonusLuck { get => Stats.BonusLuck + _bonusLuck; }
public override ElementalResistanceSet ElementalResistance => new ElementalResistanceSet(Stats.AeolicResistance, Stats.HydricResistance, Stats.IgneousResistance, Stats.FerrumResistance, Stats.TelluricResistance, Stats.HolyResistance);
[Save("accessory_tag")]
@@ -43,6 +45,9 @@ public partial class Accessory : EquipableItem
public override ItemTag ItemTag => Stats.ItemTag;
[Save("accessory_bonus_luck")]
private int _bonusLuck { get; set; } = 0;
[Export]
[Save("accessory_stats")]
public AccessoryStats Stats { get; set; } = new AccessoryStats();

5
Zennysoft.Game.Ma/src/items/armor/Armor.cs
View File

@@ -31,9 +31,14 @@ public partial class Armor : EquipableItem
public override int BonusDefense => Stats.BonusDefense + _bonusDefense;
public override int BonusLuck { get => Stats.BonusLuck + _bonusLuck; }
[Save("bonus_defense")]
private int _bonusDefense { get; set; } = 0;
[Save("armor_bonus_luck")]
private int _bonusLuck { get; set; } = 0;
public override ElementalResistanceSet ElementalResistance => new ElementalResistanceSet(Stats.AeolicResistance, Stats.HydricResistance, Stats.IgneousResistance, Stats.FerrumResistance, Stats.TelluricResistance, Stats.HolyResistance);
public void IncreaseArmorDefense(int bonus) => _bonusDefense += bonus;

5
Zennysoft.Game.Ma/src/items/weapons/Weapon.cs
View File

@@ -55,12 +55,17 @@ public partial class Weapon : EquipableItem
public override int BonusDefense { get => Stats.BonusDefense + _bonusDefense; }
public override int BonusLuck { get => Stats.BonusLuck + _bonusLuck; }
[Save("weapon_bonus_damage")]
private int _bonusDamage { get; set; } = 0;
[Save("weapon_bonus_damage")]
private int _bonusDefense { get; set; } = 0;
[Save("weapon_bonus_luck")]
private int _bonusLuck { get; set; } = 0;
[Export]
[Save("weapon_stats")]
public WeaponStats Stats { get; set; } = new WeaponStats();

4
Zennysoft.Game.Ma/src/items/weapons/WeaponStats.cs
View File

@@ -21,6 +21,10 @@ public partial class WeaponStats : InventoryItemStats
[Save("weapon_tag")]
public WeaponTag WeaponTag { get; set; } = WeaponTag.None;
[Export]
[Save("weapon_self_damage")]
public int SelfDamage { get; set; } = 0;
[Export]
public SoundEffect SoundEffect { get; set; } = SoundEffect.WeaponQuickSlash;
}

9
Zennysoft.Game.Ma/src/items/weapons/resources/PlasmaSword.tres
View File

@@ -7,14 +7,15 @@
script = ExtResource("2_rgna4")
AttackSpeed = 1.0
WeaponElement = 0
WeaponTag = 0
WeaponTag = 7
SelfDamage = 0
SoundEffect = 22
Name = "Plasma Sword"
Description = "Has the power to occasionally instantly disintegrate an enemy"
SpawnRate = 0.05
BonusAttack = 14
SpawnRate = 0.5
BonusAttack = 0
BonusDefense = 0
BonusLuck = 0.05
BonusLuck = 10
BonusHP = 0
BonusVT = 0
AeolicResistance = 0

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

@@ -108,6 +108,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
private Vector3 _knockbackDirection = Vector3.Zero;
private ItemReroller _itemReroller;
private PlayerEffectService _playerEffectService;
public void Initialize()
{
@@ -128,6 +129,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
EquipmentComponent = new EquipmentComponent();
_itemReroller = new ItemReroller(ItemDatabase.Instance);
_playerEffectService = new PlayerEffectService(this);
Settings = new PlayerLogic.Settings() { RotationSpeed = RotationSpeed, MoveSpeed = MoveSpeed, Acceleration = Acceleration };
@@ -212,7 +214,7 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
{
_camera3D.AddShake(1.0f);
TakeDamageAnimationPlayer.Play("take_damage");
var damageReceived = DamageCalculator.CalculateDamage(damage, DefenseComponent.CurrentDefense.Value + EquipmentComponent.BonusDefense, EquipmentComponent.ElementalResistance);
var damageReceived = DamageCalculator.CalculateDamage(damage, TotalDefense, EquipmentComponent.ElementalResistance);
HealthComponent.Damage(damageReceived);
SfxDatabase.Instance.Play(SoundEffect.TakeDamage);
}
@@ -225,6 +227,12 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
public void PlayJumpScareAnimation() => PlayerFXAnimations.Play("jump_scare");
public int TotalAttack => AttackComponent.CurrentAttack.Value + EquipmentComponent.BonusAttack;
public int TotalDefense => DefenseComponent.CurrentDefense.Value + EquipmentComponent.BonusDefense;
public int TotalLuck => LuckComponent.Luck.Value + EquipmentComponent.BonusLuck;
public void LevelUp()
{
ExperiencePointsComponent.LevelUp();
@@ -414,11 +422,9 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
private void HitEnemy(IEnemy enemy)
{
var ignoreElementalResistance = (EquipmentComponent.EquippedWeapon.Value as Weapon).WeaponTag == WeaponTag.IgnoreAffinity;
var ignoreDefense = (EquipmentComponent.EquippedWeapon.Value as Weapon).WeaponTag == WeaponTag.IgnoreDefense;
var isCriticalHit = BattleExtensions.IsCriticalHit(LuckComponent.Luck.Value + EquipmentComponent.BonusLuck);
var totalDamage = AttackComponent.CurrentAttack.Value + EquipmentComponent.BonusAttack;
var element = (EquipmentComponent.EquippedWeapon.Value as Weapon).WeaponElement;
var weapon = EquipmentComponent.EquippedWeapon.Value as Weapon;
var isCriticalHit = BattleExtensions.IsCriticalHit(TotalLuck);
var totalDamage = TotalAttack;
if (isCriticalHit)
{
@@ -426,21 +432,16 @@ public partial class Player : CharacterBody3D, IPlayer, IProvide<IPlayer>
SfxDatabase.Instance.Play(SoundEffect.Crit);
}
var baseAttack = new AttackData(totalDamage, element, ignoreDefense, ignoreElementalResistance);
var baseAttack = new AttackData(totalDamage, weapon.WeaponElement, weapon.WeaponTag == WeaponTag.IgnoreDefense, weapon.WeaponTag == WeaponTag.IgnoreAffinity);
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)
if (weapon.WeaponTag == WeaponTag.Knockback && enemy is IKnockbackable knockbackable)
knockbackable.Knockback(0.3f, -CurrentBasis.Z.Normalized());
if (((Weapon)EquipmentComponent.EquippedWeapon.Value).WeaponTag == WeaponTag.SelfDamage)
HealthComponent.Damage(5);
if (((Weapon)EquipmentComponent.EquippedWeapon.Value).WeaponTag == WeaponTag.Instakill)
{
var rng = new RandomNumberGenerator();
rng.Randomize();
if (rng.Randf() <= LuckComponent.Luck.Value)
enemy.Die();
}
if (weapon.WeaponTag == WeaponTag.SelfDamage)
_playerEffectService.TakeSelfDamage(weapon.Stats.SelfDamage);
if (weapon.WeaponTag == WeaponTag.Instakill)
_playerEffectService.Instakill(enemy);
}
private void CollisionDetector_AreaEntered(Area3D area)

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

@@ -427,6 +427,34 @@ tracks/1/keys = {
"values": [0, 29]
}
[sub_resource type="Animation" id="Animation_wvcio"]
resource_name = "jump_scare"
length = 5.0005
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("SubViewportContainer/SubViewport/Prosc Message:texture")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 4.2),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [ExtResource("6_bj1ma"), ExtResource("6_bj1ma")]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("SubViewportContainer/SubViewport/Prosc Message:modulate")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.6, 1.6, 2.6, 3.6, 4.16667),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
"update": 0,
"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 0.48), Color(1, 1, 1, 1), Color(1, 1, 1, 0.48), Color(1, 1, 1, 0)]
}
[sub_resource type="Animation" id="Animation_v5qoq"]
resource_name = "normal_attack"
length = 0.666669
@@ -456,34 +484,6 @@ tracks/1/keys = {
"values": [0, 30]
}
[sub_resource type="Animation" id="Animation_wvcio"]
resource_name = "jump_scare"
length = 5.0005
tracks/0/type = "value"
tracks/0/imported = false
tracks/0/enabled = true
tracks/0/path = NodePath("SubViewportContainer/SubViewport/Prosc Message:texture")
tracks/0/interp = 1
tracks/0/loop_wrap = true
tracks/0/keys = {
"times": PackedFloat32Array(0, 4.2),
"transitions": PackedFloat32Array(1, 1),
"update": 1,
"values": [ExtResource("6_bj1ma"), ExtResource("6_bj1ma")]
}
tracks/1/type = "value"
tracks/1/imported = false
tracks/1/enabled = true
tracks/1/path = NodePath("SubViewportContainer/SubViewport/Prosc Message:modulate")
tracks/1/interp = 1
tracks/1/loop_wrap = true
tracks/1/keys = {
"times": PackedFloat32Array(0, 0.6, 1.6, 2.6, 3.6, 4.16667),
"transitions": PackedFloat32Array(1, 1, 1, 1, 1, 1),
"update": 0,
"values": [Color(1, 1, 1, 0), Color(1, 1, 1, 1), Color(1, 1, 1, 0.48), Color(1, 1, 1, 1), Color(1, 1, 1, 0.48), Color(1, 1, 1, 0)]
}
[sub_resource type="AnimationLibrary" id="AnimationLibrary_ebyyx"]
_data = {
&"Divinity_Recall": SubResource("Animation_j5wmh"),
@@ -12094,6 +12094,7 @@ animations = [{
collision_layer = 802
collision_mask = 775
script = ExtResource("1_xcol5")
HealthTimerIsActive = true
[node name="MainCollision" type="CollisionShape3D" parent="."]
unique_name_in_owner = true
@@ -12112,6 +12113,7 @@ unique_name_in_owner = true
transform = Transform3D(1, 0, 0, 0, 0.999848, -0.0174524, 0, 0.0174524, 0.999848, 0.003, 2.1, -0.01)
current = true
fov = 52.9
_maxZ = null
[node name="MeshInstance3D" type="MeshInstance3D" parent="Camera/Camera3D"]
extra_cull_margin = 16384.0

26
Zennysoft.Game.Ma/src/player/PlayerEffectService.cs Normal file
View File

@@ -0,0 +1,26 @@
using Godot;
using Zennysoft.Ma.Adapter;
using Zennysoft.Ma.Adapter.Entity;
internal class PlayerEffectService
{
private IPlayer _player;
public PlayerEffectService(IPlayer player)
{
_player = player;
}
public void TakeSelfDamage(int damage)
{
_player.TakeDamage(new AttackData(5, ElementType.None, true, true));
}
public void Instakill(IEnemy enemy)
{
var rng = new RandomNumberGenerator();
rng.Randomize();
var rand = rng.RandiRange(1, 100);
if (rand <= _player.TotalLuck)
enemy.Die();
}
}

1
Zennysoft.Game.Ma/src/player/PlayerEffectService.cs.uid Normal file
View File

@@ -0,0 +1 @@
uid://dgbhf31crsdmi