From 911ce74a43f909965b38cf6fe03248bd9de632d8 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Tue, 20 Feb 2024 17:29:06 +0200 Subject: [PATCH 1/2] edit spirit lang and fuck you apace --- build.gradle | 1 + gradle.properties | 7 ++++--- .../assets/terraoriginum/lang/en_us.json | 18 +++++++++++++++++- .../powers/spirit-powers/lackofectodmg.json | 3 ++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 57f3c98..9b58adc 100644 --- a/build.gradle +++ b/build.gradle @@ -41,6 +41,7 @@ dependencies { modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}" modImplementation "com.terraformersmc:modmenu:${project.modmenu_version}" modImplementation "com.github.apace100:origins-fabric:${project.origins_version}" + modImplementation "com.github.apace100:apoli:${project.apoli_version}" modApi("com.github.Virtuoel:Pehkui:${pehkui_version}", { exclude group: "net.fabricmc.fabric-api" }) diff --git a/gradle.properties b/gradle.properties index 65b5230..cdf21c8 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,7 +4,7 @@ org.gradle.jvmargs=-Xmx2G # Fabric Properties minecraft_version=1.20.1 yarn_mappings=1.20.1+build.10 -loader_version=0.14.24 +loader_version=0.15.6 # Mod Properties mod_version=1.20.1-0.0.1-PR @@ -12,7 +12,8 @@ maven_group=dev.arcmods archives_base_name=TerraOriginum # Dependencies -fabric_version=0.90.7+1.20.1 +fabric_version=0.91.0+1.20.1 modmenu_version=7.2.2 pehkui_version=3.7.8 -origins_version=0dfec42 +origins_version=v1.10.0 +apoli_version=2.9.0 diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index a7529a0..5088d05 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -19,5 +19,21 @@ "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/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" + "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", + + //-----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." } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/spirit-powers/lackofectodmg.json b/src/main/resources/data/terraoriginum/powers/spirit-powers/lackofectodmg.json index 8b8945b..f259fa6 100644 --- a/src/main/resources/data/terraoriginum/powers/spirit-powers/lackofectodmg.json +++ b/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", From 6137a4828e4c647d28f0aa2a5c1c5efd6a63d4c7 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Tue, 20 Feb 2024 17:43:07 +0200 Subject: [PATCH 2/2] added death message --- src/main/resources/assets/terraoriginum/lang/en_us.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 5088d05..a4e0c56 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/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.",