From 501dcfa86cfa6fdebafb6de0f259d19bad303f69 Mon Sep 17 00:00:00 2001
From: vylion <volfaria@gmail.com>
Date: Sun, 30 Oct 2016 11:59:31 +0100
Subject: [PATCH] moved all prefabs (even imported prefabs) to a prefab folder
in root
---
Assets/UnitBehaviour.cs | 5 +++++
Assets/prefabs.meta | 9 +++++++++
.../{3rdParty/Skeleton/prefab => prefabs}/CYAN_SK.prefab | 0
.../Skeleton/prefab => prefabs}/CYAN_SK.prefab.meta | 0
.../Prefab => prefabs}/Necromancer_cyan.prefab | 0
.../Prefab => prefabs}/Necromancer_cyan.prefab.meta | 0
.../Prefab => prefabs}/Necromancer_puke.prefab | 0
.../Prefab => prefabs}/Necromancer_puke.prefab.meta | 0
.../Prefab => prefabs}/Necromancer_purple.prefab | 0
.../Prefab => prefabs}/Necromancer_purple.prefab.meta | 0
.../Prefab => prefabs}/Necromancer_red.prefab | 0
.../Prefab => prefabs}/Necromancer_red.prefab.meta | 0
.../{3rdParty/Skeleton/prefab => prefabs}/PUKE_SK.prefab | 0
.../Skeleton/prefab => prefabs}/PUKE_SK.prefab.meta | 0
.../Skeleton/prefab => prefabs}/PURPLE_SK.prefab | 0
.../Skeleton/prefab => prefabs}/PURPLE_SK.prefab.meta | 0
.../{3rdParty/Skeleton/prefab => prefabs}/RED_SK.prefab | 0
.../Skeleton/prefab => prefabs}/RED_SK.prefab.meta | 0
.../DemonImp/prefab => prefabs}/cyan_demon_imp.prefab | 0
.../prefab => prefabs}/cyan_demon_imp.prefab.meta | 0
.../prefab => prefabs}/cyan_sk_archer.prefab | 0
.../prefab => prefabs}/cyan_sk_archer.prefab.meta | 0
.../prefab => prefabs}/cyan_zombie_common.prefab | 0
.../prefab => prefabs}/cyan_zombie_common.prefab.meta | 0
.../DemonImp/prefab => prefabs}/puke_demon_imp.prefab | 0
.../prefab => prefabs}/puke_demon_imp.prefab.meta | 0
.../prefab => prefabs}/puke_sk_archer.prefab | 0
.../prefab => prefabs}/puke_sk_archer.prefab.meta | 0
.../prefab => prefabs}/puke_zombie_common.prefab | 0
.../prefab => prefabs}/puke_zombie_common.prefab.meta | 0
.../DemonImp/prefab => prefabs}/purple_demon_imp.prefab | 0
.../prefab => prefabs}/purple_demon_imp.prefab.meta | 0
.../prefab => prefabs}/purple_sk_archer.prefab | 0
.../prefab => prefabs}/purple_sk_archer.prefab.meta | 0
.../prefab => prefabs}/purple_zombie_common.prefab | 0
.../prefab => prefabs}/purple_zombie_common.prefab.meta | 0
.../DemonImp/prefab => prefabs}/red_demon_imp.prefab | 0
.../prefab => prefabs}/red_demon_imp.prefab.meta | 0
.../prefab => prefabs}/red_sk_archer.prefab | 0
.../prefab => prefabs}/red_sk_archer.prefab.meta | 0
.../prefab => prefabs}/red_zombie_common.prefab | 0
.../prefab => prefabs}/red_zombie_common.prefab.meta | 0
42 files changed, 14 insertions(+)
create mode 100644 Assets/prefabs.meta
rename Assets/{3rdParty/Skeleton/prefab => prefabs}/CYAN_SK.prefab (100%)
rename Assets/{3rdParty/Skeleton/prefab => prefabs}/CYAN_SK.prefab.meta (100%)
rename Assets/{3rdParty/Necromancer/Prefab => prefabs}/Necromancer_cyan.prefab (100%)
rename Assets/{3rdParty/Necromancer/Prefab => prefabs}/Necromancer_cyan.prefab.meta (100%)
rename Assets/{3rdParty/Necromancer/Prefab => prefabs}/Necromancer_puke.prefab (100%)
rename Assets/{3rdParty/Necromancer/Prefab => prefabs}/Necromancer_puke.prefab.meta (100%)
rename Assets/{3rdParty/Necromancer/Prefab => prefabs}/Necromancer_purple.prefab (100%)
rename Assets/{3rdParty/Necromancer/Prefab => prefabs}/Necromancer_purple.prefab.meta (100%)
rename Assets/{3rdParty/Necromancer/Prefab => prefabs}/Necromancer_red.prefab (100%)
rename Assets/{3rdParty/Necromancer/Prefab => prefabs}/Necromancer_red.prefab.meta (100%)
rename Assets/{3rdParty/Skeleton/prefab => prefabs}/PUKE_SK.prefab (100%)
rename Assets/{3rdParty/Skeleton/prefab => prefabs}/PUKE_SK.prefab.meta (100%)
rename Assets/{3rdParty/Skeleton/prefab => prefabs}/PURPLE_SK.prefab (100%)
rename Assets/{3rdParty/Skeleton/prefab => prefabs}/PURPLE_SK.prefab.meta (100%)
rename Assets/{3rdParty/Skeleton/prefab => prefabs}/RED_SK.prefab (100%)
rename Assets/{3rdParty/Skeleton/prefab => prefabs}/RED_SK.prefab.meta (100%)
rename Assets/{3rdParty/DemonImp/prefab => prefabs}/cyan_demon_imp.prefab (100%)
rename Assets/{3rdParty/DemonImp/prefab => prefabs}/cyan_demon_imp.prefab.meta (100%)
rename Assets/{3rdParty/ArcherSkeleton/prefab => prefabs}/cyan_sk_archer.prefab (100%)
rename Assets/{3rdParty/ArcherSkeleton/prefab => prefabs}/cyan_sk_archer.prefab.meta (100%)
rename Assets/{3rdParty/ZombieCommon/prefab => prefabs}/cyan_zombie_common.prefab (100%)
rename Assets/{3rdParty/ZombieCommon/prefab => prefabs}/cyan_zombie_common.prefab.meta (100%)
rename Assets/{3rdParty/DemonImp/prefab => prefabs}/puke_demon_imp.prefab (100%)
rename Assets/{3rdParty/DemonImp/prefab => prefabs}/puke_demon_imp.prefab.meta (100%)
rename Assets/{3rdParty/ArcherSkeleton/prefab => prefabs}/puke_sk_archer.prefab (100%)
rename Assets/{3rdParty/ArcherSkeleton/prefab => prefabs}/puke_sk_archer.prefab.meta (100%)
rename Assets/{3rdParty/ZombieCommon/prefab => prefabs}/puke_zombie_common.prefab (100%)
rename Assets/{3rdParty/ZombieCommon/prefab => prefabs}/puke_zombie_common.prefab.meta (100%)
rename Assets/{3rdParty/DemonImp/prefab => prefabs}/purple_demon_imp.prefab (100%)
rename Assets/{3rdParty/DemonImp/prefab => prefabs}/purple_demon_imp.prefab.meta (100%)
rename Assets/{3rdParty/ArcherSkeleton/prefab => prefabs}/purple_sk_archer.prefab (100%)
rename Assets/{3rdParty/ArcherSkeleton/prefab => prefabs}/purple_sk_archer.prefab.meta (100%)
rename Assets/{3rdParty/ZombieCommon/prefab => prefabs}/purple_zombie_common.prefab (100%)
rename Assets/{3rdParty/ZombieCommon/prefab => prefabs}/purple_zombie_common.prefab.meta (100%)
rename Assets/{3rdParty/DemonImp/prefab => prefabs}/red_demon_imp.prefab (100%)
rename Assets/{3rdParty/DemonImp/prefab => prefabs}/red_demon_imp.prefab.meta (100%)
rename Assets/{3rdParty/ArcherSkeleton/prefab => prefabs}/red_sk_archer.prefab (100%)
rename Assets/{3rdParty/ArcherSkeleton/prefab => prefabs}/red_sk_archer.prefab.meta (100%)
rename Assets/{3rdParty/ZombieCommon/prefab => prefabs}/red_zombie_common.prefab (100%)
rename Assets/{3rdParty/ZombieCommon/prefab => prefabs}/red_zombie_common.prefab.meta (100%)
diff --git a/Assets/UnitBehaviour.cs b/Assets/UnitBehaviour.cs
index a4b90ef..406754c 100644
--- a/Assets/UnitBehaviour.cs
+++ b/Assets/UnitBehaviour.cs
@@ -38,6 +38,11 @@ public class UnitBehaviour : MonoBehaviour {
public int attackActions = 2;
public Elemental attackElem = Elemental.None;
+ public bool attackAnim = false;
+ public bool moveAnim = false;
+ public bool castAnim = false;
+ public bool deathAnim = false;
+
public void SetupStats (int pX, int pZ, Team id, int actions = 2, int steps = 5, int p = 50, int crit = 10, int pRange = 20, int critRange = 10) {
posX = pX;
posZ = pZ;
diff --git a/Assets/prefabs.meta b/Assets/prefabs.meta
new file mode 100644
index 0000000..c460508
--- /dev/null
+++ b/Assets/prefabs.meta
@@ -0,0 +1,9 @@
+fileFormatVersion: 2
+guid: 97ae0f17910977043a86593cfc31b693
+folderAsset: yes
+timeCreated: 1477824638
+licenseType: Free
+DefaultImporter:
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/3rdParty/Skeleton/prefab/CYAN_SK.prefab b/Assets/prefabs/CYAN_SK.prefab
similarity index 100%
rename from Assets/3rdParty/Skeleton/prefab/CYAN_SK.prefab
rename to Assets/prefabs/CYAN_SK.prefab
diff --git a/Assets/3rdParty/Skeleton/prefab/CYAN_SK.prefab.meta b/Assets/prefabs/CYAN_SK.prefab.meta
similarity index 100%
rename from Assets/3rdParty/Skeleton/prefab/CYAN_SK.prefab.meta
rename to Assets/prefabs/CYAN_SK.prefab.meta
diff --git a/Assets/3rdParty/Necromancer/Prefab/Necromancer_cyan.prefab b/Assets/prefabs/Necromancer_cyan.prefab
similarity index 100%
rename from Assets/3rdParty/Necromancer/Prefab/Necromancer_cyan.prefab
rename to Assets/prefabs/Necromancer_cyan.prefab
diff --git a/Assets/3rdParty/Necromancer/Prefab/Necromancer_cyan.prefab.meta b/Assets/prefabs/Necromancer_cyan.prefab.meta
similarity index 100%
rename from Assets/3rdParty/Necromancer/Prefab/Necromancer_cyan.prefab.meta
rename to Assets/prefabs/Necromancer_cyan.prefab.meta
diff --git a/Assets/3rdParty/Necromancer/Prefab/Necromancer_puke.prefab b/Assets/prefabs/Necromancer_puke.prefab
similarity index 100%
rename from Assets/3rdParty/Necromancer/Prefab/Necromancer_puke.prefab
rename to Assets/prefabs/Necromancer_puke.prefab
diff --git a/Assets/3rdParty/Necromancer/Prefab/Necromancer_puke.prefab.meta b/Assets/prefabs/Necromancer_puke.prefab.meta
similarity index 100%
rename from Assets/3rdParty/Necromancer/Prefab/Necromancer_puke.prefab.meta
rename to Assets/prefabs/Necromancer_puke.prefab.meta
diff --git a/Assets/3rdParty/Necromancer/Prefab/Necromancer_purple.prefab b/Assets/prefabs/Necromancer_purple.prefab
similarity index 100%
rename from Assets/3rdParty/Necromancer/Prefab/Necromancer_purple.prefab
rename to Assets/prefabs/Necromancer_purple.prefab
diff --git a/Assets/3rdParty/Necromancer/Prefab/Necromancer_purple.prefab.meta b/Assets/prefabs/Necromancer_purple.prefab.meta
similarity index 100%
rename from Assets/3rdParty/Necromancer/Prefab/Necromancer_purple.prefab.meta
rename to Assets/prefabs/Necromancer_purple.prefab.meta
diff --git a/Assets/3rdParty/Necromancer/Prefab/Necromancer_red.prefab b/Assets/prefabs/Necromancer_red.prefab
similarity index 100%
rename from Assets/3rdParty/Necromancer/Prefab/Necromancer_red.prefab
rename to Assets/prefabs/Necromancer_red.prefab
diff --git a/Assets/3rdParty/Necromancer/Prefab/Necromancer_red.prefab.meta b/Assets/prefabs/Necromancer_red.prefab.meta
similarity index 100%
rename from Assets/3rdParty/Necromancer/Prefab/Necromancer_red.prefab.meta
rename to Assets/prefabs/Necromancer_red.prefab.meta
diff --git a/Assets/3rdParty/Skeleton/prefab/PUKE_SK.prefab b/Assets/prefabs/PUKE_SK.prefab
similarity index 100%
rename from Assets/3rdParty/Skeleton/prefab/PUKE_SK.prefab
rename to Assets/prefabs/PUKE_SK.prefab
diff --git a/Assets/3rdParty/Skeleton/prefab/PUKE_SK.prefab.meta b/Assets/prefabs/PUKE_SK.prefab.meta
similarity index 100%
rename from Assets/3rdParty/Skeleton/prefab/PUKE_SK.prefab.meta
rename to Assets/prefabs/PUKE_SK.prefab.meta
diff --git a/Assets/3rdParty/Skeleton/prefab/PURPLE_SK.prefab b/Assets/prefabs/PURPLE_SK.prefab
similarity index 100%
rename from Assets/3rdParty/Skeleton/prefab/PURPLE_SK.prefab
rename to Assets/prefabs/PURPLE_SK.prefab
diff --git a/Assets/3rdParty/Skeleton/prefab/PURPLE_SK.prefab.meta b/Assets/prefabs/PURPLE_SK.prefab.meta
similarity index 100%
rename from Assets/3rdParty/Skeleton/prefab/PURPLE_SK.prefab.meta
rename to Assets/prefabs/PURPLE_SK.prefab.meta
diff --git a/Assets/3rdParty/Skeleton/prefab/RED_SK.prefab b/Assets/prefabs/RED_SK.prefab
similarity index 100%
rename from Assets/3rdParty/Skeleton/prefab/RED_SK.prefab
rename to Assets/prefabs/RED_SK.prefab
diff --git a/Assets/3rdParty/Skeleton/prefab/RED_SK.prefab.meta b/Assets/prefabs/RED_SK.prefab.meta
similarity index 100%
rename from Assets/3rdParty/Skeleton/prefab/RED_SK.prefab.meta
rename to Assets/prefabs/RED_SK.prefab.meta
diff --git a/Assets/3rdParty/DemonImp/prefab/cyan_demon_imp.prefab b/Assets/prefabs/cyan_demon_imp.prefab
similarity index 100%
rename from Assets/3rdParty/DemonImp/prefab/cyan_demon_imp.prefab
rename to Assets/prefabs/cyan_demon_imp.prefab
diff --git a/Assets/3rdParty/DemonImp/prefab/cyan_demon_imp.prefab.meta b/Assets/prefabs/cyan_demon_imp.prefab.meta
similarity index 100%
rename from Assets/3rdParty/DemonImp/prefab/cyan_demon_imp.prefab.meta
rename to Assets/prefabs/cyan_demon_imp.prefab.meta
diff --git a/Assets/3rdParty/ArcherSkeleton/prefab/cyan_sk_archer.prefab b/Assets/prefabs/cyan_sk_archer.prefab
similarity index 100%
rename from Assets/3rdParty/ArcherSkeleton/prefab/cyan_sk_archer.prefab
rename to Assets/prefabs/cyan_sk_archer.prefab
diff --git a/Assets/3rdParty/ArcherSkeleton/prefab/cyan_sk_archer.prefab.meta b/Assets/prefabs/cyan_sk_archer.prefab.meta
similarity index 100%
rename from Assets/3rdParty/ArcherSkeleton/prefab/cyan_sk_archer.prefab.meta
rename to Assets/prefabs/cyan_sk_archer.prefab.meta
diff --git a/Assets/3rdParty/ZombieCommon/prefab/cyan_zombie_common.prefab b/Assets/prefabs/cyan_zombie_common.prefab
similarity index 100%
rename from Assets/3rdParty/ZombieCommon/prefab/cyan_zombie_common.prefab
rename to Assets/prefabs/cyan_zombie_common.prefab
diff --git a/Assets/3rdParty/ZombieCommon/prefab/cyan_zombie_common.prefab.meta b/Assets/prefabs/cyan_zombie_common.prefab.meta
similarity index 100%
rename from Assets/3rdParty/ZombieCommon/prefab/cyan_zombie_common.prefab.meta
rename to Assets/prefabs/cyan_zombie_common.prefab.meta
diff --git a/Assets/3rdParty/DemonImp/prefab/puke_demon_imp.prefab b/Assets/prefabs/puke_demon_imp.prefab
similarity index 100%
rename from Assets/3rdParty/DemonImp/prefab/puke_demon_imp.prefab
rename to Assets/prefabs/puke_demon_imp.prefab
diff --git a/Assets/3rdParty/DemonImp/prefab/puke_demon_imp.prefab.meta b/Assets/prefabs/puke_demon_imp.prefab.meta
similarity index 100%
rename from Assets/3rdParty/DemonImp/prefab/puke_demon_imp.prefab.meta
rename to Assets/prefabs/puke_demon_imp.prefab.meta
diff --git a/Assets/3rdParty/ArcherSkeleton/prefab/puke_sk_archer.prefab b/Assets/prefabs/puke_sk_archer.prefab
similarity index 100%
rename from Assets/3rdParty/ArcherSkeleton/prefab/puke_sk_archer.prefab
rename to Assets/prefabs/puke_sk_archer.prefab
diff --git a/Assets/3rdParty/ArcherSkeleton/prefab/puke_sk_archer.prefab.meta b/Assets/prefabs/puke_sk_archer.prefab.meta
similarity index 100%
rename from Assets/3rdParty/ArcherSkeleton/prefab/puke_sk_archer.prefab.meta
rename to Assets/prefabs/puke_sk_archer.prefab.meta
diff --git a/Assets/3rdParty/ZombieCommon/prefab/puke_zombie_common.prefab b/Assets/prefabs/puke_zombie_common.prefab
similarity index 100%
rename from Assets/3rdParty/ZombieCommon/prefab/puke_zombie_common.prefab
rename to Assets/prefabs/puke_zombie_common.prefab
diff --git a/Assets/3rdParty/ZombieCommon/prefab/puke_zombie_common.prefab.meta b/Assets/prefabs/puke_zombie_common.prefab.meta
similarity index 100%
rename from Assets/3rdParty/ZombieCommon/prefab/puke_zombie_common.prefab.meta
rename to Assets/prefabs/puke_zombie_common.prefab.meta
diff --git a/Assets/3rdParty/DemonImp/prefab/purple_demon_imp.prefab b/Assets/prefabs/purple_demon_imp.prefab
similarity index 100%
rename from Assets/3rdParty/DemonImp/prefab/purple_demon_imp.prefab
rename to Assets/prefabs/purple_demon_imp.prefab
diff --git a/Assets/3rdParty/DemonImp/prefab/purple_demon_imp.prefab.meta b/Assets/prefabs/purple_demon_imp.prefab.meta
similarity index 100%
rename from Assets/3rdParty/DemonImp/prefab/purple_demon_imp.prefab.meta
rename to Assets/prefabs/purple_demon_imp.prefab.meta
diff --git a/Assets/3rdParty/ArcherSkeleton/prefab/purple_sk_archer.prefab b/Assets/prefabs/purple_sk_archer.prefab
similarity index 100%
rename from Assets/3rdParty/ArcherSkeleton/prefab/purple_sk_archer.prefab
rename to Assets/prefabs/purple_sk_archer.prefab
diff --git a/Assets/3rdParty/ArcherSkeleton/prefab/purple_sk_archer.prefab.meta b/Assets/prefabs/purple_sk_archer.prefab.meta
similarity index 100%
rename from Assets/3rdParty/ArcherSkeleton/prefab/purple_sk_archer.prefab.meta
rename to Assets/prefabs/purple_sk_archer.prefab.meta
diff --git a/Assets/3rdParty/ZombieCommon/prefab/purple_zombie_common.prefab b/Assets/prefabs/purple_zombie_common.prefab
similarity index 100%
rename from Assets/3rdParty/ZombieCommon/prefab/purple_zombie_common.prefab
rename to Assets/prefabs/purple_zombie_common.prefab
diff --git a/Assets/3rdParty/ZombieCommon/prefab/purple_zombie_common.prefab.meta b/Assets/prefabs/purple_zombie_common.prefab.meta
similarity index 100%
rename from Assets/3rdParty/ZombieCommon/prefab/purple_zombie_common.prefab.meta
rename to Assets/prefabs/purple_zombie_common.prefab.meta
diff --git a/Assets/3rdParty/DemonImp/prefab/red_demon_imp.prefab b/Assets/prefabs/red_demon_imp.prefab
similarity index 100%
rename from Assets/3rdParty/DemonImp/prefab/red_demon_imp.prefab
rename to Assets/prefabs/red_demon_imp.prefab
diff --git a/Assets/3rdParty/DemonImp/prefab/red_demon_imp.prefab.meta b/Assets/prefabs/red_demon_imp.prefab.meta
similarity index 100%
rename from Assets/3rdParty/DemonImp/prefab/red_demon_imp.prefab.meta
rename to Assets/prefabs/red_demon_imp.prefab.meta
diff --git a/Assets/3rdParty/ArcherSkeleton/prefab/red_sk_archer.prefab b/Assets/prefabs/red_sk_archer.prefab
similarity index 100%
rename from Assets/3rdParty/ArcherSkeleton/prefab/red_sk_archer.prefab
rename to Assets/prefabs/red_sk_archer.prefab
diff --git a/Assets/3rdParty/ArcherSkeleton/prefab/red_sk_archer.prefab.meta b/Assets/prefabs/red_sk_archer.prefab.meta
similarity index 100%
rename from Assets/3rdParty/ArcherSkeleton/prefab/red_sk_archer.prefab.meta
rename to Assets/prefabs/red_sk_archer.prefab.meta
diff --git a/Assets/3rdParty/ZombieCommon/prefab/red_zombie_common.prefab b/Assets/prefabs/red_zombie_common.prefab
similarity index 100%
rename from Assets/3rdParty/ZombieCommon/prefab/red_zombie_common.prefab
rename to Assets/prefabs/red_zombie_common.prefab
diff --git a/Assets/3rdParty/ZombieCommon/prefab/red_zombie_common.prefab.meta b/Assets/prefabs/red_zombie_common.prefab.meta
similarity index 100%
rename from Assets/3rdParty/ZombieCommon/prefab/red_zombie_common.prefab.meta
rename to Assets/prefabs/red_zombie_common.prefab.meta