From 491129c3346dab8d9d0a2800dba24bb704d456fa Mon Sep 17 00:00:00 2001 From: LeonardoTPereira Date: Sat, 4 Mar 2023 20:47:51 -0300 Subject: [PATCH 1/3] Revert "Revert asset changes and the ex-new malformed imp AI" This reverts commit 1768ad3aed270e9691ea3decf43ce7d8659c5aaf. --- Assets/ScriptableObjects/AssetDatabase.asset | 21 +- .../CharacterClasses/Units/Amidi.asset | 7 +- .../CharacterClasses/Units/Gregorim.asset | 11 +- .../CharacterClasses/Units/Herman.asset | 8 +- .../CharacterClasses/Units/Xander.asset | 7 +- .../ScriptableObjects/Enemies/Banshee.asset | 28 ++- .../Enemies/CerberusHead.asset | 36 ++-- Assets/ScriptableObjects/Enemies/Dummy.asset | 26 +-- .../Enemies/Eunuch Satyr.asset | 203 ++++++++++++++++-- .../Enemies/Evil Spirit.asset | 40 ++-- .../Enemies/Freed Wanderer.asset | 70 ++---- .../Enemies/Golden Tormentor.asset | 148 ++++++------- .../Enemies/Malformed Imp (Earth).asset | 139 ++++++------ .../Enemies/Malformed Imp (Fire).asset | 139 ++++++------ .../Enemies/Malformed Imp (Water).asset | 139 ++++++------ .../Enemies/Malformed Imp (Wind).asset | 139 ++++++------ Assets/ScriptableObjects/Enemies/Mammon.asset | 32 ++- .../ScriptableObjects/Enemies/Overseer.asset | 36 ++-- Assets/ScriptableObjects/Enemies/Pwner.asset | 64 ++++-- .../ScriptableObjects/Enemies/Skeleton.asset | 20 +- .../ScriptableObjects/Enemies/Wanderer.asset | 70 ++---- Assets/ScriptableObjects/Party.asset | 6 +- Assets/ScriptableObjects/Quests/Beggars.asset | 2 +- .../Quests/Part2Mainquest.asset | 4 +- .../ScriptableObjects/Quests/SoulWalls.asset | 2 +- Assets/Scripts/DynamicTable.cs | 26 ++- .../EnemiesAI/EnemySingleActiveSkillUser.cs | 15 ++ .../EnemySingleActiveSkillUser.cs.meta | 11 + Assets/Scripts/Scriptable Objects/Enemy.cs | 90 ++++++-- .../Scripts/Scriptable Objects/EnemySkill.cs | 57 ++++- Assets/Scripts/Scriptable Objects/Skill.cs | 31 ++- Assets/Skills/BasicSkills/EnemyAttack.asset | 1 + Assets/Skills/BasicSkills/PlayerAttack.asset | 1 + Assets/Skills/BasicSkills/PlayerDefend.asset | 1 + .../BasicSkills/PlayerMagicAttack.asset | 1 + .../BasicSkills/PlayerSlashAttack.asset | 1 + Assets/Skills/BlackMageSkills/Anaemia.asset | 5 +- Assets/Skills/BlackMageSkills/Bleeding.asset | 7 +- .../Skills/BlackMageSkills/Fiery Stroke.asset | 1 + .../Skills/BlackMageSkills/FireBullet.asset | 7 +- Assets/Skills/BlackMageSkills/FrostBite.asset | 5 +- .../Skills/BlackMageSkills/Haemorrhage.asset | 1 + .../BlackMageSkills/Holy Necromancy.asset | 1 + Assets/Skills/BlackMageSkills/Impaling.asset | 5 +- .../BlackMageSkills/Infernal Hail.asset | 1 + .../Skills/BlackMageSkills/Stonestorm.asset | 1 + .../Skills/BlackMageSkills/Suffocation.asset | 1 + Assets/Skills/BlackMageSkills/WindCut.asset | 5 +- .../CerberusSkills/Bloodspil(Damage).asset | 1 + .../CerberusSkills/Bloodspill(Heal).asset | 1 + .../Skills/CerberusSkills/Ghost Limbs.asset | 41 +++- Assets/Skills/CerberusSkills/Hellfire.asset | 1 + .../CerberusSkills/Tremendous Roar.asset | 1 + .../EnemySkills/Contagious Sorrow.asset | 81 ++++++- Assets/Skills/EnemySkills/Earth Strike.asset | 1 + Assets/Skills/EnemySkills/Eternal Cry.asset | 1 + .../Skills/EnemySkills/Ethereal Shield.asset | 1 + .../EnemySkills/Fire Bullet Enemy.asset | 1 + .../Skills/EnemySkills/Frostbite Enemy.asset | 1 + .../Skills/EnemySkills/Impaling Enemy.asset | 1 + Assets/Skills/EnemySkills/LaserBeam.asset | 1 + Assets/Skills/EnemySkills/Leadership.asset | 1 + Assets/Skills/EnemySkills/Ominous Wind.asset | 1 + Assets/Skills/EnemySkills/Rebirth.asset | 1 + Assets/Skills/EnemySkills/Solitude.asset | 1 + .../Skills/EnemySkills/Unfinished Work.asset | 53 ++++- .../Skills/EnemySkills/Wind Cut Enemy.asset | 1 + .../Skills/MammonSkills/GreatDepression.asset | 25 ++- Assets/Skills/MammonSkills/Inflation.asset | 25 ++- Assets/Skills/MammonSkills/MammonsBribe.asset | 25 ++- Assets/Skills/MammonSkills/Savings.asset | 25 ++- Assets/Skills/RogueSkills/Bribery.asset | 7 +- Assets/Skills/RogueSkills/Capitalism.asset | 1 + Assets/Skills/RogueSkills/Coaching.asset | 1 + Assets/Skills/RogueSkills/De Tox juice.asset | 1 + Assets/Skills/RogueSkills/Debt Trap.asset | 1 + Assets/Skills/RogueSkills/Herman Scheme.asset | 7 +- Assets/Skills/RogueSkills/Obscurantism.asset | 1 + .../Skills/RogueSkills/Quantum Coaching.asset | 1 + Assets/Skills/RogueSkills/Socialism.asset | 9 +- Assets/Skills/RogueSkills/Surplus.asset | 7 +- .../WarriorSkills/Anti-Mage's Taunt.asset | 1 + Assets/Skills/WarriorSkills/Bait.asset | 3 +- Assets/Skills/WarriorSkills/DoubleMarch.asset | 1 + .../WarriorSkills/General's Taunt.asset | 1 + Assets/Skills/WarriorSkills/InstillFear.asset | 11 +- Assets/Skills/WarriorSkills/Insult.asset | 7 +- .../WarriorSkills/Promise of Riches.asset | 11 +- .../WarriorSkills/Rapid Deployment.asset | 7 +- .../WhiteMageSkills/Celebrating Victory.asset | 7 +- .../WhiteMageSkills/Dominica Sanitatem.asset | 7 +- .../WhiteMageSkills/Lava in Siloe.asset | 1 + .../WhiteMageSkills/Mental Fortitude.asset | 7 +- .../Omnibus Dominicae Sanitatem.asset | 1 + .../WhiteMageSkills/Surgere et ambulare.asset | 7 +- .../WhiteMageSkills/Tardus at Iram.asset | 1 + .../Skills/WhiteMageSkills/Volare Via.asset | 1 + 97 files changed, 1345 insertions(+), 728 deletions(-) create mode 100644 Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs create mode 100644 Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs.meta diff --git a/Assets/ScriptableObjects/AssetDatabase.asset b/Assets/ScriptableObjects/AssetDatabase.asset index 98813627..f37bcfc0 100644 --- a/Assets/ScriptableObjects/AssetDatabase.asset +++ b/Assets/ScriptableObjects/AssetDatabase.asset @@ -15,7 +15,6 @@ MonoBehaviour: party: assets: - {fileID: 11400000, guid: bfcc6757f0187c44cbe472d8c6016f4a, type: 2} - bundleName: party heroes: assets: - {fileID: 11400000, guid: e9fc2909baeab9f429400cf3858d323d, type: 2} @@ -23,19 +22,24 @@ MonoBehaviour: - {fileID: 11400000, guid: e9525b6ce1e46534e930ac508a9af0ab, type: 2} - {fileID: 11400000, guid: 0170c5b1892fb7b4289b1ccaba155a63, type: 2} - {fileID: 11400000, guid: 242d4f97eef6c3245949a9eabd38989c, type: 2} - bundleName: hero enemies: assets: - {fileID: 11400000, guid: 5886978ba6fa6b848b57af610480fd1c, type: 2} - {fileID: 11400000, guid: c14a8617fc60fec45a18cc0dd80ec85e, type: 2} - {fileID: 11400000, guid: 507693d0156bdff479018166728a89bb, type: 2} + - {fileID: 11400000, guid: a68e3415856a9dd8cb3f570883b10fef, type: 2} - {fileID: 11400000, guid: ebce637ca18de8049bae47ce5619b52a, type: 2} + - {fileID: 11400000, guid: c6bf0a00cb946ab2490bb614e5cbab2a, type: 2} + - {fileID: 11400000, guid: 2e41f6aa0c564c91db7c675d5e6ee50f, type: 2} + - {fileID: 11400000, guid: 810593631b8ca6737ad248c3802a5a1b, type: 2} + - {fileID: 11400000, guid: 1ba2353e8c45136c2938ac15874e4b28, type: 2} + - {fileID: 11400000, guid: 0ac451b3f2e9308f9882fbe3abd1428f, type: 2} + - {fileID: 11400000, guid: 1be46cd66e137a7a1bef6109593731c7, type: 2} - {fileID: 11400000, guid: fc9397eef5dd14f499aa19d79f54d002, type: 2} - {fileID: 11400000, guid: 05c84e55866f810439ed4018afd0ed05, type: 2} - {fileID: 11400000, guid: 038022bbbe22d8246bc82a216a1c63b0, type: 2} - {fileID: 11400000, guid: 181700fda93314d42a197c5bd09067da, type: 2} - {fileID: 11400000, guid: 619fc667c0acf5d4cbb05d6c455f3324, type: 2} - bundleName: enemy skills: assets: - {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} @@ -60,14 +64,20 @@ MonoBehaviour: - {fileID: 11400000, guid: 546e6255b06e7f548bca11b9ffd4dff3, type: 2} - {fileID: 11400000, guid: 59a8e1c9b1e65a04aaed2d03306182ec, type: 2} - {fileID: 11400000, guid: 2e0db51bfd992b14d94ac1a86a5d52f1, type: 2} + - {fileID: 11400000, guid: 86896da9b9f283255b1044339e03990c, type: 2} - {fileID: 11400000, guid: 2c3021b87d1b78a458264d0c93f382d1, type: 2} - {fileID: 11400000, guid: c7f8ca5a99d6a8240a8df51799499057, type: 2} - {fileID: 11400000, guid: 146e0b485e422a34491481061bc3166e, type: 2} + - {fileID: 11400000, guid: f25a5633998651b4c99f38fb1da19a95, type: 2} + - {fileID: 11400000, guid: 9ae85ec78258f2e40aa10d36cb6b4eac, type: 2} + - {fileID: 11400000, guid: b20f3fd69792639499299460cab52ca9, type: 2} - {fileID: 11400000, guid: 0ca2852212a68e141abd6654048cd58e, type: 2} - {fileID: 11400000, guid: df9ec28c727b6984db874ca73c12eba5, type: 2} - {fileID: 11400000, guid: 2b9ee177640e75e44b19106c40449642, type: 2} - {fileID: 11400000, guid: 44550d9bdd31a5447a4eb4a6f3fe78b1, type: 2} - {fileID: 11400000, guid: 0aabb7711250c0043a60cdb4a6f69917, type: 2} + - {fileID: 11400000, guid: 50d29aa76f7ee9a91b40d49631441a91, type: 2} + - {fileID: 11400000, guid: 1d7789405f7314147b0aa1eaa8eb7313, type: 2} - {fileID: 11400000, guid: c55a39d96a70a2e42b62675fdb3ac85c, type: 2} - {fileID: 11400000, guid: 17f4f9e1932146b44be43f80c1814741, type: 2} - {fileID: 11400000, guid: a5464d3f63f43b345b8492fa44f13164, type: 2} @@ -98,9 +108,10 @@ MonoBehaviour: - {fileID: 11400000, guid: 139c8013cbcd44a4caf3da90c87c4447, type: 2} - {fileID: 11400000, guid: 1c4a70a18c0247b4db6b72a858ba6d77, type: 2} - {fileID: 11400000, guid: e015a2414b9c8b04cbf9ae3c79970254, type: 2} - bundleName: skill quests: assets: - {fileID: 11400000, guid: 677f1c2913c03544ab216650c53219c9, type: 2} + - {fileID: 11400000, guid: 8615d4504c47cc14da14226b01563773, type: 2} - {fileID: 11400000, guid: bb0791dbfe37dc647ad7ce1c40f3c45c, type: 2} - bundleName: quest + - {fileID: 11400000, guid: 86461e150e0505f4599af049f91e27d6, type: 2} + - {fileID: 11400000, guid: 3891461a8629aaf4cab13678a2280fa1, type: 2} diff --git a/Assets/ScriptableObjects/CharacterClasses/Units/Amidi.asset b/Assets/ScriptableObjects/CharacterClasses/Units/Amidi.asset index b93d7fc0..5c2fc503 100644 --- a/Assets/ScriptableObjects/CharacterClasses/Units/Amidi.asset +++ b/Assets/ScriptableObjects/CharacterClasses/Units/Amidi.asset @@ -74,11 +74,10 @@ MonoBehaviour: - {fileID: 11400000, guid: 5f72e851454fcf74b85cce7a775190db, type: 2} - {fileID: 11400000, guid: ce0b775e8fd75a649853fbd421384006, type: 2} skillsToUpdate: - - {fileID: 11400000, guid: d1dfa69ae0800ed48820d859d36d9962, type: 2} - - {fileID: 11400000, guid: 3f064401f4f88004eb3d4651c796b505, type: 2} - - {fileID: 11400000, guid: 78819aff25442334db7295c5af3b21e0, type: 2} - - {fileID: 11400000, guid: 5f72e851454fcf74b85cce7a775190db, type: 2} - {fileID: 11400000, guid: ce0b775e8fd75a649853fbd421384006, type: 2} + - {fileID: 11400000, guid: 582d7cf50d6f72647872d290a61905b9, type: 2} + - {fileID: 11400000, guid: 796b06ccfb966ff45896f4dd474b32d4, type: 2} + - {fileID: 11400000, guid: 31c0693584d3a684294a9fbdd5b5b3c8, type: 2} heroTable: {fileID: 4900000, guid: ec36bd18194dd7c4c878df0341fec704, type: 3} table: colTypes: diff --git a/Assets/ScriptableObjects/CharacterClasses/Units/Gregorim.asset b/Assets/ScriptableObjects/CharacterClasses/Units/Gregorim.asset index b152c2a3..a8568f28 100644 --- a/Assets/ScriptableObjects/CharacterClasses/Units/Gregorim.asset +++ b/Assets/ScriptableObjects/CharacterClasses/Units/Gregorim.asset @@ -80,13 +80,12 @@ MonoBehaviour: - {fileID: 11400000, guid: f6d06b9212f30134e8de2c3338c66ce2, type: 2} - {fileID: 11400000, guid: 99772e91d402651a19f9a545fb6ac70a, type: 2} skillsToUpdate: - - {fileID: 11400000, guid: e0a3cf6667f30454f8cfb2ffd7357dd4, type: 2} - - {fileID: 11400000, guid: 2553025485ef6014db812ae57d46bf00, type: 2} - - {fileID: 11400000, guid: 8b53236f7f4782c4c97833a42662c173, type: 2} - - {fileID: 11400000, guid: 3584cab9d6f57e943997103ae321edd5, type: 2} - - {fileID: 11400000, guid: 119f98d3dde04604cb731b7ca6107340, type: 2} - - {fileID: 11400000, guid: f6d06b9212f30134e8de2c3338c66ce2, type: 2} - {fileID: 11400000, guid: 99772e91d402651a19f9a545fb6ac70a, type: 2} + - {fileID: 11400000, guid: 713ad1edfed7be047b9e54e0c27af0a8, type: 2} + - {fileID: 11400000, guid: 6e9e516a23516ef4dae37687fdd1da3c, type: 2} + - {fileID: 11400000, guid: 0e23b4c715019e540817f3a2297aab68, type: 2} + - {fileID: 11400000, guid: 0547e57ad308798409bb37fa33e8409c, type: 2} + - {fileID: 11400000, guid: 0e475961e4ca2bf40b9372c00b1d3153, type: 2} heroTable: {fileID: 4900000, guid: 175b9fe79508c224f914b6d0264e7f37, type: 3} table: colTypes: diff --git a/Assets/ScriptableObjects/CharacterClasses/Units/Herman.asset b/Assets/ScriptableObjects/CharacterClasses/Units/Herman.asset index c1206079..52bebd9a 100644 --- a/Assets/ScriptableObjects/CharacterClasses/Units/Herman.asset +++ b/Assets/ScriptableObjects/CharacterClasses/Units/Herman.asset @@ -76,11 +76,11 @@ MonoBehaviour: - {fileID: 11400000, guid: 3f375c51ea883dc4f9fb12a06317e22c, type: 2} - {fileID: 11400000, guid: 8dd102f5f6dd2f70b8ba5ce6d25f17c2, type: 2} skillsToUpdate: - - {fileID: 11400000, guid: 70758a650379ada4591f631394c1a92c, type: 2} - - {fileID: 11400000, guid: f4fe5474cbca4674780f60355fd67e56, type: 2} - - {fileID: 11400000, guid: 0e10a0ffc20aa7f4fbc5e88247c459dc, type: 2} - - {fileID: 11400000, guid: 3f375c51ea883dc4f9fb12a06317e22c, type: 2} - {fileID: 11400000, guid: 8dd102f5f6dd2f70b8ba5ce6d25f17c2, type: 2} + - {fileID: 11400000, guid: 5ef492f0f94fbdb4eac62c14393de0a4, type: 2} + - {fileID: 11400000, guid: b240aa35f24516649ad1f94be90aad55, type: 2} + - {fileID: 11400000, guid: 34258218c6ebd334d94716b725f0412e, type: 2} + - {fileID: 11400000, guid: 7d5ebe08b95eafd458911a51571ccb67, type: 2} heroTable: {fileID: 4900000, guid: 39817faa54b5b2b43a1f8151656029f0, type: 3} table: colTypes: diff --git a/Assets/ScriptableObjects/CharacterClasses/Units/Xander.asset b/Assets/ScriptableObjects/CharacterClasses/Units/Xander.asset index b1f627f2..1ba475f5 100644 --- a/Assets/ScriptableObjects/CharacterClasses/Units/Xander.asset +++ b/Assets/ScriptableObjects/CharacterClasses/Units/Xander.asset @@ -74,11 +74,10 @@ MonoBehaviour: - {fileID: 11400000, guid: 139c8013cbcd44a4caf3da90c87c4447, type: 2} - {fileID: 11400000, guid: e015a2414b9c8b04cbf9ae3c79970254, type: 2} skillsToUpdate: - - {fileID: 11400000, guid: 61b4ce536dd3a0f4db29221345a2121b, type: 2} - - {fileID: 11400000, guid: 28b507e27020566428ea6178facfc5fe, type: 2} - - {fileID: 11400000, guid: a89b9a8ab49d0a04dbcd48c5be80dce1, type: 2} - - {fileID: 11400000, guid: 139c8013cbcd44a4caf3da90c87c4447, type: 2} - {fileID: 11400000, guid: e015a2414b9c8b04cbf9ae3c79970254, type: 2} + - {fileID: 11400000, guid: f10ded09276ddb5439d144b228506ae3, type: 2} + - {fileID: 11400000, guid: 77c32345c2b6be947b14d5bcbdd5b993, type: 2} + - {fileID: 11400000, guid: 1c4a70a18c0247b4db6b72a858ba6d77, type: 2} heroTable: {fileID: 4900000, guid: 4622ed642b7962c4fa8e423753681dc0, type: 3} table: colTypes: diff --git a/Assets/ScriptableObjects/Enemies/Banshee.asset b/Assets/ScriptableObjects/Enemies/Banshee.asset index b3735595..572cff93 100644 --- a/Assets/ScriptableObjects/Enemies/Banshee.asset +++ b/Assets/ScriptableObjects/Enemies/Banshee.asset @@ -94,6 +94,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -111,7 +112,8 @@ MonoBehaviour: - XP - LevelSkill0 - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 + - ChanceToUseSkill1 rows: - elements: - Noob Banshee @@ -125,12 +127,13 @@ MonoBehaviour: - 1 - 0.5 - 1.5 - - 1.0 - - 1.0 + - 1 + - 1 - 260 - 1 - 1 - 0.3 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -150,6 +153,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Banshee - 5 @@ -162,12 +166,13 @@ MonoBehaviour: - 1 - 0.5 - 1.5 - - 1.0 - - 1.0 + - 1 + - 1 - 900 - 2 - 2 - 0.3 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -187,6 +192,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Banshee - 10 @@ -199,12 +205,13 @@ MonoBehaviour: - 1 - 0.5 - 1.5 - - 1.0 - - 1.0 + - 1 + - 1 - 1600 - 3 - 3 - 0.35 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -224,6 +231,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Banshee - 15 @@ -236,12 +244,13 @@ MonoBehaviour: - 1 - 0.5 - 1.5 - - 1.0 - - 1.0 + - 1 + - 1 - 2300 - 4 - 4 - 0.35 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -261,4 +270,5 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/CerberusHead.asset b/Assets/ScriptableObjects/Enemies/CerberusHead.asset index 0e8d7ac8..f9b16ef8 100644 --- a/Assets/ScriptableObjects/Enemies/CerberusHead.asset +++ b/Assets/ScriptableObjects/Enemies/CerberusHead.asset @@ -45,7 +45,7 @@ MonoBehaviour: _keyValues: 01000000 _keys: 01000000 _values: - - 0.5 + - 5 skills: - {fileID: 11400000, guid: 59a8e1c9b1e65a04aaed2d03306182ec, type: 2} - {fileID: 11400000, guid: 2e0db51bfd992b14d94ac1a86a5d52f1, type: 2} @@ -92,7 +92,10 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank @@ -114,8 +117,11 @@ MonoBehaviour: - LevelSkill2 - LevelSkill3 - LevelSkill4 - - LevelSkill5 - - ChancetoUseSkill + - ChanceToUseSkill0 + - ChanceToUseSkill1 + - ChanceToUseSkill2 + - ChanceToUseSkill3 + - ChanceToUseSkill4 rows: - elements: - Cerberus @@ -126,19 +132,22 @@ MonoBehaviour: - 15 - 30 - '#FFFFFFFF' - - 0.5 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 0,5 + - 1 + - 1 + - 1 + - 1 - 2331 - - 0 - 1 - 1 - 1 - 1 - 1 - - 0.4 + - 0,4 + - 1 + - 1 + - 1 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -160,7 +169,10 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 bodySprite: {fileID: 21300002, guid: b037615be5a0e2b4c9dbad9d4e737e88, type: 3} diff --git a/Assets/ScriptableObjects/Enemies/Dummy.asset b/Assets/ScriptableObjects/Enemies/Dummy.asset index 10ea1999..4f371d6b 100644 --- a/Assets/ScriptableObjects/Enemies/Dummy.asset +++ b/Assets/ScriptableObjects/Enemies/Dummy.asset @@ -81,7 +81,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -97,7 +96,6 @@ MonoBehaviour: - EarthResistance - NeutralResistance - XP - - ChancetoUseSkill rows: - elements: - Dummy @@ -108,13 +106,12 @@ MonoBehaviour: - 4 - 7 - '#D2D2D2' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 300 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -131,7 +128,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Stronk Dummy - 5 @@ -141,13 +137,12 @@ MonoBehaviour: - 10 - 10 - '#A83E00' - - 1.5 - - 1.5 - - 1.5 - - 1.5 - - 1.5 + - 1,5 + - 1,5 + - 1,5 + - 1,5 + - 1,5 - 50 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -164,5 +159,4 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset b/Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset index 79007edf..77ed1b72 100644 --- a/Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset +++ b/Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset @@ -12,13 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1316a6010cc2419be8478b1910870c23, type: 3} m_Name: Eunuch Satyr m_EditorClassIdentifier: - name: Eunuch Satyr - level: 0 - hpMax: 0 - baseDmg: 0 - baseDef: 0 - baseMagicDef: 0 - baseSpeed: 0 + name: Noob Eunuch Satyr + level: 1 + hpMax: 36 + baseDmg: 20 + baseDef: 6 + baseMagicDef: 5 + baseSpeed: 12 elementalResistances: reorderableList: canAdd: 1 @@ -42,9 +42,11 @@ MonoBehaviour: elementIcon: {fileID: 0} reqReferences: {fileID: 0} isExpanded: 0 - _keyValues: - _keys: - _values: [] + _keyValues: 0200000003000000 + _keys: 0200000003000000 + _values: + - 0.5 + - 1.5 skills: - {fileID: 11400000, guid: 86896da9b9f283255b1044339e03990c, type: 2} attackSkill: {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} @@ -69,9 +71,182 @@ MonoBehaviour: type: 3} enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3} bio: Where are my testicles, summer? - enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3} + enemyTable: {fileID: 4900000, guid: cf69a12763fd7434588fe531a6e0333c, type: 3} table: - colTypes: [] - colNames: [] - rows: [] + colTypes: + - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colNames: + - Rank + - Level + - HP + - Damage + - Defense + - Resistance + - Speed + - Color + - FireResistance + - WaterResistance + - WindResistance + - EarthResistance + - NeutralResistance + - XP + - LevelSkill0 + - ChanceToUseSkill0 + rows: + - elements: + - Noob Eunuch Satyr + - 1 + - 36 + - 20 + - 6 + - 5 + - 12 + - '#FFFFFF' + - 1 + - 0.5 + - 1.5 + - 1 + - 1 + - 260 + - 1 + - 0.4 + colTypes: + - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - Eunuch Satyr + - 5 + - 59 + - 32 + - 13 + - 12 + - 23 + - '#FF9EC0' + - 1 + - 0.5 + - 1.5 + - 1 + - 1 + - 900 + - 2 + - 0.4 + colTypes: + - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - Lt. Eunuch Satyr + - 10 + - 89 + - 44 + - 26 + - 23 + - 36 + - '#FF9EEF' + - 1 + - 0.5 + - 1.5 + - 1 + - 1 + - 1600 + - 3 + - 0.45 + colTypes: + - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - Capt. Eunuch Satyr + - 15 + - 137 + - 60 + - 40 + - 35 + - 52 + - '#E59EFF' + - 1 + - 0.5 + - 1.5 + - 1 + - 1 + - 2300 + - 4 + - 0.45 + colTypes: + - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, + PublicKeyToken=null + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Evil Spirit.asset b/Assets/ScriptableObjects/Enemies/Evil Spirit.asset index 4fd2b70d..e7c12d69 100644 --- a/Assets/ScriptableObjects/Enemies/Evil Spirit.asset +++ b/Assets/ScriptableObjects/Enemies/Evil Spirit.asset @@ -26,7 +26,7 @@ MonoBehaviour: draggable: 1 expandable: 1 multipleSelection: 1 - isExpanded: 0 + isExpanded: 1 label: m_Text: Keys m_Image: {fileID: 0} @@ -41,7 +41,7 @@ MonoBehaviour: elementNameOverride: elementIcon: {fileID: 0} reqReferences: {fileID: 0} - isExpanded: 0 + isExpanded: 1 _keyValues: 0300000004000000 _keys: 0300000004000000 _values: @@ -88,6 +88,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -105,7 +106,8 @@ MonoBehaviour: - XP - LevelSkill0 - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 + - ChanceToUseSkill1 rows: - elements: - Noob Evil Spirit @@ -116,15 +118,16 @@ MonoBehaviour: - 4 - 14 - '#FFFFFF' - - 1.0 - - 1.0 + - 1 + - 1 - 0.5 - 1.5 - - 1.0 + - 1 - 260 - 1 - 1 - 0.3 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -144,6 +147,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Evil Spirit - 5 @@ -153,15 +157,16 @@ MonoBehaviour: - 9 - 26 - '#FF9EC0' - - 1.0 - - 1.0 + - 1 + - 1 - 0.5 - 1.5 - - 1.0 + - 1 - 900 - 2 - 2 - 0.3 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -181,6 +186,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Evil Spirit - 10 @@ -190,15 +196,16 @@ MonoBehaviour: - 20 - 42 - '#FF9EEF' - - 1.0 - - 1.0 + - 1 + - 1 - 0.5 - 1.5 - - 1.0 + - 1 - 1600 - 3 - 3 - 0.35 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -218,6 +225,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Evil Spirit - 15 @@ -227,15 +235,16 @@ MonoBehaviour: - 31 - 59 - '#E59EFF' - - 1.0 - - 1.0 + - 1 + - 1 - 0.5 - 1.5 - - 1.0 + - 1 - 2300 - 4 - 4 - 0.35 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -255,4 +264,5 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Freed Wanderer.asset b/Assets/ScriptableObjects/Enemies/Freed Wanderer.asset index be1775eb..291da289 100644 --- a/Assets/ScriptableObjects/Enemies/Freed Wanderer.asset +++ b/Assets/ScriptableObjects/Enemies/Freed Wanderer.asset @@ -86,9 +86,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -104,9 +101,6 @@ MonoBehaviour: - EarthResistance - NeutralResistance - XP - - LevelSkill0 - - LevelSkill1 - - ChancetoUseSkill rows: - elements: - Noob Wanderer @@ -117,15 +111,12 @@ MonoBehaviour: - 5 - 13 - '#FFFFFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 220 - - 0 - - 0 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -142,9 +133,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Wanderer - 5 @@ -154,15 +142,12 @@ MonoBehaviour: - 12 - 24 - '#FF9EC0' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 830 - - 0 - - 0 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -179,9 +164,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Wanderer - 10 @@ -191,15 +173,12 @@ MonoBehaviour: - 23 - 39 - '#FF9EEF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 1540 - - 0 - - 0 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -216,9 +195,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Wanderer - 15 @@ -228,15 +204,12 @@ MonoBehaviour: - 35 - 55 - '#E59EFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 2210 - - 0 - - 0 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -253,7 +226,4 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Golden Tormentor.asset b/Assets/ScriptableObjects/Enemies/Golden Tormentor.asset index 14dde095..cd4ef016 100644 --- a/Assets/ScriptableObjects/Enemies/Golden Tormentor.asset +++ b/Assets/ScriptableObjects/Enemies/Golden Tormentor.asset @@ -12,13 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1494de32c58656842bde15226b17b8ca, type: 3} m_Name: Golden Tormentor m_EditorClassIdentifier: - name: Golden Tormentor - level: 5 - hpMax: 53 - baseDmg: 38 - baseDef: 10 - baseMagicDef: 12 - baseSpeed: 24 + name: Noob Golden Tormentor + level: 1 + hpMax: 34 + baseDmg: 19 + baseDef: 6 + baseMagicDef: 6 + baseSpeed: 10 elementalResistances: reorderableList: canAdd: 1 @@ -42,9 +42,11 @@ MonoBehaviour: elementIcon: {fileID: 0} reqReferences: {fileID: 0} isExpanded: 0 - _keyValues: - _keys: - _values: [] + _keyValues: 0100000002000000 + _keys: 0100000002000000 + _values: + - 0.5 + - 1.5 skills: - {fileID: 11400000, guid: 50d29aa76f7ee9a91b40d49631441a91, type: 2} attackSkill: {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} @@ -69,7 +71,7 @@ MonoBehaviour: type: 3} enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3} bio: Eat you up and spit you out. Baller. - enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3} + enemyTable: {fileID: 4900000, guid: 638d2ca67baaa5b448220ac051f291b7, type: 3} table: colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -88,7 +90,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank @@ -106,27 +107,25 @@ MonoBehaviour: - NeutralResistance - XP - LevelSkill0 - - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 rows: - elements: - - Noob Wanderer + - Noob Golden Tormentor - 1 - 34 - - 25 - - 4 - - 5 - - 13 + - 19 + - 6 + - 6 + - 10 - '#FFFFFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 220 - - 0 - - 0 - - 0 + - 0.5 + - 1.5 + - 1 + - 1 + - 1 + - 260 + - 1 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -144,26 +143,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Wanderer + - Golden Tormentor - 5 - - 53 - - 38 - - 10 - - 12 - - 24 + - 54 + - 31 + - 13 + - 13 + - 20 - '#FF9EC0' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 830 - - 0 - - 0 - - 0 + - 0.5 + - 1.5 + - 1 + - 1 + - 1 + - 900 + - 2 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -181,26 +178,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Lt. Wanderer + - Lt. Golden Tormentor - 10 - - 82 - - 52 - - 21 - - 23 - - 39 + - 84 + - 42 + - 27 + - 27 + - 32 - '#FF9EEF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1540 - - 0 - - 0 - - 0 + - 0.5 + - 1.5 + - 1 + - 1 + - 1 + - 1600 + - 3 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -218,26 +213,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Capt. Wanderer + - Capt. Golden Tormentor - 15 - - 128 - - 68 - - 32 - - 35 - - 55 + - 130 + - 58 + - 42 + - 42 + - 49 - '#E59EFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 2210 - - 0 - - 0 - - 0 + - 0.5 + - 1.5 + - 1 + - 1 + - 1 + - 2300 + - 4 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -255,6 +248,5 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - curTableRow: 1 + curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset b/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset index 38b6e2a9..be58e2e6 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset @@ -9,16 +9,16 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1494de32c58656842bde15226b17b8ca, type: 3} + m_Script: {fileID: 11500000, guid: 5bb4b73a56b066945a09e38fde03ea7c, type: 3} m_Name: Malformed Imp (Earth) m_EditorClassIdentifier: - name: Malformed Imp - level: 5 - hpMax: 53 - baseDmg: 38 - baseDef: 10 - baseMagicDef: 12 - baseSpeed: 24 + name: Noob MalformedI mp + level: 1 + hpMax: 30 + baseDmg: 27 + baseDef: 4 + baseMagicDef: 5 + baseSpeed: 14 elementalResistances: reorderableList: canAdd: 1 @@ -42,10 +42,13 @@ MonoBehaviour: elementIcon: {fileID: 0} reqReferences: {fileID: 0} isExpanded: 0 - _keyValues: - _keys: - _values: [] - skills: [] + _keyValues: 0100000004000000 + _keys: 0100000004000000 + _values: + - 1.5 + - 0.5 + skills: + - {fileID: 11400000, guid: b20f3fd69792639499299460cab52ca9, type: 2} attackSkill: {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} defenseSkill: {fileID: 11400000, guid: 91ee493282c723147a741a8ac23970d9, type: 2} color: {r: 1, g: 1, b: 1, a: 1} @@ -68,7 +71,7 @@ MonoBehaviour: type: 3} enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3} bio: Mother, am I pretty? - enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3} + enemyTable: {fileID: 4900000, guid: a11f6c68bf9878d4e91ef22afd57280c, type: 3} table: colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -87,7 +90,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank @@ -105,27 +107,25 @@ MonoBehaviour: - NeutralResistance - XP - LevelSkill0 - - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 rows: - elements: - - Noob Wanderer + - Noob MalformedI mp - 1 - - 34 - - 25 + - 30 + - 27 - 4 - 5 - - 13 + - 14 - '#FFFFFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 220 - - 0 - - 0 - - 0 + - 1.5 + - 1 + - 1 + - 0.5 + - 1 + - 240 + - 1 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -143,26 +143,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Wanderer + - Malformed Imp - 5 - - 53 - - 38 + - 48 + - 44 - 10 - 12 - - 24 + - 25 - '#FF9EC0' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 830 - - 0 - - 0 - - 0 + - 1.5 + - 1 + - 1 + - 0.5 + - 1 + - 860 + - 2 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -180,26 +178,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Lt. Wanderer + - Lt. Malformed Imp - 10 - - 82 - - 52 + - 76 + - 59 - 21 - 23 - - 39 + - 40 - '#FF9EEF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1540 - - 0 - - 0 - - 0 + - 1.5 + - 1 + - 1 + - 0.5 + - 1 + - 1570 + - 3 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -217,26 +213,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Capt. Wanderer + - Capt. Malformed Imp - 15 - - 128 - - 68 + - 120 + - 77 - 32 - 35 - - 55 + - 57 - '#E59EFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 2210 - - 0 - - 0 - - 0 + - 1.5 + - 1 + - 1 + - 0.5 + - 1 + - 2260 + - 4 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -254,6 +248,5 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - curTableRow: 1 + curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Fire).asset b/Assets/ScriptableObjects/Enemies/Malformed Imp (Fire).asset index 5167a5e0..b8046425 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Fire).asset +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Fire).asset @@ -9,16 +9,16 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1494de32c58656842bde15226b17b8ca, type: 3} + m_Script: {fileID: 11500000, guid: 5bb4b73a56b066945a09e38fde03ea7c, type: 3} m_Name: Malformed Imp (Fire) m_EditorClassIdentifier: - name: Malformed Imp - level: 5 - hpMax: 53 - baseDmg: 38 - baseDef: 10 - baseMagicDef: 12 - baseSpeed: 24 + name: Noob MalformedI mp + level: 1 + hpMax: 30 + baseDmg: 27 + baseDef: 4 + baseMagicDef: 5 + baseSpeed: 14 elementalResistances: reorderableList: canAdd: 1 @@ -42,10 +42,13 @@ MonoBehaviour: elementIcon: {fileID: 0} reqReferences: {fileID: 0} isExpanded: 0 - _keyValues: - _keys: - _values: [] - skills: [] + _keyValues: 0100000002000000 + _keys: 0100000002000000 + _values: + - 0.5 + - 1.5 + skills: + - {fileID: 11400000, guid: f25a5633998651b4c99f38fb1da19a95, type: 2} attackSkill: {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} defenseSkill: {fileID: 11400000, guid: 91ee493282c723147a741a8ac23970d9, type: 2} color: {r: 1, g: 1, b: 1, a: 1} @@ -68,7 +71,7 @@ MonoBehaviour: type: 3} enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3} bio: Mother, am I pretty? - enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3} + enemyTable: {fileID: 4900000, guid: 6b6bb685b91ae344b96d15b915a34c61, type: 3} table: colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -87,7 +90,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank @@ -105,27 +107,25 @@ MonoBehaviour: - NeutralResistance - XP - LevelSkill0 - - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 rows: - elements: - - Noob Wanderer + - Noob MalformedI mp - 1 - - 34 - - 25 + - 30 + - 27 - 4 - 5 - - 13 + - 14 - '#FFFFFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 220 - - 0 - - 0 - - 0 + - 0.5 + - 1.5 + - 1 + - 1 + - 1 + - 240 + - 1 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -143,26 +143,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Wanderer + - Malformed Imp - 5 - - 53 - - 38 + - 48 + - 44 - 10 - 12 - - 24 + - 25 - '#FF9EC0' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 830 - - 0 - - 0 - - 0 + - 0.5 + - 1.5 + - 1 + - 1 + - 1 + - 860 + - 2 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -180,26 +178,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Lt. Wanderer + - Lt. Malformed Imp - 10 - - 82 - - 52 + - 76 + - 59 - 21 - 23 - - 39 + - 40 - '#FF9EEF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1540 - - 0 - - 0 - - 0 + - 0.5 + - 1.5 + - 1 + - 1 + - 1 + - 1570 + - 3 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -217,26 +213,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Capt. Wanderer + - Capt. Malformed Imp - 15 - - 128 - - 68 + - 120 + - 77 - 32 - 35 - - 55 + - 57 - '#E59EFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 2210 - - 0 - - 0 - - 0 + - 0.5 + - 1.5 + - 1 + - 1 + - 1 + - 2260 + - 4 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -254,6 +248,5 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - curTableRow: 1 + curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Water).asset b/Assets/ScriptableObjects/Enemies/Malformed Imp (Water).asset index 95ad66d9..9710d1f6 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Water).asset +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Water).asset @@ -9,16 +9,16 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1494de32c58656842bde15226b17b8ca, type: 3} + m_Script: {fileID: 11500000, guid: 5bb4b73a56b066945a09e38fde03ea7c, type: 3} m_Name: Malformed Imp (Water) m_EditorClassIdentifier: - name: Malformed Imp - level: 5 - hpMax: 53 - baseDmg: 38 - baseDef: 10 - baseMagicDef: 12 - baseSpeed: 24 + name: Noob MalformedI mp + level: 1 + hpMax: 30 + baseDmg: 27 + baseDef: 4 + baseMagicDef: 5 + baseSpeed: 14 elementalResistances: reorderableList: canAdd: 1 @@ -42,10 +42,13 @@ MonoBehaviour: elementIcon: {fileID: 0} reqReferences: {fileID: 0} isExpanded: 0 - _keyValues: - _keys: - _values: [] - skills: [] + _keyValues: 0200000003000000 + _keys: 0200000003000000 + _values: + - 0.5 + - 1.5 + skills: + - {fileID: 11400000, guid: 9ae85ec78258f2e40aa10d36cb6b4eac, type: 2} attackSkill: {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} defenseSkill: {fileID: 11400000, guid: 91ee493282c723147a741a8ac23970d9, type: 2} color: {r: 1, g: 1, b: 1, a: 1} @@ -68,7 +71,7 @@ MonoBehaviour: type: 3} enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3} bio: Mother, am I pretty? - enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3} + enemyTable: {fileID: 4900000, guid: f2de72d54c0620545b83f16227ad020b, type: 3} table: colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -87,7 +90,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank @@ -105,27 +107,25 @@ MonoBehaviour: - NeutralResistance - XP - LevelSkill0 - - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 rows: - elements: - - Noob Wanderer + - Noob MalformedI mp - 1 - - 34 - - 25 + - 30 + - 27 - 4 - 5 - - 13 + - 14 - '#FFFFFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 220 - - 0 - - 0 - - 0 + - 1 + - 0.5 + - 1.5 + - 1 + - 1 + - 240 + - 1 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -143,26 +143,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Wanderer + - Malformed Imp - 5 - - 53 - - 38 + - 48 + - 44 - 10 - 12 - - 24 + - 25 - '#FF9EC0' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 830 - - 0 - - 0 - - 0 + - 1 + - 0.5 + - 1.5 + - 1 + - 1 + - 860 + - 2 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -180,26 +178,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Lt. Wanderer + - Lt. Malformed Imp - 10 - - 82 - - 52 + - 76 + - 59 - 21 - 23 - - 39 + - 40 - '#FF9EEF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1540 - - 0 - - 0 - - 0 + - 1 + - 0.5 + - 1.5 + - 1 + - 1 + - 1570 + - 3 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -217,26 +213,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Capt. Wanderer + - Capt. Malformed Imp - 15 - - 128 - - 68 + - 120 + - 77 - 32 - 35 - - 55 + - 57 - '#E59EFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 2210 - - 0 - - 0 - - 0 + - 1 + - 0.5 + - 1.5 + - 1 + - 1 + - 2260 + - 4 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -254,6 +248,5 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - curTableRow: 1 + curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset b/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset index ccd89075..45c294cd 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset @@ -9,16 +9,16 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 1494de32c58656842bde15226b17b8ca, type: 3} + m_Script: {fileID: 11500000, guid: 5bb4b73a56b066945a09e38fde03ea7c, type: 3} m_Name: Malformed Imp (Wind) m_EditorClassIdentifier: - name: Malformed Imp - level: 5 - hpMax: 53 - baseDmg: 38 - baseDef: 10 - baseMagicDef: 12 - baseSpeed: 24 + name: Noob MalformedI mp + level: 1 + hpMax: 30 + baseDmg: 27 + baseDef: 4 + baseMagicDef: 5 + baseSpeed: 14 elementalResistances: reorderableList: canAdd: 1 @@ -42,10 +42,13 @@ MonoBehaviour: elementIcon: {fileID: 0} reqReferences: {fileID: 0} isExpanded: 0 - _keyValues: - _keys: - _values: [] - skills: [] + _keyValues: 0300000004000000 + _keys: 0300000004000000 + _values: + - 0.5 + - 1.5 + skills: + - {fileID: 11400000, guid: 1d7789405f7314147b0aa1eaa8eb7313, type: 2} attackSkill: {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} defenseSkill: {fileID: 11400000, guid: 91ee493282c723147a741a8ac23970d9, type: 2} color: {r: 1, g: 1, b: 1, a: 1} @@ -68,7 +71,7 @@ MonoBehaviour: type: 3} enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3} bio: Mother, am I pretty? - enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3} + enemyTable: {fileID: 4900000, guid: 05887e39a6464c640a43f2a7e0552dc0, type: 3} table: colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -87,7 +90,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank @@ -105,27 +107,25 @@ MonoBehaviour: - NeutralResistance - XP - LevelSkill0 - - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 rows: - elements: - - Noob Wanderer + - Noob MalformedI mp - 1 - - 34 - - 25 + - 30 + - 27 - 4 - 5 - - 13 + - 14 - '#FFFFFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 220 - - 0 - - 0 - - 0 + - 1 + - 1 + - 0.5 + - 1.5 + - 1 + - 240 + - 1 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -143,26 +143,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Wanderer + - Malformed Imp - 5 - - 53 - - 38 + - 48 + - 44 - 10 - 12 - - 24 + - 25 - '#FF9EC0' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 830 - - 0 - - 0 - - 0 + - 1 + - 1 + - 0.5 + - 1.5 + - 1 + - 860 + - 2 + - 0.3 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -180,26 +178,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Lt. Wanderer + - Lt. Malformed Imp - 10 - - 82 - - 52 + - 76 + - 59 - 21 - 23 - - 39 + - 40 - '#FF9EEF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1540 - - 0 - - 0 - - 0 + - 1 + - 1 + - 0.5 + - 1.5 + - 1 + - 1570 + - 3 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -217,26 +213,24 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Capt. Wanderer + - Capt. Malformed Imp - 15 - - 128 - - 68 + - 120 + - 77 - 32 - 35 - - 55 + - 57 - '#E59EFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 2210 - - 0 - - 0 - - 0 + - 1 + - 1 + - 0.5 + - 1.5 + - 1 + - 2260 + - 4 + - 0.35 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -254,6 +248,5 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - curTableRow: 1 + curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Mammon.asset b/Assets/ScriptableObjects/Enemies/Mammon.asset index 00ce0127..1e96bab3 100644 --- a/Assets/ScriptableObjects/Enemies/Mammon.asset +++ b/Assets/ScriptableObjects/Enemies/Mammon.asset @@ -92,6 +92,11 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -113,7 +118,12 @@ MonoBehaviour: - LevelSkill3 - LevelSkill4 - LevelSkill5 - - ChancetoUseSkill + - ChanceToUseSkill0 + - ChanceToUseSkill1 + - ChanceToUseSkill2 + - ChanceToUseSkill3 + - ChanceToUseSkill4 + - ChanceToUseSkill5 rows: - elements: - Mammon @@ -124,11 +134,11 @@ MonoBehaviour: - 15 - 30 - '#00FFFFFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 2331 - 0 - 1 @@ -137,6 +147,11 @@ MonoBehaviour: - 1 - 1 - 0.4 + - 1 + - 1 + - 1 + - 1 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -160,4 +175,9 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Overseer.asset b/Assets/ScriptableObjects/Enemies/Overseer.asset index d5534f81..b6861c4a 100644 --- a/Assets/ScriptableObjects/Enemies/Overseer.asset +++ b/Assets/ScriptableObjects/Enemies/Overseer.asset @@ -94,6 +94,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -111,7 +112,8 @@ MonoBehaviour: - XP - LevelSkill0 - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 + - ChanceToUseSkill1 rows: - elements: - Noob Overseer @@ -124,13 +126,14 @@ MonoBehaviour: - '#FFFFFF' - 0.5 - 1.5 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 - 260 - 1 - 1 - 0.4 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -150,6 +153,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Overseer - 5 @@ -161,13 +165,14 @@ MonoBehaviour: - '#FF9EC0' - 0.5 - 1.5 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 - 900 - 2 - 2 - 0.4 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -187,6 +192,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Overseer - 10 @@ -198,13 +204,14 @@ MonoBehaviour: - '#FF9EEF' - 0.5 - 1.5 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 - 1600 - 3 - 3 - 0.45 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -224,6 +231,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Overseer - 15 @@ -235,13 +243,14 @@ MonoBehaviour: - '#E59EFF' - 0.5 - 1.5 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 - 2300 - 4 - 4 - 0.45 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -261,4 +270,5 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Pwner.asset b/Assets/ScriptableObjects/Enemies/Pwner.asset index 148db7cc..fcf76c9d 100644 --- a/Assets/ScriptableObjects/Enemies/Pwner.asset +++ b/Assets/ScriptableObjects/Enemies/Pwner.asset @@ -45,7 +45,7 @@ MonoBehaviour: _keyValues: 01000000 _keys: 01000000 _values: - - 1.9 + - 19 skills: - {fileID: 11400000, guid: 2c3021b87d1b78a458264d0c93f382d1, type: 2} - {fileID: 11400000, guid: c7f8ca5a99d6a8240a8df51799499057, type: 2} @@ -88,13 +88,18 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -110,13 +115,18 @@ MonoBehaviour: - EarthResistance - NeutralResistance - XP - - ChancetoUseSkill - LevelSkill0 - LevelSkill1 - LevelSkill2 - LevelSkill3 - LevelSkill4 - LevelSkill5 + - ChanceToUseSkill0 + - ChanceToUseSkill1 + - ChanceToUseSkill2 + - ChanceToUseSkill3 + - ChanceToUseSkill4 + - ChanceToUseSkill5 rows: - elements: - Pwner @@ -127,19 +137,24 @@ MonoBehaviour: - 14 - 22 - '#FF0000' - - 1.9 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1,9 + - 1 + - 1 + - 1 + - 1 - 2000 - - 0 - 1 - 1 - 1 - 1 - 1 - 1 + - 0.1 + - 0.1 + - 0.1 + - 0.1 + - 0.1 + - 0.1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -156,13 +171,18 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Stronk Pwner - 5 @@ -172,19 +192,24 @@ MonoBehaviour: - 100 - 100 - '#FF0000' - - 0.3 - - 0.3 - - 0.3 - - 0.3 - - 0.3 + - 0,3 + - 0,3 + - 0,3 + - 0,3 + - 0,3 - 83 - - 0 - 2 - 2 - 2 - 2 - 2 - 2 + - 0.1 + - 0.1 + - 0.1 + - 0.1 + - 0.1 + - 0.1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -201,11 +226,16 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Skeleton.asset b/Assets/ScriptableObjects/Enemies/Skeleton.asset index 31c33577..60f81bab 100644 --- a/Assets/ScriptableObjects/Enemies/Skeleton.asset +++ b/Assets/ScriptableObjects/Enemies/Skeleton.asset @@ -94,6 +94,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -111,7 +112,8 @@ MonoBehaviour: - XP - LevelSkill0 - LevelSkill1 - - ChancetoUseSkill + - ChanceToUseSkill0 + - ChanceToUseSkill1 rows: - elements: - Noob Skeleton @@ -126,11 +128,12 @@ MonoBehaviour: - 1 - 1 - 0.5 - - 1.0 + - 1 - 260 - 1 - 1 - 0.3 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -150,6 +153,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Skeleton - 5 @@ -163,11 +167,12 @@ MonoBehaviour: - 1 - 1 - 0.5 - - 1.0 + - 1 - 900 - 2 - 2 - 0.3 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -187,6 +192,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Skeleton - 10 @@ -200,11 +206,12 @@ MonoBehaviour: - 1 - 1 - 0.5 - - 1.0 + - 1 - 1600 - 3 - 3 - 0.35 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -224,6 +231,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Skeleton - 15 @@ -237,11 +245,12 @@ MonoBehaviour: - 1 - 1 - 0.5 - - 1.0 + - 1 - 2300 - 4 - 4 - 0.35 + - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -261,4 +270,5 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Wanderer.asset b/Assets/ScriptableObjects/Enemies/Wanderer.asset index 845f74ba..6ada5060 100644 --- a/Assets/ScriptableObjects/Enemies/Wanderer.asset +++ b/Assets/ScriptableObjects/Enemies/Wanderer.asset @@ -87,9 +87,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -105,9 +102,6 @@ MonoBehaviour: - EarthResistance - NeutralResistance - XP - - LevelSkill0 - - LevelSkill1 - - ChancetoUseSkill rows: - elements: - Noob Wanderer @@ -118,15 +112,12 @@ MonoBehaviour: - 5 - 13 - '#FFFFFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 220 - - 0 - - 0 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -143,9 +134,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Wanderer - 5 @@ -155,15 +143,12 @@ MonoBehaviour: - 12 - 24 - '#FF9EC0' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 830 - - 0 - - 0 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -180,9 +165,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Wanderer - 10 @@ -192,15 +174,12 @@ MonoBehaviour: - 23 - 39 - '#FF9EEF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 1540 - - 0 - - 0 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -217,9 +196,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Wanderer - 15 @@ -229,15 +205,12 @@ MonoBehaviour: - 35 - 55 - '#E59EFF' - - 1.0 - - 1.0 - - 1.0 - - 1.0 - - 1.0 + - 1 + - 1 + - 1 + - 1 + - 1 - 2210 - - 0 - - 0 - - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -254,7 +227,4 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Party.asset b/Assets/ScriptableObjects/Party.asset index c8703521..1e013262 100644 --- a/Assets/ScriptableObjects/Party.asset +++ b/Assets/ScriptableObjects/Party.asset @@ -12,11 +12,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be7539eb7de5b5a4bbe1d928aafd8405, type: 3} m_Name: Party m_EditorClassIdentifier: - currentMap: - level: 0 + currentMap: StartingArea00_single_(first_scene) + level: 1 xpMultiplier: 1 xp: 0 - xpNext: 0 + xpNextLevel: 666 characters: - {fileID: 11400000, guid: 2840e8ee8960b684fa43a84d5b78b592, type: 2} - {fileID: 11400000, guid: 3bb8308e69edd674da4b2825e3d34294, type: 2} diff --git a/Assets/ScriptableObjects/Quests/Beggars.asset b/Assets/ScriptableObjects/Quests/Beggars.asset index a828ea93..7a3b11a0 100644 --- a/Assets/ScriptableObjects/Quests/Beggars.asset +++ b/Assets/ScriptableObjects/Quests/Beggars.asset @@ -50,4 +50,4 @@ MonoBehaviour: - Beggar3 - Beggar4 - Done - _values: 0000000000 + _values: 0100000000 diff --git a/Assets/ScriptableObjects/Quests/Part2Mainquest.asset b/Assets/ScriptableObjects/Quests/Part2Mainquest.asset index 84fe0787..2abb3eae 100644 --- a/Assets/ScriptableObjects/Quests/Part2Mainquest.asset +++ b/Assets/ScriptableObjects/Quests/Part2Mainquest.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7fd6b5b5d3a24d34586180c1e5419c7c, type: 3} m_Name: Part2Mainquest m_EditorClassIdentifier: - active: 1 + active: 0 repeatable: 0 expReward: 0 events: @@ -80,4 +80,4 @@ MonoBehaviour: - BeginBossRoom - MiddleBoosRoom - EndOfLevel - _values: 0100010101010001000001000101010101010000 + _values: 0100000000000000000000000000000000000000 diff --git a/Assets/ScriptableObjects/Quests/SoulWalls.asset b/Assets/ScriptableObjects/Quests/SoulWalls.asset index 89244a29..dc246f87 100644 --- a/Assets/ScriptableObjects/Quests/SoulWalls.asset +++ b/Assets/ScriptableObjects/Quests/SoulWalls.asset @@ -48,4 +48,4 @@ MonoBehaviour: - SoulWall1 - SoulWall2 - SoulWall3 - _values: 00000000 + _values: 01000000 diff --git a/Assets/Scripts/DynamicTable.cs b/Assets/Scripts/DynamicTable.cs index c51dc511..0a838895 100644 --- a/Assets/Scripts/DynamicTable.cs +++ b/Assets/Scripts/DynamicTable.cs @@ -1,13 +1,18 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Globalization; +using System.Runtime.ExceptionServices; using UnityEngine; namespace FinalInferno { + [System.Serializable] public class DynamicTable : ISerializationCallbackReceiver { // Declaração de subclasses e delegates ------------------ + #region subclass + [System.Serializable] public class TableRow { public int Count => (elements != null) ? elements.Length : 0; @@ -29,8 +34,8 @@ private int GetColNumber(string colName, string assembQualName) { try { return colTypes[accessDict[colName]] == assembQualName ? accessDict[colName] : -1; } catch (KeyNotFoundException e) { - Debug.LogError(e.Message); - return -1; + e.Data.Add("UserMessage", $"ColName: {colName} - "); + throw; } } @@ -115,7 +120,12 @@ private T TryParseField(string fieldContent) { } public T Field(string colName) { - int colNumber = GetColNumber(colName, typeof(T).AssemblyQualifiedName); + int colNumber = -1; + try { + colNumber = GetColNumber(colName, typeof(T).AssemblyQualifiedName); + } catch (Exception) { + throw; + } if (colNumber < 0) { return default; } @@ -127,10 +137,12 @@ public T Field(string colName) { : TryParseField(fieldContent); } } - #endregion + + #endregion subclass // Variaveis/Propriedades ------------------------- protected const char splitCharacter = ';'; + [SerializeField] private string[] colTypes; [SerializeField] private string[] colNames; private Dictionary accessDict; @@ -147,7 +159,7 @@ public static DynamicTable Create(TextAsset textFile) { } } - protected static private string GetQualifiedName(string typeName) { + protected static string GetQualifiedName(string typeName) { return typeName switch { "string" => typeof(string).AssemblyQualifiedName, "int" => typeof(int).AssemblyQualifiedName, @@ -208,4 +220,4 @@ void ISerializationCallbackReceiver.OnAfterDeserialize() { void ISerializationCallbackReceiver.OnBeforeSerialize() { } } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs b/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs new file mode 100644 index 00000000..951ee38e --- /dev/null +++ b/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs @@ -0,0 +1,15 @@ +using UnityEngine; + +namespace FinalInferno { + + [CreateAssetMenu(fileName = "EnemySingleActiveSkill", menuName = "ScriptableObject/Enemy/SingleActiveSkill")] + public class EnemySingleActiveSkillUser : Enemy { + private EnemySkill ActiveSkill => (EnemySkill)skills[0]; + + public override Skill AttackDecision() { + Debug.LogWarning($"Probability: {ActiveSkill.Probability}"); + float roll = Random.Range(0.0f, 1.0f); + return roll < ActiveSkill.Probability ? ActiveSkill : attackSkill; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs.meta b/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs.meta new file mode 100644 index 00000000..07eedcbe --- /dev/null +++ b/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 5bb4b73a56b066945a09e38fde03ea7c +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Scripts/Scriptable Objects/Enemy.cs b/Assets/Scripts/Scriptable Objects/Enemy.cs index 9a14619d..f131d15e 100644 --- a/Assets/Scripts/Scriptable Objects/Enemy.cs +++ b/Assets/Scripts/Scriptable Objects/Enemy.cs @@ -1,21 +1,28 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Runtime.ExceptionServices; using UnityEngine; + #if UNITY_EDITOR #endif namespace FinalInferno { + [CreateAssetMenu(fileName = "Enemy", menuName = "ScriptableObject/Enemy/Basic")] public class Enemy : Unit, IDatabaseItem { private const string LevelSkillColumnName = "LevelSkill"; + private const string ChanceToUseSkillColumnName = "ChanceToUseSkill"; private const string ColorColumnName = "Color"; private const string LevelColumnName = "Level"; private const string RankColumnName = "Rank"; private const string BaseExpColumnName = "XP"; public override UnitType UnitType => UnitType.Enemy; public Color dialogueColor; + [Space(10)] [Header("Enemy Info")] [SerializeField] protected Element element = Element.Neutral; + public Element Element => element; [SerializeField] protected DamageType damageFocus = DamageType.None; public DamageType DamageFocus => damageFocus; @@ -27,10 +34,13 @@ public class Enemy : Unit, IDatabaseItem { public AudioClip EnemyCry => enemyCry; [SerializeField, TextArea] private string bio = "Bio"; public string Bio => bio; + [Space(10)] [Header("Table")] [SerializeField] protected TextAsset enemyTable; + [SerializeField] protected DynamicTable table; + protected DynamicTable Table { get { if (table == null && enemyTable != null) { @@ -42,13 +52,34 @@ protected DynamicTable Table { return table; } } + [SerializeField, HideInInspector] protected int curTableRow = 0; - protected int MinLevel => Table.Rows[0].Field(LevelColumnName); - protected int MaxLevel => Table.Rows[Table.Rows.Count - 1].Field(LevelColumnName); + + protected int MinLevel { + get { + try { + return Table.Rows[0].Field(LevelColumnName); + } catch (Exception) { + throw; + } + } + } + + protected int MaxLevel { + get { + try { + return Table.Rows[Table.Rows.Count - 1].Field(LevelColumnName); + } catch (Exception) { + throw; + } + } + } + public override long SkillExp => BaseExp; public long BaseExp { get; protected set; } #region IDatabaseItem + public void LoadTables() { table = DynamicTable.Create(enemyTable); } @@ -57,7 +88,8 @@ public void Preload() { curTableRow = -1; LevelEnemy(-1); } - #endregion + + #endregion IDatabaseItem public int GetSkillLevel(EnemySkill skill) { int skillIndex = skills.IndexOf(skill); @@ -100,14 +132,18 @@ public void LevelEnemy(int newLevel) { Debug.LogWarning($"This enemy({AssetName}) has no table to load", this); return; } - - level = Mathf.Clamp(newLevel, MinLevel, MaxLevel); + try { + level = Mathf.Clamp(newLevel, MinLevel, MaxLevel); + } catch (Exception e) { + ExceptionDispatchInfo.Capture(e.InnerException).Throw(); + } int newTableRow = GetTableRowWithLevel(newLevel); if (newTableRow != curTableRow) { curTableRow = newTableRow; LoadStatsFromTable(newTableRow); } LoadSkillLevelsFromTable(); + LoadSkillProbabilitiesFromTable(); } private int GetTableRowWithLevel(int newLevel) { @@ -153,11 +189,36 @@ private static string ElementalResistColumnName(Element element) { private void LoadSkillLevelsFromTable() { for (int i = 0; i < skills.Count; i++) { - skills[i].Level = Table.Rows[curTableRow].Field($"{LevelSkillColumnName}{i}"); + try { + skills[i].Level = Table.Rows[curTableRow].Field($"{LevelSkillColumnName}{i}"); + } catch (Exception e) { + string error = ""; + if (e.Data.Contains("UserMessage")) { + error += e.Data["UserMessage"].ToString(); + } + error += $"Asset Name: {AssetName} - " + e.Message + Environment.NewLine + e.StackTrace; + Debug.LogError(error); + } + } + } + + private void LoadSkillProbabilitiesFromTable() { + for (int i = 0; i < skills.Count; i++) { + try { + ((EnemySkill)skills[i]).Probability = Table.Rows[curTableRow].Field($"{ChanceToUseSkillColumnName}{i}"); + } catch (Exception e) { + string error = ""; + if (e.Data.Contains("UserMessage")) { + error += e.Data["UserMessage"].ToString(); + } + error += $"Asset Name: {AssetName} - " + e.Message + Environment.NewLine + e.StackTrace; + Debug.LogError(error); + } } } #region EnemyAI + public virtual void AIEnemy() { float relativeHP = BattleManager.instance.CurrentUnit.CurHP / GetAverageTeamHP(); float percentageNotDefense = Mathf.Sqrt(relativeHP) + 0.05f * relativeHP; @@ -177,7 +238,7 @@ private static float GetAverageTeamHP() { } protected virtual Skill SkillDecision(float percentageNotDefense) { - float roll = Random.Range(0.0f, 1.0f); + float roll = UnityEngine.Random.Range(0.0f, 1.0f); if (roll < percentageNotDefense) return AttackDecision(); return defenseSkill; @@ -187,7 +248,9 @@ public virtual Skill AttackDecision() { return attackSkill; } - public virtual void ResetParameters() { /* Função para resetar parametros de boss por exemplo */ } + public virtual void ResetParameters() { + /* Função para resetar parametros de boss por exemplo */ + } protected virtual List GetTargets(TargetType type) { return type switch { @@ -206,12 +269,12 @@ protected static List GetHeroesTeam() { protected static BattleUnit GetRandomLiveAlly() { List team = BattleManager.instance.GetTeam(UnitType.Enemy); - return team[Random.Range(0, team.Count - 1)]; + return team[UnityEngine.Random.Range(0, team.Count - 1)]; } protected virtual BattleUnit TargetDecision(List targetTeam) { List targetingChances = GetUnitTargetingChances(targetTeam); - float roll = Random.Range(0.0f, 1.0f); + float roll = UnityEngine.Random.Range(0.0f, 1.0f); for (int targetIndex = 0; targetIndex < targetTeam.Count; targetIndex++) { if (roll <= targetingChances[targetIndex]) return targetTeam[targetIndex]; @@ -244,6 +307,7 @@ protected static bool AllHeroesAreParalised() { } return true; } - #endregion + + #endregion EnemyAI } -} +} \ No newline at end of file diff --git a/Assets/Scripts/Scriptable Objects/EnemySkill.cs b/Assets/Scripts/Scriptable Objects/EnemySkill.cs index 9246f0fd..8414d0bd 100644 --- a/Assets/Scripts/Scriptable Objects/EnemySkill.cs +++ b/Assets/Scripts/Scriptable Objects/EnemySkill.cs @@ -1,15 +1,25 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; +using System.Runtime.ExceptionServices; using UnityEngine; namespace FinalInferno { + [CreateAssetMenu(fileName = "EnemySkill", menuName = "ScriptableObject/EnemySkill")] public class EnemySkill : Skill { protected const string levelColumnName = "Level"; + [Header("Enemy Skill")] public string description; + [Header("Stats Table")] [SerializeField] private TextAsset skillTable; + [SerializeField] private DynamicTable table; + + [SerializeField] protected float probability; + public float Probability { get => probability; set => probability = value; } + private DynamicTable Table { get { if (table == null && skillTable != null) { @@ -21,20 +31,45 @@ private DynamicTable Table { return table; } } - protected int MinLevel => Table.Rows[0].Field(levelColumnName); - protected int MaxLevel => Table.Rows[Table.Rows.Count - 1].Field(levelColumnName); + + protected int MinLevel { + get { + try { + return Table.Rows[0].Field(levelColumnName); + } catch (Exception) { + throw; + } + } + } + + protected int MaxLevel { + get { + try { + return Table.Rows[Table.Rows.Count - 1].Field(levelColumnName); + } catch (Exception) { + throw; + } + } + } + public override int Level { get => level; set { if (value != level && Table != null && Table.Rows.Count > 0) { - level = Mathf.Clamp(value, MinLevel, MaxLevel); + try { + level = Mathf.Clamp(value, MinLevel, MaxLevel); + } catch (Exception e) { + ExceptionDispatchInfo.Capture(e.InnerException).Throw(); + } LevelUp(); } } } + private int curTableRow = 0; #region IDatabaseItem + public override void LoadTables() { table = DynamicTable.Create(skillTable); } @@ -42,9 +77,19 @@ public override void LoadTables() { public override void Preload() { active = true; curTableRow = -1; - Level = -1; + try { + Level = -1; + } catch (Exception e) { + string error = ""; + if (e.Data.Contains("UserMessage")) { + error += e.Data["UserMessage"].ToString(); + } + error += $"Skill Name: {skillTable.name} - " + e.Message + Environment.NewLine + e.StackTrace; + Debug.LogError(error); + } } - #endregion + + #endregion IDatabaseItem public void LevelUp() { if (Table == null || Table.Rows.Count < 1) { diff --git a/Assets/Scripts/Scriptable Objects/Skill.cs b/Assets/Scripts/Scriptable Objects/Skill.cs index 96ffacbe..bf365b61 100644 --- a/Assets/Scripts/Scriptable Objects/Skill.cs +++ b/Assets/Scripts/Scriptable Objects/Skill.cs @@ -2,15 +2,18 @@ using UnityEngine; namespace FinalInferno { + //engloba todas as "skills" [CreateAssetMenu(fileName = "Skill", menuName = "ScriptableObject/Skill")] public class Skill : ScriptableObject, IDatabaseItem { public const int maxCost = 20; public const int baseCost = 8; + [Header("Skill")] public new string name; + [SerializeField] protected int level; - public virtual int Level { get => level; set { } } + public virtual int Level { get => level; set => level = value; } public float cost; public bool active = true; [TextArea, SerializeField] protected string shortDescription; @@ -18,6 +21,7 @@ public class Skill : ScriptableObject, IDatabaseItem { public TargetType target; public Element attribute; [SerializeField] private SkillType type; + public string TypeString { get => type switch { SkillType.Active => "Active Skill", @@ -32,18 +36,25 @@ public string TypeString { _ => "" }; } + public SkillType Type => type; [SerializeField] private int callbackDelay = 0; public List effects; + [Space(15)] [SerializeField] private GameObject visualEffect; + public GameObject VisualEffect => visualEffect; #region IDatabaseItem - public virtual void LoadTables() { } - public virtual void Preload() { } - #endregion + public virtual void LoadTables() { + } + + public virtual void Preload() { + } + + #endregion IDatabaseItem // TO DO: Would work better as a function of TargetType when they become SOs public List FilterTargets(BattleUnit source, List oldList) { @@ -57,35 +68,41 @@ public List FilterTargets(BattleUnit source, List oldLis newList.Remove(unit); break; + case TargetType.SingleDeadAlly: case TargetType.AllDeadAllies: if (!allies.Contains(unit) || unit.CurHP > 0) newList.Remove(unit); break; + case TargetType.SingleLiveAlly: case TargetType.AllLiveAllies: if (!allies.Contains(unit) || unit.CurHP <= 0) newList.Remove(unit); break; + case TargetType.AllAlliesLiveOrDead: if (!allies.Contains(unit)) newList.Remove(unit); break; + case TargetType.SingleDeadEnemy: case TargetType.AllDeadEnemies: if (allies.Contains(unit) || unit.CurHP > 0) newList.Remove(unit); break; + case TargetType.SingleLiveEnemy: case TargetType.AllLiveEnemies: if (allies.Contains(unit) || unit.CurHP <= 0) newList.Remove(unit); break; + case TargetType.AllEnemiesLiveOrDead: if (allies.Contains(unit)) newList.Remove(unit); @@ -136,6 +153,8 @@ public virtual void Use(BattleUnit user, BattleUnit target, bool shouldOverride1 ApplyAllSkillEffects(user, target, shouldOverride1, value1, shouldOverride2, value2); } - public virtual void ResetSkill() { Debug.LogError("Wrong use of skill reset", this); } + public virtual void ResetSkill() { + Debug.LogError("Wrong use of skill reset", this); + } } -} +} \ No newline at end of file diff --git a/Assets/Skills/BasicSkills/EnemyAttack.asset b/Assets/Skills/BasicSkills/EnemyAttack.asset index 30430788..1ee2484d 100644 --- a/Assets/Skills/BasicSkills/EnemyAttack.asset +++ b/Assets/Skills/BasicSkills/EnemyAttack.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Attack level: 0 + probability: 0 cost: 10 active: 1 shortDescription: Deals regular damage to one target, using preferred element and diff --git a/Assets/Skills/BasicSkills/PlayerAttack.asset b/Assets/Skills/BasicSkills/PlayerAttack.asset index 339d9cdc..0352fa9d 100644 --- a/Assets/Skills/BasicSkills/PlayerAttack.asset +++ b/Assets/Skills/BasicSkills/PlayerAttack.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Attack level: 0 + probability: 0 cost: 10 active: 1 shortDescription: Deals regular physical damage to a single target. diff --git a/Assets/Skills/BasicSkills/PlayerDefend.asset b/Assets/Skills/BasicSkills/PlayerDefend.asset index 326da4b0..1754900a 100644 --- a/Assets/Skills/BasicSkills/PlayerDefend.asset +++ b/Assets/Skills/BasicSkills/PlayerDefend.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Defend level: 0 + probability: 0 cost: 8 active: 1 shortDescription: Increases defense and resistance by 50% for one turn. diff --git a/Assets/Skills/BasicSkills/PlayerMagicAttack.asset b/Assets/Skills/BasicSkills/PlayerMagicAttack.asset index aaeac650..4fe005f2 100644 --- a/Assets/Skills/BasicSkills/PlayerMagicAttack.asset +++ b/Assets/Skills/BasicSkills/PlayerMagicAttack.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Attack level: 0 + probability: 0 cost: 10 active: 1 shortDescription: Deals regular magical damage to a single target. diff --git a/Assets/Skills/BasicSkills/PlayerSlashAttack.asset b/Assets/Skills/BasicSkills/PlayerSlashAttack.asset index 96bc7170..ed025d94 100644 --- a/Assets/Skills/BasicSkills/PlayerSlashAttack.asset +++ b/Assets/Skills/BasicSkills/PlayerSlashAttack.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Attack level: 0 + probability: 0 cost: 10 active: 1 shortDescription: Deals regular physical damage to a single target. diff --git a/Assets/Skills/BlackMageSkills/Anaemia.asset b/Assets/Skills/BlackMageSkills/Anaemia.asset index b6abc166..7d5d9af6 100644 --- a/Assets/Skills/BlackMageSkills/Anaemia.asset +++ b/Assets/Skills/BlackMageSkills/Anaemia.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Anaemia m_EditorClassIdentifier: name: Anaemia - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Single target reduces power. @@ -28,7 +29,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: 44ba3df0843e3474cab02447d77b3652, type: 3} xp: 0 - xpNext: 0 + xpNext: 999 description: Reduce the nutrients in the blood (or equivalent life essence) of the enemy, reducing its strength. skillsToUpdate: diff --git a/Assets/Skills/BlackMageSkills/Bleeding.asset b/Assets/Skills/BlackMageSkills/Bleeding.asset index b20df458..2e44a6a3 100644 --- a/Assets/Skills/BlackMageSkills/Bleeding.asset +++ b/Assets/Skills/BlackMageSkills/Bleeding.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Bleeding m_EditorClassIdentifier: name: Bleeding - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Single target neutral damage over time. @@ -23,12 +24,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 533417b90c067e14bbdc85bb2e52be6f, type: 2} - value1: 0.403 + value1: 0.4 value2: 3 visualEffect: {fileID: 8917310150857617220, guid: 22f2b907285e270409571aaca3977e5b, type: 3} xp: 0 - xpNext: 0 + xpNext: 999 description: Makes the blood (or any equivalent life essence) come out of the enemy from its holes and pores. Causes Damage over time for a few turns. skillsToUpdate: diff --git a/Assets/Skills/BlackMageSkills/Fiery Stroke.asset b/Assets/Skills/BlackMageSkills/Fiery Stroke.asset index 1af55666..f52f6de6 100644 --- a/Assets/Skills/BlackMageSkills/Fiery Stroke.asset +++ b/Assets/Skills/BlackMageSkills/Fiery Stroke.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Fiery Stroke level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Single target fire damage over time. diff --git a/Assets/Skills/BlackMageSkills/FireBullet.asset b/Assets/Skills/BlackMageSkills/FireBullet.asset index 36c14651..5545262b 100644 --- a/Assets/Skills/BlackMageSkills/FireBullet.asset +++ b/Assets/Skills/BlackMageSkills/FireBullet.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: FireBullet m_EditorClassIdentifier: name: Fire Bullets - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Single target fire damage. @@ -23,12 +24,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: b6e706fdcdfb4c14988557c3040ab414, type: 2} - value1: 1.12 + value1: 1.1 value2: 1 visualEffect: {fileID: 8917310150857617220, guid: 73e52014d102bf74594681c040572206, type: 3} xp: 0 - xpNext: 0 + xpNext: 999 description: Bullets made of fire are shot at extreme speed, damaging a single target. skillsToUpdate: diff --git a/Assets/Skills/BlackMageSkills/FrostBite.asset b/Assets/Skills/BlackMageSkills/FrostBite.asset index 6c63e6eb..0949eb6e 100644 --- a/Assets/Skills/BlackMageSkills/FrostBite.asset +++ b/Assets/Skills/BlackMageSkills/FrostBite.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: FrostBite m_EditorClassIdentifier: name: Frostbite - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Single target water damage. @@ -28,7 +29,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: d6debb874b8da8b48bc768062046cfc9, type: 3} xp: 0 - xpNext: 0 + xpNext: 999 description: The temperature aroud the enemy is reduced to dangerous levels and can freeze its skin (or any equivalent outer layer). skillsToUpdate: diff --git a/Assets/Skills/BlackMageSkills/Haemorrhage.asset b/Assets/Skills/BlackMageSkills/Haemorrhage.asset index 624f144b..d26eed2e 100644 --- a/Assets/Skills/BlackMageSkills/Haemorrhage.asset +++ b/Assets/Skills/BlackMageSkills/Haemorrhage.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Haemorrhage level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Single target neutral damage over time and reduces power. diff --git a/Assets/Skills/BlackMageSkills/Holy Necromancy.asset b/Assets/Skills/BlackMageSkills/Holy Necromancy.asset index 3a23c1de..3dbf7d80 100644 --- a/Assets/Skills/BlackMageSkills/Holy Necromancy.asset +++ b/Assets/Skills/BlackMageSkills/Holy Necromancy.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Holy Necromancy level: 0 + probability: 0 cost: 0 active: 0 shortDescription: Once per battle, if Xander dies in battle, Revives Xander. diff --git a/Assets/Skills/BlackMageSkills/Impaling.asset b/Assets/Skills/BlackMageSkills/Impaling.asset index fffcbd45..72266352 100644 --- a/Assets/Skills/BlackMageSkills/Impaling.asset +++ b/Assets/Skills/BlackMageSkills/Impaling.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Impaling m_EditorClassIdentifier: name: Impaling - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Singe target earth damage. @@ -28,7 +29,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: c46b620123851f349ad41e8a624592a1, type: 3} xp: 0 - xpNext: 0 + xpNext: 999 description: A stalagmite rises from the ground to impale the enemy. skillsToUpdate: - {fileID: 11400000, guid: 0547e57ad308798409bb37fa33e8409c, type: 2} diff --git a/Assets/Skills/BlackMageSkills/Infernal Hail.asset b/Assets/Skills/BlackMageSkills/Infernal Hail.asset index 8b015231..1034a370 100644 --- a/Assets/Skills/BlackMageSkills/Infernal Hail.asset +++ b/Assets/Skills/BlackMageSkills/Infernal Hail.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Infernal Hail level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Single target water damage over time. diff --git a/Assets/Skills/BlackMageSkills/Stonestorm.asset b/Assets/Skills/BlackMageSkills/Stonestorm.asset index a67f0158..5c47ae82 100644 --- a/Assets/Skills/BlackMageSkills/Stonestorm.asset +++ b/Assets/Skills/BlackMageSkills/Stonestorm.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Stonestorm level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Single target earth damage over time. diff --git a/Assets/Skills/BlackMageSkills/Suffocation.asset b/Assets/Skills/BlackMageSkills/Suffocation.asset index a092cdd5..91fba6ab 100644 --- a/Assets/Skills/BlackMageSkills/Suffocation.asset +++ b/Assets/Skills/BlackMageSkills/Suffocation.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Suffocation level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Single target wind damage over time. diff --git a/Assets/Skills/BlackMageSkills/WindCut.asset b/Assets/Skills/BlackMageSkills/WindCut.asset index b765ae3d..62dc40d8 100644 --- a/Assets/Skills/BlackMageSkills/WindCut.asset +++ b/Assets/Skills/BlackMageSkills/WindCut.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: WindCut m_EditorClassIdentifier: name: Wind Cut - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Single target wind damage. @@ -28,7 +29,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: 97afab97e0d071747b0b14634934262b, type: 3} xp: 0 - xpNext: 0 + xpNext: 999 description: Creates a sharp blade by blowing a really fast wind in a concentrated and thin area. skillsToUpdate: diff --git a/Assets/Skills/CerberusSkills/Bloodspil(Damage).asset b/Assets/Skills/CerberusSkills/Bloodspil(Damage).asset index 629729d7..d45d2154 100644 --- a/Assets/Skills/CerberusSkills/Bloodspil(Damage).asset +++ b/Assets/Skills/CerberusSkills/Bloodspil(Damage).asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Bloodspill level: 1 + probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/CerberusSkills/Bloodspill(Heal).asset b/Assets/Skills/CerberusSkills/Bloodspill(Heal).asset index 0cfb543a..fb315e14 100644 --- a/Assets/Skills/CerberusSkills/Bloodspill(Heal).asset +++ b/Assets/Skills/CerberusSkills/Bloodspill(Heal).asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Bloodpspill level: 1 + probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/CerberusSkills/Ghost Limbs.asset b/Assets/Skills/CerberusSkills/Ghost Limbs.asset index e204163b..9720141b 100644 --- a/Assets/Skills/CerberusSkills/Ghost Limbs.asset +++ b/Assets/Skills/CerberusSkills/Ghost Limbs.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Ghost Limbs m_EditorClassIdentifier: name: Ghost Limbs - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: @@ -28,8 +29,38 @@ MonoBehaviour: visualEffect: {fileID: 552734591061099818, guid: c5b81c56fc50dac4c80964acddc9c909, type: 3} description: Ghost Limbs - skillTable: {fileID: 11500000, guid: 71415530639daba4e899c47ad83e5988, type: 3} + skillTable: {fileID: 4900000, guid: 4db3a885c87ea13468000d83106e381a, type: 3} table: - colTypes: [] - colNames: [] - rows: [] + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colNames: + - Level + - SkillEffect0Value0 + - SkillEffect0Value1 + rows: + - elements: + - 1 + - 1 + - -1 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 2 + - 1 + - -1 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 3 + - 1 + - -1 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Assets/Skills/CerberusSkills/Hellfire.asset b/Assets/Skills/CerberusSkills/Hellfire.asset index 573511f4..a128be7e 100644 --- a/Assets/Skills/CerberusSkills/Hellfire.asset +++ b/Assets/Skills/CerberusSkills/Hellfire.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Hellfire level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/CerberusSkills/Tremendous Roar.asset b/Assets/Skills/CerberusSkills/Tremendous Roar.asset index 28e9df8e..f89e9887 100644 --- a/Assets/Skills/CerberusSkills/Tremendous Roar.asset +++ b/Assets/Skills/CerberusSkills/Tremendous Roar.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Tremendous Roar level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Contagious Sorrow.asset b/Assets/Skills/EnemySkills/Contagious Sorrow.asset index 3bda17f2..33ef3075 100644 --- a/Assets/Skills/EnemySkills/Contagious Sorrow.asset +++ b/Assets/Skills/EnemySkills/Contagious Sorrow.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Contagious Sorrow level: 1 + probability: 0 cost: 0 active: 1 shortDescription: @@ -24,15 +25,85 @@ MonoBehaviour: effects: - effect: {fileID: 11400000, guid: 912de08aa2e7f5a43a91bd2157bf21d5, type: 2} value1: 0.1 - value2: 3 + value2: 2 - effect: {fileID: 11400000, guid: dc5c2270be9739f4aaed7f800df3b73b, type: 2} value1: 0.1 - value2: 3 + value2: 2 visualEffect: {fileID: 552734591061099818, guid: c5b81c56fc50dac4c80964acddc9c909, type: 3} description: Contagious Sorrow skillTable: {fileID: 4900000, guid: 0ce187e6f94ea4f4e9354513afc81d4d, type: 3} table: - colTypes: [] - colNames: [] - rows: [] + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colNames: + - Level + - SkillEffect0Value0 + - SkillEffect0Value1 + - SkillEffect1Value0 + - SkillEffect1Value1 + rows: + - elements: + - 1 + - 0.1 + - 2 + - 0.1 + - 2 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 2 + - 0.2 + - 2 + - 0.2 + - 2 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 3 + - 0.25 + - 3 + - 0.25 + - 3 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 4 + - 0.35 + - 3 + - 0.35 + - 3 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 5 + - 0.4 + - 4 + - 0.4 + - 4 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Assets/Skills/EnemySkills/Earth Strike.asset b/Assets/Skills/EnemySkills/Earth Strike.asset index 581055dd..8c6663bf 100644 --- a/Assets/Skills/EnemySkills/Earth Strike.asset +++ b/Assets/Skills/EnemySkills/Earth Strike.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Earth Strike level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Eternal Cry.asset b/Assets/Skills/EnemySkills/Eternal Cry.asset index 10a79b24..5b921ff9 100644 --- a/Assets/Skills/EnemySkills/Eternal Cry.asset +++ b/Assets/Skills/EnemySkills/Eternal Cry.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Eternal Cry level: 1 + probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Ethereal Shield.asset b/Assets/Skills/EnemySkills/Ethereal Shield.asset index d383b645..acfcda0e 100644 --- a/Assets/Skills/EnemySkills/Ethereal Shield.asset +++ b/Assets/Skills/EnemySkills/Ethereal Shield.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Ethereal Shield level: 1 + probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Fire Bullet Enemy.asset b/Assets/Skills/EnemySkills/Fire Bullet Enemy.asset index 82af7c66..10e1cffe 100644 --- a/Assets/Skills/EnemySkills/Fire Bullet Enemy.asset +++ b/Assets/Skills/EnemySkills/Fire Bullet Enemy.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Fire Bullet level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Frostbite Enemy.asset b/Assets/Skills/EnemySkills/Frostbite Enemy.asset index 204fe3c7..f8358793 100644 --- a/Assets/Skills/EnemySkills/Frostbite Enemy.asset +++ b/Assets/Skills/EnemySkills/Frostbite Enemy.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Frostbite level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Impaling Enemy.asset b/Assets/Skills/EnemySkills/Impaling Enemy.asset index 98992f18..ae88c007 100644 --- a/Assets/Skills/EnemySkills/Impaling Enemy.asset +++ b/Assets/Skills/EnemySkills/Impaling Enemy.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Impaling level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/LaserBeam.asset b/Assets/Skills/EnemySkills/LaserBeam.asset index 99914555..d22dd55e 100644 --- a/Assets/Skills/EnemySkills/LaserBeam.asset +++ b/Assets/Skills/EnemySkills/LaserBeam.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Laser Beam level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Leadership.asset b/Assets/Skills/EnemySkills/Leadership.asset index 6fb3265e..ac97e1c6 100644 --- a/Assets/Skills/EnemySkills/Leadership.asset +++ b/Assets/Skills/EnemySkills/Leadership.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Leadership level: 1 + probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Ominous Wind.asset b/Assets/Skills/EnemySkills/Ominous Wind.asset index 46efae5b..dde01a21 100644 --- a/Assets/Skills/EnemySkills/Ominous Wind.asset +++ b/Assets/Skills/EnemySkills/Ominous Wind.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Ominous Wind level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Rebirth.asset b/Assets/Skills/EnemySkills/Rebirth.asset index 4672f65e..feaca517 100644 --- a/Assets/Skills/EnemySkills/Rebirth.asset +++ b/Assets/Skills/EnemySkills/Rebirth.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Rebirth level: 1 + probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Solitude.asset b/Assets/Skills/EnemySkills/Solitude.asset index 8164d1d7..b004729f 100644 --- a/Assets/Skills/EnemySkills/Solitude.asset +++ b/Assets/Skills/EnemySkills/Solitude.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Solitude level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Unfinished Work.asset b/Assets/Skills/EnemySkills/Unfinished Work.asset index 8fb148a0..794c4b8a 100644 --- a/Assets/Skills/EnemySkills/Unfinished Work.asset +++ b/Assets/Skills/EnemySkills/Unfinished Work.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Unfinished Work level: 1 + probability: 0 cost: 0 active: 1 shortDescription: @@ -30,6 +31,52 @@ MonoBehaviour: description: Unfinished Work skillTable: {fileID: 4900000, guid: 856a913caf20faf42b8aad08385db309, type: 3} table: - colTypes: [] - colNames: [] - rows: [] + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colNames: + - Level + - SkillEffect0Value0 + - SkillEffect0Value1 + rows: + - elements: + - 1 + - 0 + - 0.5 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 2 + - 0 + - 0.6 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 3 + - 0 + - 0.7 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 4 + - 0 + - 0.8 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - elements: + - 5 + - 0 + - 0.9 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Assets/Skills/EnemySkills/Wind Cut Enemy.asset b/Assets/Skills/EnemySkills/Wind Cut Enemy.asset index a69ccd45..87776e05 100644 --- a/Assets/Skills/EnemySkills/Wind Cut Enemy.asset +++ b/Assets/Skills/EnemySkills/Wind Cut Enemy.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Wind Cut level: 1 + probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/MammonSkills/GreatDepression.asset b/Assets/Skills/MammonSkills/GreatDepression.asset index 6ad72d42..f9c2b0df 100644 --- a/Assets/Skills/MammonSkills/GreatDepression.asset +++ b/Assets/Skills/MammonSkills/GreatDepression.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: GreatDepression m_EditorClassIdentifier: name: GreatDepression - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: @@ -23,13 +24,27 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 5db848a5970beef4b8a73e63feefce27, type: 2} - value1: 0.1 + value1: 1 value2: 5 visualEffect: {fileID: 5434996350183651868, guid: 0d876ce000356934f80d54c778fc3114, type: 3} description: skillTable: {fileID: 4900000, guid: 3efe1d7c03e8730489d0827063c5f73c, type: 3} table: - colTypes: [] - colNames: [] - rows: [] + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colNames: + - Level + - SkillEffect0Value0 + - SkillEffect0Value1 + rows: + - elements: + - 1 + - 0,1 + - 5 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Assets/Skills/MammonSkills/Inflation.asset b/Assets/Skills/MammonSkills/Inflation.asset index 70ab5042..ae389915 100644 --- a/Assets/Skills/MammonSkills/Inflation.asset +++ b/Assets/Skills/MammonSkills/Inflation.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Inflation m_EditorClassIdentifier: name: Inflation - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: @@ -23,13 +24,27 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 3f19701bd23be55498240876074e1420, type: 2} - value1: 0.01 + value1: 0.1 value2: -1 visualEffect: {fileID: 5434996350183651868, guid: 4c6fc6c7981053447a73e9befab53aea, type: 3} description: skillTable: {fileID: 4900000, guid: e921b8fd864ac594ea263eefa2a29f5d, type: 3} table: - colTypes: [] - colNames: [] - rows: [] + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colNames: + - Level + - SkillEffect0Value0 + - SkillEffect0Value1 + rows: + - elements: + - 1 + - 0.1 + - -1 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Assets/Skills/MammonSkills/MammonsBribe.asset b/Assets/Skills/MammonSkills/MammonsBribe.asset index fc41e4f8..ae2a8109 100644 --- a/Assets/Skills/MammonSkills/MammonsBribe.asset +++ b/Assets/Skills/MammonSkills/MammonsBribe.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: MammonsBribe m_EditorClassIdentifier: name: MammonsBribe - level: 0 + level: 1 + probability: 0 cost: 14 active: 1 shortDescription: @@ -23,13 +24,27 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 0577e2aa56915254382457914dfa64ee, type: 2} - value1: 0.5 + value1: 1 value2: 2 visualEffect: {fileID: 552734591061099818, guid: adb27ddbffd6de74fb6e34379f56176a, type: 3} description: skillTable: {fileID: 4900000, guid: 9797faf419d0d994b8e09148256285ff, type: 3} table: - colTypes: [] - colNames: [] - rows: [] + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colNames: + - Level + - SkillEffect0Value0 + - SkillEffect0Value1 + rows: + - elements: + - 1 + - 1 + - 2 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Assets/Skills/MammonSkills/Savings.asset b/Assets/Skills/MammonSkills/Savings.asset index d927d9d0..75b627fc 100644 --- a/Assets/Skills/MammonSkills/Savings.asset +++ b/Assets/Skills/MammonSkills/Savings.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Savings m_EditorClassIdentifier: name: Savings - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: @@ -23,13 +24,27 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 961b466bfd28e34478495ad8aca5b359, type: 2} - value1: 0.005 + value1: 0.5 value2: -1 visualEffect: {fileID: 552734591061099818, guid: c5b81c56fc50dac4c80964acddc9c909, type: 3} description: skillTable: {fileID: 4900000, guid: 10785a8c0c79790408b13752b059b319, type: 3} table: - colTypes: [] - colNames: [] - rows: [] + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colNames: + - Level + - SkillEffect0Value0 + - SkillEffect0Value1 + rows: + - elements: + - 1 + - 0.5 + - -1 + colTypes: + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 diff --git a/Assets/Skills/RogueSkills/Bribery.asset b/Assets/Skills/RogueSkills/Bribery.asset index 8abc1d1b..615e29d1 100644 --- a/Assets/Skills/RogueSkills/Bribery.asset +++ b/Assets/Skills/RogueSkills/Bribery.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Bribery m_EditorClassIdentifier: name: Bribery - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Decreases max health of an ally so Herman can become almost untargetable. @@ -23,7 +24,7 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: df7549738b3905a4eb5bdca25036e03a, type: 2} - value1: 0.245 + value1: 0.25 value2: 1 - effect: {fileID: 11400000, guid: 07d604dc96abaad4683bacf9782a3d53, type: 2} value1: 100 @@ -31,7 +32,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: abd8053876238744fbeb64cff6c10c6e, type: 3} xp: 0 - xpNext: 0 + xpNext: 333 description: Offers a fraction of an ally's health to the enemies in order to be virtually untargetable for a brief time. Drawing too much aggro may cancel the effect. diff --git a/Assets/Skills/RogueSkills/Capitalism.asset b/Assets/Skills/RogueSkills/Capitalism.asset index 7f7b9faa..91b2de43 100644 --- a/Assets/Skills/RogueSkills/Capitalism.asset +++ b/Assets/Skills/RogueSkills/Capitalism.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Capitalism level: 0 + probability: 0 cost: 0 active: 0 shortDescription: Gets a small part of buffs and heals given to allies. diff --git a/Assets/Skills/RogueSkills/Coaching.asset b/Assets/Skills/RogueSkills/Coaching.asset index 84eb8c6c..b5b5b0e6 100644 --- a/Assets/Skills/RogueSkills/Coaching.asset +++ b/Assets/Skills/RogueSkills/Coaching.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Coaching level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Confuses enemy for some turns by tricking them. diff --git a/Assets/Skills/RogueSkills/De Tox juice.asset b/Assets/Skills/RogueSkills/De Tox juice.asset index 3217e189..e6db7a34 100644 --- a/Assets/Skills/RogueSkills/De Tox juice.asset +++ b/Assets/Skills/RogueSkills/De Tox juice.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: De Tox juice level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Poisons enemy by tricking them. Deals damage per turn. diff --git a/Assets/Skills/RogueSkills/Debt Trap.asset b/Assets/Skills/RogueSkills/Debt Trap.asset index 358e8b91..61d1b66f 100644 --- a/Assets/Skills/RogueSkills/Debt Trap.asset +++ b/Assets/Skills/RogueSkills/Debt Trap.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Debt Trap level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Paralyzes enemy for some turns by tricking them. diff --git a/Assets/Skills/RogueSkills/Herman Scheme.asset b/Assets/Skills/RogueSkills/Herman Scheme.asset index 3d3cbf95..01023026 100644 --- a/Assets/Skills/RogueSkills/Herman Scheme.asset +++ b/Assets/Skills/RogueSkills/Herman Scheme.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Herman Scheme m_EditorClassIdentifier: name: Herman Scheme - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: "Steals power from enemy for a short time. Must payback double\r @@ -24,12 +25,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 2a811d6fe345e7241af719fce9698395, type: 2} - value1: 0.055 + value1: 0.05 value2: 3 visualEffect: {fileID: 8917310150857617220, guid: 3a53acaf9cd688c469dcfe47f3d32270, type: 3} xp: 0 - xpNext: 0 + xpNext: 333 description: Borrows power from an enemy for a limited amount of turns. If the enemy is not dead at the end of said turns, Heman pays back the loan with interest, lending his own power to the enemy. Does not work if the target already has damage diff --git a/Assets/Skills/RogueSkills/Obscurantism.asset b/Assets/Skills/RogueSkills/Obscurantism.asset index 9adfd743..c19a849b 100644 --- a/Assets/Skills/RogueSkills/Obscurantism.asset +++ b/Assets/Skills/RogueSkills/Obscurantism.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Obscurantism level: 0 + probability: 0 cost: 0 active: 0 shortDescription: Stops encounters from occuring while active. diff --git a/Assets/Skills/RogueSkills/Quantum Coaching.asset b/Assets/Skills/RogueSkills/Quantum Coaching.asset index f7c4e0eb..3eb075d2 100644 --- a/Assets/Skills/RogueSkills/Quantum Coaching.asset +++ b/Assets/Skills/RogueSkills/Quantum Coaching.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Quantum Coaching level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Poisons and confuses enemy by tricking them. diff --git a/Assets/Skills/RogueSkills/Socialism.asset b/Assets/Skills/RogueSkills/Socialism.asset index 66e4870f..570b362b 100644 --- a/Assets/Skills/RogueSkills/Socialism.asset +++ b/Assets/Skills/RogueSkills/Socialism.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Socialism m_EditorClassIdentifier: name: Socialism - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: Reduces received debuffs in self by sharing with party. @@ -24,14 +25,14 @@ MonoBehaviour: effects: - effect: {fileID: 11400000, guid: f912b702de579944b8755068b3ba1247, type: 2} value1: 0 - value2: 0.055 + value2: 0.05 - effect: {fileID: 11400000, guid: e7102a7af7a69e3498974a3e20ed0f68, type: 2} value1: 0 - value2: 0.945 + value2: 0.95 visualEffect: {fileID: 5434996350183651868, guid: 7d2b7de3873efb54391708edbbe129c4, type: 3} xp: 0 - xpNext: 0 + xpNext: 1332 description: Herman uses his charisma to convince the party to divide between them part of his hardships. skillsToUpdate: diff --git a/Assets/Skills/RogueSkills/Surplus.asset b/Assets/Skills/RogueSkills/Surplus.asset index 07d01809..55983df8 100644 --- a/Assets/Skills/RogueSkills/Surplus.asset +++ b/Assets/Skills/RogueSkills/Surplus.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Surplus m_EditorClassIdentifier: name: Surplus - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: Increases received buffs in self. @@ -24,11 +25,11 @@ MonoBehaviour: effects: - effect: {fileID: 11400000, guid: e7102a7af7a69e3498974a3e20ed0f68, type: 2} value1: 0 - value2: 1.025 + value2: 1.02 visualEffect: {fileID: 5434996350183651868, guid: 4c6fc6c7981053447a73e9befab53aea, type: 3} xp: 0 - xpNext: 0 + xpNext: 1332 description: Herman uses his skills to get the best of every chance. Buffs have increased effect on him. skillsToUpdate: [] diff --git a/Assets/Skills/WarriorSkills/Anti-Mage's Taunt.asset b/Assets/Skills/WarriorSkills/Anti-Mage's Taunt.asset index dc7c5608..ca6dc510 100644 --- a/Assets/Skills/WarriorSkills/Anti-Mage's Taunt.asset +++ b/Assets/Skills/WarriorSkills/Anti-Mage's Taunt.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Anti-Mage's Taunt level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Raises chance of Amidi being targeted and his resistance. diff --git a/Assets/Skills/WarriorSkills/Bait.asset b/Assets/Skills/WarriorSkills/Bait.asset index 58b4a36d..5a137a72 100644 --- a/Assets/Skills/WarriorSkills/Bait.asset +++ b/Assets/Skills/WarriorSkills/Bait.asset @@ -14,8 +14,9 @@ MonoBehaviour: m_EditorClassIdentifier: name: Bait level: 0 + probability: 0 cost: 0 - active: 1 + active: 0 shortDescription: Doubles the encounter rate while Amidi is baiting enemies. target: 4 attribute: 5 diff --git a/Assets/Skills/WarriorSkills/DoubleMarch.asset b/Assets/Skills/WarriorSkills/DoubleMarch.asset index 9446b0e8..e2bd788b 100644 --- a/Assets/Skills/WarriorSkills/DoubleMarch.asset +++ b/Assets/Skills/WarriorSkills/DoubleMarch.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Double March level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Raises speed from party, but they take damage over time. diff --git a/Assets/Skills/WarriorSkills/General's Taunt.asset b/Assets/Skills/WarriorSkills/General's Taunt.asset index 9ef9968a..cb1245b3 100644 --- a/Assets/Skills/WarriorSkills/General's Taunt.asset +++ b/Assets/Skills/WarriorSkills/General's Taunt.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: General's Taunt level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Raises chance of Amidi being targeted and his defense. diff --git a/Assets/Skills/WarriorSkills/InstillFear.asset b/Assets/Skills/WarriorSkills/InstillFear.asset index d4795722..d0ac1cbd 100644 --- a/Assets/Skills/WarriorSkills/InstillFear.asset +++ b/Assets/Skills/WarriorSkills/InstillFear.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: InstillFear m_EditorClassIdentifier: name: Instill Fear - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: "Raises defense and resistance but reduces a little power from\r @@ -27,18 +28,18 @@ MonoBehaviour: value1: 0 value2: 0 - effect: {fileID: 11400000, guid: 8cb5d695331ec94409f87134f782e68f, type: 2} - value1: 0.106 + value1: 0.1 value2: 2 - effect: {fileID: 11400000, guid: 169740c4d9bdd8243a98dc4221b0761d, type: 2} - value1: 0.106 + value1: 0.1 value2: 2 - effect: {fileID: 11400000, guid: c63e208a774c8a444849e85e1d5b9b1e, type: 2} - value1: 0.053 + value1: 0.05 value2: 2 visualEffect: {fileID: 8917310150857617220, guid: b485ec28783caa84d8a5368c8cda818b, type: 3} xp: 0 - xpNext: 0 + xpNext: 333 description: Warns your companions about the enemies' dangers, making them raise their defenses, but being less likely to attack due to cowardice. skillsToUpdate: diff --git a/Assets/Skills/WarriorSkills/Insult.asset b/Assets/Skills/WarriorSkills/Insult.asset index 63706ee8..3e834bb2 100644 --- a/Assets/Skills/WarriorSkills/Insult.asset +++ b/Assets/Skills/WarriorSkills/Insult.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Insult m_EditorClassIdentifier: name: Insult - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: Raises chance of Amidi being targeted. @@ -23,12 +24,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 61dd43176377ced4c9b2d639a2892d4c, type: 2} - value1: 13 + value1: 10 value2: 2 visualEffect: {fileID: 5434996350183651868, guid: 59bf284213d51e14f9c04bc37e02d879, type: 3} xp: 0 - xpNext: 0 + xpNext: 200 description: Provokes the enemies, giving them higher chance to attack Amidi. skillsToUpdate: - {fileID: 11400000, guid: 796b06ccfb966ff45896f4dd474b32d4, type: 2} diff --git a/Assets/Skills/WarriorSkills/Promise of Riches.asset b/Assets/Skills/WarriorSkills/Promise of Riches.asset index e58be6d6..dc9c227c 100644 --- a/Assets/Skills/WarriorSkills/Promise of Riches.asset +++ b/Assets/Skills/WarriorSkills/Promise of Riches.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Promise of Riches m_EditorClassIdentifier: name: Promise of Riches - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Raises power but reduces a little resistance and defense from @@ -27,18 +28,18 @@ MonoBehaviour: value1: 0 value2: 0 - effect: {fileID: 11400000, guid: f0d98790fa591e94fa7c7ac8a43fc514, type: 2} - value1: 0.105 + value1: 0.1 value2: 2 - effect: {fileID: 11400000, guid: e0011e00775cef943958ab143715f76f, type: 2} - value1: 0.053 + value1: 0.05 value2: 2 - effect: {fileID: 11400000, guid: b5d1f30b4d6d890408bf22b738ff2820, type: 2} - value1: 0.053 + value1: 0.05 value2: 2 visualEffect: {fileID: 552734591061099818, guid: adb27ddbffd6de74fb6e34379f56176a, type: 3} xp: 0 - xpNext: 0 + xpNext: 333 description: Promises a great bounty for the heads of the enemies, making your companions eager to kill. Raises the attack, but as they are less careful, slightly lowers their defenses. diff --git a/Assets/Skills/WarriorSkills/Rapid Deployment.asset b/Assets/Skills/WarriorSkills/Rapid Deployment.asset index f0817370..f0154d46 100644 --- a/Assets/Skills/WarriorSkills/Rapid Deployment.asset +++ b/Assets/Skills/WarriorSkills/Rapid Deployment.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Rapid Deployment m_EditorClassIdentifier: name: Rapid Deployment - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: Amidi first strike speed boost. @@ -24,11 +25,11 @@ MonoBehaviour: effects: - effect: {fileID: 11400000, guid: 711276199e520fc4c98bf01d86ab35e4, type: 2} value1: 0 - value2: 0.415 + value2: 0.4 visualEffect: {fileID: 5434996350183651868, guid: 0bbbb173c53d799459f0715fedc7676a, type: 3} xp: 0 - xpNext: 0 + xpNext: 200 description: Amidi always has the first move in a battle. Except agains extremely well-prepared enemies. skillsToUpdate: [] diff --git a/Assets/Skills/WhiteMageSkills/Celebrating Victory.asset b/Assets/Skills/WhiteMageSkills/Celebrating Victory.asset index eb0bd008..d18bea60 100644 --- a/Assets/Skills/WhiteMageSkills/Celebrating Victory.asset +++ b/Assets/Skills/WhiteMageSkills/Celebrating Victory.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Celebrating Victory m_EditorClassIdentifier: name: Celebrating Victory - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: Heals party outside battle. @@ -23,12 +24,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 7670b68f5e3253643bd36fc21cca07a4, type: 2} - value1: 2.12 + value1: 2 value2: 0 visualEffect: {fileID: 8917310150857617220, guid: 44af1ab9d2936f242ab6a06b766c52c5, type: 3} xp: 0 - xpNext: 0 + xpNext: 200 description: Xander celebrates victory with the party with only the best wines and meals, recovering their bodies and spirits. skillsToUpdate: [] diff --git a/Assets/Skills/WhiteMageSkills/Dominica Sanitatem.asset b/Assets/Skills/WhiteMageSkills/Dominica Sanitatem.asset index 253385de..1ec78176 100644 --- a/Assets/Skills/WhiteMageSkills/Dominica Sanitatem.asset +++ b/Assets/Skills/WhiteMageSkills/Dominica Sanitatem.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Dominica Sanitatem m_EditorClassIdentifier: name: Dominica Sanitatem - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Heals an ally. @@ -23,12 +24,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 7670b68f5e3253643bd36fc21cca07a4, type: 2} - value1: 1.36 + value1: 1.3 value2: 0 visualEffect: {fileID: 8917310150857617220, guid: b07d20838bc296c42830d2418a9ea41c, type: 3} xp: 0 - xpNext: 0 + xpNext: 999 description: Xander's holy blessings heals an ally. skillsToUpdate: - {fileID: 11400000, guid: f10ded09276ddb5439d144b228506ae3, type: 2} diff --git a/Assets/Skills/WhiteMageSkills/Lava in Siloe.asset b/Assets/Skills/WhiteMageSkills/Lava in Siloe.asset index 274a4a30..251c2a76 100644 --- a/Assets/Skills/WhiteMageSkills/Lava in Siloe.asset +++ b/Assets/Skills/WhiteMageSkills/Lava in Siloe.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Lava in Siloe level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Removes an ally's negative status effects. diff --git a/Assets/Skills/WhiteMageSkills/Mental Fortitude.asset b/Assets/Skills/WhiteMageSkills/Mental Fortitude.asset index 19c23b3d..3a3b66f2 100644 --- a/Assets/Skills/WhiteMageSkills/Mental Fortitude.asset +++ b/Assets/Skills/WhiteMageSkills/Mental Fortitude.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Mental Fortitude m_EditorClassIdentifier: name: Mental Fortitude - level: 0 + level: 1 + probability: 0 cost: 0 active: 1 shortDescription: More resistance against status and debuffs. @@ -23,12 +24,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 7ce762a86e4d5c44d955ca9056c92460, type: 2} - value1: 0.053 + value1: 0.05 value2: -1 visualEffect: {fileID: 552734591061099818, guid: c5b81c56fc50dac4c80964acddc9c909, type: 3} xp: 0 - xpNext: 0 + xpNext: 200 description: Xander's life of studies and debates made him resistant to status abnormalities and other negative influences. skillsToUpdate: diff --git a/Assets/Skills/WhiteMageSkills/Omnibus Dominicae Sanitatem.asset b/Assets/Skills/WhiteMageSkills/Omnibus Dominicae Sanitatem.asset index c412d480..ac925dfb 100644 --- a/Assets/Skills/WhiteMageSkills/Omnibus Dominicae Sanitatem.asset +++ b/Assets/Skills/WhiteMageSkills/Omnibus Dominicae Sanitatem.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Omnibus Dominicae Sanitatem level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Heals party. diff --git a/Assets/Skills/WhiteMageSkills/Surgere et ambulare.asset b/Assets/Skills/WhiteMageSkills/Surgere et ambulare.asset index 4a123172..bcb3bcc9 100644 --- a/Assets/Skills/WhiteMageSkills/Surgere et ambulare.asset +++ b/Assets/Skills/WhiteMageSkills/Surgere et ambulare.asset @@ -13,7 +13,8 @@ MonoBehaviour: m_Name: Surgere et ambulare m_EditorClassIdentifier: name: Surgere et ambulare - level: 0 + level: 1 + probability: 0 cost: 12 active: 1 shortDescription: Revives an ally. @@ -27,11 +28,11 @@ MonoBehaviour: value2: 0 - effect: {fileID: 11400000, guid: 7670b68f5e3253643bd36fc21cca07a4, type: 2} value1: 0 - value2: 0.205 + value2: 0.2 visualEffect: {fileID: 8917310150857617220, guid: c893755b873c782498de5129bf2aef9f, type: 3} xp: 0 - xpNext: 0 + xpNext: 333 description: Xander holy and powerful words make an ally rise from the grave. skillsToUpdate: - {fileID: 11400000, guid: 77c32345c2b6be947b14d5bcbdd5b993, type: 2} diff --git a/Assets/Skills/WhiteMageSkills/Tardus at Iram.asset b/Assets/Skills/WhiteMageSkills/Tardus at Iram.asset index 45dfbe3a..06e0d336 100644 --- a/Assets/Skills/WhiteMageSkills/Tardus at Iram.asset +++ b/Assets/Skills/WhiteMageSkills/Tardus at Iram.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Tardus at Iram level: 0 + probability: 0 cost: 14 active: 0 shortDescription: Reduces an enemy's speed. diff --git a/Assets/Skills/WhiteMageSkills/Volare Via.asset b/Assets/Skills/WhiteMageSkills/Volare Via.asset index 49cccb81..6eda1db8 100644 --- a/Assets/Skills/WhiteMageSkills/Volare Via.asset +++ b/Assets/Skills/WhiteMageSkills/Volare Via.asset @@ -14,6 +14,7 @@ MonoBehaviour: m_EditorClassIdentifier: name: Volare Via level: 0 + probability: 0 cost: 0 active: 0 shortDescription: Increases party speed in the overworld while active. From 4f3c726ec8c79fe32ec086dc7eb3be0292e83091 Mon Sep 17 00:00:00 2001 From: LeonardoTPereira Date: Sat, 4 Mar 2023 21:03:59 -0300 Subject: [PATCH 2/3] Adds malformed imp AI --- .../Enemies/Malformed Imp (Earth).asset | 2 +- .../Enemies/Malformed Imp (Earth).asset.meta | 4 ++-- .../Enemies/Malformed Imp (Fire).asset.meta | 4 ++-- .../Enemies/Malformed Imp (Water).asset | 2 +- .../Enemies/Malformed Imp (Wind).asset | 2 +- .../Enemies/Malformed Imp (Wind).asset.meta | 4 ++-- .../Scriptable Objects/EnemiesAI/MalformedImp.cs | 16 ++++++++++++++++ .../EnemiesAI/MalformedImp.cs.meta | 11 +++++++++++ 8 files changed, 36 insertions(+), 9 deletions(-) create mode 100644 Assets/Scripts/Scriptable Objects/EnemiesAI/MalformedImp.cs create mode 100644 Assets/Scripts/Scriptable Objects/EnemiesAI/MalformedImp.cs.meta diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset b/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset index be58e2e6..2a2b6503 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5bb4b73a56b066945a09e38fde03ea7c, type: 3} + m_Script: {fileID: 11500000, guid: cf9a078d43d02384194df57200931fd1, type: 3} m_Name: Malformed Imp (Earth) m_EditorClassIdentifier: name: Noob MalformedI mp diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset.meta b/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset.meta index 7074e099..275268b1 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset.meta +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Earth).asset.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 810593631b8ca6737ad248c3802a5a1b NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: - assetBundleName: enemy + assetBundleName: assetBundleVariant: diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Fire).asset.meta b/Assets/ScriptableObjects/Enemies/Malformed Imp (Fire).asset.meta index 807c1f40..39c69b6f 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Fire).asset.meta +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Fire).asset.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 1ba2353e8c45136c2938ac15874e4b28 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: - assetBundleName: enemy + assetBundleName: assetBundleVariant: diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Water).asset b/Assets/ScriptableObjects/Enemies/Malformed Imp (Water).asset index 9710d1f6..63316289 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Water).asset +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Water).asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5bb4b73a56b066945a09e38fde03ea7c, type: 3} + m_Script: {fileID: 11500000, guid: cf9a078d43d02384194df57200931fd1, type: 3} m_Name: Malformed Imp (Water) m_EditorClassIdentifier: name: Noob MalformedI mp diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset b/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset index 45c294cd..5e9661ec 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset @@ -9,7 +9,7 @@ MonoBehaviour: m_GameObject: {fileID: 0} m_Enabled: 0 m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5bb4b73a56b066945a09e38fde03ea7c, type: 3} + m_Script: {fileID: 11500000, guid: cf9a078d43d02384194df57200931fd1, type: 3} m_Name: Malformed Imp (Wind) m_EditorClassIdentifier: name: Noob MalformedI mp diff --git a/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset.meta b/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset.meta index 2a7044d9..9dd17d8a 100644 --- a/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset.meta +++ b/Assets/ScriptableObjects/Enemies/Malformed Imp (Wind).asset.meta @@ -2,7 +2,7 @@ fileFormatVersion: 2 guid: 1be46cd66e137a7a1bef6109593731c7 NativeFormatImporter: externalObjects: {} - mainObjectFileID: 11400000 + mainObjectFileID: 0 userData: - assetBundleName: enemy + assetBundleName: assetBundleVariant: diff --git a/Assets/Scripts/Scriptable Objects/EnemiesAI/MalformedImp.cs b/Assets/Scripts/Scriptable Objects/EnemiesAI/MalformedImp.cs new file mode 100644 index 00000000..4332742b --- /dev/null +++ b/Assets/Scripts/Scriptable Objects/EnemiesAI/MalformedImp.cs @@ -0,0 +1,16 @@ +using UnityEngine; + +namespace FinalInferno { + + [CreateAssetMenu(fileName = "Malformed Imp", menuName = "ScriptableObject/Enemy/MalformedImp")] + public class MalformedImp : Enemy { + private Skill ImpSkill => skills[0]; + + public override Skill AttackDecision() { + float roll = Random.Range(0.0f, 1.0f); + if (roll < 0.7f) + return ImpSkill; + return attackSkill; + } + } +} \ No newline at end of file diff --git a/Assets/Scripts/Scriptable Objects/EnemiesAI/MalformedImp.cs.meta b/Assets/Scripts/Scriptable Objects/EnemiesAI/MalformedImp.cs.meta new file mode 100644 index 00000000..c03eff5d --- /dev/null +++ b/Assets/Scripts/Scriptable Objects/EnemiesAI/MalformedImp.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: cf9a078d43d02384194df57200931fd1 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: From 684b91ae67563b5c0f9313804b15fb8652d18e2d Mon Sep 17 00:00:00 2001 From: LeonardoTPereira Date: Sun, 5 Mar 2023 00:49:12 -0300 Subject: [PATCH 3/3] Revert wrong reversion --- Assets/ScriptableObjects/AssetDatabase.asset | 21 +- .../CharacterClasses/Units/Amidi.asset | 7 +- .../CharacterClasses/Units/Gregorim.asset | 11 +- .../CharacterClasses/Units/Herman.asset | 8 +- .../CharacterClasses/Units/Xander.asset | 7 +- .../ScriptableObjects/Enemies/Banshee.asset | 28 +-- .../Enemies/CerberusHead.asset | 36 ++-- Assets/ScriptableObjects/Enemies/Dummy.asset | 26 ++- .../Enemies/Eunuch Satyr.asset | 203 ++---------------- .../Enemies/Evil Spirit.asset | 40 ++-- .../Enemies/Freed Wanderer.asset | 70 ++++-- .../Enemies/Golden Tormentor.asset | 148 +++++++------ Assets/ScriptableObjects/Enemies/Mammon.asset | 32 +-- .../ScriptableObjects/Enemies/Overseer.asset | 36 ++-- Assets/ScriptableObjects/Enemies/Pwner.asset | 64 ++---- .../ScriptableObjects/Enemies/Skeleton.asset | 20 +- .../ScriptableObjects/Enemies/Wanderer.asset | 70 ++++-- Assets/ScriptableObjects/Party.asset | 6 +- Assets/ScriptableObjects/Quests/Beggars.asset | 2 +- .../Quests/Part2Mainquest.asset | 4 +- .../ScriptableObjects/Quests/SoulWalls.asset | 2 +- Assets/Scripts/DynamicTable.cs | 26 +-- .../EnemiesAI/EnemySingleActiveSkillUser.cs | 15 -- .../EnemySingleActiveSkillUser.cs.meta | 11 - Assets/Scripts/Scriptable Objects/Enemy.cs | 90 ++------ .../Scripts/Scriptable Objects/EnemySkill.cs | 57 +---- Assets/Scripts/Scriptable Objects/Skill.cs | 31 +-- Assets/Skills/BasicSkills/EnemyAttack.asset | 1 - Assets/Skills/BasicSkills/PlayerAttack.asset | 1 - Assets/Skills/BasicSkills/PlayerDefend.asset | 1 - .../BasicSkills/PlayerMagicAttack.asset | 1 - .../BasicSkills/PlayerSlashAttack.asset | 1 - Assets/Skills/BlackMageSkills/Anaemia.asset | 5 +- Assets/Skills/BlackMageSkills/Bleeding.asset | 7 +- .../Skills/BlackMageSkills/Fiery Stroke.asset | 1 - .../Skills/BlackMageSkills/FireBullet.asset | 7 +- Assets/Skills/BlackMageSkills/FrostBite.asset | 5 +- .../Skills/BlackMageSkills/Haemorrhage.asset | 1 - .../BlackMageSkills/Holy Necromancy.asset | 1 - Assets/Skills/BlackMageSkills/Impaling.asset | 5 +- .../BlackMageSkills/Infernal Hail.asset | 1 - .../Skills/BlackMageSkills/Stonestorm.asset | 1 - .../Skills/BlackMageSkills/Suffocation.asset | 1 - Assets/Skills/BlackMageSkills/WindCut.asset | 5 +- .../CerberusSkills/Bloodspil(Damage).asset | 1 - .../CerberusSkills/Bloodspill(Heal).asset | 1 - .../Skills/CerberusSkills/Ghost Limbs.asset | 41 +--- Assets/Skills/CerberusSkills/Hellfire.asset | 1 - .../CerberusSkills/Tremendous Roar.asset | 1 - .../EnemySkills/Contagious Sorrow.asset | 81 +------ Assets/Skills/EnemySkills/Earth Strike.asset | 1 - Assets/Skills/EnemySkills/Eternal Cry.asset | 1 - .../Skills/EnemySkills/Ethereal Shield.asset | 1 - .../EnemySkills/Fire Bullet Enemy.asset | 1 - .../Skills/EnemySkills/Frostbite Enemy.asset | 1 - .../Skills/EnemySkills/Impaling Enemy.asset | 1 - Assets/Skills/EnemySkills/LaserBeam.asset | 1 - Assets/Skills/EnemySkills/Leadership.asset | 1 - Assets/Skills/EnemySkills/Ominous Wind.asset | 1 - Assets/Skills/EnemySkills/Rebirth.asset | 1 - Assets/Skills/EnemySkills/Solitude.asset | 1 - .../Skills/EnemySkills/Unfinished Work.asset | 53 +---- .../Skills/EnemySkills/Wind Cut Enemy.asset | 1 - .../Skills/MammonSkills/GreatDepression.asset | 25 +-- Assets/Skills/MammonSkills/Inflation.asset | 25 +-- Assets/Skills/MammonSkills/MammonsBribe.asset | 25 +-- Assets/Skills/MammonSkills/Savings.asset | 25 +-- Assets/Skills/RogueSkills/Bribery.asset | 7 +- Assets/Skills/RogueSkills/Capitalism.asset | 1 - Assets/Skills/RogueSkills/Coaching.asset | 1 - Assets/Skills/RogueSkills/De Tox juice.asset | 1 - Assets/Skills/RogueSkills/Debt Trap.asset | 1 - Assets/Skills/RogueSkills/Herman Scheme.asset | 7 +- Assets/Skills/RogueSkills/Obscurantism.asset | 1 - .../Skills/RogueSkills/Quantum Coaching.asset | 1 - Assets/Skills/RogueSkills/Socialism.asset | 9 +- Assets/Skills/RogueSkills/Surplus.asset | 7 +- .../WarriorSkills/Anti-Mage's Taunt.asset | 1 - Assets/Skills/WarriorSkills/Bait.asset | 3 +- Assets/Skills/WarriorSkills/DoubleMarch.asset | 1 - .../WarriorSkills/General's Taunt.asset | 1 - Assets/Skills/WarriorSkills/InstillFear.asset | 11 +- Assets/Skills/WarriorSkills/Insult.asset | 7 +- .../WarriorSkills/Promise of Riches.asset | 11 +- .../WarriorSkills/Rapid Deployment.asset | 7 +- .../WhiteMageSkills/Celebrating Victory.asset | 7 +- .../WhiteMageSkills/Dominica Sanitatem.asset | 7 +- .../WhiteMageSkills/Lava in Siloe.asset | 1 - .../WhiteMageSkills/Mental Fortitude.asset | 7 +- .../Omnibus Dominicae Sanitatem.asset | 1 - .../WhiteMageSkills/Surgere et ambulare.asset | 7 +- .../WhiteMageSkills/Tardus at Iram.asset | 1 - .../Skills/WhiteMageSkills/Volare Via.asset | 1 - 93 files changed, 436 insertions(+), 1081 deletions(-) delete mode 100644 Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs delete mode 100644 Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs.meta diff --git a/Assets/ScriptableObjects/AssetDatabase.asset b/Assets/ScriptableObjects/AssetDatabase.asset index f37bcfc0..98813627 100644 --- a/Assets/ScriptableObjects/AssetDatabase.asset +++ b/Assets/ScriptableObjects/AssetDatabase.asset @@ -15,6 +15,7 @@ MonoBehaviour: party: assets: - {fileID: 11400000, guid: bfcc6757f0187c44cbe472d8c6016f4a, type: 2} + bundleName: party heroes: assets: - {fileID: 11400000, guid: e9fc2909baeab9f429400cf3858d323d, type: 2} @@ -22,24 +23,19 @@ MonoBehaviour: - {fileID: 11400000, guid: e9525b6ce1e46534e930ac508a9af0ab, type: 2} - {fileID: 11400000, guid: 0170c5b1892fb7b4289b1ccaba155a63, type: 2} - {fileID: 11400000, guid: 242d4f97eef6c3245949a9eabd38989c, type: 2} + bundleName: hero enemies: assets: - {fileID: 11400000, guid: 5886978ba6fa6b848b57af610480fd1c, type: 2} - {fileID: 11400000, guid: c14a8617fc60fec45a18cc0dd80ec85e, type: 2} - {fileID: 11400000, guid: 507693d0156bdff479018166728a89bb, type: 2} - - {fileID: 11400000, guid: a68e3415856a9dd8cb3f570883b10fef, type: 2} - {fileID: 11400000, guid: ebce637ca18de8049bae47ce5619b52a, type: 2} - - {fileID: 11400000, guid: c6bf0a00cb946ab2490bb614e5cbab2a, type: 2} - - {fileID: 11400000, guid: 2e41f6aa0c564c91db7c675d5e6ee50f, type: 2} - - {fileID: 11400000, guid: 810593631b8ca6737ad248c3802a5a1b, type: 2} - - {fileID: 11400000, guid: 1ba2353e8c45136c2938ac15874e4b28, type: 2} - - {fileID: 11400000, guid: 0ac451b3f2e9308f9882fbe3abd1428f, type: 2} - - {fileID: 11400000, guid: 1be46cd66e137a7a1bef6109593731c7, type: 2} - {fileID: 11400000, guid: fc9397eef5dd14f499aa19d79f54d002, type: 2} - {fileID: 11400000, guid: 05c84e55866f810439ed4018afd0ed05, type: 2} - {fileID: 11400000, guid: 038022bbbe22d8246bc82a216a1c63b0, type: 2} - {fileID: 11400000, guid: 181700fda93314d42a197c5bd09067da, type: 2} - {fileID: 11400000, guid: 619fc667c0acf5d4cbb05d6c455f3324, type: 2} + bundleName: enemy skills: assets: - {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} @@ -64,20 +60,14 @@ MonoBehaviour: - {fileID: 11400000, guid: 546e6255b06e7f548bca11b9ffd4dff3, type: 2} - {fileID: 11400000, guid: 59a8e1c9b1e65a04aaed2d03306182ec, type: 2} - {fileID: 11400000, guid: 2e0db51bfd992b14d94ac1a86a5d52f1, type: 2} - - {fileID: 11400000, guid: 86896da9b9f283255b1044339e03990c, type: 2} - {fileID: 11400000, guid: 2c3021b87d1b78a458264d0c93f382d1, type: 2} - {fileID: 11400000, guid: c7f8ca5a99d6a8240a8df51799499057, type: 2} - {fileID: 11400000, guid: 146e0b485e422a34491481061bc3166e, type: 2} - - {fileID: 11400000, guid: f25a5633998651b4c99f38fb1da19a95, type: 2} - - {fileID: 11400000, guid: 9ae85ec78258f2e40aa10d36cb6b4eac, type: 2} - - {fileID: 11400000, guid: b20f3fd69792639499299460cab52ca9, type: 2} - {fileID: 11400000, guid: 0ca2852212a68e141abd6654048cd58e, type: 2} - {fileID: 11400000, guid: df9ec28c727b6984db874ca73c12eba5, type: 2} - {fileID: 11400000, guid: 2b9ee177640e75e44b19106c40449642, type: 2} - {fileID: 11400000, guid: 44550d9bdd31a5447a4eb4a6f3fe78b1, type: 2} - {fileID: 11400000, guid: 0aabb7711250c0043a60cdb4a6f69917, type: 2} - - {fileID: 11400000, guid: 50d29aa76f7ee9a91b40d49631441a91, type: 2} - - {fileID: 11400000, guid: 1d7789405f7314147b0aa1eaa8eb7313, type: 2} - {fileID: 11400000, guid: c55a39d96a70a2e42b62675fdb3ac85c, type: 2} - {fileID: 11400000, guid: 17f4f9e1932146b44be43f80c1814741, type: 2} - {fileID: 11400000, guid: a5464d3f63f43b345b8492fa44f13164, type: 2} @@ -108,10 +98,9 @@ MonoBehaviour: - {fileID: 11400000, guid: 139c8013cbcd44a4caf3da90c87c4447, type: 2} - {fileID: 11400000, guid: 1c4a70a18c0247b4db6b72a858ba6d77, type: 2} - {fileID: 11400000, guid: e015a2414b9c8b04cbf9ae3c79970254, type: 2} + bundleName: skill quests: assets: - {fileID: 11400000, guid: 677f1c2913c03544ab216650c53219c9, type: 2} - - {fileID: 11400000, guid: 8615d4504c47cc14da14226b01563773, type: 2} - {fileID: 11400000, guid: bb0791dbfe37dc647ad7ce1c40f3c45c, type: 2} - - {fileID: 11400000, guid: 86461e150e0505f4599af049f91e27d6, type: 2} - - {fileID: 11400000, guid: 3891461a8629aaf4cab13678a2280fa1, type: 2} + bundleName: quest diff --git a/Assets/ScriptableObjects/CharacterClasses/Units/Amidi.asset b/Assets/ScriptableObjects/CharacterClasses/Units/Amidi.asset index 5c2fc503..b93d7fc0 100644 --- a/Assets/ScriptableObjects/CharacterClasses/Units/Amidi.asset +++ b/Assets/ScriptableObjects/CharacterClasses/Units/Amidi.asset @@ -74,10 +74,11 @@ MonoBehaviour: - {fileID: 11400000, guid: 5f72e851454fcf74b85cce7a775190db, type: 2} - {fileID: 11400000, guid: ce0b775e8fd75a649853fbd421384006, type: 2} skillsToUpdate: + - {fileID: 11400000, guid: d1dfa69ae0800ed48820d859d36d9962, type: 2} + - {fileID: 11400000, guid: 3f064401f4f88004eb3d4651c796b505, type: 2} + - {fileID: 11400000, guid: 78819aff25442334db7295c5af3b21e0, type: 2} + - {fileID: 11400000, guid: 5f72e851454fcf74b85cce7a775190db, type: 2} - {fileID: 11400000, guid: ce0b775e8fd75a649853fbd421384006, type: 2} - - {fileID: 11400000, guid: 582d7cf50d6f72647872d290a61905b9, type: 2} - - {fileID: 11400000, guid: 796b06ccfb966ff45896f4dd474b32d4, type: 2} - - {fileID: 11400000, guid: 31c0693584d3a684294a9fbdd5b5b3c8, type: 2} heroTable: {fileID: 4900000, guid: ec36bd18194dd7c4c878df0341fec704, type: 3} table: colTypes: diff --git a/Assets/ScriptableObjects/CharacterClasses/Units/Gregorim.asset b/Assets/ScriptableObjects/CharacterClasses/Units/Gregorim.asset index a8568f28..b152c2a3 100644 --- a/Assets/ScriptableObjects/CharacterClasses/Units/Gregorim.asset +++ b/Assets/ScriptableObjects/CharacterClasses/Units/Gregorim.asset @@ -80,12 +80,13 @@ MonoBehaviour: - {fileID: 11400000, guid: f6d06b9212f30134e8de2c3338c66ce2, type: 2} - {fileID: 11400000, guid: 99772e91d402651a19f9a545fb6ac70a, type: 2} skillsToUpdate: + - {fileID: 11400000, guid: e0a3cf6667f30454f8cfb2ffd7357dd4, type: 2} + - {fileID: 11400000, guid: 2553025485ef6014db812ae57d46bf00, type: 2} + - {fileID: 11400000, guid: 8b53236f7f4782c4c97833a42662c173, type: 2} + - {fileID: 11400000, guid: 3584cab9d6f57e943997103ae321edd5, type: 2} + - {fileID: 11400000, guid: 119f98d3dde04604cb731b7ca6107340, type: 2} + - {fileID: 11400000, guid: f6d06b9212f30134e8de2c3338c66ce2, type: 2} - {fileID: 11400000, guid: 99772e91d402651a19f9a545fb6ac70a, type: 2} - - {fileID: 11400000, guid: 713ad1edfed7be047b9e54e0c27af0a8, type: 2} - - {fileID: 11400000, guid: 6e9e516a23516ef4dae37687fdd1da3c, type: 2} - - {fileID: 11400000, guid: 0e23b4c715019e540817f3a2297aab68, type: 2} - - {fileID: 11400000, guid: 0547e57ad308798409bb37fa33e8409c, type: 2} - - {fileID: 11400000, guid: 0e475961e4ca2bf40b9372c00b1d3153, type: 2} heroTable: {fileID: 4900000, guid: 175b9fe79508c224f914b6d0264e7f37, type: 3} table: colTypes: diff --git a/Assets/ScriptableObjects/CharacterClasses/Units/Herman.asset b/Assets/ScriptableObjects/CharacterClasses/Units/Herman.asset index 52bebd9a..c1206079 100644 --- a/Assets/ScriptableObjects/CharacterClasses/Units/Herman.asset +++ b/Assets/ScriptableObjects/CharacterClasses/Units/Herman.asset @@ -76,11 +76,11 @@ MonoBehaviour: - {fileID: 11400000, guid: 3f375c51ea883dc4f9fb12a06317e22c, type: 2} - {fileID: 11400000, guid: 8dd102f5f6dd2f70b8ba5ce6d25f17c2, type: 2} skillsToUpdate: + - {fileID: 11400000, guid: 70758a650379ada4591f631394c1a92c, type: 2} + - {fileID: 11400000, guid: f4fe5474cbca4674780f60355fd67e56, type: 2} + - {fileID: 11400000, guid: 0e10a0ffc20aa7f4fbc5e88247c459dc, type: 2} + - {fileID: 11400000, guid: 3f375c51ea883dc4f9fb12a06317e22c, type: 2} - {fileID: 11400000, guid: 8dd102f5f6dd2f70b8ba5ce6d25f17c2, type: 2} - - {fileID: 11400000, guid: 5ef492f0f94fbdb4eac62c14393de0a4, type: 2} - - {fileID: 11400000, guid: b240aa35f24516649ad1f94be90aad55, type: 2} - - {fileID: 11400000, guid: 34258218c6ebd334d94716b725f0412e, type: 2} - - {fileID: 11400000, guid: 7d5ebe08b95eafd458911a51571ccb67, type: 2} heroTable: {fileID: 4900000, guid: 39817faa54b5b2b43a1f8151656029f0, type: 3} table: colTypes: diff --git a/Assets/ScriptableObjects/CharacterClasses/Units/Xander.asset b/Assets/ScriptableObjects/CharacterClasses/Units/Xander.asset index 1ba475f5..b1f627f2 100644 --- a/Assets/ScriptableObjects/CharacterClasses/Units/Xander.asset +++ b/Assets/ScriptableObjects/CharacterClasses/Units/Xander.asset @@ -74,10 +74,11 @@ MonoBehaviour: - {fileID: 11400000, guid: 139c8013cbcd44a4caf3da90c87c4447, type: 2} - {fileID: 11400000, guid: e015a2414b9c8b04cbf9ae3c79970254, type: 2} skillsToUpdate: + - {fileID: 11400000, guid: 61b4ce536dd3a0f4db29221345a2121b, type: 2} + - {fileID: 11400000, guid: 28b507e27020566428ea6178facfc5fe, type: 2} + - {fileID: 11400000, guid: a89b9a8ab49d0a04dbcd48c5be80dce1, type: 2} + - {fileID: 11400000, guid: 139c8013cbcd44a4caf3da90c87c4447, type: 2} - {fileID: 11400000, guid: e015a2414b9c8b04cbf9ae3c79970254, type: 2} - - {fileID: 11400000, guid: f10ded09276ddb5439d144b228506ae3, type: 2} - - {fileID: 11400000, guid: 77c32345c2b6be947b14d5bcbdd5b993, type: 2} - - {fileID: 11400000, guid: 1c4a70a18c0247b4db6b72a858ba6d77, type: 2} heroTable: {fileID: 4900000, guid: 4622ed642b7962c4fa8e423753681dc0, type: 3} table: colTypes: diff --git a/Assets/ScriptableObjects/Enemies/Banshee.asset b/Assets/ScriptableObjects/Enemies/Banshee.asset index 572cff93..b3735595 100644 --- a/Assets/ScriptableObjects/Enemies/Banshee.asset +++ b/Assets/ScriptableObjects/Enemies/Banshee.asset @@ -94,7 +94,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -112,8 +111,7 @@ MonoBehaviour: - XP - LevelSkill0 - LevelSkill1 - - ChanceToUseSkill0 - - ChanceToUseSkill1 + - ChancetoUseSkill rows: - elements: - Noob Banshee @@ -127,13 +125,12 @@ MonoBehaviour: - 1 - 0.5 - 1.5 - - 1 - - 1 + - 1.0 + - 1.0 - 260 - 1 - 1 - 0.3 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -153,7 +150,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Banshee - 5 @@ -166,13 +162,12 @@ MonoBehaviour: - 1 - 0.5 - 1.5 - - 1 - - 1 + - 1.0 + - 1.0 - 900 - 2 - 2 - 0.3 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -192,7 +187,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Banshee - 10 @@ -205,13 +199,12 @@ MonoBehaviour: - 1 - 0.5 - 1.5 - - 1 - - 1 + - 1.0 + - 1.0 - 1600 - 3 - 3 - 0.35 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -231,7 +224,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Banshee - 15 @@ -244,13 +236,12 @@ MonoBehaviour: - 1 - 0.5 - 1.5 - - 1 - - 1 + - 1.0 + - 1.0 - 2300 - 4 - 4 - 0.35 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -270,5 +261,4 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/CerberusHead.asset b/Assets/ScriptableObjects/Enemies/CerberusHead.asset index f9b16ef8..0e8d7ac8 100644 --- a/Assets/ScriptableObjects/Enemies/CerberusHead.asset +++ b/Assets/ScriptableObjects/Enemies/CerberusHead.asset @@ -45,7 +45,7 @@ MonoBehaviour: _keyValues: 01000000 _keys: 01000000 _values: - - 5 + - 0.5 skills: - {fileID: 11400000, guid: 59a8e1c9b1e65a04aaed2d03306182ec, type: 2} - {fileID: 11400000, guid: 2e0db51bfd992b14d94ac1a86a5d52f1, type: 2} @@ -92,10 +92,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank @@ -117,11 +114,8 @@ MonoBehaviour: - LevelSkill2 - LevelSkill3 - LevelSkill4 - - ChanceToUseSkill0 - - ChanceToUseSkill1 - - ChanceToUseSkill2 - - ChanceToUseSkill3 - - ChanceToUseSkill4 + - LevelSkill5 + - ChancetoUseSkill rows: - elements: - Cerberus @@ -132,22 +126,19 @@ MonoBehaviour: - 15 - 30 - '#FFFFFFFF' - - 0,5 - - 1 - - 1 - - 1 - - 1 + - 0.5 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 2331 + - 0 - 1 - 1 - 1 - 1 - 1 - - 0,4 - - 1 - - 1 - - 1 - - 1 + - 0.4 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -169,10 +160,7 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 bodySprite: {fileID: 21300002, guid: b037615be5a0e2b4c9dbad9d4e737e88, type: 3} diff --git a/Assets/ScriptableObjects/Enemies/Dummy.asset b/Assets/ScriptableObjects/Enemies/Dummy.asset index 4f371d6b..10ea1999 100644 --- a/Assets/ScriptableObjects/Enemies/Dummy.asset +++ b/Assets/ScriptableObjects/Enemies/Dummy.asset @@ -81,6 +81,7 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -96,6 +97,7 @@ MonoBehaviour: - EarthResistance - NeutralResistance - XP + - ChancetoUseSkill rows: - elements: - Dummy @@ -106,12 +108,13 @@ MonoBehaviour: - 4 - 7 - '#D2D2D2' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 300 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -128,6 +131,7 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Stronk Dummy - 5 @@ -137,12 +141,13 @@ MonoBehaviour: - 10 - 10 - '#A83E00' - - 1,5 - - 1,5 - - 1,5 - - 1,5 - - 1,5 + - 1.5 + - 1.5 + - 1.5 + - 1.5 + - 1.5 - 50 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -159,4 +164,5 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset b/Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset index 77ed1b72..79007edf 100644 --- a/Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset +++ b/Assets/ScriptableObjects/Enemies/Eunuch Satyr.asset @@ -12,13 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1316a6010cc2419be8478b1910870c23, type: 3} m_Name: Eunuch Satyr m_EditorClassIdentifier: - name: Noob Eunuch Satyr - level: 1 - hpMax: 36 - baseDmg: 20 - baseDef: 6 - baseMagicDef: 5 - baseSpeed: 12 + name: Eunuch Satyr + level: 0 + hpMax: 0 + baseDmg: 0 + baseDef: 0 + baseMagicDef: 0 + baseSpeed: 0 elementalResistances: reorderableList: canAdd: 1 @@ -42,11 +42,9 @@ MonoBehaviour: elementIcon: {fileID: 0} reqReferences: {fileID: 0} isExpanded: 0 - _keyValues: 0200000003000000 - _keys: 0200000003000000 - _values: - - 0.5 - - 1.5 + _keyValues: + _keys: + _values: [] skills: - {fileID: 11400000, guid: 86896da9b9f283255b1044339e03990c, type: 2} attackSkill: {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} @@ -71,182 +69,9 @@ MonoBehaviour: type: 3} enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3} bio: Where are my testicles, summer? - enemyTable: {fileID: 4900000, guid: cf69a12763fd7434588fe531a6e0333c, type: 3} + enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3} table: - colTypes: - - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - colNames: - - Rank - - Level - - HP - - Damage - - Defense - - Resistance - - Speed - - Color - - FireResistance - - WaterResistance - - WindResistance - - EarthResistance - - NeutralResistance - - XP - - LevelSkill0 - - ChanceToUseSkill0 - rows: - - elements: - - Noob Eunuch Satyr - - 1 - - 36 - - 20 - - 6 - - 5 - - 12 - - '#FFFFFF' - - 1 - - 0.5 - - 1.5 - - 1 - - 1 - - 260 - - 1 - - 0.4 - colTypes: - - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - Eunuch Satyr - - 5 - - 59 - - 32 - - 13 - - 12 - - 23 - - '#FF9EC0' - - 1 - - 0.5 - - 1.5 - - 1 - - 1 - - 900 - - 2 - - 0.4 - colTypes: - - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - Lt. Eunuch Satyr - - 10 - - 89 - - 44 - - 26 - - 23 - - 36 - - '#FF9EEF' - - 1 - - 0.5 - - 1.5 - - 1 - - 1 - - 1600 - - 3 - - 0.45 - colTypes: - - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - Capt. Eunuch Satyr - - 15 - - 137 - - 60 - - 40 - - 35 - - 52 - - '#E59EFF' - - 1 - - 0.5 - - 1.5 - - 1 - - 1 - - 2300 - - 4 - - 0.45 - colTypes: - - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - UnityEngine.Color, UnityEngine.CoreModule, Version=0.0.0.0, Culture=neutral, - PublicKeyToken=null - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colTypes: [] + colNames: [] + rows: [] curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Evil Spirit.asset b/Assets/ScriptableObjects/Enemies/Evil Spirit.asset index e7c12d69..4fd2b70d 100644 --- a/Assets/ScriptableObjects/Enemies/Evil Spirit.asset +++ b/Assets/ScriptableObjects/Enemies/Evil Spirit.asset @@ -26,7 +26,7 @@ MonoBehaviour: draggable: 1 expandable: 1 multipleSelection: 1 - isExpanded: 1 + isExpanded: 0 label: m_Text: Keys m_Image: {fileID: 0} @@ -41,7 +41,7 @@ MonoBehaviour: elementNameOverride: elementIcon: {fileID: 0} reqReferences: {fileID: 0} - isExpanded: 1 + isExpanded: 0 _keyValues: 0300000004000000 _keys: 0300000004000000 _values: @@ -88,7 +88,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -106,8 +105,7 @@ MonoBehaviour: - XP - LevelSkill0 - LevelSkill1 - - ChanceToUseSkill0 - - ChanceToUseSkill1 + - ChancetoUseSkill rows: - elements: - Noob Evil Spirit @@ -118,16 +116,15 @@ MonoBehaviour: - 4 - 14 - '#FFFFFF' - - 1 - - 1 + - 1.0 + - 1.0 - 0.5 - 1.5 - - 1 + - 1.0 - 260 - 1 - 1 - 0.3 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -147,7 +144,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Evil Spirit - 5 @@ -157,16 +153,15 @@ MonoBehaviour: - 9 - 26 - '#FF9EC0' - - 1 - - 1 + - 1.0 + - 1.0 - 0.5 - 1.5 - - 1 + - 1.0 - 900 - 2 - 2 - 0.3 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -186,7 +181,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Evil Spirit - 10 @@ -196,16 +190,15 @@ MonoBehaviour: - 20 - 42 - '#FF9EEF' - - 1 - - 1 + - 1.0 + - 1.0 - 0.5 - 1.5 - - 1 + - 1.0 - 1600 - 3 - 3 - 0.35 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -225,7 +218,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Evil Spirit - 15 @@ -235,16 +227,15 @@ MonoBehaviour: - 31 - 59 - '#E59EFF' - - 1 - - 1 + - 1.0 + - 1.0 - 0.5 - 1.5 - - 1 + - 1.0 - 2300 - 4 - 4 - 0.35 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -264,5 +255,4 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Freed Wanderer.asset b/Assets/ScriptableObjects/Enemies/Freed Wanderer.asset index 291da289..be1775eb 100644 --- a/Assets/ScriptableObjects/Enemies/Freed Wanderer.asset +++ b/Assets/ScriptableObjects/Enemies/Freed Wanderer.asset @@ -86,6 +86,9 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -101,6 +104,9 @@ MonoBehaviour: - EarthResistance - NeutralResistance - XP + - LevelSkill0 + - LevelSkill1 + - ChancetoUseSkill rows: - elements: - Noob Wanderer @@ -111,12 +117,15 @@ MonoBehaviour: - 5 - 13 - '#FFFFFF' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 220 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -133,6 +142,9 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Wanderer - 5 @@ -142,12 +154,15 @@ MonoBehaviour: - 12 - 24 - '#FF9EC0' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 830 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -164,6 +179,9 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Wanderer - 10 @@ -173,12 +191,15 @@ MonoBehaviour: - 23 - 39 - '#FF9EEF' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 1540 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -195,6 +216,9 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Wanderer - 15 @@ -204,12 +228,15 @@ MonoBehaviour: - 35 - 55 - '#E59EFF' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 2210 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -226,4 +253,7 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Golden Tormentor.asset b/Assets/ScriptableObjects/Enemies/Golden Tormentor.asset index cd4ef016..14dde095 100644 --- a/Assets/ScriptableObjects/Enemies/Golden Tormentor.asset +++ b/Assets/ScriptableObjects/Enemies/Golden Tormentor.asset @@ -12,13 +12,13 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 1494de32c58656842bde15226b17b8ca, type: 3} m_Name: Golden Tormentor m_EditorClassIdentifier: - name: Noob Golden Tormentor - level: 1 - hpMax: 34 - baseDmg: 19 - baseDef: 6 - baseMagicDef: 6 - baseSpeed: 10 + name: Golden Tormentor + level: 5 + hpMax: 53 + baseDmg: 38 + baseDef: 10 + baseMagicDef: 12 + baseSpeed: 24 elementalResistances: reorderableList: canAdd: 1 @@ -42,11 +42,9 @@ MonoBehaviour: elementIcon: {fileID: 0} reqReferences: {fileID: 0} isExpanded: 0 - _keyValues: 0100000002000000 - _keys: 0100000002000000 - _values: - - 0.5 - - 1.5 + _keyValues: + _keys: + _values: [] skills: - {fileID: 11400000, guid: 50d29aa76f7ee9a91b40d49631441a91, type: 2} attackSkill: {fileID: 11400000, guid: 95407fd86bf202049848deeb79956196, type: 2} @@ -71,7 +69,7 @@ MonoBehaviour: type: 3} enemyCry: {fileID: 8300000, guid: 24c1a2410b1154844a312d23598a28c1, type: 3} bio: Eat you up and spit you out. Baller. - enemyTable: {fileID: 4900000, guid: 638d2ca67baaa5b448220ac051f291b7, type: 3} + enemyTable: {fileID: 4900000, guid: fad97e4bea2fabc4192746002a560182, type: 3} table: colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -90,6 +88,7 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank @@ -107,25 +106,27 @@ MonoBehaviour: - NeutralResistance - XP - LevelSkill0 - - ChanceToUseSkill0 + - LevelSkill1 + - ChancetoUseSkill rows: - elements: - - Noob Golden Tormentor + - Noob Wanderer - 1 - 34 - - 19 - - 6 - - 6 - - 10 + - 25 + - 4 + - 5 + - 13 - '#FFFFFF' - - 0.5 - - 1.5 - - 1 - - 1 - - 1 - - 260 - - 1 - - 0.3 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 220 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -143,24 +144,26 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Golden Tormentor + - Wanderer - 5 - - 54 - - 31 - - 13 - - 13 - - 20 + - 53 + - 38 + - 10 + - 12 + - 24 - '#FF9EC0' - - 0.5 - - 1.5 - - 1 - - 1 - - 1 - - 900 - - 2 - - 0.3 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 830 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -178,24 +181,26 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Lt. Golden Tormentor + - Lt. Wanderer - 10 - - 84 - - 42 - - 27 - - 27 - - 32 + - 82 + - 52 + - 21 + - 23 + - 39 - '#FF9EEF' - - 0.5 - - 1.5 - - 1 - - 1 - - 1 - - 1600 - - 3 - - 0.35 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1540 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -213,24 +218,26 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - - Capt. Golden Tormentor + - Capt. Wanderer - 15 - - 130 - - 58 - - 42 - - 42 - - 49 + - 128 + - 68 + - 32 + - 35 + - 55 - '#E59EFF' - - 0.5 - - 1.5 - - 1 - - 1 - - 1 - - 2300 - - 4 - - 0.35 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 2210 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -248,5 +255,6 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - curTableRow: 0 + curTableRow: 1 diff --git a/Assets/ScriptableObjects/Enemies/Mammon.asset b/Assets/ScriptableObjects/Enemies/Mammon.asset index 1e96bab3..00ce0127 100644 --- a/Assets/ScriptableObjects/Enemies/Mammon.asset +++ b/Assets/ScriptableObjects/Enemies/Mammon.asset @@ -92,11 +92,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -118,12 +113,7 @@ MonoBehaviour: - LevelSkill3 - LevelSkill4 - LevelSkill5 - - ChanceToUseSkill0 - - ChanceToUseSkill1 - - ChanceToUseSkill2 - - ChanceToUseSkill3 - - ChanceToUseSkill4 - - ChanceToUseSkill5 + - ChancetoUseSkill rows: - elements: - Mammon @@ -134,11 +124,11 @@ MonoBehaviour: - 15 - 30 - '#00FFFFFF' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 2331 - 0 - 1 @@ -147,11 +137,6 @@ MonoBehaviour: - 1 - 1 - 0.4 - - 1 - - 1 - - 1 - - 1 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -175,9 +160,4 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Overseer.asset b/Assets/ScriptableObjects/Enemies/Overseer.asset index b6861c4a..d5534f81 100644 --- a/Assets/ScriptableObjects/Enemies/Overseer.asset +++ b/Assets/ScriptableObjects/Enemies/Overseer.asset @@ -94,7 +94,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -112,8 +111,7 @@ MonoBehaviour: - XP - LevelSkill0 - LevelSkill1 - - ChanceToUseSkill0 - - ChanceToUseSkill1 + - ChancetoUseSkill rows: - elements: - Noob Overseer @@ -126,14 +124,13 @@ MonoBehaviour: - '#FFFFFF' - 0.5 - 1.5 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 - 260 - 1 - 1 - 0.4 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -153,7 +150,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Overseer - 5 @@ -165,14 +161,13 @@ MonoBehaviour: - '#FF9EC0' - 0.5 - 1.5 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 - 900 - 2 - 2 - 0.4 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -192,7 +187,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Overseer - 10 @@ -204,14 +198,13 @@ MonoBehaviour: - '#FF9EEF' - 0.5 - 1.5 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 - 1600 - 3 - 3 - 0.45 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -231,7 +224,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Overseer - 15 @@ -243,14 +235,13 @@ MonoBehaviour: - '#E59EFF' - 0.5 - 1.5 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 - 2300 - 4 - 4 - 0.45 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -270,5 +261,4 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Pwner.asset b/Assets/ScriptableObjects/Enemies/Pwner.asset index fcf76c9d..148db7cc 100644 --- a/Assets/ScriptableObjects/Enemies/Pwner.asset +++ b/Assets/ScriptableObjects/Enemies/Pwner.asset @@ -45,7 +45,7 @@ MonoBehaviour: _keyValues: 01000000 _keys: 01000000 _values: - - 19 + - 1.9 skills: - {fileID: 11400000, guid: 2c3021b87d1b78a458264d0c93f382d1, type: 2} - {fileID: 11400000, guid: c7f8ca5a99d6a8240a8df51799499057, type: 2} @@ -88,18 +88,13 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -115,18 +110,13 @@ MonoBehaviour: - EarthResistance - NeutralResistance - XP + - ChancetoUseSkill - LevelSkill0 - LevelSkill1 - LevelSkill2 - LevelSkill3 - LevelSkill4 - LevelSkill5 - - ChanceToUseSkill0 - - ChanceToUseSkill1 - - ChanceToUseSkill2 - - ChanceToUseSkill3 - - ChanceToUseSkill4 - - ChanceToUseSkill5 rows: - elements: - Pwner @@ -137,24 +127,19 @@ MonoBehaviour: - 14 - 22 - '#FF0000' - - 1,9 - - 1 - - 1 - - 1 - - 1 + - 1.9 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 2000 + - 0 - 1 - 1 - 1 - 1 - 1 - 1 - - 0.1 - - 0.1 - - 0.1 - - 0.1 - - 0.1 - - 0.1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -171,18 +156,13 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Stronk Pwner - 5 @@ -192,24 +172,19 @@ MonoBehaviour: - 100 - 100 - '#FF0000' - - 0,3 - - 0,3 - - 0,3 - - 0,3 - - 0,3 + - 0.3 + - 0.3 + - 0.3 + - 0.3 + - 0.3 - 83 + - 0 - 2 - 2 - 2 - 2 - 2 - 2 - - 0.1 - - 0.1 - - 0.1 - - 0.1 - - 0.1 - - 0.1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -226,16 +201,11 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Skeleton.asset b/Assets/ScriptableObjects/Enemies/Skeleton.asset index 60f81bab..31c33577 100644 --- a/Assets/ScriptableObjects/Enemies/Skeleton.asset +++ b/Assets/ScriptableObjects/Enemies/Skeleton.asset @@ -94,7 +94,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -112,8 +111,7 @@ MonoBehaviour: - XP - LevelSkill0 - LevelSkill1 - - ChanceToUseSkill0 - - ChanceToUseSkill1 + - ChancetoUseSkill rows: - elements: - Noob Skeleton @@ -128,12 +126,11 @@ MonoBehaviour: - 1 - 1 - 0.5 - - 1 + - 1.0 - 260 - 1 - 1 - 0.3 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -153,7 +150,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Skeleton - 5 @@ -167,12 +163,11 @@ MonoBehaviour: - 1 - 1 - 0.5 - - 1 + - 1.0 - 900 - 2 - 2 - 0.3 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -192,7 +187,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Skeleton - 10 @@ -206,12 +200,11 @@ MonoBehaviour: - 1 - 1 - 0.5 - - 1 + - 1.0 - 1600 - 3 - 3 - 0.35 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -231,7 +224,6 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Skeleton - 15 @@ -245,12 +237,11 @@ MonoBehaviour: - 1 - 1 - 0.5 - - 1 + - 1.0 - 2300 - 4 - 4 - 0.35 - - 1 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -270,5 +261,4 @@ MonoBehaviour: - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Enemies/Wanderer.asset b/Assets/ScriptableObjects/Enemies/Wanderer.asset index 6ada5060..845f74ba 100644 --- a/Assets/ScriptableObjects/Enemies/Wanderer.asset +++ b/Assets/ScriptableObjects/Enemies/Wanderer.asset @@ -87,6 +87,9 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 colNames: - Rank - Level @@ -102,6 +105,9 @@ MonoBehaviour: - EarthResistance - NeutralResistance - XP + - LevelSkill0 + - LevelSkill1 + - ChancetoUseSkill rows: - elements: - Noob Wanderer @@ -112,12 +118,15 @@ MonoBehaviour: - 5 - 13 - '#FFFFFF' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 220 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -134,6 +143,9 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Wanderer - 5 @@ -143,12 +155,15 @@ MonoBehaviour: - 12 - 24 - '#FF9EC0' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 830 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -165,6 +180,9 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Lt. Wanderer - 10 @@ -174,12 +192,15 @@ MonoBehaviour: - 23 - 39 - '#FF9EEF' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 1540 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -196,6 +217,9 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - elements: - Capt. Wanderer - 15 @@ -205,12 +229,15 @@ MonoBehaviour: - 35 - 55 - '#E59EFF' - - 1 - - 1 - - 1 - - 1 - - 1 + - 1.0 + - 1.0 + - 1.0 + - 1.0 + - 1.0 - 2210 + - 0 + - 0 + - 0 colTypes: - System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -227,4 +254,7 @@ MonoBehaviour: - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 curTableRow: 0 diff --git a/Assets/ScriptableObjects/Party.asset b/Assets/ScriptableObjects/Party.asset index 1e013262..c8703521 100644 --- a/Assets/ScriptableObjects/Party.asset +++ b/Assets/ScriptableObjects/Party.asset @@ -12,11 +12,11 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: be7539eb7de5b5a4bbe1d928aafd8405, type: 3} m_Name: Party m_EditorClassIdentifier: - currentMap: StartingArea00_single_(first_scene) - level: 1 + currentMap: + level: 0 xpMultiplier: 1 xp: 0 - xpNextLevel: 666 + xpNext: 0 characters: - {fileID: 11400000, guid: 2840e8ee8960b684fa43a84d5b78b592, type: 2} - {fileID: 11400000, guid: 3bb8308e69edd674da4b2825e3d34294, type: 2} diff --git a/Assets/ScriptableObjects/Quests/Beggars.asset b/Assets/ScriptableObjects/Quests/Beggars.asset index 7a3b11a0..a828ea93 100644 --- a/Assets/ScriptableObjects/Quests/Beggars.asset +++ b/Assets/ScriptableObjects/Quests/Beggars.asset @@ -50,4 +50,4 @@ MonoBehaviour: - Beggar3 - Beggar4 - Done - _values: 0100000000 + _values: 0000000000 diff --git a/Assets/ScriptableObjects/Quests/Part2Mainquest.asset b/Assets/ScriptableObjects/Quests/Part2Mainquest.asset index 2abb3eae..84fe0787 100644 --- a/Assets/ScriptableObjects/Quests/Part2Mainquest.asset +++ b/Assets/ScriptableObjects/Quests/Part2Mainquest.asset @@ -12,7 +12,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 7fd6b5b5d3a24d34586180c1e5419c7c, type: 3} m_Name: Part2Mainquest m_EditorClassIdentifier: - active: 0 + active: 1 repeatable: 0 expReward: 0 events: @@ -80,4 +80,4 @@ MonoBehaviour: - BeginBossRoom - MiddleBoosRoom - EndOfLevel - _values: 0100000000000000000000000000000000000000 + _values: 0100010101010001000001000101010101010000 diff --git a/Assets/ScriptableObjects/Quests/SoulWalls.asset b/Assets/ScriptableObjects/Quests/SoulWalls.asset index dc246f87..89244a29 100644 --- a/Assets/ScriptableObjects/Quests/SoulWalls.asset +++ b/Assets/ScriptableObjects/Quests/SoulWalls.asset @@ -48,4 +48,4 @@ MonoBehaviour: - SoulWall1 - SoulWall2 - SoulWall3 - _values: 01000000 + _values: 00000000 diff --git a/Assets/Scripts/DynamicTable.cs b/Assets/Scripts/DynamicTable.cs index 0a838895..c51dc511 100644 --- a/Assets/Scripts/DynamicTable.cs +++ b/Assets/Scripts/DynamicTable.cs @@ -1,18 +1,13 @@ -using System; -using System.Collections.Generic; +using System.Collections.Generic; using System.Collections.ObjectModel; using System.Globalization; -using System.Runtime.ExceptionServices; using UnityEngine; namespace FinalInferno { - [System.Serializable] public class DynamicTable : ISerializationCallbackReceiver { // Declaração de subclasses e delegates ------------------ - #region subclass - [System.Serializable] public class TableRow { public int Count => (elements != null) ? elements.Length : 0; @@ -34,8 +29,8 @@ private int GetColNumber(string colName, string assembQualName) { try { return colTypes[accessDict[colName]] == assembQualName ? accessDict[colName] : -1; } catch (KeyNotFoundException e) { - e.Data.Add("UserMessage", $"ColName: {colName} - "); - throw; + Debug.LogError(e.Message); + return -1; } } @@ -120,12 +115,7 @@ private T TryParseField(string fieldContent) { } public T Field(string colName) { - int colNumber = -1; - try { - colNumber = GetColNumber(colName, typeof(T).AssemblyQualifiedName); - } catch (Exception) { - throw; - } + int colNumber = GetColNumber(colName, typeof(T).AssemblyQualifiedName); if (colNumber < 0) { return default; } @@ -137,12 +127,10 @@ public T Field(string colName) { : TryParseField(fieldContent); } } - - #endregion subclass + #endregion // Variaveis/Propriedades ------------------------- protected const char splitCharacter = ';'; - [SerializeField] private string[] colTypes; [SerializeField] private string[] colNames; private Dictionary accessDict; @@ -159,7 +147,7 @@ public static DynamicTable Create(TextAsset textFile) { } } - protected static string GetQualifiedName(string typeName) { + protected static private string GetQualifiedName(string typeName) { return typeName switch { "string" => typeof(string).AssemblyQualifiedName, "int" => typeof(int).AssemblyQualifiedName, @@ -220,4 +208,4 @@ void ISerializationCallbackReceiver.OnAfterDeserialize() { void ISerializationCallbackReceiver.OnBeforeSerialize() { } } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs b/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs deleted file mode 100644 index 951ee38e..00000000 --- a/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs +++ /dev/null @@ -1,15 +0,0 @@ -using UnityEngine; - -namespace FinalInferno { - - [CreateAssetMenu(fileName = "EnemySingleActiveSkill", menuName = "ScriptableObject/Enemy/SingleActiveSkill")] - public class EnemySingleActiveSkillUser : Enemy { - private EnemySkill ActiveSkill => (EnemySkill)skills[0]; - - public override Skill AttackDecision() { - Debug.LogWarning($"Probability: {ActiveSkill.Probability}"); - float roll = Random.Range(0.0f, 1.0f); - return roll < ActiveSkill.Probability ? ActiveSkill : attackSkill; - } - } -} \ No newline at end of file diff --git a/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs.meta b/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs.meta deleted file mode 100644 index 07eedcbe..00000000 --- a/Assets/Scripts/Scriptable Objects/EnemiesAI/EnemySingleActiveSkillUser.cs.meta +++ /dev/null @@ -1,11 +0,0 @@ -fileFormatVersion: 2 -guid: 5bb4b73a56b066945a09e38fde03ea7c -MonoImporter: - externalObjects: {} - serializedVersion: 2 - defaultReferences: [] - executionOrder: 0 - icon: {instanceID: 0} - userData: - assetBundleName: - assetBundleVariant: diff --git a/Assets/Scripts/Scriptable Objects/Enemy.cs b/Assets/Scripts/Scriptable Objects/Enemy.cs index f131d15e..9a14619d 100644 --- a/Assets/Scripts/Scriptable Objects/Enemy.cs +++ b/Assets/Scripts/Scriptable Objects/Enemy.cs @@ -1,28 +1,21 @@ -using System; -using System.Collections.Generic; -using System.Runtime.ExceptionServices; +using System.Collections.Generic; using UnityEngine; - #if UNITY_EDITOR #endif namespace FinalInferno { - [CreateAssetMenu(fileName = "Enemy", menuName = "ScriptableObject/Enemy/Basic")] public class Enemy : Unit, IDatabaseItem { private const string LevelSkillColumnName = "LevelSkill"; - private const string ChanceToUseSkillColumnName = "ChanceToUseSkill"; private const string ColorColumnName = "Color"; private const string LevelColumnName = "Level"; private const string RankColumnName = "Rank"; private const string BaseExpColumnName = "XP"; public override UnitType UnitType => UnitType.Enemy; public Color dialogueColor; - [Space(10)] [Header("Enemy Info")] [SerializeField] protected Element element = Element.Neutral; - public Element Element => element; [SerializeField] protected DamageType damageFocus = DamageType.None; public DamageType DamageFocus => damageFocus; @@ -34,13 +27,10 @@ public class Enemy : Unit, IDatabaseItem { public AudioClip EnemyCry => enemyCry; [SerializeField, TextArea] private string bio = "Bio"; public string Bio => bio; - [Space(10)] [Header("Table")] [SerializeField] protected TextAsset enemyTable; - [SerializeField] protected DynamicTable table; - protected DynamicTable Table { get { if (table == null && enemyTable != null) { @@ -52,34 +42,13 @@ protected DynamicTable Table { return table; } } - [SerializeField, HideInInspector] protected int curTableRow = 0; - - protected int MinLevel { - get { - try { - return Table.Rows[0].Field(LevelColumnName); - } catch (Exception) { - throw; - } - } - } - - protected int MaxLevel { - get { - try { - return Table.Rows[Table.Rows.Count - 1].Field(LevelColumnName); - } catch (Exception) { - throw; - } - } - } - + protected int MinLevel => Table.Rows[0].Field(LevelColumnName); + protected int MaxLevel => Table.Rows[Table.Rows.Count - 1].Field(LevelColumnName); public override long SkillExp => BaseExp; public long BaseExp { get; protected set; } #region IDatabaseItem - public void LoadTables() { table = DynamicTable.Create(enemyTable); } @@ -88,8 +57,7 @@ public void Preload() { curTableRow = -1; LevelEnemy(-1); } - - #endregion IDatabaseItem + #endregion public int GetSkillLevel(EnemySkill skill) { int skillIndex = skills.IndexOf(skill); @@ -132,18 +100,14 @@ public void LevelEnemy(int newLevel) { Debug.LogWarning($"This enemy({AssetName}) has no table to load", this); return; } - try { - level = Mathf.Clamp(newLevel, MinLevel, MaxLevel); - } catch (Exception e) { - ExceptionDispatchInfo.Capture(e.InnerException).Throw(); - } + + level = Mathf.Clamp(newLevel, MinLevel, MaxLevel); int newTableRow = GetTableRowWithLevel(newLevel); if (newTableRow != curTableRow) { curTableRow = newTableRow; LoadStatsFromTable(newTableRow); } LoadSkillLevelsFromTable(); - LoadSkillProbabilitiesFromTable(); } private int GetTableRowWithLevel(int newLevel) { @@ -189,36 +153,11 @@ private static string ElementalResistColumnName(Element element) { private void LoadSkillLevelsFromTable() { for (int i = 0; i < skills.Count; i++) { - try { - skills[i].Level = Table.Rows[curTableRow].Field($"{LevelSkillColumnName}{i}"); - } catch (Exception e) { - string error = ""; - if (e.Data.Contains("UserMessage")) { - error += e.Data["UserMessage"].ToString(); - } - error += $"Asset Name: {AssetName} - " + e.Message + Environment.NewLine + e.StackTrace; - Debug.LogError(error); - } - } - } - - private void LoadSkillProbabilitiesFromTable() { - for (int i = 0; i < skills.Count; i++) { - try { - ((EnemySkill)skills[i]).Probability = Table.Rows[curTableRow].Field($"{ChanceToUseSkillColumnName}{i}"); - } catch (Exception e) { - string error = ""; - if (e.Data.Contains("UserMessage")) { - error += e.Data["UserMessage"].ToString(); - } - error += $"Asset Name: {AssetName} - " + e.Message + Environment.NewLine + e.StackTrace; - Debug.LogError(error); - } + skills[i].Level = Table.Rows[curTableRow].Field($"{LevelSkillColumnName}{i}"); } } #region EnemyAI - public virtual void AIEnemy() { float relativeHP = BattleManager.instance.CurrentUnit.CurHP / GetAverageTeamHP(); float percentageNotDefense = Mathf.Sqrt(relativeHP) + 0.05f * relativeHP; @@ -238,7 +177,7 @@ private static float GetAverageTeamHP() { } protected virtual Skill SkillDecision(float percentageNotDefense) { - float roll = UnityEngine.Random.Range(0.0f, 1.0f); + float roll = Random.Range(0.0f, 1.0f); if (roll < percentageNotDefense) return AttackDecision(); return defenseSkill; @@ -248,9 +187,7 @@ public virtual Skill AttackDecision() { return attackSkill; } - public virtual void ResetParameters() { - /* Função para resetar parametros de boss por exemplo */ - } + public virtual void ResetParameters() { /* Função para resetar parametros de boss por exemplo */ } protected virtual List GetTargets(TargetType type) { return type switch { @@ -269,12 +206,12 @@ protected static List GetHeroesTeam() { protected static BattleUnit GetRandomLiveAlly() { List team = BattleManager.instance.GetTeam(UnitType.Enemy); - return team[UnityEngine.Random.Range(0, team.Count - 1)]; + return team[Random.Range(0, team.Count - 1)]; } protected virtual BattleUnit TargetDecision(List targetTeam) { List targetingChances = GetUnitTargetingChances(targetTeam); - float roll = UnityEngine.Random.Range(0.0f, 1.0f); + float roll = Random.Range(0.0f, 1.0f); for (int targetIndex = 0; targetIndex < targetTeam.Count; targetIndex++) { if (roll <= targetingChances[targetIndex]) return targetTeam[targetIndex]; @@ -307,7 +244,6 @@ protected static bool AllHeroesAreParalised() { } return true; } - - #endregion EnemyAI + #endregion } -} \ No newline at end of file +} diff --git a/Assets/Scripts/Scriptable Objects/EnemySkill.cs b/Assets/Scripts/Scriptable Objects/EnemySkill.cs index 8414d0bd..9246f0fd 100644 --- a/Assets/Scripts/Scriptable Objects/EnemySkill.cs +++ b/Assets/Scripts/Scriptable Objects/EnemySkill.cs @@ -1,25 +1,15 @@ -using System; -using System.Collections.Generic; -using System.Runtime.ExceptionServices; +using System.Collections.Generic; using UnityEngine; namespace FinalInferno { - [CreateAssetMenu(fileName = "EnemySkill", menuName = "ScriptableObject/EnemySkill")] public class EnemySkill : Skill { protected const string levelColumnName = "Level"; - [Header("Enemy Skill")] public string description; - [Header("Stats Table")] [SerializeField] private TextAsset skillTable; - [SerializeField] private DynamicTable table; - - [SerializeField] protected float probability; - public float Probability { get => probability; set => probability = value; } - private DynamicTable Table { get { if (table == null && skillTable != null) { @@ -31,45 +21,20 @@ private DynamicTable Table { return table; } } - - protected int MinLevel { - get { - try { - return Table.Rows[0].Field(levelColumnName); - } catch (Exception) { - throw; - } - } - } - - protected int MaxLevel { - get { - try { - return Table.Rows[Table.Rows.Count - 1].Field(levelColumnName); - } catch (Exception) { - throw; - } - } - } - + protected int MinLevel => Table.Rows[0].Field(levelColumnName); + protected int MaxLevel => Table.Rows[Table.Rows.Count - 1].Field(levelColumnName); public override int Level { get => level; set { if (value != level && Table != null && Table.Rows.Count > 0) { - try { - level = Mathf.Clamp(value, MinLevel, MaxLevel); - } catch (Exception e) { - ExceptionDispatchInfo.Capture(e.InnerException).Throw(); - } + level = Mathf.Clamp(value, MinLevel, MaxLevel); LevelUp(); } } } - private int curTableRow = 0; #region IDatabaseItem - public override void LoadTables() { table = DynamicTable.Create(skillTable); } @@ -77,19 +42,9 @@ public override void LoadTables() { public override void Preload() { active = true; curTableRow = -1; - try { - Level = -1; - } catch (Exception e) { - string error = ""; - if (e.Data.Contains("UserMessage")) { - error += e.Data["UserMessage"].ToString(); - } - error += $"Skill Name: {skillTable.name} - " + e.Message + Environment.NewLine + e.StackTrace; - Debug.LogError(error); - } + Level = -1; } - - #endregion IDatabaseItem + #endregion public void LevelUp() { if (Table == null || Table.Rows.Count < 1) { diff --git a/Assets/Scripts/Scriptable Objects/Skill.cs b/Assets/Scripts/Scriptable Objects/Skill.cs index bf365b61..96ffacbe 100644 --- a/Assets/Scripts/Scriptable Objects/Skill.cs +++ b/Assets/Scripts/Scriptable Objects/Skill.cs @@ -2,18 +2,15 @@ using UnityEngine; namespace FinalInferno { - //engloba todas as "skills" [CreateAssetMenu(fileName = "Skill", menuName = "ScriptableObject/Skill")] public class Skill : ScriptableObject, IDatabaseItem { public const int maxCost = 20; public const int baseCost = 8; - [Header("Skill")] public new string name; - [SerializeField] protected int level; - public virtual int Level { get => level; set => level = value; } + public virtual int Level { get => level; set { } } public float cost; public bool active = true; [TextArea, SerializeField] protected string shortDescription; @@ -21,7 +18,6 @@ public class Skill : ScriptableObject, IDatabaseItem { public TargetType target; public Element attribute; [SerializeField] private SkillType type; - public string TypeString { get => type switch { SkillType.Active => "Active Skill", @@ -36,25 +32,18 @@ public string TypeString { _ => "" }; } - public SkillType Type => type; [SerializeField] private int callbackDelay = 0; public List effects; - [Space(15)] [SerializeField] private GameObject visualEffect; - public GameObject VisualEffect => visualEffect; #region IDatabaseItem + public virtual void LoadTables() { } - public virtual void LoadTables() { - } - - public virtual void Preload() { - } - - #endregion IDatabaseItem + public virtual void Preload() { } + #endregion // TO DO: Would work better as a function of TargetType when they become SOs public List FilterTargets(BattleUnit source, List oldList) { @@ -68,41 +57,35 @@ public List FilterTargets(BattleUnit source, List oldLis newList.Remove(unit); break; - case TargetType.SingleDeadAlly: case TargetType.AllDeadAllies: if (!allies.Contains(unit) || unit.CurHP > 0) newList.Remove(unit); break; - case TargetType.SingleLiveAlly: case TargetType.AllLiveAllies: if (!allies.Contains(unit) || unit.CurHP <= 0) newList.Remove(unit); break; - case TargetType.AllAlliesLiveOrDead: if (!allies.Contains(unit)) newList.Remove(unit); break; - case TargetType.SingleDeadEnemy: case TargetType.AllDeadEnemies: if (allies.Contains(unit) || unit.CurHP > 0) newList.Remove(unit); break; - case TargetType.SingleLiveEnemy: case TargetType.AllLiveEnemies: if (allies.Contains(unit) || unit.CurHP <= 0) newList.Remove(unit); break; - case TargetType.AllEnemiesLiveOrDead: if (allies.Contains(unit)) newList.Remove(unit); @@ -153,8 +136,6 @@ public virtual void Use(BattleUnit user, BattleUnit target, bool shouldOverride1 ApplyAllSkillEffects(user, target, shouldOverride1, value1, shouldOverride2, value2); } - public virtual void ResetSkill() { - Debug.LogError("Wrong use of skill reset", this); - } + public virtual void ResetSkill() { Debug.LogError("Wrong use of skill reset", this); } } -} \ No newline at end of file +} diff --git a/Assets/Skills/BasicSkills/EnemyAttack.asset b/Assets/Skills/BasicSkills/EnemyAttack.asset index 1ee2484d..30430788 100644 --- a/Assets/Skills/BasicSkills/EnemyAttack.asset +++ b/Assets/Skills/BasicSkills/EnemyAttack.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Attack level: 0 - probability: 0 cost: 10 active: 1 shortDescription: Deals regular damage to one target, using preferred element and diff --git a/Assets/Skills/BasicSkills/PlayerAttack.asset b/Assets/Skills/BasicSkills/PlayerAttack.asset index 0352fa9d..339d9cdc 100644 --- a/Assets/Skills/BasicSkills/PlayerAttack.asset +++ b/Assets/Skills/BasicSkills/PlayerAttack.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Attack level: 0 - probability: 0 cost: 10 active: 1 shortDescription: Deals regular physical damage to a single target. diff --git a/Assets/Skills/BasicSkills/PlayerDefend.asset b/Assets/Skills/BasicSkills/PlayerDefend.asset index 1754900a..326da4b0 100644 --- a/Assets/Skills/BasicSkills/PlayerDefend.asset +++ b/Assets/Skills/BasicSkills/PlayerDefend.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Defend level: 0 - probability: 0 cost: 8 active: 1 shortDescription: Increases defense and resistance by 50% for one turn. diff --git a/Assets/Skills/BasicSkills/PlayerMagicAttack.asset b/Assets/Skills/BasicSkills/PlayerMagicAttack.asset index 4fe005f2..aaeac650 100644 --- a/Assets/Skills/BasicSkills/PlayerMagicAttack.asset +++ b/Assets/Skills/BasicSkills/PlayerMagicAttack.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Attack level: 0 - probability: 0 cost: 10 active: 1 shortDescription: Deals regular magical damage to a single target. diff --git a/Assets/Skills/BasicSkills/PlayerSlashAttack.asset b/Assets/Skills/BasicSkills/PlayerSlashAttack.asset index ed025d94..96bc7170 100644 --- a/Assets/Skills/BasicSkills/PlayerSlashAttack.asset +++ b/Assets/Skills/BasicSkills/PlayerSlashAttack.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Attack level: 0 - probability: 0 cost: 10 active: 1 shortDescription: Deals regular physical damage to a single target. diff --git a/Assets/Skills/BlackMageSkills/Anaemia.asset b/Assets/Skills/BlackMageSkills/Anaemia.asset index 7d5d9af6..b6abc166 100644 --- a/Assets/Skills/BlackMageSkills/Anaemia.asset +++ b/Assets/Skills/BlackMageSkills/Anaemia.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Anaemia m_EditorClassIdentifier: name: Anaemia - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Single target reduces power. @@ -29,7 +28,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: 44ba3df0843e3474cab02447d77b3652, type: 3} xp: 0 - xpNext: 999 + xpNext: 0 description: Reduce the nutrients in the blood (or equivalent life essence) of the enemy, reducing its strength. skillsToUpdate: diff --git a/Assets/Skills/BlackMageSkills/Bleeding.asset b/Assets/Skills/BlackMageSkills/Bleeding.asset index 2e44a6a3..b20df458 100644 --- a/Assets/Skills/BlackMageSkills/Bleeding.asset +++ b/Assets/Skills/BlackMageSkills/Bleeding.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Bleeding m_EditorClassIdentifier: name: Bleeding - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Single target neutral damage over time. @@ -24,12 +23,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 533417b90c067e14bbdc85bb2e52be6f, type: 2} - value1: 0.4 + value1: 0.403 value2: 3 visualEffect: {fileID: 8917310150857617220, guid: 22f2b907285e270409571aaca3977e5b, type: 3} xp: 0 - xpNext: 999 + xpNext: 0 description: Makes the blood (or any equivalent life essence) come out of the enemy from its holes and pores. Causes Damage over time for a few turns. skillsToUpdate: diff --git a/Assets/Skills/BlackMageSkills/Fiery Stroke.asset b/Assets/Skills/BlackMageSkills/Fiery Stroke.asset index f52f6de6..1af55666 100644 --- a/Assets/Skills/BlackMageSkills/Fiery Stroke.asset +++ b/Assets/Skills/BlackMageSkills/Fiery Stroke.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Fiery Stroke level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Single target fire damage over time. diff --git a/Assets/Skills/BlackMageSkills/FireBullet.asset b/Assets/Skills/BlackMageSkills/FireBullet.asset index 5545262b..36c14651 100644 --- a/Assets/Skills/BlackMageSkills/FireBullet.asset +++ b/Assets/Skills/BlackMageSkills/FireBullet.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: FireBullet m_EditorClassIdentifier: name: Fire Bullets - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Single target fire damage. @@ -24,12 +23,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: b6e706fdcdfb4c14988557c3040ab414, type: 2} - value1: 1.1 + value1: 1.12 value2: 1 visualEffect: {fileID: 8917310150857617220, guid: 73e52014d102bf74594681c040572206, type: 3} xp: 0 - xpNext: 999 + xpNext: 0 description: Bullets made of fire are shot at extreme speed, damaging a single target. skillsToUpdate: diff --git a/Assets/Skills/BlackMageSkills/FrostBite.asset b/Assets/Skills/BlackMageSkills/FrostBite.asset index 0949eb6e..6c63e6eb 100644 --- a/Assets/Skills/BlackMageSkills/FrostBite.asset +++ b/Assets/Skills/BlackMageSkills/FrostBite.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: FrostBite m_EditorClassIdentifier: name: Frostbite - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Single target water damage. @@ -29,7 +28,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: d6debb874b8da8b48bc768062046cfc9, type: 3} xp: 0 - xpNext: 999 + xpNext: 0 description: The temperature aroud the enemy is reduced to dangerous levels and can freeze its skin (or any equivalent outer layer). skillsToUpdate: diff --git a/Assets/Skills/BlackMageSkills/Haemorrhage.asset b/Assets/Skills/BlackMageSkills/Haemorrhage.asset index d26eed2e..624f144b 100644 --- a/Assets/Skills/BlackMageSkills/Haemorrhage.asset +++ b/Assets/Skills/BlackMageSkills/Haemorrhage.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Haemorrhage level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Single target neutral damage over time and reduces power. diff --git a/Assets/Skills/BlackMageSkills/Holy Necromancy.asset b/Assets/Skills/BlackMageSkills/Holy Necromancy.asset index 3dbf7d80..3a23c1de 100644 --- a/Assets/Skills/BlackMageSkills/Holy Necromancy.asset +++ b/Assets/Skills/BlackMageSkills/Holy Necromancy.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Holy Necromancy level: 0 - probability: 0 cost: 0 active: 0 shortDescription: Once per battle, if Xander dies in battle, Revives Xander. diff --git a/Assets/Skills/BlackMageSkills/Impaling.asset b/Assets/Skills/BlackMageSkills/Impaling.asset index 72266352..fffcbd45 100644 --- a/Assets/Skills/BlackMageSkills/Impaling.asset +++ b/Assets/Skills/BlackMageSkills/Impaling.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Impaling m_EditorClassIdentifier: name: Impaling - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Singe target earth damage. @@ -29,7 +28,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: c46b620123851f349ad41e8a624592a1, type: 3} xp: 0 - xpNext: 999 + xpNext: 0 description: A stalagmite rises from the ground to impale the enemy. skillsToUpdate: - {fileID: 11400000, guid: 0547e57ad308798409bb37fa33e8409c, type: 2} diff --git a/Assets/Skills/BlackMageSkills/Infernal Hail.asset b/Assets/Skills/BlackMageSkills/Infernal Hail.asset index 1034a370..8b015231 100644 --- a/Assets/Skills/BlackMageSkills/Infernal Hail.asset +++ b/Assets/Skills/BlackMageSkills/Infernal Hail.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Infernal Hail level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Single target water damage over time. diff --git a/Assets/Skills/BlackMageSkills/Stonestorm.asset b/Assets/Skills/BlackMageSkills/Stonestorm.asset index 5c47ae82..a67f0158 100644 --- a/Assets/Skills/BlackMageSkills/Stonestorm.asset +++ b/Assets/Skills/BlackMageSkills/Stonestorm.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Stonestorm level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Single target earth damage over time. diff --git a/Assets/Skills/BlackMageSkills/Suffocation.asset b/Assets/Skills/BlackMageSkills/Suffocation.asset index 91fba6ab..a092cdd5 100644 --- a/Assets/Skills/BlackMageSkills/Suffocation.asset +++ b/Assets/Skills/BlackMageSkills/Suffocation.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Suffocation level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Single target wind damage over time. diff --git a/Assets/Skills/BlackMageSkills/WindCut.asset b/Assets/Skills/BlackMageSkills/WindCut.asset index 62dc40d8..b765ae3d 100644 --- a/Assets/Skills/BlackMageSkills/WindCut.asset +++ b/Assets/Skills/BlackMageSkills/WindCut.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: WindCut m_EditorClassIdentifier: name: Wind Cut - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Single target wind damage. @@ -29,7 +28,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: 97afab97e0d071747b0b14634934262b, type: 3} xp: 0 - xpNext: 999 + xpNext: 0 description: Creates a sharp blade by blowing a really fast wind in a concentrated and thin area. skillsToUpdate: diff --git a/Assets/Skills/CerberusSkills/Bloodspil(Damage).asset b/Assets/Skills/CerberusSkills/Bloodspil(Damage).asset index d45d2154..629729d7 100644 --- a/Assets/Skills/CerberusSkills/Bloodspil(Damage).asset +++ b/Assets/Skills/CerberusSkills/Bloodspil(Damage).asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Bloodspill level: 1 - probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/CerberusSkills/Bloodspill(Heal).asset b/Assets/Skills/CerberusSkills/Bloodspill(Heal).asset index fb315e14..0cfb543a 100644 --- a/Assets/Skills/CerberusSkills/Bloodspill(Heal).asset +++ b/Assets/Skills/CerberusSkills/Bloodspill(Heal).asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Bloodpspill level: 1 - probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/CerberusSkills/Ghost Limbs.asset b/Assets/Skills/CerberusSkills/Ghost Limbs.asset index 9720141b..e204163b 100644 --- a/Assets/Skills/CerberusSkills/Ghost Limbs.asset +++ b/Assets/Skills/CerberusSkills/Ghost Limbs.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Ghost Limbs m_EditorClassIdentifier: name: Ghost Limbs - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: @@ -29,38 +28,8 @@ MonoBehaviour: visualEffect: {fileID: 552734591061099818, guid: c5b81c56fc50dac4c80964acddc9c909, type: 3} description: Ghost Limbs - skillTable: {fileID: 4900000, guid: 4db3a885c87ea13468000d83106e381a, type: 3} + skillTable: {fileID: 11500000, guid: 71415530639daba4e899c47ad83e5988, type: 3} table: - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - colNames: - - Level - - SkillEffect0Value0 - - SkillEffect0Value1 - rows: - - elements: - - 1 - - 1 - - -1 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 2 - - 1 - - -1 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 3 - - 1 - - -1 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colTypes: [] + colNames: [] + rows: [] diff --git a/Assets/Skills/CerberusSkills/Hellfire.asset b/Assets/Skills/CerberusSkills/Hellfire.asset index a128be7e..573511f4 100644 --- a/Assets/Skills/CerberusSkills/Hellfire.asset +++ b/Assets/Skills/CerberusSkills/Hellfire.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Hellfire level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/CerberusSkills/Tremendous Roar.asset b/Assets/Skills/CerberusSkills/Tremendous Roar.asset index f89e9887..28e9df8e 100644 --- a/Assets/Skills/CerberusSkills/Tremendous Roar.asset +++ b/Assets/Skills/CerberusSkills/Tremendous Roar.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Tremendous Roar level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Contagious Sorrow.asset b/Assets/Skills/EnemySkills/Contagious Sorrow.asset index 33ef3075..3bda17f2 100644 --- a/Assets/Skills/EnemySkills/Contagious Sorrow.asset +++ b/Assets/Skills/EnemySkills/Contagious Sorrow.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Contagious Sorrow level: 1 - probability: 0 cost: 0 active: 1 shortDescription: @@ -25,85 +24,15 @@ MonoBehaviour: effects: - effect: {fileID: 11400000, guid: 912de08aa2e7f5a43a91bd2157bf21d5, type: 2} value1: 0.1 - value2: 2 + value2: 3 - effect: {fileID: 11400000, guid: dc5c2270be9739f4aaed7f800df3b73b, type: 2} value1: 0.1 - value2: 2 + value2: 3 visualEffect: {fileID: 552734591061099818, guid: c5b81c56fc50dac4c80964acddc9c909, type: 3} description: Contagious Sorrow skillTable: {fileID: 4900000, guid: 0ce187e6f94ea4f4e9354513afc81d4d, type: 3} table: - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - colNames: - - Level - - SkillEffect0Value0 - - SkillEffect0Value1 - - SkillEffect1Value0 - - SkillEffect1Value1 - rows: - - elements: - - 1 - - 0.1 - - 2 - - 0.1 - - 2 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 2 - - 0.2 - - 2 - - 0.2 - - 2 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 3 - - 0.25 - - 3 - - 0.25 - - 3 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 4 - - 0.35 - - 3 - - 0.35 - - 3 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 5 - - 0.4 - - 4 - - 0.4 - - 4 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colTypes: [] + colNames: [] + rows: [] diff --git a/Assets/Skills/EnemySkills/Earth Strike.asset b/Assets/Skills/EnemySkills/Earth Strike.asset index 8c6663bf..581055dd 100644 --- a/Assets/Skills/EnemySkills/Earth Strike.asset +++ b/Assets/Skills/EnemySkills/Earth Strike.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Earth Strike level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Eternal Cry.asset b/Assets/Skills/EnemySkills/Eternal Cry.asset index 5b921ff9..10a79b24 100644 --- a/Assets/Skills/EnemySkills/Eternal Cry.asset +++ b/Assets/Skills/EnemySkills/Eternal Cry.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Eternal Cry level: 1 - probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Ethereal Shield.asset b/Assets/Skills/EnemySkills/Ethereal Shield.asset index acfcda0e..d383b645 100644 --- a/Assets/Skills/EnemySkills/Ethereal Shield.asset +++ b/Assets/Skills/EnemySkills/Ethereal Shield.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Ethereal Shield level: 1 - probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Fire Bullet Enemy.asset b/Assets/Skills/EnemySkills/Fire Bullet Enemy.asset index 10e1cffe..82af7c66 100644 --- a/Assets/Skills/EnemySkills/Fire Bullet Enemy.asset +++ b/Assets/Skills/EnemySkills/Fire Bullet Enemy.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Fire Bullet level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Frostbite Enemy.asset b/Assets/Skills/EnemySkills/Frostbite Enemy.asset index f8358793..204fe3c7 100644 --- a/Assets/Skills/EnemySkills/Frostbite Enemy.asset +++ b/Assets/Skills/EnemySkills/Frostbite Enemy.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Frostbite level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Impaling Enemy.asset b/Assets/Skills/EnemySkills/Impaling Enemy.asset index ae88c007..98992f18 100644 --- a/Assets/Skills/EnemySkills/Impaling Enemy.asset +++ b/Assets/Skills/EnemySkills/Impaling Enemy.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Impaling level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/LaserBeam.asset b/Assets/Skills/EnemySkills/LaserBeam.asset index d22dd55e..99914555 100644 --- a/Assets/Skills/EnemySkills/LaserBeam.asset +++ b/Assets/Skills/EnemySkills/LaserBeam.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Laser Beam level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Leadership.asset b/Assets/Skills/EnemySkills/Leadership.asset index ac97e1c6..6fb3265e 100644 --- a/Assets/Skills/EnemySkills/Leadership.asset +++ b/Assets/Skills/EnemySkills/Leadership.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Leadership level: 1 - probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Ominous Wind.asset b/Assets/Skills/EnemySkills/Ominous Wind.asset index dde01a21..46efae5b 100644 --- a/Assets/Skills/EnemySkills/Ominous Wind.asset +++ b/Assets/Skills/EnemySkills/Ominous Wind.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Ominous Wind level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Rebirth.asset b/Assets/Skills/EnemySkills/Rebirth.asset index feaca517..4672f65e 100644 --- a/Assets/Skills/EnemySkills/Rebirth.asset +++ b/Assets/Skills/EnemySkills/Rebirth.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Rebirth level: 1 - probability: 0 cost: 0 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Solitude.asset b/Assets/Skills/EnemySkills/Solitude.asset index b004729f..8164d1d7 100644 --- a/Assets/Skills/EnemySkills/Solitude.asset +++ b/Assets/Skills/EnemySkills/Solitude.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Solitude level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/EnemySkills/Unfinished Work.asset b/Assets/Skills/EnemySkills/Unfinished Work.asset index 794c4b8a..8fb148a0 100644 --- a/Assets/Skills/EnemySkills/Unfinished Work.asset +++ b/Assets/Skills/EnemySkills/Unfinished Work.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Unfinished Work level: 1 - probability: 0 cost: 0 active: 1 shortDescription: @@ -31,52 +30,6 @@ MonoBehaviour: description: Unfinished Work skillTable: {fileID: 4900000, guid: 856a913caf20faf42b8aad08385db309, type: 3} table: - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - colNames: - - Level - - SkillEffect0Value0 - - SkillEffect0Value1 - rows: - - elements: - - 1 - - 0 - - 0.5 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 2 - - 0 - - 0.6 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 3 - - 0 - - 0.7 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 4 - - 0 - - 0.8 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - elements: - - 5 - - 0 - - 0.9 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colTypes: [] + colNames: [] + rows: [] diff --git a/Assets/Skills/EnemySkills/Wind Cut Enemy.asset b/Assets/Skills/EnemySkills/Wind Cut Enemy.asset index 87776e05..a69ccd45 100644 --- a/Assets/Skills/EnemySkills/Wind Cut Enemy.asset +++ b/Assets/Skills/EnemySkills/Wind Cut Enemy.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Wind Cut level: 1 - probability: 0 cost: 12 active: 1 shortDescription: diff --git a/Assets/Skills/MammonSkills/GreatDepression.asset b/Assets/Skills/MammonSkills/GreatDepression.asset index f9c2b0df..6ad72d42 100644 --- a/Assets/Skills/MammonSkills/GreatDepression.asset +++ b/Assets/Skills/MammonSkills/GreatDepression.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: GreatDepression m_EditorClassIdentifier: name: GreatDepression - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: @@ -24,27 +23,13 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 5db848a5970beef4b8a73e63feefce27, type: 2} - value1: 1 + value1: 0.1 value2: 5 visualEffect: {fileID: 5434996350183651868, guid: 0d876ce000356934f80d54c778fc3114, type: 3} description: skillTable: {fileID: 4900000, guid: 3efe1d7c03e8730489d0827063c5f73c, type: 3} table: - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - colNames: - - Level - - SkillEffect0Value0 - - SkillEffect0Value1 - rows: - - elements: - - 1 - - 0,1 - - 5 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colTypes: [] + colNames: [] + rows: [] diff --git a/Assets/Skills/MammonSkills/Inflation.asset b/Assets/Skills/MammonSkills/Inflation.asset index ae389915..70ab5042 100644 --- a/Assets/Skills/MammonSkills/Inflation.asset +++ b/Assets/Skills/MammonSkills/Inflation.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Inflation m_EditorClassIdentifier: name: Inflation - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: @@ -24,27 +23,13 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 3f19701bd23be55498240876074e1420, type: 2} - value1: 0.1 + value1: 0.01 value2: -1 visualEffect: {fileID: 5434996350183651868, guid: 4c6fc6c7981053447a73e9befab53aea, type: 3} description: skillTable: {fileID: 4900000, guid: e921b8fd864ac594ea263eefa2a29f5d, type: 3} table: - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - colNames: - - Level - - SkillEffect0Value0 - - SkillEffect0Value1 - rows: - - elements: - - 1 - - 0.1 - - -1 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colTypes: [] + colNames: [] + rows: [] diff --git a/Assets/Skills/MammonSkills/MammonsBribe.asset b/Assets/Skills/MammonSkills/MammonsBribe.asset index ae2a8109..fc41e4f8 100644 --- a/Assets/Skills/MammonSkills/MammonsBribe.asset +++ b/Assets/Skills/MammonSkills/MammonsBribe.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: MammonsBribe m_EditorClassIdentifier: name: MammonsBribe - level: 1 - probability: 0 + level: 0 cost: 14 active: 1 shortDescription: @@ -24,27 +23,13 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 0577e2aa56915254382457914dfa64ee, type: 2} - value1: 1 + value1: 0.5 value2: 2 visualEffect: {fileID: 552734591061099818, guid: adb27ddbffd6de74fb6e34379f56176a, type: 3} description: skillTable: {fileID: 4900000, guid: 9797faf419d0d994b8e09148256285ff, type: 3} table: - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - colNames: - - Level - - SkillEffect0Value0 - - SkillEffect0Value1 - rows: - - elements: - - 1 - - 1 - - 2 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colTypes: [] + colNames: [] + rows: [] diff --git a/Assets/Skills/MammonSkills/Savings.asset b/Assets/Skills/MammonSkills/Savings.asset index 75b627fc..d927d9d0 100644 --- a/Assets/Skills/MammonSkills/Savings.asset +++ b/Assets/Skills/MammonSkills/Savings.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Savings m_EditorClassIdentifier: name: Savings - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: @@ -24,27 +23,13 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 961b466bfd28e34478495ad8aca5b359, type: 2} - value1: 0.5 + value1: 0.005 value2: -1 visualEffect: {fileID: 552734591061099818, guid: c5b81c56fc50dac4c80964acddc9c909, type: 3} description: skillTable: {fileID: 4900000, guid: 10785a8c0c79790408b13752b059b319, type: 3} table: - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - colNames: - - Level - - SkillEffect0Value0 - - SkillEffect0Value1 - rows: - - elements: - - 1 - - 0.5 - - -1 - colTypes: - - System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - System.Single, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + colTypes: [] + colNames: [] + rows: [] diff --git a/Assets/Skills/RogueSkills/Bribery.asset b/Assets/Skills/RogueSkills/Bribery.asset index 615e29d1..8abc1d1b 100644 --- a/Assets/Skills/RogueSkills/Bribery.asset +++ b/Assets/Skills/RogueSkills/Bribery.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Bribery m_EditorClassIdentifier: name: Bribery - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Decreases max health of an ally so Herman can become almost untargetable. @@ -24,7 +23,7 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: df7549738b3905a4eb5bdca25036e03a, type: 2} - value1: 0.25 + value1: 0.245 value2: 1 - effect: {fileID: 11400000, guid: 07d604dc96abaad4683bacf9782a3d53, type: 2} value1: 100 @@ -32,7 +31,7 @@ MonoBehaviour: visualEffect: {fileID: 8917310150857617220, guid: abd8053876238744fbeb64cff6c10c6e, type: 3} xp: 0 - xpNext: 333 + xpNext: 0 description: Offers a fraction of an ally's health to the enemies in order to be virtually untargetable for a brief time. Drawing too much aggro may cancel the effect. diff --git a/Assets/Skills/RogueSkills/Capitalism.asset b/Assets/Skills/RogueSkills/Capitalism.asset index 91b2de43..7f7b9faa 100644 --- a/Assets/Skills/RogueSkills/Capitalism.asset +++ b/Assets/Skills/RogueSkills/Capitalism.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Capitalism level: 0 - probability: 0 cost: 0 active: 0 shortDescription: Gets a small part of buffs and heals given to allies. diff --git a/Assets/Skills/RogueSkills/Coaching.asset b/Assets/Skills/RogueSkills/Coaching.asset index b5b5b0e6..84eb8c6c 100644 --- a/Assets/Skills/RogueSkills/Coaching.asset +++ b/Assets/Skills/RogueSkills/Coaching.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Coaching level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Confuses enemy for some turns by tricking them. diff --git a/Assets/Skills/RogueSkills/De Tox juice.asset b/Assets/Skills/RogueSkills/De Tox juice.asset index e6db7a34..3217e189 100644 --- a/Assets/Skills/RogueSkills/De Tox juice.asset +++ b/Assets/Skills/RogueSkills/De Tox juice.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: De Tox juice level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Poisons enemy by tricking them. Deals damage per turn. diff --git a/Assets/Skills/RogueSkills/Debt Trap.asset b/Assets/Skills/RogueSkills/Debt Trap.asset index 61d1b66f..358e8b91 100644 --- a/Assets/Skills/RogueSkills/Debt Trap.asset +++ b/Assets/Skills/RogueSkills/Debt Trap.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Debt Trap level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Paralyzes enemy for some turns by tricking them. diff --git a/Assets/Skills/RogueSkills/Herman Scheme.asset b/Assets/Skills/RogueSkills/Herman Scheme.asset index 01023026..3d3cbf95 100644 --- a/Assets/Skills/RogueSkills/Herman Scheme.asset +++ b/Assets/Skills/RogueSkills/Herman Scheme.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Herman Scheme m_EditorClassIdentifier: name: Herman Scheme - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: "Steals power from enemy for a short time. Must payback double\r @@ -25,12 +24,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 2a811d6fe345e7241af719fce9698395, type: 2} - value1: 0.05 + value1: 0.055 value2: 3 visualEffect: {fileID: 8917310150857617220, guid: 3a53acaf9cd688c469dcfe47f3d32270, type: 3} xp: 0 - xpNext: 333 + xpNext: 0 description: Borrows power from an enemy for a limited amount of turns. If the enemy is not dead at the end of said turns, Heman pays back the loan with interest, lending his own power to the enemy. Does not work if the target already has damage diff --git a/Assets/Skills/RogueSkills/Obscurantism.asset b/Assets/Skills/RogueSkills/Obscurantism.asset index c19a849b..9adfd743 100644 --- a/Assets/Skills/RogueSkills/Obscurantism.asset +++ b/Assets/Skills/RogueSkills/Obscurantism.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Obscurantism level: 0 - probability: 0 cost: 0 active: 0 shortDescription: Stops encounters from occuring while active. diff --git a/Assets/Skills/RogueSkills/Quantum Coaching.asset b/Assets/Skills/RogueSkills/Quantum Coaching.asset index 3eb075d2..f7c4e0eb 100644 --- a/Assets/Skills/RogueSkills/Quantum Coaching.asset +++ b/Assets/Skills/RogueSkills/Quantum Coaching.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Quantum Coaching level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Poisons and confuses enemy by tricking them. diff --git a/Assets/Skills/RogueSkills/Socialism.asset b/Assets/Skills/RogueSkills/Socialism.asset index 570b362b..66e4870f 100644 --- a/Assets/Skills/RogueSkills/Socialism.asset +++ b/Assets/Skills/RogueSkills/Socialism.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Socialism m_EditorClassIdentifier: name: Socialism - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: Reduces received debuffs in self by sharing with party. @@ -25,14 +24,14 @@ MonoBehaviour: effects: - effect: {fileID: 11400000, guid: f912b702de579944b8755068b3ba1247, type: 2} value1: 0 - value2: 0.05 + value2: 0.055 - effect: {fileID: 11400000, guid: e7102a7af7a69e3498974a3e20ed0f68, type: 2} value1: 0 - value2: 0.95 + value2: 0.945 visualEffect: {fileID: 5434996350183651868, guid: 7d2b7de3873efb54391708edbbe129c4, type: 3} xp: 0 - xpNext: 1332 + xpNext: 0 description: Herman uses his charisma to convince the party to divide between them part of his hardships. skillsToUpdate: diff --git a/Assets/Skills/RogueSkills/Surplus.asset b/Assets/Skills/RogueSkills/Surplus.asset index 55983df8..07d01809 100644 --- a/Assets/Skills/RogueSkills/Surplus.asset +++ b/Assets/Skills/RogueSkills/Surplus.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Surplus m_EditorClassIdentifier: name: Surplus - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: Increases received buffs in self. @@ -25,11 +24,11 @@ MonoBehaviour: effects: - effect: {fileID: 11400000, guid: e7102a7af7a69e3498974a3e20ed0f68, type: 2} value1: 0 - value2: 1.02 + value2: 1.025 visualEffect: {fileID: 5434996350183651868, guid: 4c6fc6c7981053447a73e9befab53aea, type: 3} xp: 0 - xpNext: 1332 + xpNext: 0 description: Herman uses his skills to get the best of every chance. Buffs have increased effect on him. skillsToUpdate: [] diff --git a/Assets/Skills/WarriorSkills/Anti-Mage's Taunt.asset b/Assets/Skills/WarriorSkills/Anti-Mage's Taunt.asset index ca6dc510..dc7c5608 100644 --- a/Assets/Skills/WarriorSkills/Anti-Mage's Taunt.asset +++ b/Assets/Skills/WarriorSkills/Anti-Mage's Taunt.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Anti-Mage's Taunt level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Raises chance of Amidi being targeted and his resistance. diff --git a/Assets/Skills/WarriorSkills/Bait.asset b/Assets/Skills/WarriorSkills/Bait.asset index 5a137a72..58b4a36d 100644 --- a/Assets/Skills/WarriorSkills/Bait.asset +++ b/Assets/Skills/WarriorSkills/Bait.asset @@ -14,9 +14,8 @@ MonoBehaviour: m_EditorClassIdentifier: name: Bait level: 0 - probability: 0 cost: 0 - active: 0 + active: 1 shortDescription: Doubles the encounter rate while Amidi is baiting enemies. target: 4 attribute: 5 diff --git a/Assets/Skills/WarriorSkills/DoubleMarch.asset b/Assets/Skills/WarriorSkills/DoubleMarch.asset index e2bd788b..9446b0e8 100644 --- a/Assets/Skills/WarriorSkills/DoubleMarch.asset +++ b/Assets/Skills/WarriorSkills/DoubleMarch.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Double March level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Raises speed from party, but they take damage over time. diff --git a/Assets/Skills/WarriorSkills/General's Taunt.asset b/Assets/Skills/WarriorSkills/General's Taunt.asset index cb1245b3..9ef9968a 100644 --- a/Assets/Skills/WarriorSkills/General's Taunt.asset +++ b/Assets/Skills/WarriorSkills/General's Taunt.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: General's Taunt level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Raises chance of Amidi being targeted and his defense. diff --git a/Assets/Skills/WarriorSkills/InstillFear.asset b/Assets/Skills/WarriorSkills/InstillFear.asset index d0ac1cbd..d4795722 100644 --- a/Assets/Skills/WarriorSkills/InstillFear.asset +++ b/Assets/Skills/WarriorSkills/InstillFear.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: InstillFear m_EditorClassIdentifier: name: Instill Fear - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: "Raises defense and resistance but reduces a little power from\r @@ -28,18 +27,18 @@ MonoBehaviour: value1: 0 value2: 0 - effect: {fileID: 11400000, guid: 8cb5d695331ec94409f87134f782e68f, type: 2} - value1: 0.1 + value1: 0.106 value2: 2 - effect: {fileID: 11400000, guid: 169740c4d9bdd8243a98dc4221b0761d, type: 2} - value1: 0.1 + value1: 0.106 value2: 2 - effect: {fileID: 11400000, guid: c63e208a774c8a444849e85e1d5b9b1e, type: 2} - value1: 0.05 + value1: 0.053 value2: 2 visualEffect: {fileID: 8917310150857617220, guid: b485ec28783caa84d8a5368c8cda818b, type: 3} xp: 0 - xpNext: 333 + xpNext: 0 description: Warns your companions about the enemies' dangers, making them raise their defenses, but being less likely to attack due to cowardice. skillsToUpdate: diff --git a/Assets/Skills/WarriorSkills/Insult.asset b/Assets/Skills/WarriorSkills/Insult.asset index 3e834bb2..63706ee8 100644 --- a/Assets/Skills/WarriorSkills/Insult.asset +++ b/Assets/Skills/WarriorSkills/Insult.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Insult m_EditorClassIdentifier: name: Insult - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: Raises chance of Amidi being targeted. @@ -24,12 +23,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 61dd43176377ced4c9b2d639a2892d4c, type: 2} - value1: 10 + value1: 13 value2: 2 visualEffect: {fileID: 5434996350183651868, guid: 59bf284213d51e14f9c04bc37e02d879, type: 3} xp: 0 - xpNext: 200 + xpNext: 0 description: Provokes the enemies, giving them higher chance to attack Amidi. skillsToUpdate: - {fileID: 11400000, guid: 796b06ccfb966ff45896f4dd474b32d4, type: 2} diff --git a/Assets/Skills/WarriorSkills/Promise of Riches.asset b/Assets/Skills/WarriorSkills/Promise of Riches.asset index dc9c227c..e58be6d6 100644 --- a/Assets/Skills/WarriorSkills/Promise of Riches.asset +++ b/Assets/Skills/WarriorSkills/Promise of Riches.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Promise of Riches m_EditorClassIdentifier: name: Promise of Riches - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Raises power but reduces a little resistance and defense from @@ -28,18 +27,18 @@ MonoBehaviour: value1: 0 value2: 0 - effect: {fileID: 11400000, guid: f0d98790fa591e94fa7c7ac8a43fc514, type: 2} - value1: 0.1 + value1: 0.105 value2: 2 - effect: {fileID: 11400000, guid: e0011e00775cef943958ab143715f76f, type: 2} - value1: 0.05 + value1: 0.053 value2: 2 - effect: {fileID: 11400000, guid: b5d1f30b4d6d890408bf22b738ff2820, type: 2} - value1: 0.05 + value1: 0.053 value2: 2 visualEffect: {fileID: 552734591061099818, guid: adb27ddbffd6de74fb6e34379f56176a, type: 3} xp: 0 - xpNext: 333 + xpNext: 0 description: Promises a great bounty for the heads of the enemies, making your companions eager to kill. Raises the attack, but as they are less careful, slightly lowers their defenses. diff --git a/Assets/Skills/WarriorSkills/Rapid Deployment.asset b/Assets/Skills/WarriorSkills/Rapid Deployment.asset index f0154d46..f0817370 100644 --- a/Assets/Skills/WarriorSkills/Rapid Deployment.asset +++ b/Assets/Skills/WarriorSkills/Rapid Deployment.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Rapid Deployment m_EditorClassIdentifier: name: Rapid Deployment - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: Amidi first strike speed boost. @@ -25,11 +24,11 @@ MonoBehaviour: effects: - effect: {fileID: 11400000, guid: 711276199e520fc4c98bf01d86ab35e4, type: 2} value1: 0 - value2: 0.4 + value2: 0.415 visualEffect: {fileID: 5434996350183651868, guid: 0bbbb173c53d799459f0715fedc7676a, type: 3} xp: 0 - xpNext: 200 + xpNext: 0 description: Amidi always has the first move in a battle. Except agains extremely well-prepared enemies. skillsToUpdate: [] diff --git a/Assets/Skills/WhiteMageSkills/Celebrating Victory.asset b/Assets/Skills/WhiteMageSkills/Celebrating Victory.asset index d18bea60..eb0bd008 100644 --- a/Assets/Skills/WhiteMageSkills/Celebrating Victory.asset +++ b/Assets/Skills/WhiteMageSkills/Celebrating Victory.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Celebrating Victory m_EditorClassIdentifier: name: Celebrating Victory - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: Heals party outside battle. @@ -24,12 +23,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 7670b68f5e3253643bd36fc21cca07a4, type: 2} - value1: 2 + value1: 2.12 value2: 0 visualEffect: {fileID: 8917310150857617220, guid: 44af1ab9d2936f242ab6a06b766c52c5, type: 3} xp: 0 - xpNext: 200 + xpNext: 0 description: Xander celebrates victory with the party with only the best wines and meals, recovering their bodies and spirits. skillsToUpdate: [] diff --git a/Assets/Skills/WhiteMageSkills/Dominica Sanitatem.asset b/Assets/Skills/WhiteMageSkills/Dominica Sanitatem.asset index 1ec78176..253385de 100644 --- a/Assets/Skills/WhiteMageSkills/Dominica Sanitatem.asset +++ b/Assets/Skills/WhiteMageSkills/Dominica Sanitatem.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Dominica Sanitatem m_EditorClassIdentifier: name: Dominica Sanitatem - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Heals an ally. @@ -24,12 +23,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 7670b68f5e3253643bd36fc21cca07a4, type: 2} - value1: 1.3 + value1: 1.36 value2: 0 visualEffect: {fileID: 8917310150857617220, guid: b07d20838bc296c42830d2418a9ea41c, type: 3} xp: 0 - xpNext: 999 + xpNext: 0 description: Xander's holy blessings heals an ally. skillsToUpdate: - {fileID: 11400000, guid: f10ded09276ddb5439d144b228506ae3, type: 2} diff --git a/Assets/Skills/WhiteMageSkills/Lava in Siloe.asset b/Assets/Skills/WhiteMageSkills/Lava in Siloe.asset index 251c2a76..274a4a30 100644 --- a/Assets/Skills/WhiteMageSkills/Lava in Siloe.asset +++ b/Assets/Skills/WhiteMageSkills/Lava in Siloe.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Lava in Siloe level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Removes an ally's negative status effects. diff --git a/Assets/Skills/WhiteMageSkills/Mental Fortitude.asset b/Assets/Skills/WhiteMageSkills/Mental Fortitude.asset index 3a3b66f2..19c23b3d 100644 --- a/Assets/Skills/WhiteMageSkills/Mental Fortitude.asset +++ b/Assets/Skills/WhiteMageSkills/Mental Fortitude.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Mental Fortitude m_EditorClassIdentifier: name: Mental Fortitude - level: 1 - probability: 0 + level: 0 cost: 0 active: 1 shortDescription: More resistance against status and debuffs. @@ -24,12 +23,12 @@ MonoBehaviour: callbackDelay: 0 effects: - effect: {fileID: 11400000, guid: 7ce762a86e4d5c44d955ca9056c92460, type: 2} - value1: 0.05 + value1: 0.053 value2: -1 visualEffect: {fileID: 552734591061099818, guid: c5b81c56fc50dac4c80964acddc9c909, type: 3} xp: 0 - xpNext: 200 + xpNext: 0 description: Xander's life of studies and debates made him resistant to status abnormalities and other negative influences. skillsToUpdate: diff --git a/Assets/Skills/WhiteMageSkills/Omnibus Dominicae Sanitatem.asset b/Assets/Skills/WhiteMageSkills/Omnibus Dominicae Sanitatem.asset index ac925dfb..c412d480 100644 --- a/Assets/Skills/WhiteMageSkills/Omnibus Dominicae Sanitatem.asset +++ b/Assets/Skills/WhiteMageSkills/Omnibus Dominicae Sanitatem.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Omnibus Dominicae Sanitatem level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Heals party. diff --git a/Assets/Skills/WhiteMageSkills/Surgere et ambulare.asset b/Assets/Skills/WhiteMageSkills/Surgere et ambulare.asset index bcb3bcc9..4a123172 100644 --- a/Assets/Skills/WhiteMageSkills/Surgere et ambulare.asset +++ b/Assets/Skills/WhiteMageSkills/Surgere et ambulare.asset @@ -13,8 +13,7 @@ MonoBehaviour: m_Name: Surgere et ambulare m_EditorClassIdentifier: name: Surgere et ambulare - level: 1 - probability: 0 + level: 0 cost: 12 active: 1 shortDescription: Revives an ally. @@ -28,11 +27,11 @@ MonoBehaviour: value2: 0 - effect: {fileID: 11400000, guid: 7670b68f5e3253643bd36fc21cca07a4, type: 2} value1: 0 - value2: 0.2 + value2: 0.205 visualEffect: {fileID: 8917310150857617220, guid: c893755b873c782498de5129bf2aef9f, type: 3} xp: 0 - xpNext: 333 + xpNext: 0 description: Xander holy and powerful words make an ally rise from the grave. skillsToUpdate: - {fileID: 11400000, guid: 77c32345c2b6be947b14d5bcbdd5b993, type: 2} diff --git a/Assets/Skills/WhiteMageSkills/Tardus at Iram.asset b/Assets/Skills/WhiteMageSkills/Tardus at Iram.asset index 06e0d336..45dfbe3a 100644 --- a/Assets/Skills/WhiteMageSkills/Tardus at Iram.asset +++ b/Assets/Skills/WhiteMageSkills/Tardus at Iram.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Tardus at Iram level: 0 - probability: 0 cost: 14 active: 0 shortDescription: Reduces an enemy's speed. diff --git a/Assets/Skills/WhiteMageSkills/Volare Via.asset b/Assets/Skills/WhiteMageSkills/Volare Via.asset index 6eda1db8..49cccb81 100644 --- a/Assets/Skills/WhiteMageSkills/Volare Via.asset +++ b/Assets/Skills/WhiteMageSkills/Volare Via.asset @@ -14,7 +14,6 @@ MonoBehaviour: m_EditorClassIdentifier: name: Volare Via level: 0 - probability: 0 cost: 0 active: 0 shortDescription: Increases party speed in the overworld while active.