Merge pull request 'cosmo-main' (#1) from cosmo-main into main

Reviewed-on: #1

src/main/resources/data/origins/origin_layers/origin.json

@@ -17,6 +17,7 @@
 		"terraoriginum:muckunde",
 		"terraoriginum:blight",
 		"terraoriginum:munch",
+		"terraoriginum:angel",
 		"terraoriginum:sylt",
 		{
 			"condition": {

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
+}

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
+    }
+  }
+}

src/main/resources/data/terraoriginum/powers/angel-powers/lesser_heal_ray.json

@@ -0,0 +1,39 @@
+{
+  "type": "origins:active_self",
+  "entity_action": {
+    "type": "origins:and",
+    "actions": [
+      {
+        "type": "origins:delay",
+        "action": {
+          "type": "origins:raycast",
+          "distance": 20,
+          "block": false,
+          "entity": true,
+          "shape_type": "visual",
+          "fluid_handling": "any",
+          "miss_action": {
+            "type": "origins:nothing"
+          },
+          "command_at_hit": "/execute as @e[distance=..2] run effect give @s minecraft:regeneration 0 5",
+          "command_along_ray": "/particle electric_spark ~ ~ ~ 0 0 0 0 10",
+          "command_step": 0.3
+        },
+        "ticks": 0
+      },
+      {
+        "type": "origins:play_sound",
+        "sound": "block.beacon.activate",
+        "volume": 1,
+        "pitch": 1
+      }
+
+    ]
+  },
+  "cooldown": 100,
+  "hud_render": {
+    "sprite_location": "origins:textures/gui/community/huang/resource_bar_01.png",
+    "bar_index": "4"
+  },
+  "key": "secondary"
+}

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": {

src/main/resources/data/terraoriginum/tags/entity_types/innocent.json

@@ -0,0 +1,22 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:ocelot",
+    "minecraft:rabbit",
+    "minecraft:fox",
+    "minecraft:tropical_fish",
+    "minecraft:mule",
+    "minecraft:donkey",
+    "minecraft:horse",
+    "minecraft:turtle",
+    "minecraft:skeleton_horse",
+    "minecraft:squid",
+    "minecraft:strider",
+    "minecraft:wandering_trader",
+    "minecraft:zombie_horse",
+    "minecraft:cod",
+    "minecraft:frog",
+    "minecraft:glow_squid",
+    "minecraft:villager"
+  ]
+}

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"
+  ]
+}

src/main/resources/data/terraoriginum/tags/entity_types/unholy.json

@@ -0,0 +1,13 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:drowned",
+    "minecraft:husk",
+    "minecraft:zombie",
+    "minecraft:zombie_horse",
+    "minecraft:zombie_villager",
+    "minecraft:zombified_piglin",
+    "#minecraft:skeletons",
+    "minecraft:phantoms"
+  ]
+}