diff options
Diffstat (limited to 'scripts/entities')
| -rw-r--r-- | scripts/entities/Entity.cs | 34 | ||||
| -rw-r--r-- | scripts/entities/EntityDefinition.cs | 7 | ||||
| -rw-r--r-- | scripts/entities/actions/Action.cs | 3 | ||||
| -rw-r--r-- | scripts/entities/actions/ItemAction.cs | 15 | ||||
| -rw-r--r-- | scripts/entities/actions/ItemAction.cs.uid | 1 | ||||
| -rw-r--r-- | scripts/entities/actors/Actor.cs | 4 | ||||
| -rw-r--r-- | scripts/entities/items/ConsumableItem.cs | 31 | ||||
| -rw-r--r-- | scripts/entities/items/ConsumableItem.cs.uid | 1 | ||||
| -rw-r--r-- | scripts/entities/items/ConsumableItemDefinition.cs | 7 | ||||
| -rw-r--r-- | scripts/entities/items/ConsumableItemDefinition.cs.uid | 1 | ||||
| -rw-r--r-- | scripts/entities/items/HealingConsumable.cs | 27 | ||||
| -rw-r--r-- | scripts/entities/items/HealingConsumable.cs.uid | 1 | ||||
| -rw-r--r-- | scripts/entities/items/HealingConsumableDefinition.cs | 11 | ||||
| -rw-r--r-- | scripts/entities/items/HealingConsumableDefinition.cs.uid | 1 |
14 files changed, 135 insertions, 9 deletions
diff --git a/scripts/entities/Entity.cs b/scripts/entities/Entity.cs index fb83f90..85a3156 100644 --- a/scripts/entities/Entity.cs +++ b/scripts/entities/Entity.cs @@ -1,16 +1,42 @@ using Godot; -public partial class Entity : Sprite2D { +/// <summary> +/// Defino aqui que o jogo irá desenhar +/// atores em cima de itens e itens acima de corpos. +/// </summary> +public enum EntityType +{ + CORPSE, + ITEM, + ACTOR +}; + +/// <summary> +/// Classe para elementos móveis que o jogador pode interagir. +/// </summary> +public abstract partial class Entity : Sprite2D { /// <summary> /// A definição da entidade possui caracterísitcas padrões que definem /// a entidade em questão. /// </summary> private EntityDefinition definition; + private EntityType type; /// <summary> - /// É conveniente ter acesso ao mapa dentro da entidade. Isto porque ela existe dentro - /// do mapa, então é necessário ter acesso à algumas informações. + /// Usado para definir a camada da entidade no mapa. /// </summary> + public EntityType Type { + get => type; + set { + type = value; + ZIndex = (int) type; + } + } + + /// <summary> + /// É conveniente ter acesso ao mapa dentro da entidade. Isto porque ela existe dentro + /// do mapa, então é necessário ter acesso à algumas informações. + /// </summary> public MapData Map_Data { get; set; } private Vector2I gridPosition = Vector2I.Zero; @@ -76,7 +102,7 @@ public partial class Entity : Sprite2D { this.definition = definition; BlocksMovement = definition.blocksMovement; DisplayName = definition.name; - ZIndex = 1; + Type = definition.Type; Texture = definition.texture; } }
\ No newline at end of file diff --git a/scripts/entities/EntityDefinition.cs b/scripts/entities/EntityDefinition.cs index 19693db..ba7236a 100644 --- a/scripts/entities/EntityDefinition.cs +++ b/scripts/entities/EntityDefinition.cs @@ -2,15 +2,18 @@ using Godot; [GlobalClass] public partial class EntityDefinition : Resource{ - [ExportCategory("Visuals")] + [ExportCategory("Entity Visuals")] // Nome da entidade. [Export] public string name = "unnamed"; // Seu sprite. [Export] public Texture2D texture; + // A camada da entidade. + [Export] + public EntityType Type; - [ExportCategory("Mechanics")] + [ExportCategory("Entity Mechanics")] // Se a entidade bloqueia movimento. [Export] public bool blocksMovement = true; diff --git a/scripts/entities/actions/Action.cs b/scripts/entities/actions/Action.cs index 3f15105..9dab5a4 100644 --- a/scripts/entities/actions/Action.cs +++ b/scripts/entities/actions/Action.cs @@ -10,8 +10,9 @@ public abstract partial class Action : RefCounted { /// O ator que realiza a ação. /// </summary> protected Actor actor; + public Actor ThisActor { get => actor; } - // O custo da ação. + // O custo da ação. protected int cost; public Action(Actor actor) { diff --git a/scripts/entities/actions/ItemAction.cs b/scripts/entities/actions/ItemAction.cs new file mode 100644 index 0000000..54ff207 --- /dev/null +++ b/scripts/entities/actions/ItemAction.cs @@ -0,0 +1,15 @@ +using Godot; + +public partial class ItemAction : Action +{ + private ConsumableItem item; + public ItemAction(Actor actor, ConsumableItem item) : base(actor) + { + this.item = item; + } + + public override bool Perform() + { + return item.Activate(this); + } +}
\ No newline at end of file diff --git a/scripts/entities/actions/ItemAction.cs.uid b/scripts/entities/actions/ItemAction.cs.uid new file mode 100644 index 0000000..c8c8e23 --- /dev/null +++ b/scripts/entities/actions/ItemAction.cs.uid @@ -0,0 +1 @@ +uid://f7ep4u4fwsyl diff --git a/scripts/entities/actors/Actor.cs b/scripts/entities/actors/Actor.cs index dc8ba53..1717cfa 100644 --- a/scripts/entities/actors/Actor.cs +++ b/scripts/entities/actors/Actor.cs @@ -156,7 +156,7 @@ public partial class Actor : Entity base.SetDefinition(definition); this.definition = definition; - ZIndex = 1; + Type = definition.Type; MaxHp = definition.Hp; Hp = definition.Hp; @@ -207,7 +207,7 @@ public partial class Actor : Entity Texture = definition.deathTexture; BlocksMovement = false; - ZIndex = 0; + Type = EntityType.CORPSE; DisplayName= $"Restos mortais de {DisplayName}"; Map_Data.UnregisterBlockingEntity(this); EmitSignal(SignalName.Died); diff --git a/scripts/entities/items/ConsumableItem.cs b/scripts/entities/items/ConsumableItem.cs new file mode 100644 index 0000000..8c862da --- /dev/null +++ b/scripts/entities/items/ConsumableItem.cs @@ -0,0 +1,31 @@ +using Godot; + +/// <summary> +/// Classe para itens consumíveis. +/// Itens consumíveis são itens de uso limitado. +/// </summary> +public abstract partial class ConsumableItem : Entity +{ + public ConsumableItem(Vector2I initialPosition, MapData map, EntityDefinition definition) : base(initialPosition, map, definition) + { + } + + /// <summary> + /// Gera uma ação onde o ator consome o item. + /// </summary> + /// <param name="consumer"></param> + /// <returns></returns> + public Action GetAction(Actor consumer) + { + return new ItemAction(consumer, this); + } + + /// <summary> + /// Ativa a função deste item. + /// Este método é chamado pela ação gerada por ele mesmo. + /// Este método permite definir condições para a sua ativação. + /// </summary> + /// <param name="action">Ação gerada pelo item.</param> + /// <returns>Se a ação foi realizada ou não.</returns> + public abstract bool Activate(ItemAction action); +}
\ No newline at end of file diff --git a/scripts/entities/items/ConsumableItem.cs.uid b/scripts/entities/items/ConsumableItem.cs.uid new file mode 100644 index 0000000..e6c452a --- /dev/null +++ b/scripts/entities/items/ConsumableItem.cs.uid @@ -0,0 +1 @@ +uid://hpppt5k743x diff --git a/scripts/entities/items/ConsumableItemDefinition.cs b/scripts/entities/items/ConsumableItemDefinition.cs new file mode 100644 index 0000000..74340d2 --- /dev/null +++ b/scripts/entities/items/ConsumableItemDefinition.cs @@ -0,0 +1,7 @@ +using Godot; + +/// <summary> +/// Esta classe só existe para agrupar seus descendentes. +/// </summary> +[GlobalClass] +public abstract partial class ConsumableItemDefinition : EntityDefinition;
\ No newline at end of file diff --git a/scripts/entities/items/ConsumableItemDefinition.cs.uid b/scripts/entities/items/ConsumableItemDefinition.cs.uid new file mode 100644 index 0000000..9ddc0f6 --- /dev/null +++ b/scripts/entities/items/ConsumableItemDefinition.cs.uid @@ -0,0 +1 @@ +uid://dpdju2ucehsb0 diff --git a/scripts/entities/items/HealingConsumable.cs b/scripts/entities/items/HealingConsumable.cs new file mode 100644 index 0000000..3d8df51 --- /dev/null +++ b/scripts/entities/items/HealingConsumable.cs @@ -0,0 +1,27 @@ +using Godot; + +public partial class HealingConsumable : ConsumableItem +{ + private HealingConsumableDefinition definition; + public float HealingPercentage { get; private set; } + public HealingConsumable(Vector2I initialPosition, MapData map, HealingConsumableDefinition definition) : base(initialPosition, map, definition) + { + this.definition = definition; + HealingPercentage = definition.healingPercentage; + } + + public override bool Activate(ItemAction action) + { + Actor consumer = action.ThisActor; + int intendedAmount = (int)(HealingPercentage / 100 * consumer.MaxHp); + int recovered = consumer.Heal(intendedAmount); + + // Se não tinha o que curar, a ativação falhou. + if (recovered == 0) { + MessageLogData.Instance.AddMessage("Você já está saudável."); + return false; + } + MessageLogData.Instance.AddMessage($"Você consome {DisplayName} e recupera {recovered} de HP"); + return true; + } +}
\ No newline at end of file diff --git a/scripts/entities/items/HealingConsumable.cs.uid b/scripts/entities/items/HealingConsumable.cs.uid new file mode 100644 index 0000000..8f8f942 --- /dev/null +++ b/scripts/entities/items/HealingConsumable.cs.uid @@ -0,0 +1 @@ +uid://ct20rmjhaukge diff --git a/scripts/entities/items/HealingConsumableDefinition.cs b/scripts/entities/items/HealingConsumableDefinition.cs new file mode 100644 index 0000000..2562e9e --- /dev/null +++ b/scripts/entities/items/HealingConsumableDefinition.cs @@ -0,0 +1,11 @@ +using Godot; + +[GlobalClass] +public partial class HealingConsumableDefinition : ConsumableItemDefinition { + ///<summary> + /// Porcentagem da vida do ator para restaurar. + ///</summary> + [ExportCategory("Item Mechanics")] + [Export] + public float healingPercentage = 10; +}
\ No newline at end of file diff --git a/scripts/entities/items/HealingConsumableDefinition.cs.uid b/scripts/entities/items/HealingConsumableDefinition.cs.uid new file mode 100644 index 0000000..2fd311d --- /dev/null +++ b/scripts/entities/items/HealingConsumableDefinition.cs.uid @@ -0,0 +1 @@ +uid://b3qy4gtjfci14 |