Formulas finished, damage added and fixes

- Formulas script changed - Calculate formulas in editor and in play mode (when slots changes) - Attributes calculated from formulas added and showed in editor - Added damage attribute to battleOptions and reflected in combat - Character slots defined in specialized classes changed - Editor fixes
Narratech · May 2, 2018 · d76ce99 · d76ce99
1 parent 67f4d15
commit d76ce99
Show file tree

Hide file tree

Showing 44 changed files with 657 additions and 357 deletions.
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset
@@ -50,4 +50,12 @@ MonoBehaviour:
     minValue: 0
     value: 1
     isCore: 1
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 50
+    isCore: 1
+  attributesWithFormulas: []
   specializedClasses: []
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(2).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(2).asset
@@ -0,0 +1,62 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_PrefabParentObject: {fileID: 0}
+  m_PrefabInternal: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 2d9fb3b8c5fa23c4e8313ab14ed5bdb8, type: 3}
+  m_Name: NewCharacter(2)
+  m_EditorClassIdentifier: 
+  name: NewCharacter(2)
+  inventory: {fileID: 0}
+  Slots: []
+  attributes:
+  - name: Health
+    id: HP
+    description: 
+    maxValue: 0
+    minValue: 0
+    value: 0
+    isCore: 1
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 50
+    isCore: 1
+  - name: Move Range
+    id: MVR
+    description: 
+    maxValue: 30
+    minValue: 0
+    value: 5
+    isCore: 1
+  - name: Move height
+    id: MVH
+    description: 
+    maxValue: 15
+    minValue: 0
+    value: 1
+    isCore: 1
+  - name: Attack Range
+    id: ATR
+    description: 
+    maxValue: 30
+    minValue: 0
+    value: 4
+    isCore: 1
+  - name: Attack Height
+    id: ATH
+    description: 
+    maxValue: 15
+    minValue: 0
+    value: 1
+    isCore: 1
+  attributesWithFormulas: []
+  specializedClasses: []
+  specializedClassesCount: 0
diff --git a/...er/Database/Skills/NewSkill(1).asset.meta → ...ase/Characters/NewCharacter(2).asset.meta b/...er/Database/Skills/NewSkill(1).asset.meta → ...ase/Characters/NewCharacter(2).asset.meta
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(4).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(4).asset
@@ -13,7 +13,10 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   name: NewCharacter(4)
   inventory: {fileID: 0}
-  Slots: []
+  Slots:
+  - slotType: Head
+    _modifier: {fileID: 11400000, guid: 242d1289cf2bba54c88d032eafa8eec4, type: 2}
+    calculatedFormula: 1
   attributes:
   - name: Health
     id: HP
@@ -50,4 +53,13 @@ MonoBehaviour:
     minValue: 0
     value: 1
     isCore: 1
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 50
+    isCore: 1
+  attributesWithFormulas: []
   specializedClasses: []
+  specializedClassesCount: 0
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(5).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(5).asset
@@ -50,4 +50,13 @@ MonoBehaviour:
     minValue: 0
     value: 1
     isCore: 1
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 50
+    isCore: 1
+  attributesWithFormulas: []
   specializedClasses: []
+  specializedClassesCount: 0
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(6).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(6).asset
@@ -50,4 +50,13 @@ MonoBehaviour:
     minValue: 0
     value: 1
     isCore: 1
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 50
+    isCore: 1
+  attributesWithFormulas: []
   specializedClasses: []
+  specializedClassesCount: 0
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(7).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(7).asset
@@ -50,4 +50,11 @@ MonoBehaviour:
     minValue: 0
     value: 1
     isCore: 1
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 50
+    isCore: 1
   specializedClasses: []
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter.asset b/Assets/TRPGMaker/Database/Characters/NewCharacter.asset
@@ -14,25 +14,16 @@ MonoBehaviour:
   name: NewCharacter
   inventory: {fileID: 0}
   Slots:
-  - slotType: Head
-    modifier: {fileID: 11400000, guid: 4c69bdc0758205346836ff1ddb49b90d, type: 2}
-  - slotType: Right Hand
-    modifier: {fileID: 11400000, guid: 4c69bdc0758205346836ff1ddb49b90d, type: 2}
-  - slotType: 
-    modifier: {fileID: 0}
-  - slotType: 
-    modifier: {fileID: 0}
-  - slotType: 
-    modifier: {fileID: 0}
-  - slotType: 
-    modifier: {fileID: 0}
+  - slotType: Left hand
+    _modifier: {fileID: 11400000, guid: 242d1289cf2bba54c88d032eafa8eec4, type: 2}
+    calculatedFormula: 1
   attributes:
   - name: Health
     id: HP
     description: 
     maxValue: 300
     minValue: 0
-    value: 300
+    value: 250
     isCore: 0
   - name: Move Range
     id: MVR
@@ -62,4 +53,70 @@ MonoBehaviour:
     minValue: 0
     value: 1
     isCore: 1
-  specializedClasses: []
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 50
+    isCore: 1
+  - name: Mana
+    id: MAN
+    description: 
+    maxValue: 0
+    minValue: 0
+    value: 0
+    isCore: 0
+  attributesWithFormulas:
+  - name: Health
+    id: HP
+    description: 
+    maxValue: 300
+    minValue: 0
+    value: 265
+    isCore: 0
+  - name: Move Range
+    id: MVR
+    description: 
+    maxValue: 30
+    minValue: 0
+    value: 5
+    isCore: 1
+  - name: Move height
+    id: MVH
+    description: 
+    maxValue: 15
+    minValue: 0
+    value: 1
+    isCore: 1
+  - name: Attack Range
+    id: ATR
+    description: 
+    maxValue: 30
+    minValue: 0
+    value: 4
+    isCore: 1
+  - name: Attack Height
+    id: ATH
+    description: 
+    maxValue: 15
+    minValue: 0
+    value: 1
+    isCore: 1
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 110
+    isCore: 1
+  - name: Mana
+    id: MAN
+    description: 
+    maxValue: 0
+    minValue: 0
+    value: 0
+    isCore: 0
+  specializedClasses:
+  - {fileID: 11400000, guid: 684c928e26a3b364c9cc9cff30e18082, type: 2}
+  specializedClassesCount: 1
diff --git a/Assets/TRPGMaker/Database/Database.asset b/Assets/TRPGMaker/Database/Database.asset
@@ -19,6 +19,13 @@ MonoBehaviour:
     minValue: 0
     value: 0
     isCore: 1
+  - name: Damage
+    id: DMG
+    description: Damage
+    maxValue: 300
+    minValue: 0
+    value: 50
+    isCore: 1
   - name: Move Range
     id: MVR
     description: 
@@ -47,22 +54,23 @@ MonoBehaviour:
     minValue: 0
     value: 1
     isCore: 1
+  - name: Mana
+    id: MAN
+    description: 
+    maxValue: 0
+    minValue: 0
+    value: 0
+    isCore: 0
   tags:
-  - Espada
-  - Mandoble
-  - Casco
-  - Vara
-  - Escudo
-  - Armadura ligera
+  - Light armour
   slotTypes:
   - Head
-  - Right Hand
-  - Left Hand
+  - Right hand
+  - Left hand
   items:
-  - {fileID: 11400000, guid: 4c69bdc0758205346836ff1ddb49b90d, type: 2}
   - {fileID: 11400000, guid: 242d1289cf2bba54c88d032eafa8eec4, type: 2}
-  - {fileID: 11400000, guid: f6b6622b87c152f4599e44b22cdddc5a, type: 2}
-  - {fileID: 11400000, guid: a06817ff9fca9d14b9df2b85c4fd2c2e, type: 2}
+  - {fileID: 11400000, guid: 4c69bdc0758205346836ff1ddb49b90d, type: 2}
+  - {fileID: 11400000, guid: 7182cd41f7eb67743a3612a0fd7c9ac5, type: 2}
   specializedClasses:
   - {fileID: 11400000, guid: 684c928e26a3b364c9cc9cff30e18082, type: 2}
   characters:
@@ -72,13 +80,11 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 75942776545ea02418c221a9273f406b, type: 2}
   - {fileID: 11400000, guid: bac31a58c9f786c4a9d5b67034ba5482, type: 2}
   - {fileID: 11400000, guid: 496024b31fb8d604ba8b12317f0d4762, type: 2}
+  - {fileID: 11400000, guid: a0544f3bb46f87e4b902b7442a6702ca, type: 2}
   teams:
   - {fileID: 11400000, guid: 15bb40f2e1f0dd04a8ec14b3c2bb0cc4, type: 2}
   - {fileID: 11400000, guid: edbd6fc84edad7749b2192b14449f153, type: 2}
-  skills:
-  - {fileID: 11400000, guid: e0fa9d1311b88f547beee49449fc519f, type: 2}
-  - {fileID: 11400000, guid: dfe22705bcdd79847ba1a5df96149c38, type: 2}
-  - {fileID: 11400000, guid: 9216a251e61bcfe4d80b1430c9b830a7, type: 2}
+  skills: []
   _TRPGOptions:
     _gameType: 0
     _turnType: 0
@@ -90,6 +96,14 @@ MonoBehaviour:
       minValue: 0
       value: 0
       isCore: 1
+    _damageAttribute:
+      name: Damage
+      id: DMG
+      description: Damage
+      maxValue: 300
+      minValue: 0
+      value: 50
+      isCore: 1
     _moveRange:
       name: Move Range
       id: MVR

diff --git a/Assets/TRPGMaker/Database/Items/Axe.asset b/Assets/TRPGMaker/Database/Items/Axe.asset
@@ -14,7 +14,13 @@ MonoBehaviour:
   name: Axe
   description: Enter item description
   tags: []
+  _formulas:
+  - attributeID: HP
+    formula: HP + 15
+  - attributeID: DMG
+    formula: DMG + 10
   icon: {fileID: 2800000, guid: c0470fcd9b1259b4c972a2f119f22e43, type: 3}
   SlotType:
   - slotsOcupped:
-    - Head
+    - Right hand
+    - Left hand
diff --git a/Assets/TRPGMaker/Database/Items/New Item(3).asset b/Assets/TRPGMaker/Database/Items/New Item(3).asset
diff --git a/Assets/TRPGMaker/Database/Items/New Item(3).asset.meta b/Assets/TRPGMaker/Database/Items/New Item(3).asset.meta
diff --git a/...RPGMaker/Database/Items/New Item(2).asset → Assets/TRPGMaker/Database/Items/Rod.asset b/...RPGMaker/Database/Items/New Item(2).asset → Assets/TRPGMaker/Database/Items/Rod.asset
@@ -9,9 +9,13 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 169f70efb2d642342bccf93f555f7742, type: 3}
-  m_Name: New Item(2)
+  m_Name: Rod
   m_EditorClassIdentifier: 
-  name: New Item(2)
+  name: Rod
   description: Enter item description
   tags: []
-  SlotType: []
+  _formulas: []
+  icon: {fileID: 0}
+  SlotType:
+  - slotsOcupped:
+    - Right hand