Merge branch 'gmr-main' into cosmo-main

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

@@ -3,6 +3,9 @@
   "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.player": "%1$s died to the light whilst trying to escape %2$s.",
+
   //-----Immortal Human-----//
   "origin.terraoriginum.immortal_human.name": "Immortal Human",
   "origin.terraoriginum.immortal_human.description": "You hate life, but out of spite, the gods cursed you with being immortal. How unfortunate.",
@@ -18,8 +21,11 @@
   "power.terraoriginum.demon-powers/self_transfiguration1.description": "A demon has the innate ability to transfigure it's own body to temporarily increase it's physical capabilities, but beware whilst using it, because it rapidly drains ectoplasm",
   "power.terraoriginum.demon-powers/stained.name": "Stained",
   "power.terraoriginum.demon-powers/stained.description": "A demon is stained in the blood of it's victims",
+
   "power.terraoriginum.demon-powers/extra_health.name": "Extra Health",
   "power.terraoriginum.demon-powers/extra_health.description": "A demon's body is exceptionally well built, allowing it to take a bit more punishment than usual before perishing",
+  "power.terraoriginum.demon-powers/rigid.name": "",
+  "power.terraoriginum.demon-powers/regid.description": "A demon's body is exceptionally well built, allowing it to take a bit more punishment than usual before perishing",
 
   //-----Wraith-----//
   "origin.terraoriginum.wraith.name": "Wraith",
@@ -47,5 +53,22 @@
   "power.terraoriginum.merfolk-powers/webbedfeet.name": "Webbed Feet",
   "power.terraoriginum.merfolk-powers/webbedfeet.description": "A merfolk has webbed feet to help it swim under water. however, this makes it walk slower on land and also makes it not be able to jump as high as more land creatures.",
   "power.terraoriginum.merfolk-powers/wethands.name": "Wet Hands",
-  "power.terraoriginum.merfolk-powers/wethands.description": "A merfolk's hands are made for use underwater, making it harder to break blocks on dry land. Also a great song"
+  "power.terraoriginum.merfolk-powers/wethands.description": "A merfolk's hands are made for use underwater, making it harder to break blocks on dry land. Also a great song",
+
+
+  //-----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)",
+  "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",
+  "power.terraoriginum.spirit-powers/nightvis.description": "A ghost likes the darkness, so they're able to see in the dark.",
+  "power.terraoriginum.spirit-powers/phasing1.name": "Phasing",
+  "power.terraoriginum.spirit-powers/phasing1.description": "Ghosts have the ability to phase through blocks, this is because they are incorporeal. toggleable",
+  "power.terraoriginum.spirit-powers/undead.name": "Undead",
+  "power.terraoriginum.spirit-powers/undead.description": "Spirits are undead, meaning that health and poison potion effects are swapped and you cannot drown.",
+  "power.terraoriginum.spirit-powers/ectodiff.name": "Luminophobia",
+  "power.terraoriginum.spirit-powers/ectodiff.description": "Light gradually decreases the amount of ectoplasm that you have, which causes you to take damage or die if it becomes too low.",
+  "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."
 }

src/main/resources/data/terraoriginum/powers/spirit-powers/lackofectodmg.json

@@ -1,5 +1,6 @@
 {
     "type": "origins:action_over_time",
+    "hidden": true,
     "interval": 20,
     "entity_action": {
         "type": "origins:if_else_list",
@@ -9,7 +10,7 @@
                     "type": "origins:resource",
                     "resource": "terraoriginum:spirit-powers/ectoplasm",
                     "comparison": "<",
-                    "compare_to": 26
+                    "compare_to": 13
                 },
                 "action": {
                     "type": "origins:damage",