diff --git a/gm4/modeldata_registry.json b/gm4/modeldata_registry.json index 430a974d53..403c3d667b 100644 --- a/gm4/modeldata_registry.json +++ b/gm4/modeldata_registry.json @@ -122,7 +122,8 @@ "gm4_orb_of_ankou:pneuma/shrieking": 235, "gm4_orb_of_ankou:pneuma/dashing": 236, "gm4_orb_of_ankou:pneuma/sniffing": 237, - "gm4_orb_of_ankou:pneuma/tranquilizing": 238 + "gm4_orb_of_ankou:pneuma/tranquilizing": 238, + "gm4_orb_of_ankou:pneuma/debilitate": 239 }, "blaze_powder": { "gm4_mysterious_midnights:guidebook_icon/nightmare_nights": 1 @@ -644,7 +645,8 @@ "gm4_orb_of_ankou:pneuma/shrieking": 235, "gm4_orb_of_ankou:pneuma/dashing": 236, "gm4_orb_of_ankou:pneuma/sniffing": 237, - "gm4_orb_of_ankou:pneuma/tranquilizing": 238 + "gm4_orb_of_ankou:pneuma/tranquilizing": 238, + "gm4_orb_of_ankou:pneuma/debilitate": 239 }, "flint_and_steel": { "gm4_orb_of_ankou:gui/advancement/orb_of_ankou_soul_forge": 1, diff --git a/gm4_orb_of_ankou/assets/model_data.yaml b/gm4_orb_of_ankou/assets/model_data.yaml index f8468aef89..10d6c19795 100644 --- a/gm4_orb_of_ankou/assets/model_data.yaml +++ b/gm4_orb_of_ankou/assets/model_data.yaml @@ -44,6 +44,7 @@ model_data: - reference: pneuma/feigning - reference: pneuma/shrieking - reference: pneuma/tranquilizing + - reference: pneuma/debilitate - item: swords reference: shamir/corripio template: diff --git a/gm4_orb_of_ankou/assets/translations.csv b/gm4_orb_of_ankou/assets/translations.csv index 38403f1325..c7fe480321 100644 --- a/gm4_orb_of_ankou/assets/translations.csv +++ b/gm4_orb_of_ankou/assets/translations.csv @@ -59,6 +59,7 @@ text.gm4.pneuma_soaring,Soaring text.gm4.pneuma_striding,Striding text.gm4.pneuma_synergetic,Synergetic text.gm4.pneuma_tranquilizing,Tranquilizing +text.gm4.pneuma_debilitate,Debilitate text.gm4.pneuma_vanishing,Vanishing text.gm4.pneuma_venomous,Venomous text.gm4.pneuma_volatile,Volatile @@ -93,6 +94,7 @@ text.gm4.guidebook.orb_of_ankou.note.depriving,Applies Hunger to attacked target text.gm4.guidebook.orb_of_ankou.note.freezing,Applies Slowness to arrows shot from bows text.gm4.guidebook.orb_of_ankou.note.hawkeye,Doubles the damage of arrows shot from bows; Arrows shot from bows will have Piercing I text.gm4.guidebook.orb_of_ankou.note.tranquilizing,Applies Poison to arrows shot from bows +text.gm4.guidebook.orb_of_ankou.note.debilitate,Applies Weakness to arrows shot from bows text.gm4.guidebook.orb_of_ankou.note.venomous,Applies Poison to attacked target text.gm4.guidebook.orb_of_ankou.note.withering,Applies Wither to attacked target text.gm4.guidebook.orb_of_ankou.passive_pneumas,"The following pneumas are passive, activating automatically:" diff --git a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/camel_husk.json b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/camel_husk.json new file mode 100644 index 0000000000..ae831cc903 --- /dev/null +++ b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/camel_husk.json @@ -0,0 +1,7 @@ +{ + "criteria": { + "requirement": { + "trigger": "minecraft:impossible" + } + } +} diff --git a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/nautilus.json b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/nautilus.json new file mode 100644 index 0000000000..ae831cc903 --- /dev/null +++ b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/nautilus.json @@ -0,0 +1,7 @@ +{ + "criteria": { + "requirement": { + "trigger": "minecraft:impossible" + } + } +} diff --git a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/parched.json b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/parched.json new file mode 100644 index 0000000000..ae831cc903 --- /dev/null +++ b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/parched.json @@ -0,0 +1,7 @@ +{ + "criteria": { + "requirement": { + "trigger": "minecraft:impossible" + } + } +} diff --git a/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/zombie_nautilus.json b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/zombie_nautilus.json new file mode 100644 index 0000000000..ae831cc903 --- /dev/null +++ b/gm4_orb_of_ankou/backport_88/data/gm4_corripio_shamir/advancement/kill_entity/zombie_nautilus.json @@ -0,0 +1,7 @@ +{ + "criteria": { + "requirement": { + "trigger": "minecraft:impossible" + } + } +} diff --git a/gm4_orb_of_ankou/beet.yaml b/gm4_orb_of_ankou/beet.yaml index 09ff2b08fd..a3ad147961 100644 --- a/gm4_orb_of_ankou/beet.yaml +++ b/gm4_orb_of_ankou/beet.yaml @@ -11,6 +11,12 @@ data_pack: min_format: 1 max_format: 71 directory: backport_71 + - formats: + min_inclusive: 1 + max_inclusive: 88 + min_format: 1 + max_format: 88 + directory: backport_88 resource_pack: load: diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/init.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/init.mcfunction index dc24f83fc5..80375d81c3 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/init.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/init.mcfunction @@ -28,6 +28,7 @@ scoreboard objectives add gm4_oa_swim minecraft.custom:minecraft.swim_one_cm scoreboard objectives add gm4_oa_bow_hawkeye minecraft.used:minecraft.bow scoreboard objectives add gm4_oa_bow_freezing minecraft.used:minecraft.bow scoreboard objectives add gm4_oa_bow_tranquilizing minecraft.used:minecraft.bow +scoreboard objectives add gm4_oa_bow_debilitate minecraft.used:minecraft.bow # start module execute unless score orb_of_ankou gm4_modules matches 1 run data modify storage gm4:log queue append value {type:"install",module:"Orb of Ankou"} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/debilitate.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/debilitate.mcfunction new file mode 100644 index 0000000000..aafc2ea569 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/debilitate.mcfunction @@ -0,0 +1,11 @@ +# @s = none +# run from update_tags/check_pneuma + +execute unless entity @a[tag=gm4_pneuma_debilitate,limit=1] run return 0 +execute unless entity @a[gamemode=!spectator,tag=gm4_pneuma_debilitate,scores={gm4_oa_bow_debilitate=1..},limit=1] run return run schedule function gm4_orb_of_ankou:pneumas/temp_tick/debilitate 1t +execute as @a[gamemode=!spectator,tag=gm4_pneuma_debilitate,scores={gm4_oa_bow_debilitate=1..}] at @s anchored eyes positioned ^ ^ ^2 run tag @e[type=arrow,distance=..2.5,limit=1] add gm4_oa_arrow +data merge entity @e[type=arrow,tag=gm4_oa_arrow,limit=1] {item: {components: {"minecraft:potion_contents": {custom_effects: [{duration: 600, show_icon: 1b, id: "minecraft:weakness"}]}}}} +tag @e[type=arrow] remove gm4_oa_arrow + +scoreboard players reset @a gm4_oa_bow_debilitate +schedule function gm4_orb_of_ankou:pneumas/temp_tick/debilitate 1t diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/check_pneuma.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/check_pneuma.mcfunction index b64cf879fd..0b25a330f1 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/check_pneuma.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/check_pneuma.mcfunction @@ -32,6 +32,7 @@ tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/soaring] add gm4_pneuma_soarin tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/striding] add gm4_pneuma_striding tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/synergetic] add gm4_pneuma_synergetic tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/tranquilizing] add gm4_pneuma_tranquilizing +tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/debilitate] add gm4_pneuma_debilitate tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/vanishing] add gm4_pneuma_vanishing tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/volatile] add gm4_pneuma_volatile tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/withering] add gm4_pneuma_withering @@ -47,9 +48,11 @@ tag @s[tag=gm4_pneuma_dashing] add gm4_sneak_pneuma scoreboard players reset @s gm4_oa_bow_hawkeye scoreboard players reset @s gm4_oa_bow_freezing scoreboard players reset @s gm4_oa_bow_tranquilizing +scoreboard players reset @s gm4_oa_bow_debilitate # run tick functions execute if entity @a[gamemode=!spectator,tag=gm4_pneuma_hawkeye,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/hawkeye 1t execute if entity @a[gamemode=!spectator,tag=gm4_pneuma_freezing,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/freezing 1t execute if entity @a[gamemode=!spectator,tag=gm4_pneuma_tranquilizing,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/tranquilizing 1t +execute if entity @a[gamemode=!spectator,tag=gm4_pneuma_debilitate,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/debilitate 1t execute if entity @a[gamemode=!spectator,tag=gm4_pneuma_striding,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/striding 1t diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/remove_tags.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/remove_tags.mcfunction index f5ad1649a7..41bf040bc2 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/remove_tags.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/remove_tags.mcfunction @@ -31,6 +31,7 @@ tag @s remove gm4_pneuma_soaring tag @s remove gm4_pneuma_striding tag @s remove gm4_pneuma_synergetic tag @s remove gm4_pneuma_tranquilizing +tag @s remove gm4_pneuma_debilitate tag @s remove gm4_pneuma_vanishing tag @s remove gm4_pneuma_volatile tag @s remove gm4_pneuma_withering diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/guidebook/orb_of_ankou.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/guidebook/orb_of_ankou.json index 0883f1baca..acc0639b7a 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/guidebook/orb_of_ankou.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/guidebook/orb_of_ankou.json @@ -461,6 +461,26 @@ } }, "\n", + { + "translate": "text.gm4.guidebook.orb_of_ankou.pneuma_list", + "fallback": " - %1$s*", + "with": [ + { + "translate": "text.gm4.pneuma_debilitate", + "fallback": "Debilitate" + } + ], + "hover_event": { + "action": "show_text", + "value": [ + { + "translate": "text.gm4.guidebook.orb_of_ankou.note.debilitate", + "fallback": "Applies Weakness to arrows shot from bows" + } + ] + } + }, + "\n", { "translate": "text.gm4.guidebook.orb_of_ankou.pneuma_list", "fallback": " - %1$s*", diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/debilitate.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/debilitate.json new file mode 100644 index 0000000000..378e706168 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/debilitate.json @@ -0,0 +1,63 @@ +{ + "type": "minecraft:generic", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:flint", + "functions": [ + { + "function": "minecraft:set_lore", + "mode": "append", + "lore": [ + { + "translate": "text.gm4.pneuma_debilitate", + "fallback": "Debilitate", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/debilitate", + "minecraft:item_name": { + "translate": "item.gm4.soul_shard", + "fallback": "Soul Shard" + }, + "minecraft:rarity": "common", + "minecraft:damage_resistant": { + "types": "#minecraft:is_fire" + }, + "minecraft:equippable": { + "slot": "offhand" + }, + "minecraft:max_stack_size": 1 + } + }, + { + "function": "minecraft:set_attributes", + "modifiers": [ + { + "attribute": "minecraft:attack_damage", + "id": "gm4_orb_of_ankou:attack_damage", + "amount": -0.2, + "operation": "add_multiplied_base", + "slot": "offhand" + } + ] + }, + { + "function": "minecraft:set_custom_data", + "tag": "{gm4_orb_of_ankou:{item:'soul_shard',pneumas:[{id:'debilitate'}],stored_color:[2304605],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/soul_essence.csv b/gm4_orb_of_ankou/soul_essence.csv index b61584e8ef..8388113b44 100644 --- a/gm4_orb_of_ankou/soul_essence.csv +++ b/gm4_orb_of_ankou/soul_essence.csv @@ -24,6 +24,9 @@ breeze,agile,0.04%,0.16%,1.0%,3.28%,,30.5,396.3 breeze,bounding,0.04%,0.16%,1.0%,3.28%,,30.5,396.3 camel,dashing,0.025%,0.1%,0.625%,2.05%,,48.8,634.1 camel,retreating,0.04%,0.16%,1.0%,3.28%,,30.5,396.3 +camel_husk,dashing,0.03%,0.12%,0.75%,2.46%,,40.7,528.5 +camel_husk,lifeless,0.035%,0.14%,0.875%,2.87%,,34.8,453.0 +camel_husk,retreating,0.045%,0.18%,1.125%,3.69%,,27.1,352.3 cat,agile,0.05%,0.2%,1.25%,4.1%,,24.4,317.1 cat,gazing,0.1%,0.4%,2.5%,8.2%,,12.2,158.5 cat,retreating,0.04%,0.16%,1.0%,3.28%,,30.5,396.3 @@ -91,11 +94,17 @@ magma_cube,bounding,0.016%,0.064%,0.4%,1.31%,,76.2,990.9 magma_cube,incombustible,0.012%,0.048%,0.3%,0.98%,,101.6,1321.1 mooshroom,retreating,0.03%,0.12%,0.75%,2.46%,,40.7,528.5 mule,bounding,0.09%,0.36%,2.25%,7.38%,,13.6,176.2 +nautilus,bubbly,0.07%,0.28%,1.75%,5.74%,,17.4,226.5 +nautilus,gliding,0.06%,0.24%,1.5%,4.92%,,20.3,264.2 +nautilus,dashing,0.01%,0.04%,0.25%,0.82%,,122.0,1585.4 ocelot,agile,0.07%,0.28%,1.75%,5.74%,,17.4,226.5 ocelot,gazing,0.08%,0.32%,2.0%,6.56%,,15.2,198.2 panda,aggressive,0.1%,0.4%,2.5%,8.2%,,12.2,158.5 parrot,feathery,0.1%,0.4%,2.5%,8.2%,,12.2,158.5 parrot,soaring,0.07%,0.28%,1.75%,5.74%,,17.4,226.5 +parched,hawkeye,0.01%,0.04%,0.25%,0.82%,,122.0,1585.4 +parched,lifeless,0.012%,0.048%,0.3%,0.98%,,101.6,1321.1 +parched,debilitate,0.01%,0.04%,0.25%,0.82%,,122.0,1585.4 phantom,feathery,0.02%,0.08%,0.5%,1.64%,,61.0,792.7 phantom,lifeless,0.02%,0.08%,0.5%,1.64%,,61.0,792.7 phantom,soaring,0.005%,0.02%,0.125%,0.41%,,243.9,3170.7 @@ -181,6 +190,10 @@ zoglin,bashing,0.04%,0.16%,1.0%,3.28%,,30.5,396.3 zoglin,incombustible,0.04%,0.16%,1.0%,3.28%,,30.5,396.3 zoglin,lifeless,0.06%,0.24%,1.5%,4.92%,,20.3,264.2 zombie,lifeless,0.005%,0.02%,0.125%,0.41%,,243.9,3170.7 +zombie_nautilus,bubbly,0.21%,0.84%,5.25%,17.22%,,5.8,75.5 +zombie_nautilus,gliding,0.18%,0.72%,4.5%,14.76%,,6.8,88.1 +zombie_nautilus,dashing,0.09%,0.36%,2.25%,7.38%,,13.6,176.2 +zombie_nautilus,lifeless,0.15%,0.6%,3.75%,12.3%,,8.1,105.7 zombie_horse,bounding,0.05%,0.2%,1.25%,4.1%,,24.4,317.1 zombie_horse,lifeless,0.03%,0.12%,0.75%,2.46%,,40.7,528.5 zombie_villager,lifeless,0.01%,0.04%,0.25%,0.82%,,122.0,1585.4