Merge branch 'cosmo-main' into gmr-main

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

@@ -3,8 +3,11 @@
   "item.terraoriginum.mync_eye": "you shouldnt have this",
   "item.terraoriginum.umbrella": "Umbrella",
 
-  "death.attack.lack_of_ectoplasm": "%1$s died to the light.",
+  "death.attack.lack_of_ectoplasm": "%1$s faded away",
-  "death.attack.lack_of_ectoplasm.player": "%1$s died to the light whilst trying to escape %2$s.",
+  "death.attack.lack_of_ectoplasm.player": "%1$s faded away whilst trying to escape %2$s",
+
+  "death.attack.boiling": "%1$s boiled up",
+  "death.attack.boiling.player": "%1$s boiled up whilst trying to fight off %2$s",
 
   //-----Immortal Human-----//
   "origin.terraoriginum.immortal_human.name": "Immortal Human",
@@ -72,6 +75,15 @@
   "power.terraoriginum.spirit-powers/skin.name": "Translucent skin",
   "power.terraoriginum.spirit-powers/skin.description": "Your skin is slightly translucent, allowing others to see through you.",
 
+  //-----Serpenta-----//
+  "origin.terraoriginum.serpenta.name": "Serpenta",
+  "origin.terraoriginum.serpenta.description": "A hybrid between merfolk and sea serpents... don't ask",
+  "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",
+  "power.terraoriginum.serpenta-powers/scales.description": "A serpenta has thick scales, giving it some natural armour",
+
+
   //-----Lato-----//
   "origin.terraoriginum.lato.name": "Lato",
   "origin.terraoriginum.lato.description": "A creature from a faraway world, one with very little sun, one with a very high gravitational pull.",
@@ -118,4 +130,7 @@
 
   "death.attack.burn_in_sun": "%1$s sizzled up in the sun.",
   "death.attack.burn_in_sun.player": "%1$s sizzled up in the sun whilst trying to escape %2$s."
+
+
+
 }

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

@@ -8,6 +8,8 @@
 		"terraoriginum:shade",
 		"terraoriginum:merfolk",
 		"terraoriginum:lato",
+		"terraoriginum:serpenta",
+
 		{
 			"condition": {
 				"type": "origins:equipped_item",

src/main/resources/data/terraoriginum/damage_type/boiling.json

@@ -0,0 +1,5 @@
+{
+	"exhaustion": 0.1,
+ 	"message_id": "boiling",
+	"scaling": "never"
+}

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

@@ -0,0 +1,21 @@
+{
+	"powers": [
+
+        "terraoriginum:serpenta-powers/boilingshot",
+		"terraoriginum:serpenta-powers/scales",
+		"terraoriginum:merfolk-powers/hydration",
+		"terraoriginum:merfolk-powers/hydrodiff",
+		"terraoriginum:merfolk-powers/lackofhydrodamage",
+		"terraoriginum:merfolk-powers/waterbreathing",
+		"terraoriginum:merfolk-powers/webbedfeet",
+		"terraoriginum:merfolk-powers/webbedfeet2",
+		"terraoriginum:merfolk-powers/wethands",
+		"origins:swim_speed",
+		"origins:like_water",
+		"origins:aqua_affinity",
+		"origins:water_vision"
+	],
+	"icon": "minecraft:ender_eye",
+	"order": 1005,
+	"impact": 3
+}

src/main/resources/data/terraoriginum/powers/serpenta-powers/boilingshot.json

@@ -0,0 +1,45 @@
+{
+    "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 damage @s 10 terraoriginum:boiling",
+                    "command_along_ray": "/particle splash ~ ~ ~ 0 0 0 0 10",
+                    "command_step": 0.3
+                },
+                "ticks": 0
+            },
+            {
+                "type": "origins:play_sound",
+                "sound": "entity.dolphin.splash",
+                "volume": 1,
+                "pitch": 1
+            },
+            {
+                "type": "origins:change_resource",
+                "resource": "terraoriginum:merfolk-powers/hydration",
+                "change": -50,
+                "operation": "add"
+              }
+
+        ]
+    },
+    "cooldown": 600,
+    "hud_render": {
+      "sprite_location": "origins:textures/gui/community/spiderkolo/resource_bar_02.png",
+      "bar_index": "15"
+    },
+    "key": "secondary"
+}

src/main/resources/data/terraoriginum/powers/serpenta-powers/scales.json

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