Update combat tab

template.json

@@ -31,8 +31,9 @@
           "xpearned": 0,
           "xpspent": 0,
           "combatskills": "",
-          "presenceattack": "",
-          "gmnotes": ""
+          "presenceattack": {},
+          "gmnotes": "",
+          "combatnotes1":""
         }
       },
       "characteristics": {
@@ -42,7 +43,7 @@
             "value": 10,
             "base": 10,
             "category": "main",
-            "strdice": "",
+            "strdice": {},
             "lift": "",
             "strend": 0,
             "hasroll": true,
@@ -68,7 +69,8 @@
             "hasroll": true,
             "category": "main",
             "value": 10,
-            "base": 10
+            "base": 10,
+            "perceptionroll": 10
           },
           "ego": {
             "label": "Ego",
@@ -314,7 +316,6 @@
       "power",
       "advantage",
       "maneuver",
-      "martialart",
       "limitation",
       "complication",
       "equipment"
@@ -355,6 +356,7 @@
       "pha": "",
       "ocv": 0,
       "dcv" : 0,
+      "isstock": false,
       "active": false
     },
     "advantage": {
@@ -458,15 +460,6 @@
       "templates": [
         "common"
       ]
-    },
-    "martialart": {
-      "maneuver_phase": 0,
-      "maneuver_ocv": 0,
-      "maneuver_dcv": 0,
-      "maneuver_effect": "",
-      "templates": [
-        "common"
-      ]
     }
   }
 }