Merge branch 'cosmo-main' into gmr-main

src/main/resources/assets/terraoriginum/lang/en_us.json

@@ -63,7 +63,7 @@
 
   //-----Spirit-----//
   "origin.terraoriginum.spirit.name": "Spirit",
-  "origin.terraoriginum.spirit.description": "A ghostly creature which has not been build for any specific purpoes (Gotta figure this one out)",
+  "origin.terraoriginum.spirit.description": "A ghostly creature which has not been buile for any specific purpose.",
   "power.terraoriginum.spirit-powers/ectoplasm.name": "Ectoplasm",
   "power.terraoriginum.spirit-powers/ectoplasm.description": "Ectoplasm is the life essence of any ghostly creature, without it, they will slowly start to die.",
   "power.terraoriginum.spirit-powers/nightvis.name": "Night Vision",
@@ -79,7 +79,7 @@
 
   //-----Serpenta-----//
   "origin.terraoriginum.serpenta.name": "Serpenta",
-  "origin.terraoriginum.serpenta.description": "A hybrid between merfolk and sea serpents... don't ask",
+  "origin.terraoriginum.serpenta.description": "A hybrid between merfolk and sea serpents... don't ask how they managed that.",
   "power.terraoriginum.serpenta-powers/boilingshot.name": "Boiling Shot",
   "power.terraoriginum.serpenta-powers/boilingshot.description": "shoot a jet of boiling water, this dehydrates you and has a cooldown of 30 seconds",
   "power.terraoriginum.serpenta-powers/scales.name": "Scales",
@@ -96,6 +96,8 @@
   "power.terraoriginum.fairy-powers/yummyhoney.description": "honey is extremely good for you, providing a lot of food and topping up your saturation",
   "power.terraoriginum.fairy-powers/nimble.name": "Nimble",
   "power.terraoriginum.fairy-powers/nimble.description": "You must remain lightweight to fly, this means you cannot wear armour stronger than chainmail.",
+  "power.terraoriginum.fairy-powers/pollenation.name": "Pollenation",
+  "power.terraoriginum.fairy-powers/pollenation.description": "you pollenate plants in a 4 block radius to yourself, making them grow faster.",
 
   //-----Lato-----//
   "origin.terraoriginum.lato.name": "Lato",
@@ -201,6 +203,22 @@
   "power.terraoriginum.florian-powers/weak.name": "Weak",
   "power.terraoriginum.florian-powers/weak.description": "Because you are a creature of nature, you cannot do much damage.",
 
+
+  "death.attack.terraoriginum:last_stand": "%1$s made their last stand.",
+  "death.attack.terraoriginum:last_stand.player": "%1$s made their last stand before dying to %2$s.",
+
+  //-----Muckunde-----//
+  "origin.terraoriginum.muckunde.name": "Muckunde",
+  "origin.terraoriginum.muckunde.description": "A dirt creature often found borrowing underground.",
+  "power.terraoriginum.muckunde-powers/toughskin.name": "Tough Skin",
+  "power.terraoriginum.muckunde-powers/toughskin.description": "A muckunde has hard skin, giving it some natural armour",
+  "power.terraoriginum.muckunde-powers/likesoil1.name": "Like Soil",
+  "power.terraoriginum.muckunde-powers/likesoil1.description": "This origin has the ability to phase through any dirt-like blocks.",
+  "power.terraoriginum.muckunde-powers/yummybeets.name": "Yummy Beets",
+  "power.terraoriginum.muckunde-powers/yummybeets.description": "Your body makes good use of the nutritional composition of beetroot",
+  "power.terraoriginum.muckunde-powers/hydrophobic.name": "Hydrophobic",
+  "power.terraoriginum.muckunde-powers/hydrophobic.description": "your body completely ignores water",
+
   //-----empyrian-----//
   "origin.terraoriginum.empyrian.name": "Empyrian",
   "origin.terraoriginum.empyrian.description": "Weightless floating creatures, adept at flight and forming pressurized air using their strange abilities.",
@@ -216,4 +234,5 @@
   "power.terraoriginum.empyrian-powers/shoot.description": "Lob a ball of compressed air, knocking back targets but dealing no damage."
   // the tooltips have no lang def or i cant figure out how to set it (most likely the former)
 
+
 }

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

@@ -13,6 +13,7 @@
 		"terraoriginum:yulde",
 		"terraoriginum:florian",
 		"terraoriginum:fairy",
+		"terraoriginum:muckunde",
 		"terraoriginum:empyrian",
 		{
 			"condition": {

src/main/resources/data/terraoriginum/origins/fairy.json

@@ -7,6 +7,7 @@
 		"terraoriginum:fairy-powers/fragile",
 		"terraoriginum:fairy-powers/yummyhoney",
 		"terraoriginum:fairy-powers/nimble",
+		"terraoriginum:fairy-powers/pollenation",
 		"origins:elytra",
 		"origins:launch_into_air"
 	],

src/main/resources/data/terraoriginum/origins/muckunde.json

@@ -0,0 +1,12 @@
+{
+	"powers": [
+        "terraoriginum:muckunde-powers/toughskin",
+        "terraoriginum:muckunde-powers/likesoil1",
+        "terraoriginum:muckunde-powers/likesoil2",
+        "terraoriginum:muckunde-powers/yummybeets",
+        "terraoriginum:muckunde-powers/hydrophobic"
+	],
+	"icon": "minecraft:dirt",
+	"order": 1008,
+	"impact": 3
+}

src/main/resources/data/terraoriginum/origins/spirit.json

@@ -8,8 +8,7 @@
 		"terraoriginum:spirit-powers/phasing2",
 		"terraoriginum:spirit-powers/phasing3",
 		"terraoriginum:spirit-powers/undead",
-		"terraoriginum:spirit-powers/nightvis",
-		"terraoriginum:ectotest"
+		"terraoriginum:spirit-powers/nightvis"
 	],
 	"icon": "terraoriginum:spirit",
 	"order": 1001,

src/main/resources/data/terraoriginum/powers/fairy-powers/pollenation.json

@@ -0,0 +1,26 @@
+{
+    "type": "origins:action_over_time",
+    "interval": 1,
+    "entity_action": {
+        "type": "origins:block_action_at",
+        "block_action": {
+            "type": "origins:area_of_effect",
+            "radius": 4,
+            "shape": "cube",
+            "block_condition": {
+                "type": "origins:block_state",
+                "property": "age"
+            },
+            "block_action": {
+                "type": "origins:chance",
+                "chance": 0.005,
+                "action": {
+                    "type": "origins:modify_block_state",
+                    "property": "age",
+                    "operation": "add",
+                    "change": 1
+                }
+            }
+        }
+    }
+}

src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json

@@ -0,0 +1,3 @@
+{
+    "type": "origins:ignore_water"
+}

src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil1.json

@@ -0,0 +1,9 @@
+{
+    "type": "origins:toggle",
+    "active_by_default": false,
+    "key": {
+      "key": "key.origins.primary_active",
+      "continuous": false
+    },
+    "retain_state": false
+  }

src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil2.json

@@ -0,0 +1,51 @@
+{
+    "type": "origins:phasing",
+    "render_type": "blindness",
+    "view_distance": 10,
+    "hidden": true,
+    "block_condition": {
+        "type": "origins:or",
+        "conditions": [
+            {
+                "type": "origins:block",
+                "block": "minecraft:dirt"
+            },
+            {
+                "type": "origins:block",
+                "block": "minecraft:grass_block"
+            },
+            {
+                "type": "origins:block",
+                "block": "minecraft:podzol"
+            },
+            {
+                "type": "origins:block",
+                "block": "minecraft:mycelium"
+            },
+            {
+                "type": "origins:block",
+                "block": "minecraft:coarse_dirt"
+            },
+            {
+                "type": "origins:block",
+                "block": "minecraft:mud"
+            }
+            
+        ]
+    },
+    "phase_down_condition": {
+        "type": "origins:and",
+        "conditions": [
+            {
+                "type": "origins:sneaking"
+            },
+            {
+                "type": "origins:on_block"
+            }
+        ]
+    },
+    "condition": {
+        "type": "origins:power_active",
+        "power": "terraoriginum:muckunde-powers/likesoil1"
+      }
+}

src/main/resources/data/terraoriginum/powers/muckunde-powers/toughskin.json

@@ -0,0 +1,8 @@
+{
+    "type": "origins:attribute",
+    "modifier": {
+      "attribute": "minecraft:generic.armor",
+      "value": 4.0,
+      "operation": "addition"
+    }
+  }

src/main/resources/data/terraoriginum/powers/muckunde-powers/yummybeets.json

@@ -0,0 +1,19 @@
+{
+    "type": "origins:modify_food",
+    "item_condition": {
+        "type": "origins:ingredient",
+        "ingredient": {
+            "item": "minecraft:beetroot"
+        }
+    },
+    "food_modifier": {
+        "name": "Increased food points",
+        "operation": "addition",
+        "value": 3.0
+    },
+    "saturation_modifier": {
+        "name": "Increased saturation points",
+        "operation": "addition",
+        "value": 8
+    }
+}

src/main/resources/data/terraoriginum/tags/items/boots.json

@@ -1,7 +1,6 @@
 {
     "values": [
         "minecraft:leather_boots",
-        "minecraft:netherite_boots",
         "minecraft:chainmail_boots"
     ]
 }

src/main/resources/data/terraoriginum/tags/items/chestplate.json

@@ -1,7 +1,6 @@
 {
     "values": [
         "minecraft:leather_chestplate",
-        "minecraft:netherite_chestplate",
         "minecraft:chainmail_chestplate"
     ]
 }

src/main/resources/data/terraoriginum/tags/items/helmet.json

@@ -1,7 +1,6 @@
 {
     "values": [
         "minecraft:leather_helmet",
-        "minecraft:netherite_helmet",
         "minecraft:chainmail_helmet"
     ]
 }

src/main/resources/data/terraoriginum/tags/items/leggings.json

@@ -1,7 +1,6 @@
 {
     "values": [
         "minecraft:leather_leggings",
-        "minecraft:netherite_leggings",
         "minecraft:chainmail_leggings"
     ]
 }