IA Move and Attack: decissions and actions

- IA move decissions (nearest character) - IA atomatically shows move and attack area and select the destination cell. - IA atomatically moves and attack. - Team editor fixed.
Narratech · Apr 11, 2018 · 1a2fa5f · 1a2fa5f
1 parent 88ae815
commit 1a2fa5f
Show file tree

Hide file tree

Showing 14 changed files with 388 additions and 266 deletions.
diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(1).asset
@@ -20,7 +20,7 @@ MonoBehaviour:
     description: 
     maxValue: 250
     minValue: 0
-    value: 250
+    value: 500
     isCore: 1
   - name: Move Height
     id: MVH

diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter(2).asset b/Assets/TRPGMaker/Database/Characters/NewCharacter(2).asset
@@ -20,7 +20,7 @@ MonoBehaviour:
     description: 
     maxValue: 250
     minValue: 0
-    value: 250
+    value: 500
     isCore: 1
   - name: Move Range
     id: MVR

diff --git a/Assets/TRPGMaker/Database/Characters/NewCharacter.asset b/Assets/TRPGMaker/Database/Characters/NewCharacter.asset
@@ -32,7 +32,7 @@ MonoBehaviour:
     description: 
     maxValue: 250
     minValue: 0
-    value: 250
+    value: 500
     isCore: 1
   - name: Move Range
     id: MVR

diff --git a/Assets/TRPGMaker/Database/Database.asset b/Assets/TRPGMaker/Database/Database.asset
@@ -89,8 +89,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 496024b31fb8d604ba8b12317f0d4762, type: 2}
   - {fileID: 11400000, guid: bac31a58c9f786c4a9d5b67034ba5482, type: 2}
   teams:
-  - {fileID: 11400000, guid: 6997cfd5caffcfe4c874c9f0ac22d59b, type: 2}
-  - {fileID: 11400000, guid: 6c8f21e3fb66c0346a2b2cc371eb3219, type: 2}
+  - {fileID: 11400000, guid: 15bb40f2e1f0dd04a8ec14b3c2bb0cc4, type: 2}
+  - {fileID: 11400000, guid: edbd6fc84edad7749b2192b14449f153, type: 2}
   _TRPGOptions:
     _gameType: 0
     _turnType: 0

diff --git a/...s/TRPGMaker/Database/Teams/EnemyTea.asset → ...TRPGMaker/Database/Teams/NewTeam(1).asset b/...s/TRPGMaker/Database/Teams/EnemyTea.asset → ...TRPGMaker/Database/Teams/NewTeam(1).asset
@@ -9,9 +9,9 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4a7b1fcdece9778478b2575993f98a72, type: 3}
-  m_Name: EnemyTea
+  m_Name: NewTeam(1)
   m_EditorClassIdentifier: 
-  name: EnemyTeam
+  name: NewTeam(1)
   id: 0
   characters:
   - {fileID: 11400000, guid: 3eca2b4789a5bc44abd112d60d4af688, type: 2}

diff --git a/...GMaker/Database/Teams/EnemyTea.asset.meta → ...aker/Database/Teams/NewTeam(1).asset.meta b/...GMaker/Database/Teams/EnemyTea.asset.meta → ...aker/Database/Teams/NewTeam(1).asset.meta
diff --git a/...TRPGMaker/Database/Teams/PlayerTeam.asset → ...ts/TRPGMaker/Database/Teams/NewTeam.asset b/...TRPGMaker/Database/Teams/PlayerTeam.asset → ...ts/TRPGMaker/Database/Teams/NewTeam.asset
@@ -9,9 +9,9 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 4a7b1fcdece9778478b2575993f98a72, type: 3}
-  m_Name: PlayerTeam
+  m_Name: NewTeam
   m_EditorClassIdentifier: 
-  name: PlayerTeam
+  name: NewTeam
   id: 0
   characters:
   - {fileID: 11400000, guid: 36a63a88f336fee4fbee3ca4e3812861, type: 2}

diff --git a/...aker/Database/Teams/PlayerTeam.asset.meta → ...PGMaker/Database/Teams/NewTeam.asset.meta b/...aker/Database/Teams/PlayerTeam.asset.meta → ...PGMaker/Database/Teams/NewTeam.asset.meta
diff --git a/Assets/TRPGMaker/Editor/TeamEditor.cs b/Assets/TRPGMaker/Editor/TeamEditor.cs
@@ -16,14 +16,14 @@ private void OnEnable()
         listCharacters = new ReorderableList(serializedObject,
             serializedObject.FindProperty("characters"),
             true, true, true, true);
-
+        
         // Draw characters
         listCharacters.drawElementCallback =
             (Rect rect, int index, bool isActive, bool isFocused) => {
                 var element = listCharacters.serializedProperty.GetArrayElementAtIndex(index);
                 Character character = element.objectReferenceValue as Character;
-
                 rect.y += 2;
+
                 EditorGUI.LabelField(
                     new Rect(rect.x, rect.y, rect.width, EditorGUIUtility.singleLineHeight),
                     character.name);
@@ -51,6 +51,14 @@ public override void OnInspectorGUI()
     {
         serializedObject.Update();
 
+        // Clean array if there are null objects
+        for (int i = 0; i < listCharacters.serializedProperty.arraySize; i++)
+        {
+            var elementProperty = listCharacters.serializedProperty.GetArrayElementAtIndex(i);
+            if (elementProperty.objectReferenceValue == null)
+                listCharacters.serializedProperty.DeleteArrayElementAtIndex(i);
+        }
+
         var customStyle = new GUIStyle();
         customStyle.alignment = TextAnchor.UpperCenter;
         customStyle.fontSize = 17;
@@ -78,6 +86,6 @@ private void clickHandlerCharacters(object target)
     {
         var data = (Character)target;
         ((Team)this.target).characters.Add(data);
-        serializedObject.ApplyModifiedProperties();
+        EditorUtility.SetDirty(this.target);
     }
 }
diff --git a/Assets/TRPGMaker/Scripts/Connectors/ITRPGMapConnector.cs b/Assets/TRPGMaker/Scripts/Connectors/ITRPGMapConnector.cs
@@ -18,8 +18,11 @@ public interface ITRPGMapConnector {
     void ShowArea(CharacterScript character, EventTypes eventType, ShowAreaCallBack callback);
     void triggerAnimation(Character character, Cell cell);
     CharacterScript GetCharacterAtCell(Cell cell);
+    Cell GetCellAtCharacter(CharacterScript character);
 
     // IA Methods
     List<CharacterScript> GetAttackRangeTargets(CharacterScript character);
+    List<Cell> GetPathFromCharToChar(CharacterScript character, CharacterScript target);
     void IAAttack(CharacterScript character, CharacterScript target, ShowAreaCallBack callback);
+    void IAMove(CharacterScript character, Cell destiny, MoveCharacterToCallBack callback);
 }