Merge branch 'master' of github.com:sayterdarkwynd/FrackinUniverse

GuyBronson · May 27, 2017 · 34fc54d · 34fc54d
2 parents b11e979 + ccb69ad
commit 34fc54d
Show file tree

Hide file tree

Showing 2,254 changed files with 60,863 additions and 16,212 deletions.
diff --git a/.metadata b/.metadata
@@ -7,5 +7,5 @@
   "name" : "FrackinUniverse",
   "requires" : [],
   "steamContentId" : "729480149",
-  "version" : "5.1.6"
+  "version" : "5.2.17"
 }
diff --git a/animations/apexhoverbike/teslacoil.animation b/animations/apexhoverbike/teslacoil.animation
@@ -0,0 +1,7 @@
+{
+  "frames" : "teslacoil.png",
+  "variants" : 1,
+  "frameNumber" : 6,
+  "animationCycle" : 0.1,
+  "offset" : [0, 0]
+}
diff --git a/animations/apexhoverbike/teslacoil.frames b/animations/apexhoverbike/teslacoil.frames
@@ -0,0 +1,10 @@
+{
+  "frameGrid" : {
+    "size" : [24, 24],
+    "dimensions" : [6, 1],
+
+     "names" : [
+    			  [ "discharge.1", "discharge.3", "discharge.5", "discharge.6", "discharge.4", "discharge.2"]
+    ]
+  }
+}
diff --git a/animations/apexhoverbike/teslacoil.png b/animations/apexhoverbike/teslacoil.png
diff --git a/animations/shards/apexhoverbikeshard.animation b/animations/shards/apexhoverbikeshard.animation
@@ -0,0 +1,9 @@
+{
+  "frames" : "apexhoverbikeshard.png",
+  "variants" : 1,
+  "loops" : 1,
+  "frameNumber" : 5,
+  "animationCycle" : 0.5,
+  "looping" : false,
+  "offset" : [0, 0]
+}
diff --git a/animations/shards/apexhoverbikeshard.png b/animations/shards/apexhoverbikeshard.png
diff --git a/animations/shards/avianhoverbikeshard.animation b/animations/shards/avianhoverbikeshard.animation
@@ -0,0 +1,9 @@
+{
+  "frames" : "avianhoverbikeshard.png",
+  "variants" : 1,
+  "loops" : 1,
+  "frameNumber" : 5,
+  "animationCycle" : 0.5,
+  "looping" : false,
+  "offset" : [0, 0]
+}
diff --git a/animations/shards/avianhoverbikeshard.png b/animations/shards/avianhoverbikeshard.png
diff --git a/animations/shards/default.frames b/animations/shards/default.frames
@@ -0,0 +1,10 @@
+{
+  "frameGrid" : {
+    "size" : [8, 8],
+    "dimensions" : [5, 1],
+
+    "names" : [
+      [ "0", "1", "2", "3", "4" ]
+    ]
+  }
+}
diff --git a/animations/shards/hylotlhoverbikeshard.animation b/animations/shards/hylotlhoverbikeshard.animation
@@ -0,0 +1,9 @@
+{
+  "frames" : "hylotlhoverbikeshard.png",
+  "variants" : 1,
+  "loops" : 1,
+  "frameNumber" : 5,
+  "animationCycle" : 0.5,
+  "looping" : false,
+  "offset" : [0, 0]
+}
diff --git a/animations/shards/hylotlhoverbikeshard.png b/animations/shards/hylotlhoverbikeshard.png
diff --git a/aseprite_palettes/magicalgirl.ase b/aseprite_palettes/magicalgirl.ase
diff --git a/behaviors/monsters/modular/actions/charge.behavior.patch b/behaviors/monsters/modular/actions/charge.behavior.patch
@@ -0,0 +1,31 @@
+[
+  {
+    "op": "add",
+    "path": "/parameters/damageOnTouch",
+    "value": false
+  },
+  {
+    "op": "add",
+    "path": "/root/children/1/children/1/children/1/children/0/children/1",
+    "value": {
+      "title": "setDamageOnTouch",
+      "type": "action",
+      "name": "setDamageOnTouch",
+      "parameters": {
+        "touchDamage": true
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/root/children/-",
+    "value": {
+      "title": "setDamageOnTouch",
+      "type": "action",
+      "name": "setDamageOnTouch",
+      "parameters": {
+        "touchDamage": "<damageOnTouch>"
+      }
+    }
+  }
+]
diff --git a/behaviors/monsters/modular/actions/fire.behavior.patch b/behaviors/monsters/modular/actions/fire.behavior.patch
@@ -0,0 +1,20 @@
+[
+  {
+    "op": "add",
+    "path": "/parameters/trackSource",
+    "value": false
+  },
+  {
+    "op": "remove",
+    "path": "/root/children/0/children/0/children/4/child/children/4/children/0/parameters/damageRepeatGroup"
+  },
+  {
+    "op": "remove",
+    "path": "/root/children/0/children/0/children/4/child/children/4/children/0/parameters/uniqueRepeatGroup"
+  },
+  {
+    "op": "replace",
+    "path": "/root/children/0/children/0/children/4/child/children/4/children/0/parameters/trackSource",
+    "value": "<trackSource>"
+  }
+]
diff --git a/behaviors/monsters/modular/actions/hop.behavior.patch b/behaviors/monsters/modular/actions/hop.behavior.patch
@@ -0,0 +1,31 @@
+[
+  {
+    "op": "add",
+    "path": "/parameters/damageOnTouch",
+    "value": false
+  },
+  {
+    "op": "add",
+    "path": "/root/children/1/child/children/6",
+    "value": {
+      "title": "setDamageOnTouch",
+      "type": "action",
+      "name": "setDamageOnTouch",
+      "parameters": {
+        "touchDamage": true
+      }
+    }
+  },
+  {
+    "op": "add",
+    "path": "/root/children/1/child/children/10",
+    "value": {
+      "title": "setDamageOnTouch",
+      "type": "action",
+      "name": "setDamageOnTouch",
+      "parameters": {
+        "touchDamage": "<damageOnTouch>"
+      }
+    }
+  }
+]