Skills finished

Skills 100% working Editor fixes
narratech · May 20, 2018 · 1385e10 · 1385e10
1 parent 68cf54a
commit 1385e10
Show file tree

Hide file tree

Showing 24 changed files with 419 additions and 149 deletions.
diff --git a/Assets/Scenes/test.unity b/Assets/Scenes/test.unity
@@ -16088,7 +16088,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
+  character: {fileID: 11400000, guid: d4ebd4afa6cc6394db5f44be6f178cbb, type: 2}
   team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
 --- !u!114 &494325675
 MonoBehaviour:
@@ -20933,7 +20933,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
+  character: {fileID: 11400000, guid: 1d0e0e29e24af58469a861571a64f906, type: 2}
   team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
 --- !u!114 &651502395
 MonoBehaviour:
@@ -34783,7 +34783,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
+  character: {fileID: 11400000, guid: 80ca2c8d0a392ad45a4b90144760f9c9, type: 2}
   team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
 --- !u!114 &909185162
 MonoBehaviour:
@@ -41552,7 +41552,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
+  character: {fileID: 11400000, guid: e3c4baa27b73ff740ae708c819b74b32, type: 2}
   team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
 --- !u!114 &1140926019
 MonoBehaviour:
@@ -56884,7 +56884,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 53999f937d6643b42949d28bcda1a943, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  character: {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
+  character: {fileID: 11400000, guid: dea631a34e1bf1b4a88109d369f08b72, type: 2}
   team: {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
 --- !u!114 &1573021072
 MonoBehaviour:

diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset
@@ -0,0 +1,45 @@
+%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(1)
+  m_EditorClassIdentifier: 
+  name: NewCharacter(1)
+  inventory: {fileID: 0}
+  Slots: []
+  attributes:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 240
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  attributesWithFormulas:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 500
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  specializedClasses:
+  - {fileID: 11400000, guid: de99074a2c9f3e44fb0871e3f484f8a4, type: 2}
+  specializedClassesCount: 1
diff --git a/...Maker/Database/Skills/NewSkill.asset.meta → ...ase/Characters/NewCharacter(1).asset.meta b/...Maker/Database/Skills/NewSkill.asset.meta → ...ase/Characters/NewCharacter(1).asset.meta
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(2).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(2).asset
@@ -0,0 +1,45 @@
+%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:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 215
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  attributesWithFormulas:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 215
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  specializedClasses:
+  - {fileID: 11400000, guid: de99074a2c9f3e44fb0871e3f484f8a4, type: 2}
+  specializedClassesCount: 1
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(3).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(3).asset
@@ -0,0 +1,45 @@
+%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(3)
+  m_EditorClassIdentifier: 
+  name: NewCharacter(3)
+  inventory: {fileID: 0}
+  Slots: []
+  attributes:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 20
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  attributesWithFormulas:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 20
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  specializedClasses:
+  - {fileID: 11400000, guid: de99074a2c9f3e44fb0871e3f484f8a4, type: 2}
+  specializedClassesCount: 1
diff --git a/...er/Database/Skills/NewSkill(2).asset.meta → ...ase/Characters/NewCharacter(3).asset.meta b/...er/Database/Skills/NewSkill(2).asset.meta → ...ase/Characters/NewCharacter(3).asset.meta
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(4).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(4).asset
@@ -0,0 +1,45 @@
+%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(4)
+  m_EditorClassIdentifier: 
+  name: NewCharacter(4)
+  inventory: {fileID: 0}
+  Slots: []
+  attributes:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 111
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  attributesWithFormulas:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 111
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  specializedClasses:
+  - {fileID: 11400000, guid: de99074a2c9f3e44fb0871e3f484f8a4, type: 2}
+  specializedClassesCount: 1
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(4).asset.meta b/Assets/TRPGMaker/Database/Characters/NewCharacter(4).asset.meta
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(5).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(5).asset
@@ -0,0 +1,45 @@
+%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(5)
+  m_EditorClassIdentifier: 
+  name: NewCharacter(5)
+  inventory: {fileID: 0}
+  Slots: []
+  attributes:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 500
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  attributesWithFormulas:
+  - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
+    maxValue: 500
+    minValue: 0
+    value: 500
+  - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  - _attribute: {fileID: 11400000, guid: 7a51ab61027fe2842b7277a93add2237, type: 2}
+    maxValue: 0
+    minValue: 0
+    value: 0
+  specializedClasses:
+  - {fileID: 11400000, guid: de99074a2c9f3e44fb0871e3f484f8a4, type: 2}
+  specializedClassesCount: 1
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(5).asset.meta b/Assets/TRPGMaker/Database/Characters/NewCharacter(5).asset.meta
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter.asset b/Assets/TRPGMaker/Database/Characters/NewCharacter.asset
@@ -20,9 +20,9 @@ MonoBehaviour:
     calculatedFormula: 1
   attributes:
   - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
-    maxValue: 20
+    maxValue: 500
     minValue: 0
-    value: 20
+    value: 120
   - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
     maxValue: 23
     minValue: 0
@@ -33,9 +33,9 @@ MonoBehaviour:
     value: 0
   attributesWithFormulas:
   - _attribute: {fileID: 11400000, guid: 570466ba20bcf074aa9cb2a7bc75d9aa, type: 2}
-    maxValue: 20
+    maxValue: 500
     minValue: 0
-    value: 20
+    value: 120
   - _attribute: {fileID: 11400000, guid: 2bacf50ce194d1b46b929529f5723ad4, type: 2}
     maxValue: 23
     minValue: 0

diff --git a/Assets/TRPGMaker/Database/Database.asset b/Assets/TRPGMaker/Database/Database.asset
@@ -26,12 +26,14 @@ MonoBehaviour:
   - {fileID: 11400000, guid: de99074a2c9f3e44fb0871e3f484f8a4, type: 2}
   characters:
   - {fileID: 11400000, guid: e7f127d3314f50841893ffe7a2ef77e7, type: 2}
+  - {fileID: 11400000, guid: dea631a34e1bf1b4a88109d369f08b72, type: 2}
+  - {fileID: 11400000, guid: d4ebd4afa6cc6394db5f44be6f178cbb, type: 2}
+  - {fileID: 11400000, guid: 1d0e0e29e24af58469a861571a64f906, type: 2}
+  - {fileID: 11400000, guid: e3c4baa27b73ff740ae708c819b74b32, type: 2}
+  - {fileID: 11400000, guid: 80ca2c8d0a392ad45a4b90144760f9c9, type: 2}
   teams:
   - {fileID: 11400000, guid: ff36771f8c32cc64b9f083fbe542428e, type: 2}
-  skills:
-  - {fileID: 11400000, guid: 6140f844d2699c34183175b8e0937e5e, type: 2}
-  - {fileID: 11400000, guid: 58c4a5f649a699b4282451a006428fc1, type: 2}
-  - {fileID: 11400000, guid: 347122fdaa7394b4baf27c18b79176bb, type: 2}
+  skills: []
   _TRPGOptions:
     _gameType: 0
     _turnType: 0

diff --git a/Assets/TRPGMaker/Database/Skills/NewSkill(1).asset b/Assets/TRPGMaker/Database/Skills/NewSkill(1).asset