Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ Assets/Data/Metagame/Items/Editor/*.csv.meta
# Visual Studio cache directory
.vs/
.history
.vscode/

# Gradle cache directory
.gradle/
Expand Down
4 changes: 4 additions & 0 deletions Assets/Card TCG Design 6/PNG/card/elements/desktop.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
[ViewState]
Mode=
Vid=
FolderType=Generic

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
104 changes: 104 additions & 0 deletions Assets/Card TCG Design 6/PNG/cover/cover/eye_6.png.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 5 additions & 3 deletions Assets/Gameplay/Behaviours/AttackBehaviour.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ public class AttackBehaviour : BaseBehaviour
{
[SerializeField] int damage = 10;

const int CooldownInSeconds = 1;
protected const int CooldownInSeconds = 1;

List<IAttacker> _attackers;

Expand All @@ -21,9 +21,9 @@ public class AttackBehaviour : BaseBehaviour

public bool IsAttacking => HasValidTarget;

bool HasValidTarget => CurrentTarget != null;
protected bool HasValidTarget => CurrentTarget != null;

float _attackTimer = 0;
protected float _attackTimer = 0;

protected override void Awake()
{
Expand Down Expand Up @@ -62,13 +62,15 @@ void Update()
_attackTimer += Time.deltaTime;
if (_attackTimer > CooldownInSeconds)
{

Attack();
_attackTimer = 0f;
}
}

void Attack()
{
Debug.Log("Ta no default");
Assert.IsTrue(HasValidTarget, message: "Attack should only be called with a valid target");
CurrentTarget.ScheduleDamage(damage);
_attackers.ForEach(action: attacker => attacker.Attack(CurrentTarget));
Expand Down
64 changes: 64 additions & 0 deletions Assets/Gameplay/Behaviours/SplashDamageAttackBehaviour.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
using System.Collections.Generic;
using Gameplay.Behaviours.Interfaces;
using Gameplay.Core;
using UnityEngine;

namespace Gameplay.Behaviours
{
public class SplashDamageAttackBehaviour : AttackBehaviour
{

public float distanceSplashDamage = 3;

private List<IDamageable> getEnemies()
{
var myTeam = Entity.Team;

var enemies = GameObject.FindGameObjectsWithTag(myTeam.Opposite().GetTag());

var damageables = new List<IDamageable>();

foreach (var enemy in enemies)
{
if ((transform.position - enemy.transform.position).sqrMagnitude <= distanceSplashDamage * distanceSplashDamage)
{
var damageable = enemy.GetComponent<IDamageable>();
if (damageable != null)
{
damageables.Add(damageable);
}
}

}
return damageables;

}

void Update()
{
if (!HasValidTarget)
{
return;
}

_attackTimer += Time.deltaTime;
if (_attackTimer > CooldownInSeconds)
{
Attack();
_attackTimer = 0f;
}
}

void Attack()
{
Debug.Log("Ta no splash");
var enemies = getEnemies();
foreach (var enemy in enemies)
{
enemy.ScheduleDamage(10);
}
}


}
}
11 changes: 11 additions & 0 deletions Assets/Gameplay/Behaviours/SplashDamageAttackBehaviour.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 2 additions & 1 deletion Assets/Gameplay/Behaviours/UI/CardView.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,10 @@ MonoBehaviour:
rect: {fileID: 1234890418332635619}
imageCard: {fileID: 7843744602157141522}
cardSprites:
m_keys: 00000000
m_keys: 0000000001000000
m_values:
- {fileID: 21300000, guid: 9b7223aa726eb41ee9f4349249340e9b, type: 3}
- {fileID: 21300000, guid: 23ebed2390aa23d4f863a4ea731c3197, type: 3}
--- !u!114 &8570471700893772512
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down
3 changes: 2 additions & 1 deletion Assets/Gameplay/Core/Cards/CardPrefabsMap.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
cardPrefabDict:
m_keys: 00000000
m_keys: 0000000001000000
m_values:
- {fileID: 3274150517216157666, guid: 77cd19d9dee0340bc973086d5d3a567c, type: 3}
- {fileID: 3615646017921554434, guid: 2087384702dcd44b39e1a49f38502dc3, type: 3}
3 changes: 2 additions & 1 deletion Assets/Gameplay/Core/Cards/CardType.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
{
public enum CardType
{
Warrior
Warrior,
SplashDamage
}
}
71 changes: 71 additions & 0 deletions Assets/Gameplay/Core/Cards/Mage.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &4208324368316942175
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 3274150517216157666, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_Name
value: Warrior
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5836261650095805016, guid: 77cd19d9dee0340bc973086d5d3a567c,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 77cd19d9dee0340bc973086d5d3a567c, type: 3}
7 changes: 7 additions & 0 deletions Assets/Gameplay/Core/Cards/Mage.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading