diff --git a/CHANGELOG b/CHANGELOG index 252d448..5217602 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1 +1,2 @@ -# Changes \ No newline at end of file +# Changes +- Functional implementation of the 'Blight' origin. \ No newline at end of file diff --git a/src/main/resources/assets/terraoriginum/lang/en_us.json b/src/main/resources/assets/terraoriginum/lang/en_us.json index 2ac449b..e456cb2 100644 --- a/src/main/resources/assets/terraoriginum/lang/en_us.json +++ b/src/main/resources/assets/terraoriginum/lang/en_us.json @@ -245,6 +245,22 @@ "power.terraoriginum.monarchpowers/hydropetrification.name": "Hydropetrification", "power.terraoriginum.monarchpowers/hydropetrification.description": "Your body's cells contain a high concentration of neutrinos to facilitate nuclear processes whithin itself, this causes your entire body to heavily slow down underwater", "power.terraoriginum.monarchpowers/totem_fueled.name": "Totem Fueled", - "power.terraoriginum.monarchpowers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun" + "power.terraoriginum.monarchpowers/totem_fueled.description": "Craft a Sun Totem and hold it to get small amounts of sun energy even outside the sun", + + //-----Blight-----// + "origin.terraoriginum.blight.name": "Blight", + "origin.terraoriginum.blight.description": "Blights are foul and disgusting creatures. Created in the depths of the nether, they exist for the purpose of bring rot and wither to all forms of nature.", + "power.terraoriginum.blight-powers/bane_of_agriculture.name": "Bane of Agriculture", + "power.terraoriginum.blight-powers/bane_of_agriculture.description": "Through a process not very well understood, blights can rapidly reverse the growth of all crops in about a 6 block radius around themselves", + "power.terraoriginum.blight-powers/blighted_feet.name": "Blighted Feet", + "power.terraoriginum.blight-powers/blighted_feet.description": "The Blight's cursed feet destroy life within the soil they touch, turning it to course dirt.", + "power.terraoriginum.blight-powers/nether_spawn.name": "Nether Spawn", + "power.terraoriginum.blight-powers/nether_spawn.description": "Blights created in the nether, hence you will start there when you spawn. Curiously, they are not immune to fire like most other nether inhabitants", + "power.terraoriginum.blight-powers/foul_flesh.name": "Foul Flesh", + "power.terraoriginum.blight-powers/foul_flesh.description": "The Blight's flesh is foul and rotten, and as such no poison can effect it.", + "power.terraoriginum.blight-powers/florivory.name": "Florvory", + "power.terraoriginum.blight-powers/florivory.description": "The Blight cannot naturally regenerate, and needs to devour flowers to reconstitute it's body if damaged.", + "power.terraoriginum.blight-powers/dead_cells.name": "Dead Cells", + "power.terraoriginum.blight-powers/dead_cells.description": "A large portion of a Blight's body is comprised of dead cells, hitting them does not damage it's vital functions, essentially acting as a small amount of armour for the blight." } \ 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 2881d3a..7576f66 100644 --- a/src/main/resources/data/origins/origin_layers/origin.json +++ b/src/main/resources/data/origins/origin_layers/origin.json @@ -16,6 +16,7 @@ "terraoriginum:muckunde", "terraoriginum:mync", "terraoriginum:monarch", + "terraoriginum:blight", { "condition": { "type": "origins:equipped_item", diff --git a/src/main/resources/data/terraoriginum/origins/blight.json b/src/main/resources/data/terraoriginum/origins/blight.json new file mode 100644 index 0000000..6a4681e --- /dev/null +++ b/src/main/resources/data/terraoriginum/origins/blight.json @@ -0,0 +1,15 @@ +{ + "powers": [ + "terraoriginum:blight-powers/nether_spawn", + "terraoriginum:blight-powers/bane_of_agriculture", + "terraoriginum:blight-powers/florivory", + "terraoriginum:blight-powers/blighted_feet", + "terraoriginum:blight-powers/foul_flesh", + "terraoriginum:blight-powers/dead_cells", + "terraoriginum:blight-powers/foul_skin", + "terraoriginum:blight-powers/noregen" + ], + "icon": "minecraft:rotten_flesh", + "order": 1010, + "impact": 3 +} diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/bane_of_agriculture.json b/src/main/resources/data/terraoriginum/powers/blight-powers/bane_of_agriculture.json new file mode 100644 index 0000000..bec8b95 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/bane_of_agriculture.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": 6, + "shape": "cube", + "block_condition": { + "type": "origins:block_state", + "property": "age" + }, + "block_action": { + "type": "origins:chance", + "chance": 1, + "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/blight-powers/blighted_feet.json b/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json new file mode 100644 index 0000000..70f15f1 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/blighted_feet.json @@ -0,0 +1,36 @@ +{ + "type": "origins:action_over_time", + "interval": 1, + "condition": { + "type": "origins:on_block", + "block_condition": { + "type": "origins:or", + "conditions": [ + { + "type": "origins:block", + "block": "minecraft:grass_block" + }, + { + "type": "origins:block", + "block": "minecraft:moss_block" + }, + { + "type": "origins:block", + "block": "minecraft:dirt" + }, + { + "type": "origins:block", + "block": "minecraft:dirt_path" + }, + { + "type": "origins:block", + "block": "minecraft:mycelium" + } + ] + } + }, + "entity_action": { + "type": "origins:execute_command", + "command": "setblock ~ ~-1 ~ minecraft:coarse_dirt" + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/dead_cells.json b/src/main/resources/data/terraoriginum/powers/blight-powers/dead_cells.json new file mode 100644 index 0000000..def61ac --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/dead_cells.json @@ -0,0 +1,8 @@ +{ + "type": "origins:attribute", + "modifier": { + "attribute": "minecraft:generic.armor", + "value": 5.0, + "operation": "addition" + } + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/florivory.json b/src/main/resources/data/terraoriginum/powers/blight-powers/florivory.json new file mode 100644 index 0000000..61c4b0b --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/florivory.json @@ -0,0 +1,277 @@ +{ + "type": "origins:multiple", + "hidden": true, + "res": { + "type": "origins:resource", + "min": 0, + "max": 30, + "start_value": 0, + "hud_render": { + "should_render": false + }, + "max_action": { + "type": "origins:and", + "actions": [{ + "type": "origins:feed", + "food": 4, + "saturation": 0.8 + }, + { + "type": "origins:execute_command", + "command": "playsound minecraft:entity.player.burp player @a ~ ~ ~" + }, + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:regeneration", + "amplifier": 0, + "duration": 100 + } + }, + { + "type": "origins:if_else_list", + "actions": [{ + "condition": { + "type": "origins:equipped_item", + "equipment_slot": "mainhand", + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:flowers" + } + } + }, + "action": { + "type": "origins:equipped_item_action", + "equipment_slot": "mainhand", + "action": { + "type": "origins:consume", + "amount": 1 + } + } + }, + { + "condition": { + "type": "origins:equipped_item", + "equipment_slot": "offhand", + "item_condition": { + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:flowers" + } + } + }, + "action": { + "type": "origins:equipped_item_action", + "equipment_slot": "offhand", + "action": { + "type": "origins:consume", + "amount": 1 + } + } + } + ] + }, + { + "type": "origins:change_resource", + "resource": "*:*_res", + "change": 0, + "operation": "set" + } + ] + } + }, + "0": { + "condition": { + "type": "origins:or", + "conditions": [{ + "type": "origins:equipped_item", + "equipment_slot": "mainhand", + "item_condition": { + "type": "origins:and", + "conditions": [{ + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:flowers" + } + }] + } + }, + { + "type": "origins:equipped_item", + "equipment_slot": "offhand", + "item_condition": { + "type": "origins:and", + "conditions": [{ + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:flowers" + } + }] + } + } + ] + }, + "type": "origins:active_self", + "entity_action": { + "type": "origins:and", + "actions": [{ + "type": "origins:change_resource", + "resource": "*:*_res", + "change": 0, + "operation": "set" + }] + }, + "cooldown": 1, + "hud_render": { + "should_render": false + }, + "key": { + "key": "key.use" + } + }, + "grow": { + "condition": { + "type": "origins:or", + "conditions": [{ + "type": "origins:equipped_item", + "equipment_slot": "mainhand", + "item_condition": { + "type": "origins:and", + "conditions": [{ + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:flowers" + } + }] + } + }, + { + "type": "origins:equipped_item", + "equipment_slot": "offhand", + "item_condition": { + "type": "origins:and", + "conditions": [{ + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:flowers" + } + }] + } + } + ] + }, + "type": "origins:active_self", + "entity_action": { + "type": "origins:and", + "actions": [{ + "type": "origins:change_resource", + "resource": "*:*_res", + "change": 1 + }] + }, + "cooldown": 1, + "hud_render": { + "should_render": false + }, + "key": { + "key": "key.use", + "continuous": true + } + }, + "particle": { + "condition": { + "type": "origins:and", + "conditions": [{ + "type": "origins:or", + "conditions": [{ + "type": "origins:equipped_item", + "equipment_slot": "mainhand", + "item_condition": { + "type": "origins:and", + "conditions": [{ + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:flowers" + } + }] + } + }, + { + "type": "origins:equipped_item", + "equipment_slot": "offhand", + "item_condition": { + "type": "origins:and", + "conditions": [{ + "type": "origins:ingredient", + "ingredient": { + "tag": "minecraft:flowers" + } + }] + } + } + ] + }, + { + "type": "origins:food_level", + "comparison": "<", + "compare_to": 20 + } + ] + }, + "type": "origins:active_self", + "entity_action": { + "type": "origins:and", + "actions": [{ + "type": "origins:execute_command", + "command": "execute positioned ~ ~0.2 ~0.1 rotated as @s run particle minecraft:large_smoke ^ ^ ^0.1 0.1 0.1 0.1 0.055 4" + }, + { + "type": "origins:execute_command", + "command": "playsound minecraft:entity.generic.eat player @s ~ ~ ~" + }, + { + "type": "origins:apply_effect", + "effect": { + "effect": "minecraft:slowness", + "duration": 5, + "show_particles": false, + "amplifier": 1, + "show_icon": false + } + } + ] + }, + "cooldown": 4, + "hud_render": { + "should_render": false + }, + "key": { + "key": "key.use", + "continuous": true + } + }, + "restrict": { + "condition": { + "type": "origins:and", + "conditions": [{ + "type": "origins:food_level", + "comparison": "==", + "compare_to": 20 + }, + { + "inverted": true, + "type": "origins:gamemode", + "gamemode": "creative" + } + ] + }, + "type": "origins:action_over_time", + "interval": 2, + "entity_action": { + "type": "origins:set_resource", + "resource": "*:*_res", + "value": 0 + } + } +} \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/foul_flesh.json b/src/main/resources/data/terraoriginum/powers/blight-powers/foul_flesh.json new file mode 100644 index 0000000..a33325a --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/foul_flesh.json @@ -0,0 +1,10 @@ +{ + "type": "origins:effect_immunity", + "effects": [ + "minecraft:wither", + "minecraft:poison", + "minecraft:instant_damage", + "minecraft:hunger" + ] + } + \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/foul_skin.json b/src/main/resources/data/terraoriginum/powers/blight-powers/foul_skin.json new file mode 100644 index 0000000..7434012 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/foul_skin.json @@ -0,0 +1,6 @@ +{ + "type": "origins:model_color", + "red": 0.9, + "green": 0.6, + "blue": 0.55 +} diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/nether_spawn.json b/src/main/resources/data/terraoriginum/powers/blight-powers/nether_spawn.json new file mode 100644 index 0000000..9569f2c --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/nether_spawn.json @@ -0,0 +1,5 @@ +{ + "type": "origins:modify_player_spawn", + "dimension": "minecraft:the_nether", + "spawn_strategy": "center" + } \ No newline at end of file diff --git a/src/main/resources/data/terraoriginum/powers/blight-powers/noregen.json b/src/main/resources/data/terraoriginum/powers/blight-powers/noregen.json new file mode 100644 index 0000000..49983b8 --- /dev/null +++ b/src/main/resources/data/terraoriginum/powers/blight-powers/noregen.json @@ -0,0 +1,4 @@ +{ + "type": "origins:disable_regen", + "hidden": true +} \ No newline at end of file