From ec17cef3f08a23ac532d4381ce571938acfaf376 Mon Sep 17 00:00:00 2001 From: Ryan <78032176+BigGaemer@users.noreply.github.com> Date: Wed, 10 Apr 2024 18:33:57 +0200 Subject: [PATCH 1/2] unfuck kitsune --- src/main/resources/assets/terraoriginum/lang/en_us.json | 4 ++-- src/main/resources/data/terraoriginum/origins/spirit.json | 3 +-- src/main/resources/data/terraoriginum/tags/items/boots.json | 1 - .../resources/data/terraoriginum/tags/items/chestplate.json | 1 - src/main/resources/data/terraoriginum/tags/items/helmet.json | 1 - .../resources/data/terraoriginum/tags/items/leggings.json | 1 - 6 files changed, 3 insertions(+), 8 deletions(-) diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index e6f92a6..914845b 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -59,7 +59,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", @@ -75,7 +75,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", diff --git a/src/main/resources/data/terraoriginum/origins/spirit.json b/src/main/resources/data/terraoriginum/origins/spirit.json index cfbda43..e595bf9 100644 --- a/src/main/resources/data/terraoriginum/origins/spirit.json +++ b/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": "minecraft:air", "order": 1001, diff --git a/src/main/resources/data/terraoriginum/tags/items/boots.json b/src/main/resources/data/terraoriginum/tags/items/boots.json index 80a471b..5fa16c7 100644 --- a/src/main/resources/data/terraoriginum/tags/items/boots.json +++ b/src/main/resources/data/terraoriginum/tags/items/boots.json @@ -1,7 +1,6 @@ { "values": [ "minecraft:leather_boots", - "minecraft:netherite_boots", "minecraft:chainmail_boots" ] } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/tags/items/chestplate.json b/src/main/resources/data/terraoriginum/tags/items/chestplate.json index e9a52f3..5224a80 100644 --- a/src/main/resources/data/terraoriginum/tags/items/chestplate.json +++ b/src/main/resources/data/terraoriginum/tags/items/chestplate.json @@ -1,7 +1,6 @@ { "values": [ "minecraft:leather_chestplate", - "minecraft:netherite_chestplate", "minecraft:chainmail_chestplate" ] } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/tags/items/helmet.json b/src/main/resources/data/terraoriginum/tags/items/helmet.json index 1d21934..9a9effd 100644 --- a/src/main/resources/data/terraoriginum/tags/items/helmet.json +++ b/src/main/resources/data/terraoriginum/tags/items/helmet.json @@ -1,7 +1,6 @@ { "values": [ "minecraft:leather_helmet", - "minecraft:netherite_helmet", "minecraft:chainmail_helmet" ] } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/tags/items/leggings.json b/src/main/resources/data/terraoriginum/tags/items/leggings.json index 9477cd6..a2f51ba 100644 --- a/src/main/resources/data/terraoriginum/tags/items/leggings.json +++ b/src/main/resources/data/terraoriginum/tags/items/leggings.json @@ -1,7 +1,6 @@ { "values": [ "minecraft:leather_leggings", - "minecraft:netherite_leggings", "minecraft:chainmail_leggings" ] } \ No newline at end of file From f3af0c5d918cfc30b34858cb77ac11f9891b1bf8 Mon Sep 17 00:00:00 2001 From: CosmoOrSth <79050675+CosmoOrSth@users.noreply.github.com> Date: Sun, 14 Apr 2024 03:43:58 +0530 Subject: [PATCH 2/2] complete implementation of 'Muckunde' origin --- .../assets/terraoriginum/lang/en_us.json | 16 +++++- .../data/origins/origin_layers/origin.json | 1 + .../data/terraoriginum/origins/fairy.json | 1 + .../data/terraoriginum/origins/muckunde.json | 12 +++++ .../powers/fairy-powers/pollenation.json | 26 ++++++++++ .../powers/muckunde-powers/hydrophobic.json | 3 ++ .../powers/muckunde-powers/likesoil1.json | 9 ++++ .../powers/muckunde-powers/likesoil2.json | 51 +++++++++++++++++++ .../powers/muckunde-powers/toughskin.json | 8 +++ .../powers/muckunde-powers/yummybeets.json | 19 +++++++ 10 files changed, 145 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/data/terraoriginum/origins/muckunde.json create mode 100644 src/main/resources/data/terraoriginum/powers/fairy-powers/pollenation.json create mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json create mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil1.json create mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil2.json create mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/toughskin.json create mode 100644 src/main/resources/data/terraoriginum/powers/muckunde-powers/yummybeets.json diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 914845b..b9ccec7 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -92,6 +92,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", @@ -194,7 +196,19 @@ "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.", + //-----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", + "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." + "death.attack.terraoriginum:last_stand.player": "%1$s made their last stand trying to kill %2$s." } \ No newline at end of file diff --git a/src/main/resources/data/origins/origin_layers/origin.json b/src/main/resources/data/origins/origin_layers/origin.json index e9a93c5..6af652a 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -13,6 +13,7 @@ "terraoriginum:yulde", "terraoriginum:florian", "terraoriginum:fairy", + "terraoriginum:muckunde", { "condition": { "type": "origins:equipped_item", diff --git a/src/main/resources/data/terraoriginum/origins/fairy.json b/src/main/resources/data/terraoriginum/origins/fairy.json index 8c0c2d9..ad4e020 100644 --- a/src/main/resources/data/terraoriginum/origins/fairy.json +++ b/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" ], diff --git a/src/main/resources/data/terraoriginum/origins/muckunde.json b/src/main/resources/data/terraoriginum/origins/muckunde.json new file mode 100644 index 0000000..db3a55a --- /dev/null +++ b/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 +} diff --git a/src/main/resources/data/terraoriginum/powers/fairy-powers/pollenation.json b/src/main/resources/data/terraoriginum/powers/fairy-powers/pollenation.json new file mode 100644 index 0000000..4f9814e --- /dev/null +++ b/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 + } + } + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json new file mode 100644 index 0000000..db7a044 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/muckunde-powers/hydrophobic.json @@ -0,0 +1,3 @@ +{ + "type": "origins:ignore_water" +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil1.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil1.json new file mode 100644 index 0000000..1f72634 --- /dev/null +++ b/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 + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil2.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/likesoil2.json new file mode 100644 index 0000000..29704d0 --- /dev/null +++ b/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" + } +} diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/toughskin.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/toughskin.json new file mode 100644 index 0000000..cd22fe7 --- /dev/null +++ b/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" + } + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/muckunde-powers/yummybeets.json b/src/main/resources/data/terraoriginum/powers/muckunde-powers/yummybeets.json new file mode 100644 index 0000000..e6de023 --- /dev/null +++ b/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 + } +} \ No newline at end of file