From a39ba75c2fb5525f89871cb9493e13dc6226f6dd Mon Sep 17 00:00:00 2001
From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com>
Date: Mon, 5 May 2025 17:07:13 +0530
Subject: [PATCH] buncha things

-partial implementation of angel origin
-increase in difficulty of 'Sun Totem' recipe
---
 .../data/origins/origin_layers/origin.json    |  1 +
 .../data/terraoriginum/origins/angel.json     |  8 ++++
 .../powers/angel-powers/divine_grace.json     | 42 +++++++++++++++++++
 .../data/terraoriginum/recipes/sun_totem.json |  5 ++-
 .../tags/entity_types/nomercy.json            | 12 ++++++
 5 files changed, 67 insertions(+), 1 deletion(-)
 create mode 100644 src/main/resources/data/terraoriginum/origins/angel.json
 create mode 100644 src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json
 create mode 100644 src/main/resources/data/terraoriginum/tags/entity_types/nomercy.json

diff --git a/src/main/resources/data/origins/origin_layers/origin.json b/src/main/resources/data/origins/origin_layers/origin.json
index e62f9f4..0faa059 100644
--- a/src/main/resources/data/origins/origin_layers/origin.json
+++ b/src/main/resources/data/origins/origin_layers/origin.json
@@ -17,6 +17,7 @@
 		"terraoriginum:muckunde",
 		"terraoriginum:blight",
 		"terraoriginum:munch",
+		"terraoriginum:angel",
 		{
 			"condition": {
 				"type": "origins:equipped_item",
diff --git a/src/main/resources/data/terraoriginum/origins/angel.json b/src/main/resources/data/terraoriginum/origins/angel.json
new file mode 100644
index 0000000..52087b5
--- /dev/null
+++ b/src/main/resources/data/terraoriginum/origins/angel.json
@@ -0,0 +1,8 @@
+{
+  "powers": [
+    "terraoriginum:angel-powers/divine_grace"
+  ],
+  "icon": "minecraft:rotten_flesh",
+  "order": 1011,
+  "impact": 3
+}
diff --git a/src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json b/src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json
new file mode 100644
index 0000000..fc50261
--- /dev/null
+++ b/src/main/resources/data/terraoriginum/powers/angel-powers/divine_grace.json
@@ -0,0 +1,42 @@
+{
+  "type": "origins:multiple",
+  "divine_grace":
+  {
+    "type": "origins:resource",
+    "min": 0,
+    "max": 22,
+    "start_value": 11,
+    "hud_render": {
+      "should_render": true,
+      "bar_index": 4,
+      "sprite_location": "origins:textures/gui/resource_bar.png"
+    }
+  },
+  "instant_fall_from_grace":
+  {
+    "type": "origins:self_action_on_kill",
+    "target_condition": {
+      "type": "origins:or",
+      "conditions": [
+        {
+          "type": "origins:in_tag",
+          "tag": "terraoriginum:nomercy"
+        }
+      ]
+    },
+    "entity_action": {
+      "type": "origins:and",
+      "actions": [
+        {
+          "type": "origins:change_resource",
+          "resource": "*:*_divine_grace",
+          "change": -22
+        }
+      ]
+    },
+    "cooldown": 0,
+    "hud_render": {
+      "should_render": false
+    }
+  }
+}
\ No newline at end of file
diff --git a/src/main/resources/data/terraoriginum/recipes/sun_totem.json b/src/main/resources/data/terraoriginum/recipes/sun_totem.json
index 781bfc5..7134f7c 100644
--- a/src/main/resources/data/terraoriginum/recipes/sun_totem.json
+++ b/src/main/resources/data/terraoriginum/recipes/sun_totem.json
@@ -1,7 +1,7 @@
 {
     "type": "minecraft:crafting_shaped",
     "pattern": [
-      " / ",
+      " D ",
       "#P#",
       " / "
     ],
@@ -14,6 +14,9 @@
       },
       "P": {
         "item": "minecraft:totem_of_undying"
+      },
+      "D": {
+        "item": "minecraft:nether_star"
       }
     },
     "result": {
diff --git a/src/main/resources/data/terraoriginum/tags/entity_types/nomercy.json b/src/main/resources/data/terraoriginum/tags/entity_types/nomercy.json
new file mode 100644
index 0000000..8773748
--- /dev/null
+++ b/src/main/resources/data/terraoriginum/tags/entity_types/nomercy.json
@@ -0,0 +1,12 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:cat",
+    "minecraft:wolf",
+    "minecraft:parrot",
+    "minecraft:allay",
+    "minecraft:panda",
+    "minecraft:axolotl",
+    "minecraft:bee"
+  ]
+}
\ No newline at end of file