Compare commits
41 Commits
2c6af58036
...
item_chang
| Author | SHA1 | Date | |
|---|---|---|---|
| 34c125e6bb | |||
| 66905c9b53 | |||
|
|
a1f4a29eb3 | ||
| a6ea1b1873 | |||
|
|
47ceb2f613 | ||
| bf6b0d50c3 | |||
| c7603a163f | |||
| a20c80d922 | |||
| e14007b7f4 | |||
| b17c134c9a | |||
| fe0241ac88 | |||
| 0ab6ef1343 | |||
|
|
638946d23a | ||
|
|
b56668dcbe | ||
| d6faf8642a | |||
| 68b1455c53 | |||
| 9615e1e251 | |||
| c755485855 | |||
| d503413140 | |||
|
|
ac31c3ae65 | ||
|
|
549040c339 | ||
| c246d8d654 | |||
| b475df6f68 | |||
| 230b47061d | |||
| 8ce38c3c13 | |||
| 5451f0b31f | |||
| 92b4e8662f | |||
| 2f377d2d7a | |||
| 363ee1cd33 | |||
| 97198afe18 | |||
|
|
fdc4a6f2c1 | ||
|
|
843a100218 | ||
|
|
8001556f37 | ||
| 90d054a3c6 | |||
| aba325ff2b | |||
| bfaa324e6a | |||
| f08c69fa10 | |||
| 9d6aa6d88d | |||
| 654e368a65 | |||
| ce727b523a | |||
|
|
6a474576f0 |
@@ -1,8 +0,0 @@
|
||||
namespace Zennysoft.Game.Abstractions;
|
||||
|
||||
public interface IStackable
|
||||
{
|
||||
int Count { get; }
|
||||
|
||||
void SetCount(int count);
|
||||
}
|
||||
@@ -2,5 +2,5 @@
|
||||
|
||||
public interface IHealthPack
|
||||
{
|
||||
public double RestoreAmount { get; }
|
||||
public int RestoreAmount { get; }
|
||||
}
|
||||
|
||||
@@ -47,4 +47,8 @@ public partial class DimmableAudioStreamPlayer3D : AudioStreamPlayer3D, IDimmabl
|
||||
FADE_DURATION
|
||||
).SetTrans(Tween.TransitionType.Circ).SetEase(ease);
|
||||
}
|
||||
|
||||
public override void _EnterTree() => FadeIn();
|
||||
|
||||
public override void _ExitTree() => FadeOut();
|
||||
}
|
||||
|
||||
10
Zennysoft.Game.Godot.Implementation/Entity/IStackable.cs
Normal file
@@ -0,0 +1,10 @@
|
||||
using Chickensoft.Collections;
|
||||
|
||||
namespace Zennysoft.Game.Implementation;
|
||||
|
||||
public interface IStackable
|
||||
{
|
||||
AutoProp<int> Count { get; }
|
||||
|
||||
void SetCount(int count);
|
||||
}
|
||||
@@ -13,7 +13,7 @@
|
||||
<PackageReference Include="Chickensoft.Serialization.Godot" Version="0.7.6" />
|
||||
<PackageReference Include="System.IO.Abstractions" Version="22.0.11" />
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
|
||||
<ItemGroup>
|
||||
<ProjectReference Include="..\Zennysoft.Game.Abstractions\Zennysoft.Game.Abstractions.csproj" />
|
||||
|
||||
@@ -25,7 +25,7 @@ namespace Zennysoft.Ma.Adapter
|
||||
int incomingDamage,
|
||||
double elementalResistance)
|
||||
{
|
||||
var result = incomingDamage - (int)(incomingDamage * elementalResistance);
|
||||
var result = incomingDamage - (int)(incomingDamage * (elementalResistance / 100));
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -9,5 +9,6 @@ public enum ElementType
|
||||
Igneous,
|
||||
Ferrum,
|
||||
Holy,
|
||||
Curse,
|
||||
All
|
||||
}
|
||||
|
||||
@@ -5,17 +5,23 @@ using Zennysoft.Ma.Adapter.Entity;
|
||||
namespace Zennysoft.Ma.Adapter;
|
||||
public interface IEquipmentComponent : IEntityComponent
|
||||
{
|
||||
public IAutoProp<EquipableItem> EquippedWeapon { get; }
|
||||
public IAutoProp<IWeapon> EquippedWeapon { get; }
|
||||
|
||||
public IAutoProp<EquipableItem> EquippedArmor { get; }
|
||||
public IAutoProp<IArmor> EquippedArmor { get; }
|
||||
|
||||
public IAutoProp<EquipableItem> EquippedAccessory { get; }
|
||||
public IAutoProp<IAccessory> EquippedAccessory { get; }
|
||||
|
||||
public void Equip(EquipableItem equipable);
|
||||
public IAutoProp<IEquipableItem> EquippedAmmo { get; }
|
||||
|
||||
public void Unequip(EquipableItem equipable);
|
||||
public void Equip(IEquipableItem equipable);
|
||||
|
||||
public bool IsItemEquipped(InventoryItem item);
|
||||
public void Unequip(IEquipableItem equipable);
|
||||
|
||||
public bool IsItemEquipped(IEquipableItem item);
|
||||
|
||||
public void UpdateEquipment(IEquipableItem equipable);
|
||||
|
||||
public bool AugmentableEquipmentExists();
|
||||
|
||||
public int BonusAttack { get; }
|
||||
|
||||
@@ -29,5 +35,5 @@ public interface IEquipmentComponent : IEntityComponent
|
||||
|
||||
public ElementalResistanceSet ElementalResistance { get; }
|
||||
|
||||
public event Action<EquipableItem> EquipmentChanged;
|
||||
public event Action<IEquipableItem> EquipmentChanged;
|
||||
}
|
||||
|
||||
@@ -12,8 +12,12 @@ public interface IExperiencePointsComponent : IEntityComponent
|
||||
|
||||
public IAutoProp<int> Level { get; }
|
||||
|
||||
public void ModifyExpGainRate(double newRate);
|
||||
|
||||
public void Gain(int baseExpGain);
|
||||
|
||||
public void GainUnmodified(int flateRateExpGain);
|
||||
|
||||
public void LevelUp();
|
||||
|
||||
public event Action PlayerLevelUp;
|
||||
|
||||
@@ -7,9 +7,9 @@ namespace Zennysoft.Ma.Adapter.Entity
|
||||
[Save("elemental_resist_set")]
|
||||
public Dictionary<ElementType, double> ElementalResistance { get; }
|
||||
|
||||
public static ElementalResistanceSet None => new ElementalResistanceSet(0, 0, 0, 0, 0, 0);
|
||||
public static ElementalResistanceSet None => new ElementalResistanceSet(0, 0, 0, 0, 0, 0, 0);
|
||||
|
||||
public ElementalResistanceSet(double aeolicResistance, double hydricResistance, double igneousResistance, double ferrumResistance, double telluricResistance, double holyResistance)
|
||||
public ElementalResistanceSet(double aeolicResistance, double hydricResistance, double igneousResistance, double ferrumResistance, double telluricResistance, double holyResistance, double curseResistance)
|
||||
{
|
||||
ElementalResistance = new Dictionary<ElementType, double>
|
||||
{
|
||||
@@ -20,7 +20,8 @@ namespace Zennysoft.Ma.Adapter.Entity
|
||||
{ ElementType.Ferrum, ferrumResistance },
|
||||
{ ElementType.Telluric, telluricResistance },
|
||||
{ ElementType.Holy, holyResistance },
|
||||
{ ElementType.All, aeolicResistance + hydricResistance + igneousResistance + ferrumResistance + telluricResistance + holyResistance },
|
||||
{ ElementType.Curse, curseResistance },
|
||||
{ ElementType.All, aeolicResistance + hydricResistance + igneousResistance + ferrumResistance + telluricResistance + holyResistance + curseResistance },
|
||||
};
|
||||
}
|
||||
|
||||
@@ -32,7 +33,8 @@ namespace Zennysoft.Ma.Adapter.Entity
|
||||
left.ElementalResistance[ElementType.Igneous] + right.ElementalResistance[ElementType.Igneous],
|
||||
left.ElementalResistance[ElementType.Ferrum] + right.ElementalResistance[ElementType.Ferrum],
|
||||
left.ElementalResistance[ElementType.Telluric] + right.ElementalResistance[ElementType.Telluric],
|
||||
left.ElementalResistance[ElementType.Holy] + right.ElementalResistance[ElementType.Holy]);
|
||||
left.ElementalResistance[ElementType.Holy] + right.ElementalResistance[ElementType.Holy],
|
||||
left.ElementalResistance[ElementType.Curse] + right.ElementalResistance[ElementType.Curse]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
167
Zennysoft.Game.Ma.Implementation/Equipment/Augment.cs
Normal file
@@ -0,0 +1,167 @@
|
||||
using Zennysoft.Ma.Adapter;
|
||||
|
||||
public class Augment
|
||||
{
|
||||
public JewelTags AugmentTag;
|
||||
|
||||
public Augment(JewelTags tag, IAugmentType augment)
|
||||
{
|
||||
AugmentTag = tag;
|
||||
AugmentType = augment;
|
||||
}
|
||||
|
||||
public IAugmentType AugmentType { get; set; }
|
||||
}
|
||||
|
||||
public class HPRecoverySpeedAugment : IAugmentType
|
||||
{
|
||||
private readonly IPlayer _player;
|
||||
|
||||
public HPRecoverySpeedAugment(IPlayer player)
|
||||
{
|
||||
_player = player;
|
||||
}
|
||||
|
||||
public void Apply() => _player.HealthTimerHPRate += 2;
|
||||
|
||||
public void Remove() => _player.HealthTimerHPRate -= 2;
|
||||
}
|
||||
|
||||
public class BasicAugment : IAugmentType
|
||||
{
|
||||
public void Apply()
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
|
||||
public void Remove()
|
||||
{
|
||||
// do nothing
|
||||
}
|
||||
}
|
||||
|
||||
public class HastenVTAugment : IAugmentType
|
||||
{
|
||||
private readonly IPlayer _player;
|
||||
|
||||
public HastenVTAugment(IPlayer player)
|
||||
{
|
||||
_player = player;
|
||||
}
|
||||
|
||||
public void Apply() => _player.ModifyHealthTimerSpeed(_player.HealthTimerSpeedModifier + 0.25f);
|
||||
|
||||
public void Remove() => _player.ModifyHealthTimerSpeed(_player.HealthTimerSpeedModifier - 0.25f);
|
||||
}
|
||||
|
||||
public class SlowVTReductionAugment : IAugmentType
|
||||
{
|
||||
private readonly IPlayer _player;
|
||||
|
||||
public SlowVTReductionAugment(IPlayer player)
|
||||
{
|
||||
_player = player;
|
||||
}
|
||||
|
||||
public void Apply() => _player.ModifyHealthTimerSpeed(_player.HealthTimerSpeedModifier - 0.25f);
|
||||
|
||||
public void Remove() => _player.ModifyHealthTimerSpeed(_player.HealthTimerSpeedModifier + 0.25f);
|
||||
}
|
||||
|
||||
public class IncreaseEXPRateAugment : IAugmentType
|
||||
{
|
||||
private readonly IPlayer _player;
|
||||
|
||||
public IncreaseEXPRateAugment(IPlayer player)
|
||||
{
|
||||
_player = player;
|
||||
}
|
||||
|
||||
public void Apply() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value + 0.25f);
|
||||
public void Remove() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value - 0.25f);
|
||||
}
|
||||
|
||||
public class LowerEXPRateAugment : IAugmentType
|
||||
{
|
||||
private readonly IPlayer _player;
|
||||
|
||||
public LowerEXPRateAugment(IPlayer player)
|
||||
{
|
||||
_player = player;
|
||||
}
|
||||
|
||||
public void Apply() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value - 0.25f);
|
||||
public void Remove() => _player.ExperiencePointsComponent.ModifyExpGainRate(_player.ExperiencePointsComponent.ExpGainRate.Value + 0.25f);
|
||||
}
|
||||
|
||||
public class LowerHPRecoveryAugment : IAugmentType
|
||||
{
|
||||
private readonly IPlayer _player;
|
||||
|
||||
public LowerHPRecoveryAugment(IPlayer player)
|
||||
{
|
||||
_player = player;
|
||||
}
|
||||
|
||||
public void Apply() => _player.HealthTimerHPRate -= 1;
|
||||
public void Remove() => _player.HealthTimerHPRate += 1;
|
||||
}
|
||||
|
||||
public class IdentifyAllItemsAugment : IAugmentType
|
||||
{
|
||||
private readonly IPlayer _player;
|
||||
|
||||
public IdentifyAllItemsAugment(IPlayer player)
|
||||
{
|
||||
_player = player;
|
||||
}
|
||||
|
||||
public void Apply()
|
||||
{
|
||||
_player.AutoIdentifyItems = true;
|
||||
foreach (var item in _player.Inventory.Items.ToList())
|
||||
{
|
||||
if (item.ItemTag == ItemTag.MysteryItem)
|
||||
_player.IdentifyItem(item);
|
||||
}
|
||||
}
|
||||
|
||||
public void Remove()
|
||||
{
|
||||
var weaponAugment = _player.EquipmentComponent.EquippedWeapon.Value.Augment;
|
||||
var armorAugment = _player.EquipmentComponent.EquippedArmor.Value.Augment;
|
||||
var accessoryAugment = _player.EquipmentComponent.EquippedAccessory.Value.Augment;
|
||||
var augments = new List<Augment?>() { weaponAugment, armorAugment, accessoryAugment };
|
||||
if (augments.Count(x => x != null && x.AugmentTag == JewelTags.AutoIdentifyAllItems) > 1)
|
||||
return;
|
||||
else
|
||||
_player.AutoIdentifyItems = false;
|
||||
}
|
||||
}
|
||||
|
||||
public class RevivePlayerAugment : IAugmentType
|
||||
{
|
||||
private readonly IPlayer _player;
|
||||
|
||||
public RevivePlayerAugment(IPlayer player)
|
||||
{
|
||||
_player = player;
|
||||
}
|
||||
|
||||
public void Apply()
|
||||
{
|
||||
_player.AutoRevive = true;
|
||||
}
|
||||
|
||||
public void Remove()
|
||||
{
|
||||
var weaponAugment = _player.EquipmentComponent.EquippedWeapon.Value.Augment;
|
||||
var armorAugment = _player.EquipmentComponent.EquippedArmor.Value.Augment;
|
||||
var accessoryAugment = _player.EquipmentComponent.EquippedAccessory.Value.Augment;
|
||||
var augments = new List<Augment?>() { weaponAugment, armorAugment, accessoryAugment };
|
||||
if (augments.Count(x => x != null && x.AugmentTag == JewelTags.ReviveUserOnce) > 1)
|
||||
return;
|
||||
else
|
||||
_player.AutoRevive = false;
|
||||
}
|
||||
}
|
||||
@@ -1,22 +0,0 @@
|
||||
using Chickensoft.Introspection;
|
||||
using Chickensoft.Serialization;
|
||||
using Zennysoft.Ma.Adapter.Entity;
|
||||
|
||||
namespace Zennysoft.Ma.Adapter;
|
||||
|
||||
[Meta, Id("equipable_item")]
|
||||
public abstract partial class EquipableItem : InventoryItem
|
||||
{
|
||||
[Save("bonus_attack_stats")]
|
||||
public virtual int BonusAttack { get; }
|
||||
[Save("bonus_defense_stats")]
|
||||
public virtual int BonusDefense { get; }
|
||||
[Save("bonus_hp_stats")]
|
||||
public virtual int BonusHP { get; }
|
||||
[Save("bonus_vt_stats")]
|
||||
public virtual int BonusVT { get; }
|
||||
[Save("bonus_luck_stats")]
|
||||
public virtual int BonusLuck { get; }
|
||||
[Save("bonus_elemental_resist_stats")]
|
||||
public virtual ElementalResistanceSet ElementalResistance { get; } = new ElementalResistanceSet(0, 0, 0, 0, 0, 0);
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
public interface IAugmentType
|
||||
{
|
||||
void Apply();
|
||||
|
||||
void Remove();
|
||||
}
|
||||
@@ -1,26 +0,0 @@
|
||||
using Chickensoft.Introspection;
|
||||
using Chickensoft.Serialization;
|
||||
using Godot;
|
||||
|
||||
namespace Zennysoft.Ma.Adapter;
|
||||
|
||||
[Meta, Id("inventory_item")]
|
||||
public abstract partial class InventoryItem : Node3D
|
||||
{
|
||||
[Save("inventory_item_id")]
|
||||
public Guid ID => Guid.NewGuid();
|
||||
[Save("inventory_item_name")]
|
||||
public abstract string ItemName { get; }
|
||||
[Save("inventory_item_description")]
|
||||
public abstract string Description { get; }
|
||||
[Save("inventory_item_spawn_rate")]
|
||||
public abstract float SpawnRate { get; }
|
||||
[Save("inventory_item_throw_damage")]
|
||||
public abstract int ThrowDamage { get; }
|
||||
[Save("inventory_item_throw_speed")]
|
||||
public abstract float ThrowSpeed { get; }
|
||||
[Save("inventory_item_tag")]
|
||||
public abstract ItemTag ItemTag { get; }
|
||||
|
||||
public abstract Texture2D GetTexture();
|
||||
}
|
||||
21
Zennysoft.Game.Ma.Implementation/Equipment/Tags/JewelTags.cs
Normal file
@@ -0,0 +1,21 @@
|
||||
|
||||
public enum JewelTags
|
||||
{
|
||||
None,
|
||||
AeolicElement,
|
||||
IncreaseHPRecovery,
|
||||
HastenVT,
|
||||
LowerEXPGain,
|
||||
Glue,
|
||||
ItemRescue,
|
||||
HydricElement,
|
||||
IgneousElement,
|
||||
IncreaseEXPGain,
|
||||
LowerHPRecovery,
|
||||
SlowVTReduction,
|
||||
AutoIdentifyAllItems,
|
||||
ReviveUserOnce,
|
||||
TelluricElement,
|
||||
IncreaseAtkDefLuck,
|
||||
IncreaseLuck
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
namespace Zennysoft.Ma.Adapter;
|
||||
|
||||
public enum ThrowableItemTag
|
||||
{
|
||||
None,
|
||||
DoubleExp,
|
||||
LowerTargetTo1HP,
|
||||
CanChangeAffinity,
|
||||
TeleportToRandomLocation,
|
||||
WarpToExitIfFound
|
||||
}
|
||||
@@ -16,4 +16,9 @@ public enum UsableItemTag
|
||||
RaiseCurrentDefenseArmor,
|
||||
RaiseLevel,
|
||||
RandomEffect,
|
||||
DoubleExp,
|
||||
LowerTargetTo1HP,
|
||||
CanChangeAffinity,
|
||||
TeleportToRandomLocation,
|
||||
WarpToExitIfFound
|
||||
}
|
||||
|
||||
@@ -8,5 +8,11 @@ public enum WeaponTag
|
||||
IgnoreDefense,
|
||||
Knockback,
|
||||
InverseHPAttackPower,
|
||||
RustChanceSelfAndEnemy
|
||||
RustChanceSelfAndEnemy,
|
||||
Instakill,
|
||||
DegradeOnSwing,
|
||||
DoubleAttack,
|
||||
TripleAttack,
|
||||
ElementalProjectile,
|
||||
KineticProjectile
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@
|
||||
using Godot;
|
||||
using Zennysoft.Game.Abstractions;
|
||||
using Zennysoft.Game.Implementation;
|
||||
using Zennysoft.Ma.Adapter.Entity;
|
||||
|
||||
namespace Zennysoft.Ma.Adapter;
|
||||
|
||||
@@ -19,7 +20,7 @@ public interface IGameRepo : IDisposable
|
||||
|
||||
event Action? DoubleExpTimeEnd;
|
||||
|
||||
event Action<InventoryItem>? RemoveItemFromInventoryEvent;
|
||||
event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
|
||||
|
||||
event Action? PlayerAttack;
|
||||
|
||||
@@ -27,11 +28,11 @@ public interface IGameRepo : IDisposable
|
||||
|
||||
event Action? PlayerAttackedEnemy;
|
||||
|
||||
event Action<EquipableItem>? EquippedItem;
|
||||
event Action<IEquipableItem>? EquippedItem;
|
||||
|
||||
event Action<EquipableItem>? UnequippedItem;
|
||||
event Action<IEquipableItem>? UnequippedItem;
|
||||
|
||||
event Action<IHealthPack>? RestorativePickedUp;
|
||||
event Action<IEnemy>? EnemyDied;
|
||||
|
||||
void Pause();
|
||||
|
||||
@@ -47,21 +48,21 @@ public interface IGameRepo : IDisposable
|
||||
|
||||
public void AnnounceMessageInInventory(string message);
|
||||
|
||||
public void RemoveItemFromInventory(InventoryItem item);
|
||||
public void RemoveItemFromInventory(IBaseInventoryItem item);
|
||||
|
||||
public void OnPlayerAttack();
|
||||
|
||||
public void OnPlayerAttackedWall();
|
||||
|
||||
public void OnRestorativePickedUp(IHealthPack restorative);
|
||||
|
||||
public void CloseInventory();
|
||||
|
||||
public void GameEnded();
|
||||
|
||||
public void OnEquippedItem(EquipableItem item);
|
||||
public void OnEquippedItem(IEquipableItem item);
|
||||
|
||||
public void OnUnequippedItem(EquipableItem item);
|
||||
public void OnUnequippedItem(IEquipableItem item);
|
||||
|
||||
public void OnEnemyDied(IEnemy enemy);
|
||||
|
||||
public double ExpRate { get; }
|
||||
}
|
||||
@@ -74,13 +75,13 @@ public class GameRepo : IGameRepo
|
||||
public event Action<string>? AnnounceMessageInInventoryEvent;
|
||||
public event Action<int>? DoubleExpTimeStart;
|
||||
public event Action? DoubleExpTimeEnd;
|
||||
public event Action<InventoryItem>? RemoveItemFromInventoryEvent;
|
||||
public event Action<IBaseInventoryItem>? RemoveItemFromInventoryEvent;
|
||||
public event Action? PlayerAttack;
|
||||
public event Action? PlayerAttackedWall;
|
||||
public event Action? PlayerAttackedEnemy;
|
||||
public event Action<EquipableItem>? EquippedItem;
|
||||
public event Action<EquipableItem>? UnequippedItem;
|
||||
public event Action<IHealthPack>? RestorativePickedUp;
|
||||
public event Action<IEquipableItem>? EquippedItem;
|
||||
public event Action<IEquipableItem>? UnequippedItem;
|
||||
public event Action<IEnemy>? EnemyDied;
|
||||
public IAutoProp<bool> IsPaused => _isPaused;
|
||||
private readonly AutoProp<bool> _isPaused;
|
||||
|
||||
@@ -110,14 +111,14 @@ public class GameRepo : IGameRepo
|
||||
{
|
||||
AnnounceMessageInInventory("Experience points temporarily doubled.");
|
||||
DoubleExpTimeStart?.Invoke(lengthOfEffect.Seconds);
|
||||
ExpRate = 2;
|
||||
ExpRate *= 2;
|
||||
}
|
||||
|
||||
public void EndDoubleExp()
|
||||
{
|
||||
AnnounceMessageOnMainScreen("Experience points effect wore off.");
|
||||
DoubleExpTimeEnd?.Invoke();
|
||||
ExpRate = 1;
|
||||
ExpRate /= 2;
|
||||
}
|
||||
|
||||
public void AnnounceMessageOnMainScreen(string message)
|
||||
@@ -130,7 +131,7 @@ public class GameRepo : IGameRepo
|
||||
AnnounceMessageInInventoryEvent?.Invoke(message);
|
||||
}
|
||||
|
||||
public void RemoveItemFromInventory(InventoryItem item)
|
||||
public void RemoveItemFromInventory(IBaseInventoryItem item)
|
||||
{
|
||||
RemoveItemFromInventoryEvent?.Invoke(item);
|
||||
}
|
||||
@@ -145,19 +146,16 @@ public class GameRepo : IGameRepo
|
||||
PlayerAttackedWall?.Invoke();
|
||||
}
|
||||
|
||||
public void OnRestorativePickedUp(IHealthPack restorative)
|
||||
{
|
||||
RestorativePickedUp?.Invoke(restorative);
|
||||
}
|
||||
|
||||
public void CloseInventory()
|
||||
{
|
||||
CloseInventoryEvent?.Invoke();
|
||||
}
|
||||
|
||||
public void OnEquippedItem(EquipableItem item) => EquippedItem?.Invoke(item);
|
||||
public void OnEquippedItem(IEquipableItem item) => EquippedItem?.Invoke(item);
|
||||
|
||||
public void OnUnequippedItem(EquipableItem item) => UnequippedItem?.Invoke(item);
|
||||
public void OnUnequippedItem(IEquipableItem item) => UnequippedItem?.Invoke(item);
|
||||
|
||||
public void OnEnemyDied(IEnemy enemy) => EnemyDied?.Invoke(enemy);
|
||||
|
||||
public void GameEnded()
|
||||
{
|
||||
|
||||
@@ -8,13 +8,20 @@ public partial class GameState
|
||||
public partial record State
|
||||
{
|
||||
[Meta, LogicBlock(typeof(State), Diagram = true)]
|
||||
public partial record GameOver : State, IGet<Input.NewGame>
|
||||
public partial record GameOver : InGame, IGet<Input.NewGame>, IGet<Input.ExitGame>
|
||||
{
|
||||
public Transition On(in Input.NewGame input)
|
||||
{
|
||||
Output(new Output.InitializeGame());
|
||||
return To<InGame>();
|
||||
}
|
||||
|
||||
public Transition On(in Input.ExitGame input)
|
||||
{
|
||||
Output(new Output.ClosePauseScreen());
|
||||
Output(new Output.ExitGame());
|
||||
return To<State>();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
5
Zennysoft.Game.Ma.Implementation/Item/IAccessory.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
using Zennysoft.Ma.Adapter;
|
||||
|
||||
public interface IAccessory : IEquipableItem, IAugmentableItem
|
||||
{
|
||||
}
|
||||
5
Zennysoft.Game.Ma.Implementation/Item/IArmor.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
using Zennysoft.Ma.Adapter;
|
||||
|
||||
public interface IArmor : IEquipableItem, IAugmentableItem
|
||||
{
|
||||
}
|
||||
5
Zennysoft.Game.Ma.Implementation/Item/IAugmentItem.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
public interface IAugmentItem : IBaseInventoryItem
|
||||
{
|
||||
|
||||
public IAugmentType Augment { get; }
|
||||
}
|
||||
@@ -0,0 +1,7 @@
|
||||
namespace Zennysoft.Ma.Adapter
|
||||
{
|
||||
public interface IAugmentableItem
|
||||
{
|
||||
public Augment? Augment { get; }
|
||||
}
|
||||
}
|
||||
15
Zennysoft.Game.Ma.Implementation/Item/IBaseInventoryItem.cs
Normal file
@@ -0,0 +1,15 @@
|
||||
|
||||
using Godot;
|
||||
using Zennysoft.Ma.Adapter;
|
||||
|
||||
public interface IBaseInventoryItem
|
||||
{
|
||||
public string ItemName { get; }
|
||||
public string Description { get; }
|
||||
public float SpawnRate { get; }
|
||||
public int ThrowDamage { get; }
|
||||
public float ThrowSpeed { get; }
|
||||
public ItemTag ItemTag { get; }
|
||||
|
||||
public abstract Texture2D GetTexture();
|
||||
}
|
||||
@@ -4,6 +4,6 @@
|
||||
{
|
||||
void RescueItem();
|
||||
|
||||
public InventoryItem Item { get; }
|
||||
public IBaseInventoryItem Item { get; }
|
||||
}
|
||||
}
|
||||
|
||||
14
Zennysoft.Game.Ma.Implementation/Item/IEquipableItem.cs
Normal file
@@ -0,0 +1,14 @@
|
||||
using Zennysoft.Ma.Adapter.Entity;
|
||||
|
||||
public interface IEquipableItem : IBaseInventoryItem
|
||||
{
|
||||
public int BonusAttack { get; }
|
||||
public int BonusDefense { get; }
|
||||
public int BonusHP { get; }
|
||||
public int BonusVT { get; }
|
||||
public int BonusLuck { get; }
|
||||
|
||||
public bool Glued { get; set; }
|
||||
|
||||
public ElementalResistanceSet ElementalResistance { get; }
|
||||
}
|
||||
@@ -2,17 +2,19 @@
|
||||
|
||||
public interface IInventory
|
||||
{
|
||||
public bool PickUpItem(InventoryItem item);
|
||||
public bool PickUpItem(IBaseInventoryItem item);
|
||||
|
||||
public List<InventoryItem> Items { get; }
|
||||
public List<IBaseInventoryItem> Items { get; }
|
||||
|
||||
public bool TryAdd(InventoryItem inventoryItem);
|
||||
public bool TryAdd(IBaseInventoryItem inventoryItem);
|
||||
|
||||
public bool TryInsert(InventoryItem inventoryItem, int index);
|
||||
public bool TryInsert(IBaseInventoryItem inventoryItem, int index);
|
||||
|
||||
public void Remove(InventoryItem inventoryItem);
|
||||
public void Remove(IBaseInventoryItem inventoryItem);
|
||||
|
||||
public bool Sort(EquipableItem currentWeapon, EquipableItem currentArmor, EquipableItem currentAccessory);
|
||||
public bool Sort(IWeapon currentWeapon, IArmor currentArmor, IAccessory currentAccessory, IEquipableItem ammo);
|
||||
|
||||
public bool AtCapacity();
|
||||
|
||||
public event Action<string> BroadcastMessage;
|
||||
public event Action InventoryChanged;
|
||||
|
||||
@@ -2,5 +2,5 @@
|
||||
|
||||
public interface IThrownItem
|
||||
{
|
||||
public InventoryItem ItemThatIsThrown { get; set; }
|
||||
public IBaseInventoryItem ItemThatIsThrown { get; set; }
|
||||
}
|
||||
|
||||
5
Zennysoft.Game.Ma.Implementation/Item/IWeapon.cs
Normal file
@@ -0,0 +1,5 @@
|
||||
using Zennysoft.Ma.Adapter;
|
||||
|
||||
public interface IWeapon : IEquipableItem, IAugmentableItem
|
||||
{
|
||||
}
|
||||
@@ -7,10 +7,10 @@ namespace Zennysoft.Ma.Adapter;
|
||||
public partial class RescuedItemDatabase
|
||||
{
|
||||
[Save("rescued_item_list")]
|
||||
public List<InventoryItem> Items { get; init; }
|
||||
public List<IBaseInventoryItem> Items { get; init; }
|
||||
|
||||
public RescuedItemDatabase()
|
||||
{
|
||||
Items = new List<InventoryItem>();
|
||||
Items = new List<IBaseInventoryItem>();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,9 +11,6 @@ public partial class ItemTagEnumContext : JsonSerializerContext;
|
||||
[JsonSerializable(typeof(AccessoryTag))]
|
||||
public partial class AccessoryTagEnumContext : JsonSerializerContext;
|
||||
|
||||
[JsonSerializable(typeof(ThrowableItemTag))]
|
||||
public partial class ThrowableItemTagEnumContext : JsonSerializerContext;
|
||||
|
||||
[JsonSerializable(typeof(UsableItemTag))]
|
||||
public partial class UsableItemTagEnumContext : JsonSerializerContext;
|
||||
|
||||
|
||||
@@ -20,12 +20,16 @@ public interface IPlayer : IKillable, ICharacterBody3D
|
||||
|
||||
public void TeleportPlayer((Vector3 Rotation, Vector3 Position) newTransform);
|
||||
|
||||
public void Equip(EquipableItem equipable);
|
||||
public void Equip(IEquipableItem equipable);
|
||||
|
||||
public void Unequip(EquipableItem equipable);
|
||||
public void Unequip(IEquipableItem equipable);
|
||||
|
||||
public void PlayJumpScareAnimation();
|
||||
|
||||
public void ApplyNewAugment(IAugmentItem jewel, IAugmentableItem equipableItem);
|
||||
|
||||
public void IdentifyItem(IBaseInventoryItem unidentifiedItem);
|
||||
|
||||
public IInventory Inventory { get; }
|
||||
|
||||
public IHealthComponent HealthComponent { get; }
|
||||
@@ -44,8 +48,20 @@ public interface IPlayer : IKillable, ICharacterBody3D
|
||||
|
||||
public void SetHealthTimerStatus(bool isActive);
|
||||
|
||||
public bool CanEquipState { get; set; }
|
||||
public void ModifyHealthTimerSpeed(float newModifier);
|
||||
|
||||
public bool AutoRevive { get; set; }
|
||||
|
||||
public int TotalAttack { get; }
|
||||
public int TotalDefense { get; }
|
||||
public int TotalLuck { get; }
|
||||
|
||||
public int HealthTimerHPRate { get; set; }
|
||||
|
||||
public float HealthTimerSpeedModifier { get; }
|
||||
|
||||
public bool AutoIdentifyItems { get; set; }
|
||||
|
||||
public event Action PlayerDied;
|
||||
public delegate InventoryItem RerollItem(InventoryItem item);
|
||||
public delegate IBaseInventoryItem RerollItem(IBaseInventoryItem item);
|
||||
}
|
||||
|
||||
@@ -8,8 +8,6 @@ public partial class PlayerLogic
|
||||
{
|
||||
public readonly record struct PhysicsTick(double Delta);
|
||||
|
||||
public readonly record struct Moved(Vector3 GlobalPosition, Transform3D GlobalTransform);
|
||||
|
||||
public readonly record struct Enable;
|
||||
|
||||
public readonly record struct Attack;
|
||||
|
||||
@@ -19,7 +19,7 @@ public sealed class MaSaveFileManager : IMaSaveFileManager
|
||||
public MaSaveFileManager(ISaveFileManager saveFileManager)
|
||||
{
|
||||
_saveFileManager = saveFileManager;
|
||||
_converters = [WeaponTagEnumContext.Default, ItemTagEnumContext.Default, ElementTypeEnumContext.Default, AccessoryTagEnumContext.Default, ThrowableItemTagEnumContext.Default, UsableItemTagEnumContext.Default, BoxItemTagEnumContext.Default];
|
||||
_converters = [WeaponTagEnumContext.Default, ItemTagEnumContext.Default, ElementTypeEnumContext.Default, AccessoryTagEnumContext.Default, UsableItemTagEnumContext.Default, BoxItemTagEnumContext.Default];
|
||||
}
|
||||
|
||||
public async Task Save<T>(T gameData)
|
||||
|
||||
@@ -38,7 +38,7 @@ public partial class InGameUILogic
|
||||
Output(new Output.AnnounceMessageInInventory(message));
|
||||
}
|
||||
|
||||
private void OnRemoveItemFromInventory(InventoryItem item) => Output(new Output.RemoveItemFromInventory(item));
|
||||
private void OnRemoveItemFromInventory(IBaseInventoryItem item) => Output(new Output.RemoveItemFromInventory(item));
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -8,7 +8,7 @@ public partial class InGameUILogic
|
||||
{
|
||||
public readonly record struct AnnounceMessageOnMainScreen(string Message);
|
||||
public readonly record struct AnnounceMessageInInventory(string Message);
|
||||
public readonly record struct RemoveItemFromInventory(InventoryItem Item);
|
||||
public readonly record struct RemoveItemFromInventory(IBaseInventoryItem Item);
|
||||
public readonly record struct ShowInventory;
|
||||
public readonly record struct HideInventory;
|
||||
}
|
||||
|
||||
@@ -1,23 +1,22 @@
|
||||
[preset.0]
|
||||
|
||||
name="Steamdeck"
|
||||
platform="Linux"
|
||||
name="Windows Desktop"
|
||||
platform="Windows Desktop"
|
||||
runnable=true
|
||||
advanced_options=false
|
||||
advanced_options=true
|
||||
dedicated_server=false
|
||||
custom_features=""
|
||||
export_filter="exclude"
|
||||
export_files=PackedStringArray()
|
||||
export_filter="all_resources"
|
||||
include_filter=""
|
||||
exclude_filter=""
|
||||
export_path=""
|
||||
export_path="Export/Ma.exe"
|
||||
patches=PackedStringArray()
|
||||
encryption_include_filters=""
|
||||
encryption_exclude_filters=""
|
||||
seed=0
|
||||
encrypt_pck=false
|
||||
encrypt_directory=false
|
||||
script_export_mode=2
|
||||
script_export_mode=1
|
||||
|
||||
[preset.0.options]
|
||||
|
||||
@@ -28,51 +27,6 @@ binary_format/embed_pck=false
|
||||
texture_format/s3tc_bptc=true
|
||||
texture_format/etc2_astc=false
|
||||
binary_format/architecture="x86_64"
|
||||
ssh_remote_deploy/enabled=false
|
||||
ssh_remote_deploy/host="user@host_ip"
|
||||
ssh_remote_deploy/port="22"
|
||||
ssh_remote_deploy/extra_args_ssh=""
|
||||
ssh_remote_deploy/extra_args_scp=""
|
||||
ssh_remote_deploy/run_script="#!/usr/bin/env bash
|
||||
export DISPLAY=:0
|
||||
unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
|
||||
\"{temp_dir}/{exe_name}\" {cmd_args}"
|
||||
ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
|
||||
kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
|
||||
rm -rf \"{temp_dir}\""
|
||||
dotnet/include_scripts_content=false
|
||||
dotnet/include_debug_symbols=true
|
||||
dotnet/embed_build_outputs=false
|
||||
|
||||
[preset.1]
|
||||
|
||||
name="Windows Desktop"
|
||||
platform="Windows Desktop"
|
||||
runnable=true
|
||||
advanced_options=false
|
||||
dedicated_server=false
|
||||
custom_features=""
|
||||
export_filter="all_resources"
|
||||
include_filter=""
|
||||
exclude_filter=""
|
||||
export_path="Output/Ma.zip"
|
||||
patches=PackedStringArray()
|
||||
encryption_include_filters=""
|
||||
encryption_exclude_filters=""
|
||||
seed=0
|
||||
encrypt_pck=false
|
||||
encrypt_directory=false
|
||||
script_export_mode=2
|
||||
|
||||
[preset.1.options]
|
||||
|
||||
custom_template/debug=""
|
||||
custom_template/release=""
|
||||
debug/export_console_wrapper=0
|
||||
binary_format/embed_pck=true
|
||||
texture_format/s3tc_bptc=true
|
||||
texture_format/etc2_astc=false
|
||||
binary_format/architecture="x86_64"
|
||||
codesign/enable=false
|
||||
codesign/timestamp=true
|
||||
codesign/timestamp_server_url=""
|
||||
@@ -111,5 +65,5 @@ ssh_remote_deploy/cleanup_script="Stop-ScheduledTask -TaskName godot_remote_debu
|
||||
Unregister-ScheduledTask -TaskName godot_remote_debug -Confirm:$false -ErrorAction:SilentlyContinue
|
||||
Remove-Item -Recurse -Force '{temp_dir}'"
|
||||
dotnet/include_scripts_content=false
|
||||
dotnet/include_debug_symbols=false
|
||||
dotnet/include_debug_symbols=true
|
||||
dotnet/embed_build_outputs=false
|
||||
|
||||
@@ -12,9 +12,8 @@ config_version=5
|
||||
|
||||
config/name="Ma"
|
||||
run/main_scene="uid://d1gjaijijd5ot"
|
||||
run/print_header=false
|
||||
config/features=PackedStringArray("4.4", "C#", "GL Compatibility")
|
||||
run/delta_smoothing=false
|
||||
run/max_fps=60
|
||||
boot_splash/show_image=false
|
||||
|
||||
[autoload]
|
||||
@@ -42,6 +41,10 @@ window/stretch/mode="canvas_items"
|
||||
|
||||
project/assembly_name="Ma"
|
||||
|
||||
[editor]
|
||||
|
||||
export/convert_text_resources_to_binary=false
|
||||
|
||||
[editor_plugins]
|
||||
|
||||
enabled=PackedStringArray("res://addons/dialogue_manager/plugin.cfg", "res://addons/input_helper/plugin.cfg")
|
||||
@@ -76,10 +79,16 @@ folder_colors={
|
||||
|
||||
import/blender/enabled=false
|
||||
|
||||
[global_group]
|
||||
|
||||
DimmableAudio=""
|
||||
|
||||
[importer_defaults]
|
||||
|
||||
texture={
|
||||
"detect_3d/compress_to": 0
|
||||
&"compress/high_quality": true,
|
||||
&"compress/mode": 2,
|
||||
&"detect_3d/compress_to": 0
|
||||
}
|
||||
|
||||
[input]
|
||||
@@ -265,7 +274,7 @@ EnemyViewerWalk={
|
||||
|
||||
[internationalization]
|
||||
|
||||
locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue", "res://stone.dialogue", "res://src/npc/Proscenium/JumpScare.dialogue")
|
||||
locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialogue", "res://src/npc/Ran/ran.dialogue", "res://src/npc/Rat/ratdialogue.dialogue", "res://src/dialog/Altar.dialogue", "res://stone.dialogue", "res://src/npc/Proscenium/JumpScare.dialogue", "res://tutorialstone.dialogue")
|
||||
|
||||
[layer_names]
|
||||
|
||||
@@ -293,6 +302,7 @@ locale/translations_pot_files=PackedStringArray("res://src/dialog/Dialogue.dialo
|
||||
|
||||
3d/run_on_separate_thread=true
|
||||
common/physics_ticks_per_second=144
|
||||
jolt_physics_3d/simulation/areas_detect_static_bodies=true
|
||||
|
||||
[rendering]
|
||||
|
||||
|
||||
1
Zennysoft.Game.Ma/src/Components/AugmentComponent.cs.uid
Normal file
@@ -0,0 +1 @@
|
||||
uid://bevfcpew3kket
|
||||
@@ -1,5 +1,4 @@
|
||||
using Chickensoft.Collections;
|
||||
using Godot;
|
||||
using System;
|
||||
using Zennysoft.Ma.Adapter;
|
||||
using Zennysoft.Ma.Adapter.Entity;
|
||||
@@ -7,19 +6,23 @@ using Zennysoft.Ma.Adapter.Entity;
|
||||
namespace Zennysoft.Game.Ma;
|
||||
public class EquipmentComponent : IEquipmentComponent
|
||||
{
|
||||
public IAutoProp<EquipableItem> EquippedWeapon => _equippedWeapon;
|
||||
public IAutoProp<IWeapon> EquippedWeapon => _equippedWeapon;
|
||||
|
||||
public IAutoProp<EquipableItem> EquippedArmor => _equippedArmor;
|
||||
public IAutoProp<IArmor> EquippedArmor => _equippedArmor;
|
||||
|
||||
public IAutoProp<EquipableItem> EquippedAccessory => _equippedAccessory;
|
||||
public IAutoProp<IAccessory> EquippedAccessory => _equippedAccessory;
|
||||
|
||||
public AutoProp<EquipableItem> _equippedWeapon;
|
||||
public IAutoProp<IEquipableItem> EquippedAmmo => _equippedAmmo;
|
||||
|
||||
public AutoProp<EquipableItem> _equippedArmor;
|
||||
public AutoProp<IWeapon> _equippedWeapon;
|
||||
|
||||
public AutoProp<EquipableItem> _equippedAccessory;
|
||||
public AutoProp<IArmor> _equippedArmor;
|
||||
|
||||
public event Action<EquipableItem> EquipmentChanged;
|
||||
public AutoProp<IAccessory> _equippedAccessory;
|
||||
|
||||
public AutoProp<IEquipableItem> _equippedAmmo;
|
||||
|
||||
public event Action<IEquipableItem> EquipmentChanged;
|
||||
|
||||
public int BonusAttack => _equippedWeapon.Value.BonusAttack + _equippedArmor.Value.BonusAttack + _equippedAccessory.Value.BonusAttack;
|
||||
|
||||
@@ -35,9 +38,10 @@ public class EquipmentComponent : IEquipmentComponent
|
||||
|
||||
public EquipmentComponent()
|
||||
{
|
||||
_equippedWeapon = new AutoProp<EquipableItem>(new Weapon());
|
||||
_equippedArmor = new AutoProp<EquipableItem>(new Armor());
|
||||
_equippedAccessory = new AutoProp<EquipableItem>(new Accessory());
|
||||
_equippedWeapon = new AutoProp<IWeapon>(new Weapon());
|
||||
_equippedArmor = new AutoProp<IArmor>(new Armor());
|
||||
_equippedAccessory = new AutoProp<IAccessory>(new Accessory());
|
||||
_equippedAmmo = new AutoProp<IEquipableItem>(new Ammo());
|
||||
}
|
||||
|
||||
public void Reset()
|
||||
@@ -45,9 +49,10 @@ public class EquipmentComponent : IEquipmentComponent
|
||||
_equippedWeapon.OnNext(new Weapon());
|
||||
_equippedArmor.OnNext(new Armor());
|
||||
_equippedAccessory.OnNext(new Accessory());
|
||||
_equippedAmmo.OnNext(new Ammo());
|
||||
}
|
||||
|
||||
public void Equip(EquipableItem equipable)
|
||||
public void Equip(IEquipableItem equipable)
|
||||
{
|
||||
if (equipable is Weapon weapon)
|
||||
_equippedWeapon.OnNext(weapon);
|
||||
@@ -55,10 +60,12 @@ public class EquipmentComponent : IEquipmentComponent
|
||||
_equippedArmor.OnNext(armor);
|
||||
if (equipable is Accessory accessory)
|
||||
_equippedAccessory.OnNext(accessory);
|
||||
if (equipable is Ammo ammo)
|
||||
_equippedAmmo.OnNext(ammo);
|
||||
EquipmentChanged?.Invoke(equipable);
|
||||
}
|
||||
|
||||
public void Unequip(EquipableItem equipable)
|
||||
public void Unequip(IEquipableItem equipable)
|
||||
{
|
||||
if (equipable is Weapon weapon)
|
||||
_equippedWeapon.OnNext(new Weapon());
|
||||
@@ -66,14 +73,20 @@ public class EquipmentComponent : IEquipmentComponent
|
||||
_equippedArmor.OnNext(new Armor());
|
||||
if (equipable is Accessory accessory)
|
||||
_equippedAccessory.OnNext(new Accessory());
|
||||
if (equipable is Ammo ammo)
|
||||
_equippedAmmo.OnNext(new Ammo());
|
||||
EquipmentChanged?.Invoke(equipable);
|
||||
}
|
||||
|
||||
public bool IsItemEquipped(InventoryItem item)
|
||||
public bool IsItemEquipped(IEquipableItem item)
|
||||
{
|
||||
if (item is not EquipableItem)
|
||||
return false;
|
||||
return item == _equippedWeapon.Value || item == _equippedArmor.Value || item == _equippedAccessory.Value || item == _equippedAmmo.Value;
|
||||
}
|
||||
|
||||
return item == _equippedWeapon.Value || item == _equippedArmor.Value || item == _equippedAccessory.Value;
|
||||
public void UpdateEquipment(IEquipableItem equipable) => EquipmentChanged?.Invoke(equipable);
|
||||
|
||||
public bool AugmentableEquipmentExists()
|
||||
{
|
||||
return (_equippedWeapon.Value.ItemName != null && _equippedWeapon.Value.Augment == null) || (_equippedArmor.Value.ItemName != null && _equippedArmor.Value.Augment == null) || (_equippedAccessory.Value.ItemName != null && _equippedAccessory.Value.Augment == null);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -52,6 +52,17 @@ public class ExperiencePointsComponent : IExperiencePointsComponent
|
||||
_currentExp.OnNext(cappedAmount);
|
||||
}
|
||||
|
||||
public void GainUnmodified(int flatRateExp)
|
||||
{
|
||||
var newCurrentExpTotal = flatRateExp + _currentExp.Value;
|
||||
while (flatRateExp + _currentExp.Value >= _expToNextLevel.Value)
|
||||
LevelUp();
|
||||
var cappedAmount = Math.Min(flatRateExp + _currentExp.Value, _expToNextLevel.Value);
|
||||
_currentExp.OnNext(cappedAmount);
|
||||
}
|
||||
|
||||
public void ModifyExpGainRate(double newRate) => _expGainRate.OnNext(newRate);
|
||||
|
||||
public void LevelUp()
|
||||
{
|
||||
SfxDatabase.Instance.Play(SoundEffect.LevelUp);
|
||||
|
||||
@@ -31,8 +31,6 @@ public partial class App : Node, IApp
|
||||
|
||||
[Node] private GalleryMenu GalleryMenu { get; set; }
|
||||
|
||||
[Node] private VideoStreamPlayer VideoStreamPlayer { get; set; }
|
||||
|
||||
IAppRepo IProvide<IAppRepo>.Value() => AppRepo;
|
||||
|
||||
public IAppRepo AppRepo { get; set; } = default!;
|
||||
@@ -148,7 +146,7 @@ public partial class App : Node, IApp
|
||||
})
|
||||
.Handle((in AppLogic.Output.SetupGameScene _) =>
|
||||
{
|
||||
LoadingScreen.Show();
|
||||
LoadingScreen.ShowLoadingScreen();
|
||||
LoadGame(GAME_SCENE_PATH);
|
||||
})
|
||||
.Handle((in AppLogic.Output.ShowMainMenu _) =>
|
||||
@@ -157,7 +155,7 @@ public partial class App : Node, IApp
|
||||
})
|
||||
.Handle((in AppLogic.Output.CloseGame _) =>
|
||||
{
|
||||
LoadingScreen.Hide();
|
||||
LoadingScreen.HideLoadingScreen();
|
||||
_game.GameExitRequested -= GameExitRequested;
|
||||
MainMenu.StartGameButton.GrabFocus();
|
||||
_game.CallDeferred(MethodName.QueueFree, []);
|
||||
@@ -168,13 +166,13 @@ public partial class App : Node, IApp
|
||||
})
|
||||
.Handle((in AppLogic.Output.EnemyViewerOpened _) =>
|
||||
{
|
||||
LoadingScreen.Show();
|
||||
LoadingScreen.ShowLoadingScreen();
|
||||
MainMenu.Hide();
|
||||
LoadEnemyViewer(ENEMY_VIEWER_PATH);
|
||||
})
|
||||
.Handle((in AppLogic.Output.EnemyViewerExited _) =>
|
||||
{
|
||||
LoadingScreen.Hide();
|
||||
LoadingScreen.HideLoadingScreen();
|
||||
if (_enemyViewer != null && _enemyViewer is DataViewer enemyViewer)
|
||||
enemyViewer.CallDeferred(MethodName.QueueFree);
|
||||
MainMenu.Show();
|
||||
@@ -205,24 +203,22 @@ public partial class App : Node, IApp
|
||||
_game = scene as IGame;
|
||||
_game.GameLoaded += OnGameLoaded;
|
||||
_game.GameExitRequested += GameExitRequested;
|
||||
await ToSignal(GetTree().CreateTimer(0.8f), "timeout");
|
||||
CallDeferred(MethodName.AddChild, scene);
|
||||
}
|
||||
|
||||
private void OnGameLoaded() => LoadingScreen.Hide();
|
||||
private void OnGameLoaded() => LoadingScreen.HideLoadingScreen();
|
||||
|
||||
private async void LoadEnemyViewer(string sceneName)
|
||||
{
|
||||
var scene = await LoadSceneInternal(sceneName);
|
||||
_enemyViewer = scene as IDataViewer;
|
||||
await ToSignal(GetTree().CreateTimer(0.8f), "timeout");
|
||||
CallDeferred(MethodName.AddChild, scene);
|
||||
LoadingScreen.Hide();
|
||||
LoadingScreen.HideLoadingScreen();
|
||||
}
|
||||
|
||||
private async Task<Node> LoadSceneInternal(string sceneName)
|
||||
{
|
||||
LoadingScreen.Show();
|
||||
LoadingScreen.ShowLoadingScreen();
|
||||
LoadingScreen.ProgressBar.Value = 0;
|
||||
var sceneLoader = new SceneLoader();
|
||||
CallDeferred(MethodName.AddChild, sceneLoader);
|
||||
@@ -263,6 +259,13 @@ public partial class App : Node, IApp
|
||||
|
||||
MainMenu.StartGame -= OnStartGame;
|
||||
MainMenu.EnemyViewer -= OnEnemyViewer;
|
||||
MainMenu.Gallery -= OnGallery;
|
||||
MainMenu.Options -= OnOptions;
|
||||
MainMenu.Quit -= OnQuit;
|
||||
|
||||
GalleryMenu.GalleryExited -= GalleryExited;
|
||||
|
||||
OptionsMenu.OptionsMenuExited -= OptionsMenu_OptionsMenuExited;
|
||||
OptionsMenu.DeleteSaveData -= DeleteSaveData;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,9 +10,16 @@
|
||||
process_mode = 3
|
||||
script = ExtResource("1_rt73h")
|
||||
|
||||
[node name="ColorRect" type="ColorRect" parent="."]
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
color = Color(0, 0, 0, 1)
|
||||
|
||||
[node name="MainMenu" parent="." instance=ExtResource("2_1uiag")]
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
|
||||
[node name="OptionsMenu" parent="." instance=ExtResource("2_v0mgf")]
|
||||
unique_name_in_owner = true
|
||||
@@ -22,12 +29,6 @@ visible = false
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
|
||||
[node name="VideoStreamPlayer" type="VideoStreamPlayer" parent="."]
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
offset_right = 40.0
|
||||
offset_bottom = 40.0
|
||||
|
||||
[node name="LoadingScreen" parent="." instance=ExtResource("3_3st5l")]
|
||||
unique_name_in_owner = true
|
||||
visible = false
|
||||
|
||||
@@ -2,4 +2,5 @@
|
||||
|
||||
public partial class AmbientSFXPlayer : DimmableAudioStreamPlayer
|
||||
{
|
||||
public override void _EnterTree() => FadeIn();
|
||||
}
|
||||
|
||||
@@ -2,4 +2,5 @@
|
||||
|
||||
public partial class AmbientSFXPlayer3D : DimmableAudioStreamPlayer3D
|
||||
{
|
||||
public override void _EnterTree() => FadeIn();
|
||||
}
|
||||
|
||||
@@ -39,6 +39,7 @@ bus = &"SFX"
|
||||
[node name="MoveSound" type="AudioStreamPlayer" parent="UI"]
|
||||
unique_name_in_owner = true
|
||||
stream = ExtResource("6_r16t0")
|
||||
max_polyphony = 5
|
||||
bus = &"SFX"
|
||||
|
||||
[node name="SelectSound" type="AudioStreamPlayer" parent="UI"]
|
||||
|
||||
@@ -106,6 +106,6 @@ public enum SoundEffect
|
||||
SwapHPAndVT,
|
||||
TurnAllEnemiesIntoHealingItems,
|
||||
WeaponQuickSlash,
|
||||
WeaponSlowSlash
|
||||
WeaponSlowSlash,
|
||||
}
|
||||
|
||||
|
||||
@@ -54,111 +54,118 @@ public partial class DataViewer : Control, IDataViewer
|
||||
|
||||
public void OnReady()
|
||||
{
|
||||
BackButton.Pressed += BackButton_Pressed;
|
||||
_enemies = [.. ModelPivot.GetChildren().Cast<EnemyModelView>()];
|
||||
_currentModel = _enemies.First();
|
||||
DisplayEnemy();
|
||||
BackButton.Pressed += BackButton_Pressed;
|
||||
_enemies = [.. ModelPivot.GetChildren().Cast<EnemyModelView>()];
|
||||
_currentModel = _enemies.First();
|
||||
DisplayEnemy();
|
||||
}
|
||||
|
||||
public void OnEnterTree() => GetTree().Paused = false;
|
||||
public void OnEnterTree()
|
||||
{
|
||||
GetTree().Paused = false;
|
||||
}
|
||||
|
||||
public void OnExitTree() => GetTree().Paused = false;
|
||||
public void OnExitTree()
|
||||
{
|
||||
GetTree().Paused = false;
|
||||
BackButton.Pressed -= BackButton_Pressed;
|
||||
}
|
||||
|
||||
private void BackButton_Pressed() => AppRepo.OnDataViewerExited();
|
||||
|
||||
public override void _Input(InputEvent @event)
|
||||
{
|
||||
if (BackButton.HasFocus() && @event.IsActionPressed(GameInputs.Interact))
|
||||
{
|
||||
GetTree().Paused = false;
|
||||
BackButton.ReleaseFocus();
|
||||
return;
|
||||
}
|
||||
if (BackButton.HasFocus() && @event.IsActionPressed(GameInputs.Interact))
|
||||
{
|
||||
GetTree().Paused = false;
|
||||
BackButton.ReleaseFocus();
|
||||
return;
|
||||
}
|
||||
|
||||
if (_currentModel == null || BackButton.HasFocus())
|
||||
return;
|
||||
if (_currentModel == null || BackButton.HasFocus())
|
||||
return;
|
||||
|
||||
if (@event.IsActionPressed(GameInputs.Attack))
|
||||
_currentModel.PlayPrimaryAttackAnimation();
|
||||
if (@event.IsActionPressed(GameInputs.InventorySort))
|
||||
_currentModel.PlaySecondaryAttackAnimation();
|
||||
if (Input.IsActionJustPressed(GameInputs.Inventory))
|
||||
_currentModel.PlayActivateAnimation();
|
||||
if (@event.IsActionPressed(GameInputs.EnemyViewerWalk))
|
||||
_currentModel.PlayWalkAnimation();
|
||||
if (@event.IsActionReleased(GameInputs.EnemyViewerWalk))
|
||||
_currentModel.PlayIdleAnimation();
|
||||
if (@event.IsActionPressed(GameInputs.Attack))
|
||||
_currentModel.PlayPrimaryAttackAnimation();
|
||||
if (@event.IsActionPressed(GameInputs.InventorySort))
|
||||
_currentModel.PlaySecondaryAttackAnimation();
|
||||
if (Input.IsActionJustPressed(GameInputs.Inventory))
|
||||
_currentModel.PlayActivateAnimation();
|
||||
if (@event.IsActionPressed(GameInputs.EnemyViewerWalk))
|
||||
_currentModel.PlayWalkAnimation();
|
||||
if (@event.IsActionReleased(GameInputs.EnemyViewerWalk))
|
||||
_currentModel.PlayIdleAnimation();
|
||||
|
||||
if (@event.IsActionPressed(GameInputs.Interact))
|
||||
{
|
||||
GetTree().Paused = true;
|
||||
BackButton.GrabFocus();
|
||||
}
|
||||
if (@event.IsActionPressed(GameInputs.Interact))
|
||||
{
|
||||
GetTree().Paused = true;
|
||||
BackButton.GrabFocus();
|
||||
}
|
||||
|
||||
if (@event.IsActionPressed(GameInputs.StrafeRight))
|
||||
{
|
||||
// Load next model
|
||||
_enemies[_currentIndex].Hide();
|
||||
if (_currentIndex == _enemies.Count - 1)
|
||||
_currentIndex = 0;
|
||||
else
|
||||
_currentIndex++;
|
||||
DisplayEnemy();
|
||||
}
|
||||
if (@event.IsActionPressed(GameInputs.StrafeLeft))
|
||||
{
|
||||
_enemies[_currentIndex].Hide();
|
||||
// Load previous model
|
||||
if (_currentIndex == 0)
|
||||
_currentIndex = _enemies.Count - 1;
|
||||
else
|
||||
_currentIndex--;
|
||||
DisplayEnemy();
|
||||
}
|
||||
if (@event.IsActionPressed(GameInputs.StrafeRight))
|
||||
{
|
||||
// Load next model
|
||||
_enemies[_currentIndex].Hide();
|
||||
if (_currentIndex == _enemies.Count - 1)
|
||||
_currentIndex = 0;
|
||||
else
|
||||
_currentIndex++;
|
||||
DisplayEnemy();
|
||||
}
|
||||
if (@event.IsActionPressed(GameInputs.StrafeLeft))
|
||||
{
|
||||
_enemies[_currentIndex].Hide();
|
||||
// Load previous model
|
||||
if (_currentIndex == 0)
|
||||
_currentIndex = _enemies.Count - 1;
|
||||
else
|
||||
_currentIndex--;
|
||||
DisplayEnemy();
|
||||
}
|
||||
}
|
||||
|
||||
public override void _Process(double delta)
|
||||
{
|
||||
if (_currentModel == null || BackButton.HasFocus())
|
||||
return;
|
||||
if (_currentModel == null || BackButton.HasFocus())
|
||||
return;
|
||||
|
||||
var forwardStrength = Input.GetActionStrength(GameInputs.CameraForward);
|
||||
Camera3D.Position = Camera3D.Position.MoveToward(CameraPivot.Position, _cameraSpeed * forwardStrength * (_cameraStartingPoint / 10));
|
||||
var backStrength = Input.GetActionStrength(GameInputs.CameraBack);
|
||||
Camera3D.Position = Camera3D.Position.MoveToward(CameraPivot.Position, -_cameraSpeed * backStrength * (_cameraStartingPoint / 10));
|
||||
var leftStrength = Input.GetActionStrength(GameInputs.MoveLeft);
|
||||
CameraPivot.RotateY(_cameraSpeed * leftStrength);
|
||||
var rightStrength = Input.GetActionStrength(GameInputs.MoveRight);
|
||||
CameraPivot.RotateY(-_cameraSpeed * rightStrength);
|
||||
var forwardStrength = Input.GetActionStrength(GameInputs.CameraForward);
|
||||
Camera3D.Position = Camera3D.Position.MoveToward(CameraPivot.Position, _cameraSpeed * forwardStrength * (_cameraStartingPoint / 10));
|
||||
var backStrength = Input.GetActionStrength(GameInputs.CameraBack);
|
||||
Camera3D.Position = Camera3D.Position.MoveToward(CameraPivot.Position, -_cameraSpeed * backStrength * (_cameraStartingPoint / 10));
|
||||
var leftStrength = Input.GetActionStrength(GameInputs.MoveLeft);
|
||||
CameraPivot.RotateY(_cameraSpeed * leftStrength);
|
||||
var rightStrength = Input.GetActionStrength(GameInputs.MoveRight);
|
||||
CameraPivot.RotateY(-_cameraSpeed * rightStrength);
|
||||
|
||||
Camera3D.Position = Camera3D.Position.Clamp(new Vector3(0, 0, _cameraStartingPoint / 2), new Vector3(0, 0, _cameraStartingPoint));
|
||||
ModelPivot.Rotation = ModelPivot.Rotation.Clamp(Mathf.DegToRad(-60), Mathf.DegToRad(60));
|
||||
Camera3D.Position = Camera3D.Position.Clamp(new Vector3(0, 0, _cameraStartingPoint / 2), new Vector3(0, 0, _cameraStartingPoint));
|
||||
ModelPivot.Rotation = ModelPivot.Rotation.Clamp(Mathf.DegToRad(-60), Mathf.DegToRad(60));
|
||||
|
||||
if (_currentModel is EnemyModelView2D enemyModelView2D)
|
||||
enemyModelView2D.SetCurrentDirection(_currentModel.GlobalBasis, -CameraPivot.Basis.Z);
|
||||
if (_currentModel is EnemyModelView2D enemyModelView2D)
|
||||
enemyModelView2D.SetCurrentDirection(_currentModel.GlobalBasis, -CameraPivot.Basis.Z);
|
||||
}
|
||||
|
||||
private void DisplayEnemy()
|
||||
{
|
||||
_currentModel = _enemies[_currentIndex];
|
||||
_currentModel = _enemies[_currentIndex];
|
||||
|
||||
var size = _currentModel.GetSize();
|
||||
if (_currentModel is EnemyModelView2D)
|
||||
_cameraStartingPoint = size.X / 50;
|
||||
else
|
||||
_cameraStartingPoint = size.X * 2;
|
||||
var size = _currentModel.GetSize();
|
||||
if (_currentModel is EnemyModelView2D)
|
||||
_cameraStartingPoint = size.X / 50;
|
||||
else
|
||||
_cameraStartingPoint = size.X * 2;
|
||||
|
||||
Camera3D.Position = new Vector3(Camera3D.Position.X, Camera3D.Position.Y, _cameraStartingPoint);
|
||||
EnemyName.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Name : "Placeholder Text";
|
||||
Description.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Description : "Placeholder Text";
|
||||
HPValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.MaximumHP : "Placeholder Text";
|
||||
ATKValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.ATK : "Placeholder Text";
|
||||
DEFValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.DEF : "Placeholder Text";
|
||||
Drop1Value.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Drop1 : "Placeholder Text";
|
||||
Drop2Value.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Drop2 : "Placeholder Text";
|
||||
AffinityValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Affinity : "Placeholder Text";
|
||||
WeaknessValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Weakness : "Placeholder Text";
|
||||
Camera3D.Position = new Vector3(Camera3D.Position.X, Camera3D.Position.Y, _cameraStartingPoint);
|
||||
EnemyName.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Name : "Placeholder Text";
|
||||
Description.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Description : "Placeholder Text";
|
||||
HPValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.MaximumHP : "Placeholder Text";
|
||||
ATKValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.ATK : "Placeholder Text";
|
||||
DEFValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.DEF : "Placeholder Text";
|
||||
Drop1Value.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Drop1 : "Placeholder Text";
|
||||
Drop2Value.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Drop2 : "Placeholder Text";
|
||||
AffinityValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Affinity : "Placeholder Text";
|
||||
WeaknessValue.Text = _currentModel.EnemyLoreInfo != null ? _currentModel.EnemyLoreInfo.Weakness : "Placeholder Text";
|
||||
|
||||
_enemies[_currentIndex].Show();
|
||||
_enemies[_currentIndex].Show();
|
||||
}
|
||||
}
|
||||
|
||||
40
Zennysoft.Game.Ma/src/debug_info/DebugInfo.cs
Normal file
@@ -0,0 +1,40 @@
|
||||
using Chickensoft.AutoInject;
|
||||
using Chickensoft.Introspection;
|
||||
using Godot;
|
||||
using System.Linq;
|
||||
using Zennysoft.Game.Ma;
|
||||
using Zennysoft.Ma.Adapter;
|
||||
using Zennysoft.Ma.Adapter.Entity;
|
||||
|
||||
[Meta(typeof(IAutoNode)), Id("debug")]
|
||||
public partial class DebugInfo : Control
|
||||
{
|
||||
public override void _Notification(int what) => this.Notify(what);
|
||||
|
||||
[Dependency] private IGame _game => this.DependOn<IGame>();
|
||||
[Dependency] private IGameRepo _gameRepo => this.DependOn<IGameRepo>();
|
||||
[Dependency] private IMap _map => this.DependOn<IMap>();
|
||||
[Dependency] private IPlayer _player => this.DependOn<IPlayer>();
|
||||
|
||||
[Node] public Label MapName { get; set; }
|
||||
[Node] public Label EnemyCount { get; set; }
|
||||
[Node] public Label DeathCount { get; set; }
|
||||
|
||||
public void OnResolved()
|
||||
{
|
||||
_map.FloorLoaded += _map_FloorLoaded;
|
||||
_gameRepo.EnemyDied += _gameRepo_EnemyDied;
|
||||
_player.PlayerDied += _player_PlayerDied;
|
||||
DeathCount.Text = _game.QuestData.DeathCount.ToString();
|
||||
}
|
||||
|
||||
private void _gameRepo_EnemyDied(IEnemy obj) => EnemyCount.Text = (EnemyCount.Text.ToInt() - 1).ToString();
|
||||
|
||||
private void _map_FloorLoaded()
|
||||
{
|
||||
MapName.Text = _map.CurrentFloor.SceneFilePath.GetFile().TrimSuffix(".tscn");
|
||||
EnemyCount.Text = _map.CurrentFloor.GetChild(0).GetChildren().OfType<IDungeonRoom>().Select(x => x.GetChildren().OfType<IEnemy>()).Count().ToString();
|
||||
}
|
||||
|
||||
private void _player_PlayerDied() => DeathCount.Text = _game.QuestData.DeathCount.ToString();
|
||||
}
|
||||
1
Zennysoft.Game.Ma/src/debug_info/DebugInfo.cs.uid
Normal file
@@ -0,0 +1 @@
|
||||
uid://c4g3frcpt0h36
|
||||
82
Zennysoft.Game.Ma/src/debug_info/DebugInfo.tscn
Normal file
@@ -0,0 +1,82 @@
|
||||
[gd_scene load_steps=4 format=3 uid="uid://t22s2y1t8ktc"]
|
||||
|
||||
[ext_resource type="Script" uid="uid://c4g3frcpt0h36" path="res://src/debug_info/DebugInfo.cs" id="1_6tk84"]
|
||||
[ext_resource type="LabelSettings" uid="uid://b6f8ggy3ulonb" path="res://src/ui/label_settings/GeorgiaItalic.tres" id="1_i766g"]
|
||||
[ext_resource type="Script" uid="uid://3fpuxsgdl8xe" path="res://src/utils/FpsCounter.cs" id="3_rco7p"]
|
||||
|
||||
[node name="DebugInfo" type="Control"]
|
||||
layout_mode = 3
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
script = ExtResource("1_6tk84")
|
||||
|
||||
[node name="MarginContainer" type="MarginContainer" parent="."]
|
||||
layout_mode = 1
|
||||
anchors_preset = 15
|
||||
anchor_right = 1.0
|
||||
anchor_bottom = 1.0
|
||||
grow_horizontal = 2
|
||||
grow_vertical = 2
|
||||
theme_override_constants/margin_left = 20
|
||||
theme_override_constants/margin_top = 20
|
||||
theme_override_constants/margin_right = 20
|
||||
theme_override_constants/margin_bottom = 20
|
||||
|
||||
[node name="VFlowContainer" type="VFlowContainer" parent="MarginContainer"]
|
||||
layout_mode = 2
|
||||
alignment = 2
|
||||
|
||||
[node name="FPS" type="HBoxContainer" parent="MarginContainer/VFlowContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="FPSLabel" type="Label" parent="MarginContainer/VFlowContainer/FPS"]
|
||||
layout_mode = 2
|
||||
text = "FPS:"
|
||||
label_settings = ExtResource("1_i766g")
|
||||
|
||||
[node name="FPSCounter" type="Label" parent="MarginContainer/VFlowContainer/FPS"]
|
||||
layout_mode = 2
|
||||
label_settings = ExtResource("1_i766g")
|
||||
script = ExtResource("3_rco7p")
|
||||
|
||||
[node name="MapInfo" type="HBoxContainer" parent="MarginContainer/VFlowContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Map Name Label" type="Label" parent="MarginContainer/VFlowContainer/MapInfo"]
|
||||
layout_mode = 2
|
||||
text = "Map Name:"
|
||||
label_settings = ExtResource("1_i766g")
|
||||
|
||||
[node name="MapName" type="Label" parent="MarginContainer/VFlowContainer/MapInfo"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
label_settings = ExtResource("1_i766g")
|
||||
|
||||
[node name="EnemyInfo" type="HBoxContainer" parent="MarginContainer/VFlowContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="Enemy Count Label" type="Label" parent="MarginContainer/VFlowContainer/EnemyInfo"]
|
||||
layout_mode = 2
|
||||
text = "Number of enemies:"
|
||||
label_settings = ExtResource("1_i766g")
|
||||
|
||||
[node name="EnemyCount" type="Label" parent="MarginContainer/VFlowContainer/EnemyInfo"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
label_settings = ExtResource("1_i766g")
|
||||
|
||||
[node name="HBoxContainer" type="HBoxContainer" parent="MarginContainer/VFlowContainer"]
|
||||
layout_mode = 2
|
||||
|
||||
[node name="DeathCountLabel" type="Label" parent="MarginContainer/VFlowContainer/HBoxContainer"]
|
||||
layout_mode = 2
|
||||
text = "Player Death Count:"
|
||||
label_settings = ExtResource("1_i766g")
|
||||
|
||||
[node name="DeathCount" type="Label" parent="MarginContainer/VFlowContainer/HBoxContainer"]
|
||||
unique_name_in_owner = true
|
||||
layout_mode = 2
|
||||
label_settings = ExtResource("1_i766g")
|
||||
@@ -39,4 +39,10 @@ public partial class BossAModelView : EnemyModelView3D, INode3D
|
||||
ExplodingModel.Show();
|
||||
DeathAnimation.Play("Animation");
|
||||
}
|
||||
|
||||
public void OnExitTree()
|
||||
{
|
||||
Hitbox.AreaEntered -= Hitbox_AreaEntered;
|
||||
DeathAnimation.AnimationFinished -= DeathAnimation_AnimationFinished;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,8 +1,9 @@
|
||||
using Chickensoft.AutoInject;
|
||||
using Chickensoft.Introspection;
|
||||
using Godot;
|
||||
using System.Collections.Generic;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Zennysoft.Ma.Adapter;
|
||||
|
||||
namespace Zennysoft.Game.Ma;
|
||||
@@ -180,5 +181,6 @@ public partial class BossTypeA : Enemy, IHaveEngagePlayerBehavior, IHaveFollowBe
|
||||
EngagePlayerBehavior.TakeAction -= PerformAction;
|
||||
PlayerDetector.BodyEntered -= PlayerDetector_BodyEntered;
|
||||
PlayerDetector.BodyExited -= PlayerDetector_BodyExited;
|
||||
(EnemyModelView as BossAModelView).OnDeathAnimationCompleted -= EnemyModelView3D_OnDeathAnimationCompleted;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,6 +24,8 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
|
||||
|
||||
#region Dependencies
|
||||
[Dependency] protected IPlayer _player => this.DependOn(() => GetParent().GetChildren().OfType<IPlayer>().Single());
|
||||
|
||||
[Dependency] protected IGameRepo _gameRepo => this.DependOn<IGameRepo>();
|
||||
#endregion
|
||||
|
||||
public IHealthComponent HealthComponent { get; private set; }
|
||||
@@ -57,7 +59,9 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
|
||||
|
||||
[Export] public double HolyResistance { get; set; }
|
||||
|
||||
public ElementalResistanceSet ElementalResistanceSet => new ElementalResistanceSet(AeolicResistance, HydricResistance, IgenousResistance, FerrumResistance, TelluricResistance, HolyResistance);
|
||||
[Export] public double CurseResistance { get; set; }
|
||||
|
||||
public ElementalResistanceSet ElementalResistanceSet => new ElementalResistanceSet(AeolicResistance, HydricResistance, IgenousResistance, FerrumResistance, TelluricResistance, HolyResistance, CurseResistance);
|
||||
|
||||
[Node] private AudioStreamPlayer3D _absorbSFX { get; set; } = default!;
|
||||
[Node] private AudioStreamPlayer3D _hitSFX { get; set; } = default!;
|
||||
@@ -161,6 +165,7 @@ public abstract partial class Enemy : CharacterBody3D, IEnemy, IProvide<IEnemyLo
|
||||
EnemyModelView.PlayDeathAnimation();
|
||||
_hitSFX.Play();
|
||||
_dieSFX.Play();
|
||||
_gameRepo.OnEnemyDied(this);
|
||||
var tweener = CreateTween();
|
||||
tweener.TweenInterval(1.0f);
|
||||
tweener.TweenCallback(Callable.From(QueueFree));
|
||||
|
||||
@@ -69,4 +69,10 @@ public abstract partial class Enemy2D : Enemy
|
||||
if (body is IPlayer)
|
||||
_enemyLogic.Input(new EnemyLogic.Input.Alert());
|
||||
}
|
||||
|
||||
public new void OnExitTree()
|
||||
{
|
||||
base.OnExitTree();
|
||||
LineOfSight.BodyEntered -= LineOfSight_BodyEntered;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -129,5 +129,6 @@ public abstract partial class EnemyModelView : Node3D, IEnemyModelView
|
||||
{
|
||||
if (AnimationTree != null)
|
||||
AnimationTree.Get(_parametersPlayback).As<AnimationNodeStateMachinePlayback>().Stop();
|
||||
AnimationTree.AnimationFinished -= AnimationTree_AnimationFinished;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2,7 +2,6 @@ using Chickensoft.AutoInject;
|
||||
using Chickensoft.Introspection;
|
||||
using Godot;
|
||||
using System.Linq;
|
||||
using Zennysoft.Ma.Adapter;
|
||||
|
||||
namespace Zennysoft.Game.Ma;
|
||||
[Meta(typeof(IAutoNode))]
|
||||
@@ -51,6 +50,7 @@ public partial class EnemyModelView2D : EnemyModelView, IEnemyModelView
|
||||
|
||||
public override void PlayDeathAnimation()
|
||||
{
|
||||
AnimationPlayer.Stop();
|
||||
LoadShader("res://src/vfx/shaders/PixelMelt.gdshader");
|
||||
var tweener = GetTree().CreateTween();
|
||||
tweener.TweenMethod(Callable.From((float x) => SetShaderValue(x)), 0.0f, 0.1f, 0.8f);
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using Chickensoft.AutoInject;
|
||||
using Chickensoft.Introspection;
|
||||
using Godot;
|
||||
using System.Linq;
|
||||
|
||||
namespace Zennysoft.Game.Ma;
|
||||
|
||||
|
||||
@@ -101,15 +101,14 @@ _followSpeed = 150.0
|
||||
|
||||
[node name="EngagePlayerBehavior" parent="Components" instance=ExtResource("5_drfkj")]
|
||||
unique_name_in_owner = true
|
||||
_minimumAttackTime = 3.0
|
||||
_maximumAttackTime = 7.0
|
||||
_minimumAttackTime = 1.0
|
||||
_maximumAttackTime = 3.0
|
||||
_acquireTargetTime = 2.0
|
||||
|
||||
[node name="NavigationAgent" type="NavigationAgent3D" parent="Components"]
|
||||
unique_name_in_owner = true
|
||||
avoidance_enabled = true
|
||||
radius = 1.0
|
||||
debug_enabled = true
|
||||
|
||||
[node name="SFX" type="Node3D" parent="."]
|
||||
transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 2.0617, 0)
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
using Chickensoft.AutoInject;
|
||||
using Chickensoft.Introspection;
|
||||
using Godot;
|
||||
using System.Linq;
|
||||
|
||||
namespace Zennysoft.Game.Ma;
|
||||
|
||||
@@ -18,23 +19,33 @@ public partial class Michael : Enemy2D, IHavePatrolBehavior, IHaveEngagePlayerBe
|
||||
|
||||
public void OnReady()
|
||||
{
|
||||
FollowBehavior.Init(NavigationAgent);
|
||||
PatrolBehavior.Init(NavigationAgent);
|
||||
PatrolBehavior.HomePosition = GlobalPosition;
|
||||
PatrolBehavior.OnVelocityComputed += OnVelocityComputed;
|
||||
FollowBehavior.OnVelocityComputed += OnVelocityComputed;
|
||||
EngagePlayerBehavior.TakeAction += EngagePlayerBehavior_TakeAction;
|
||||
EngagePlayerBehavior.AcquireTarget += EngagePlayerBehavior_AcquireTarget;
|
||||
PlayerDetector.BodyEntered += PlayerDetector_BodyEntered;
|
||||
PlayerDetector.BodyExited += PlayerDetector_BodyExited;
|
||||
SetPhysicsProcess(true);
|
||||
FollowBehavior.Init(NavigationAgent);
|
||||
PatrolBehavior.Init(NavigationAgent);
|
||||
PatrolBehavior.HomePosition = GlobalPosition;
|
||||
PatrolBehavior.OnVelocityComputed += OnVelocityComputed;
|
||||
FollowBehavior.OnVelocityComputed += OnVelocityComputed;
|
||||
EngagePlayerBehavior.TakeAction += EngagePlayerBehavior_TakeAction;
|
||||
EngagePlayerBehavior.AcquireTarget += EngagePlayerBehavior_AcquireTarget;
|
||||
PlayerDetector.BodyEntered += PlayerDetector_BodyEntered;
|
||||
PlayerDetector.BodyExited += PlayerDetector_BodyExited;
|
||||
SetPhysicsProcess(true);
|
||||
}
|
||||
|
||||
public void OnResolved()
|
||||
{
|
||||
_enemyLogic.Input(new EnemyLogic.Input.Patrol());
|
||||
_enemyLogic.Input(new EnemyLogic.Input.Patrol());
|
||||
}
|
||||
|
||||
|
||||
public override void Move() => EnemyModelView.PlayIdleAnimation();
|
||||
|
||||
public new void OnExitTree()
|
||||
{
|
||||
base.OnExitTree();
|
||||
PatrolBehavior.OnVelocityComputed -= OnVelocityComputed;
|
||||
FollowBehavior.OnVelocityComputed -= OnVelocityComputed;
|
||||
EngagePlayerBehavior.TakeAction -= EngagePlayerBehavior_TakeAction;
|
||||
EngagePlayerBehavior.AcquireTarget -= EngagePlayerBehavior_AcquireTarget;
|
||||
PlayerDetector.BodyEntered -= PlayerDetector_BodyEntered;
|
||||
PlayerDetector.BodyExited -= PlayerDetector_BodyExited;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -89,6 +89,8 @@ _followSpeed = 150.0
|
||||
|
||||
[node name="EngagePlayerBehavior" parent="Components" instance=ExtResource("7_x8mrp")]
|
||||
unique_name_in_owner = true
|
||||
_minimumAttackTime = 1.0
|
||||
_maximumAttackTime = 3.0
|
||||
_acquireTargetTime = 2.0
|
||||
|
||||
[node name="NavigationAgent" type="NavigationAgent3D" parent="Components"]
|
||||
|
||||
@@ -3,6 +3,7 @@ using Chickensoft.Introspection;
|
||||
using Godot;
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
|
||||
namespace Zennysoft.Game.Ma;
|
||||
|
||||
|
||||
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 210 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 170 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 171 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 185 KiB |
|
Before Width: | Height: | Size: 17 KiB After Width: | Height: | Size: 166 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 183 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 204 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 207 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 190 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 181 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 167 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 186 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 184 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 187 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 188 KiB |
|
Before Width: | Height: | Size: 19 KiB After Width: | Height: | Size: 186 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 118 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 139 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 138 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 134 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 155 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 144 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 116 KiB |
|
Before Width: | Height: | Size: 12 KiB After Width: | Height: | Size: 114 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 127 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 134 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 144 KiB |
|
Before Width: | Height: | Size: 16 KiB After Width: | Height: | Size: 158 KiB |
|
Before Width: | Height: | Size: 15 KiB After Width: | Height: | Size: 153 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 124 KiB |
|
Before Width: | Height: | Size: 13 KiB After Width: | Height: | Size: 123 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 210 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 214 KiB |
|
Before Width: | Height: | Size: 20 KiB After Width: | Height: | Size: 209 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 218 KiB |
|
Before Width: | Height: | Size: 21 KiB After Width: | Height: | Size: 212 KiB |