From e8126a66d1847a848cef5bb4e80adc179860c9f5 Mon Sep 17 00:00:00 2001
From: Latokike <81393451+Latokike@users.noreply.github.com>
Date: Sat, 5 Feb 2022 23:37:58 -0800
Subject: [PATCH] Update powers

---
 .../data/latoorigins/powers/arcane_skin.json  |   6 +-
 .../powers/dominant_subspecies.json           |   2 +-
 .../data/latoorigins/powers/grass_graze.json  |  86 +++------
 .../latoorigins/powers/habitat_advantage.json |   2 +-
 .../data/latoorigins/powers/iron_diet.json    |   8 +-
 .../data/latoorigins/powers/not_solid.json    | 148 ++++++++++++++-
 .../data/latoorigins/powers/play_dead.json    | 174 +++++++++++++++++-
 .../latoorigins/powers/redstone_fuelled.json  |  52 ++++++
 .../data/latoorigins/powers/regenerate.json   |  49 ++---
 .../latoorigins/powers/replace_sounds.json    |  11 ++
 .../latoorigins/powers/rideable_slime.json    |  22 +++
 .../powers/rideable_slime_dummy.json          |  19 ++
 .../data/latoorigins/powers/rocky_eater.json  |   3 +-
 13 files changed, 478 insertions(+), 104 deletions(-)
 create mode 100644 src/main/resources/data/latoorigins/powers/redstone_fuelled.json
 create mode 100644 src/main/resources/data/latoorigins/powers/rideable_slime.json
 create mode 100644 src/main/resources/data/latoorigins/powers/rideable_slime_dummy.json

diff --git a/src/main/resources/data/latoorigins/powers/arcane_skin.json b/src/main/resources/data/latoorigins/powers/arcane_skin.json
index ca7434e8..674d62a6 100644
--- a/src/main/resources/data/latoorigins/powers/arcane_skin.json
+++ b/src/main/resources/data/latoorigins/powers/arcane_skin.json
@@ -1,7 +1,7 @@
 {
   "type": "origins:model_color",
-  "red": 0.05,
-  "green": 0.25,
-  "blue": 0.25,
+  "red": 0.4,
+  "green": 0.45,
+  "blue": 0.7,
   "alpha": 1
 }
diff --git a/src/main/resources/data/latoorigins/powers/dominant_subspecies.json b/src/main/resources/data/latoorigins/powers/dominant_subspecies.json
index 5b839f9c..cbdcaba5 100644
--- a/src/main/resources/data/latoorigins/powers/dominant_subspecies.json
+++ b/src/main/resources/data/latoorigins/powers/dominant_subspecies.json
@@ -4,4 +4,4 @@
     "type": "origins:in_tag",
     "tag": "latoorigins:slime"
   }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/data/latoorigins/powers/grass_graze.json b/src/main/resources/data/latoorigins/powers/grass_graze.json
index 4301f84d..cea1eac3 100644
--- a/src/main/resources/data/latoorigins/powers/grass_graze.json
+++ b/src/main/resources/data/latoorigins/powers/grass_graze.json
@@ -1,62 +1,36 @@
 {
-  "type": "origins:active_self",
+  "type": "origins:action_on_block_use",
   "entity_action": {
-    "type": "origins:raycast",
-    "distance": 8.0,
-    "block_action": {
-      "type": "origins:set_block",
-      "block": "minecraft:dirt"
-    },
-    "bientity_condition": {
-      "type": "origins:actor_condition",
-      "condition": {
-        "type": "origins:and",
-        "conditions": [
-          {
-            "type": "origins:raycast",
-            "distance": 8.0,
-            "block_condition": {
-              "type": "origins:in_tag",
-              "tag": "latoorigins:edible"
-            }
-          },
-          {
-            "type": "origins:equipped_item",
-            "equipment_slot": "mainhand",
-            "item_condition": {
-              "type": "origins:empty"
-            }
-          }
-        ]
+    "type": "origins:and",
+    "actions": [
+      {
+        "type": "origins:feed",
+        "food": 2,
+        "saturation": 1.0
+      },
+      {
+        "type": "origins:swing_hand",
+        "hand": "MAIN_HAND"
+      },
+      {
+        "type": "origins:play_sound",
+        "sound": "minecraft:block.grass.break",
+        "pitch": 1
       }
-    },
-    "bientity_action": {
-      "type": "origins:actor_action",
-      "action": {
-        "type": "origins:and",
-        "actions": [
-          {
-            "type": "origins:feed",
-            "food": 7,
-            "saturation": 0.0
-          },
-          {
-            "type": "origins:swing_hand",
-            "hand": "MAIN_HAND"
-          },
-          {
-            "type": "origins:play_sound",
-            "sound": "minecraft:block.grass.break",
-            "pitch": 0.4
-          }
-        ]
-      }
-    }
+    ]
+  },
+  "item_condition": {
+    "type": "origins:empty"
+  },
+  "hands": [
+    "main_hand"
+  ],
+  "block_action": {
+    "type": "origins:set_block",
+    "block": "minecraft:dirt"
   },
-  "cooldown": 300,
-  "key": "key.use",
-  "hud_render": {
-    "sprite_location": "latoorigins:textures/gui/nothing.png",
-    "bar_index": 6
+  "block_condition": {
+    "type": "origins:in_tag",
+    "tag": "latoorigins:edible"
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/latoorigins/powers/habitat_advantage.json b/src/main/resources/data/latoorigins/powers/habitat_advantage.json
index 84f37a26..d978a326 100644
--- a/src/main/resources/data/latoorigins/powers/habitat_advantage.json
+++ b/src/main/resources/data/latoorigins/powers/habitat_advantage.json
@@ -6,7 +6,7 @@
       "category": "plains"
     },
     "attribute": "generic.attack_damage",
-	  "value": 2.0,
+	  "value": 0.75,
 	  "operation": "multiply_total"
   }
 }
diff --git a/src/main/resources/data/latoorigins/powers/iron_diet.json b/src/main/resources/data/latoorigins/powers/iron_diet.json
index 8c7b5e28..75e995df 100644
--- a/src/main/resources/data/latoorigins/powers/iron_diet.json
+++ b/src/main/resources/data/latoorigins/powers/iron_diet.json
@@ -1,12 +1,13 @@
 {
   "type": "origins:active_self",
   "key": {
-    "key": "key.use"
+    "key": "key.use",
+    "continuous": true
   },
   "hud_render": {
     "should_render": false
   },
-  "cooldown": 10,
+  "cooldown": 3,
   "entity_action": {
     "type": "origins:and",
     "actions": [
@@ -43,7 +44,8 @@
         }
       },
       {
-        "type": "origins:sneaking"
+        "type": "origins:sneaking",
+        "inverted": true
       }
     ]
   }
diff --git a/src/main/resources/data/latoorigins/powers/not_solid.json b/src/main/resources/data/latoorigins/powers/not_solid.json
index f3acb072..860488b7 100644
--- a/src/main/resources/data/latoorigins/powers/not_solid.json
+++ b/src/main/resources/data/latoorigins/powers/not_solid.json
@@ -50,12 +50,7 @@
           {
             "type": "origins:spawn_entity",
             "entity_type": "minecraft:slime",
-            "tag": "{Size:3,PersistenceRequired:1,Health:20.0f}",
-            "entity_action": {
-              "type": "origins:grant_power",
-              "power": "latoorigins:rideable_slime",
-              "source": "latoorigins:slimeeq"
-            }
+            "tag": "{Size:3,PersistenceRequired:1,Health:20.0f}"
           },
           {
             "type": "origins:damage",
@@ -68,7 +63,7 @@
           }
         ]
       },
-      "chance": 0.00001
+      "chance": 0.1
     },
     "cooldown": 0
   },
@@ -79,7 +74,144 @@
     },
     "modifier": {
       "operation": "multiply_base",
-      "value": 1.0
+      "value": 1.5
+    }
+  },
+  "slime_healer": {
+    "type": "origins:action_on_entity_use",
+    "bientity_action": {
+      "type": "origins:and",
+      "actions": [
+        {
+          "type": "origins:target_action",
+          "action": {
+            "type": "origins:and",
+            "actions": [
+              {
+                "type": "origins:grant_power",
+                "power": "latoorigins:slimeeq_friend",
+                "source": "latoorigins:slimeeq"
+              },
+              {
+                "type": "origins:grant_power",
+                "power": "latoorigins:rideable_slime",
+                "source": "latoorigins:slimeeq"
+              },
+              {
+                "type": "origins:grant_power",
+                "power": "latoorigins:rideable_slime_dummy",
+                "source": "latoorigins:slimeeq"
+              },
+              {
+                "type": "origins:heal",
+                "amount": 3
+              }
+            ]
+          }
+        },
+        {
+          "type": "origins:actor_action",
+          "action": {
+            "type": "origins:and",
+            "actions": [
+              {
+                "type": "origins:equipped_item_action",
+                "equipment_slot": "mainhand",
+                "action": {
+                  "type": "origins:consume",
+                  "amount": 1
+                }
+              },
+              {
+                "type": "origins:swing_hand",
+                "hand": "MAIN_HAND"
+              },
+              {
+                "type": "origins:play_sound",
+                "sound": "minecraft:entity.slime.squish"
+              }
+            ]
+          }
+        }
+      ]
+    },
+    "item_condition": {
+      "type": "origins:ingredient",
+      "ingredient": {
+        "item": "slime_ball"
+      }
+    },
+    "bientity_condition": {
+      "type": "origins:and",
+      "conditions": [
+        {
+          "type": "origins:target_condition",
+          "condition": {
+            "type": "origins:entity_type",
+            "entity_type": "minecraft:slime"
+          }
+        },
+        {
+          "type": "origins:actor_condition",
+          "condition": {
+            "type": "origins:sneaking"
+          }
+        }
+      ]
+    }
+  },
+  "sugar_consumption": {
+    "type": "origins:active_self",
+    "entity_action": {
+      "type": "origins:and",
+      "actions": [
+        {
+          "type": "origins:equipped_item_action",
+          "equipment_slot": "mainhand",
+          "action": {
+            "type": "origins:consume",
+            "amount": 1
+          }
+        },
+        {
+          "type": "origins:feed",
+          "food": 0.0,
+          "saturation": 0.1
+        },
+        {
+          "type": "origins:play_sound",
+          "sound": "minecraft:entity.player.burp"
+        },
+        {
+          "type": "origins:apply_effect",
+          "effect": {
+            "effect": "minecraft:speed",
+            "duration": 100,
+            "amplifier": 0,
+            "is_ambient": true,
+            "show_particles": false,
+            "show_icon": false
+          }
+        }
+      ]
+    },
+    "cooldown": 3,
+    "hud_render": {
+      "should_render": false
+    },
+    "key": {
+      "key": "key.use",
+      "continuous": true
+    },
+    "condition": {
+      "type": "origins:equipped_item",
+      "equipment_slot": "mainhand",
+      "item_condition": {
+        "type": "origins:ingredient",
+        "ingredient": {
+          "item": "minecraft:sugar"
+        }
+      }
     }
   }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/latoorigins/powers/play_dead.json b/src/main/resources/data/latoorigins/powers/play_dead.json
index 21299a55..04f37f9c 100644
--- a/src/main/resources/data/latoorigins/powers/play_dead.json
+++ b/src/main/resources/data/latoorigins/powers/play_dead.json
@@ -1,21 +1,175 @@
 {
     "type": "origins:multiple",
-    "effect": {
+    "resource": {
+        "type": "origins:resource",
+        "min": 0,
+        "max": 240,
+        "hud_render": {
+            "should_render": false,
+            "bar_index": 0
+        }
+    },
+    "set_resource": {
+        "type": "origins:self_action_when_hit",
+        "entity_action": {
+            "type": "origins:change_resource",
+            "resource": "latoorigins:play_dead_resource",
+            "change": 240
+        },
+        "condition": {
+            "type": "origins:and",
+            "conditions": [
+                {
+                    "type": "origins:health",
+                    "comparison": "<=",
+                    "compare_to": 1
+                },
+                {
+                    "type": "origins:health",
+                    "comparison": ">",
+                    "compare_to": 0
+                }
+            ]
+        },
+        "cooldown": 7500,
+        "hud_render": {
+            "should_render": false,
+            "bar_index": 0
+        }
+    },
+    "decrease_resource": {
+        "type": "origins:action_over_time",
+        "entity_action": {
+            "type": "origins:change_resource",
+            "resource": "latoorigins:play_dead_resource",
+            "change": -1
+        },
+        "interval": 1
+    },
+    "attributes": {
+        "type": "origins:conditioned_attribute",
+        "modifiers": [
+            {
+                "attribute": "minecraft:generic.movement_speed",
+                "operation": "multiply_total",
+                "value": -1,
+                "name": "Play dead spd modifier"
+            },
+            {
+                "attribute": "minecraft:generic.attack_damage",
+                "operation": "multiply_total",
+                "value": -1,
+                "name": "Play dead atk modifier"
+            }
+        ],
+        "tick_rate": 1,
+        "condition": {
+            "type": "origins:resource",
+            "resource": "latoorigins:play_dead_resource",
+            "comparison": ">",
+            "compare_to": 0
+        }
+    },
+    "swim_speed": {
+        "type": "origins:modify_swim_speed",
+        "modifier": {
+            "attribute": "minecraft:generic.movement_speed",
+            "operation": "multiply_total",
+            "value": -1,
+            "name": "Play dead sm_spd modifier"
+        },
+        "tick_rate": 1,
+        "condition": {
+            "type": "origins:resource",
+            "resource": "latoorigins:play_dead_resource",
+            "comparison": ">",
+            "compare_to": 0
+        }
+    },
+    "no_aggro": {
+        "type": "latoorigins:modify_behavior",
+        "entity_condition": {
+            "type": "origins:exists"
+        },
+        "condition": {
+            "type": "origins:resource",
+            "resource": "latoorigins:play_dead_resource",
+            "comparison": ">",
+            "compare_to": 0
+        }
+    },
+    "closed_eyes": {
+        "type": "origins:overlay",
+        "texture": "latoorigins:textures/overlay/eyes_closed.png",
+        "strength": 1.0,
+        "red": 1.0,
+        "green": 1.0,
+        "blue": 1.0,
+        "draw_mode": "texture",
+        "draw_phase": "below_hud",
+        "hide_with_hud": false,
+        "visible_in_third_person": true,
+        "condition": {
+            "type": "origins:resource",
+            "resource": "latoorigins:play_dead_resource",
+            "comparison": ">",
+            "compare_to": 0
+        }
+    },
+    "status": {
         "type": "origins:self_action_when_hit",
         "entity_action": {
             "type": "origins:apply_effect",
             "effect": {
-                "effect": "minecraft:slowness",
-                "duration": 60,
-                "amplifier": 4
+                "effect": "minecraft:regeneration",
+                "duration": 80,
+                "amplifier": 0,
+                "is_ambient": true,
+                "show_particles": false,
+                "show_icon": false
             }
         },
         "condition": {
             "type": "origins:health",
             "comparison": "<=",
-            "compare_to": 2
+            "compare_to": 1
+        },
+        "cooldown": 7500,
+        "hud_render": {
+            "should_render": false,
+            "bar_index": 0
+        }
+    },
+    "invulnerability": {
+        "type": "origins:invulnerability",
+        "condition": {
+            "type": "origins:resource",
+            "resource": "latoorigins:play_dead_resource",
+            "comparison": ">",
+            "compare_to": 0
+        },
+        "damage_condition": {
+            "type": "origins:name",
+            "name": "out_of_world",
+            "inverted": true
+        }
+    },
+    "heal": {
+        "type": "origins:self_action_when_hit",
+        "entity_action": {
+            "type": "origins:heal",
+            "amount": 8
+        },
+        "condition": {
+            "type": "origins:health",
+            "comparison": "<=",
+            "compare_to": 1
         },
-        "cooldown": 0
+        "cooldown": 7500,
+        "hud_render": {
+            "should_render": false,
+            "bar_index": 0
+        }
     },
     "sound": {
         "type": "origins:self_action_when_hit",
@@ -26,8 +180,12 @@
         "condition": {
             "type": "origins:health",
             "comparison": "<=",
-            "compare_to": 2
+            "compare_to": 1
         },
-        "cooldown": 0
+        "cooldown": 7500,
+        "hud_render": {
+            "should_render": false,
+            "bar_index": 0
+        }
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/data/latoorigins/powers/redstone_fuelled.json b/src/main/resources/data/latoorigins/powers/redstone_fuelled.json
new file mode 100644
index 00000000..444087bf
--- /dev/null
+++ b/src/main/resources/data/latoorigins/powers/redstone_fuelled.json
@@ -0,0 +1,52 @@
+{
+  "type": "origins:active_self",
+  "key": {
+    "key": "key.use",
+    "continuous": true
+  },
+  "hud_render": {
+    "should_render": false
+  },
+  "cooldown": 1,
+  "entity_action": {
+    "type": "origins:and",
+    "actions": [
+      {
+        "type": "origins:feed",
+        "food": 1.0,
+        "saturation": 2.0
+      },
+      {
+        "type": "origins:equipped_item_action",
+        "equipment_slot": "mainhand",
+        "action": {
+          "type": "origins:consume",
+          "amount": 1
+        }
+      },
+      {
+        "type": "origins:play_sound",
+        "sound": "minecraft:entity.player.burp"
+      }
+    ]
+  },
+  "condition": {
+    "type": "origins:and",
+    "conditions": [
+      {
+        "type": "origins:equipped_item",
+        "equipment_slot": "mainhand",
+        "item_condition": {
+          "type": "origins:ingredient",
+          "ingredient": {
+            "item": "redstone"
+          }
+        }
+      },
+      {
+        "type": "origins:sneaking",
+        "inverted": true
+      }
+    ]
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/latoorigins/powers/regenerate.json b/src/main/resources/data/latoorigins/powers/regenerate.json
index 9ce63590..669d11ec 100644
--- a/src/main/resources/data/latoorigins/powers/regenerate.json
+++ b/src/main/resources/data/latoorigins/powers/regenerate.json
@@ -1,25 +1,28 @@
 {
-    "type": "origins:active_self",
-    "entity_action": {
-      "type": "origins:and",
-      "actions": [
-        {
-          "type": "origins:apply_effect",
-          "effect": {
-            "effect": "minecraft:regeneration",
-            "duration": 200,
-            "amplifier": 2
-          }
-        },
-        {
-          "type": "origins:exhaust",
-          "amount": 10
+  "type": "origins:active_self",
+  "key": {
+    "key": "secondary"
+  },
+  "entity_action": {
+    "type": "origins:and",
+    "actions": [
+      {
+        "type": "origins:apply_effect",
+        "effect": {
+          "effect": "minecraft:regeneration",
+          "duration": 200,
+          "amplifier": 2
         }
-      ]
-    },
-    "cooldown": 600,
-    "hud_render": {
-      "sprite_location": "latoorigins:textures/gui/ability_bars.png",
-      "bar_index": "8"
-    }
-  }
\ No newline at end of file
+      },
+      {
+        "type": "origins:exhaust",
+        "amount": 10
+      }
+    ]
+  },
+  "cooldown": 600,
+  "hud_render": {
+    "sprite_location": "latoorigins:textures/gui/ability_bars.png",
+    "bar_index": "8"
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/latoorigins/powers/replace_sounds.json b/src/main/resources/data/latoorigins/powers/replace_sounds.json
index ed3cdc5b..0cb80d5c 100644
--- a/src/main/resources/data/latoorigins/powers/replace_sounds.json
+++ b/src/main/resources/data/latoorigins/powers/replace_sounds.json
@@ -1,5 +1,16 @@
 {
     "type": "origins:multiple",
+    "jump": {
+        "type": "origins:action_on_land",
+        "entity_action": {
+            "type": "origins:play_sound",
+            "sound": "minecraft:entity.slime.jump_small"
+        },
+        "cooldown": 0,
+        "hud_render": {
+            "should_render": false
+        }
+    },
     "hit": {
         "type": "origins:self_action_when_hit",
         "entity_action": {
diff --git a/src/main/resources/data/latoorigins/powers/rideable_slime.json b/src/main/resources/data/latoorigins/powers/rideable_slime.json
new file mode 100644
index 00000000..6f05ea27
--- /dev/null
+++ b/src/main/resources/data/latoorigins/powers/rideable_slime.json
@@ -0,0 +1,22 @@
+{
+  "type": "origins:action_on_being_used",
+  "bientity_action": {
+    "type": "origins:mount"
+  },
+  "bientity_condition": {
+    "type": "origins:actor_condition",
+    "condition": {
+      "type": "origins:and",
+      "conditions": [
+        {
+          "type": "origins:power",
+          "power": "latoorigins:not_solid"
+        },
+        {
+          "type": "origins:sneaking",
+          "inverted": true
+        }
+      ]
+    }
+  }
+}
diff --git a/src/main/resources/data/latoorigins/powers/rideable_slime_dummy.json b/src/main/resources/data/latoorigins/powers/rideable_slime_dummy.json
new file mode 100644
index 00000000..36e20ce5
--- /dev/null
+++ b/src/main/resources/data/latoorigins/powers/rideable_slime_dummy.json
@@ -0,0 +1,19 @@
+{
+  "type": "origins:conditioned_attribute",
+  "modifier": {
+    "attribute": "minecraft:generic.attack_damage",
+    "operation": "multiply_total",
+    "value": -1
+  },
+  "tick_rate": 1,
+  "condition": {
+    "type": "origins:passenger",
+    "bientity_condition": {
+      "type": "origins:actor_condition",
+      "condition": {
+        "type": "origins:power",
+        "power": "latoorigins:not_solid"
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/latoorigins/powers/rocky_eater.json b/src/main/resources/data/latoorigins/powers/rocky_eater.json
index be0b7caa..29d0269d 100644
--- a/src/main/resources/data/latoorigins/powers/rocky_eater.json
+++ b/src/main/resources/data/latoorigins/powers/rocky_eater.json
@@ -1,7 +1,8 @@
 {
   "type": "origins:active_self",
   "key": {
-    "key": "key.use"
+    "key": "key.use",
+    "continuous": true
   },
   "hud_render": {
     "should_render": false