Skip to content

Commit ee9ac46

Browse files
authored
Orb of Ankou 1.21.6-1.21.8 (#1172)
* make happy ghast drop soaring * make gazing passive * add 1.21.5 backport overlay - prevents the advancement load error * fix ooa animi equipability * make gazing not flashing vision
1 parent 22d6c6e commit ee9ac46

File tree

8 files changed

+18
-7
lines changed

8 files changed

+18
-7
lines changed
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
{
2+
"criteria": {
3+
"requirement": {
4+
"trigger": "minecraft:impossible"
5+
}
6+
}
7+
}

gm4_orb_of_ankou/beet.yaml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,11 @@ version: 1.8.X
44

55
data_pack:
66
load: .
7+
overlays:
8+
- formats:
9+
min_inclusive: 0
10+
max_inclusive: 71
11+
directory: backport_71
712

813
resource_pack:
914
load:
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
# Marks Orbs of Ankou as tools for the animi shamir
22
# run from #gm4_animi_shamir:mark_item_validity
33

4-
execute unless score valid_item gm4_ml_data matches 1 store success score valid_item gm4_ml_data if items entity @s contents minecraft:firework_star[custom_data~{gm4_orb_of_ankou:{item:"orb"}}]
4+
execute if items entity @e[type=item,tag=gm4_ml_source,dx=0] contents *[custom_data~{gm4_metallurgy:{stored_shamir:'animi'}}] if items entity @s contents minecraft:firework_star[custom_data~{gm4_orb_of_ankou:{item:"orb"}}] run scoreboard players set valid_item gm4_ml_data 1

gm4_orb_of_ankou/data/gm4_animi_shamir/tags/function/mark_item_validity.json

Lines changed: 0 additions & 5 deletions
This file was deleted.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
{
22
"values": [
3+
"gm4_animi_shamir:mark_orb_of_ankou",
34
"gm4_corripio_shamir:check_item_validity"
45
]
56
}

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/main.mcfunction

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@ execute in the_nether run function gm4_orb_of_ankou:nether_main
55

66
## PNEUMA STUFF ##
77

8+
# gazing
9+
effect give @a[gamemode=!spectator,tag=gm4_pneuma_gazing] night_vision 15 0 true
10+
811
# gliding
912
effect give @a[gamemode=!spectator,tag=gm4_pneuma_gliding,scores={gm4_oa_swim=1..}] dolphins_grace 3 1 true
1013
scoreboard players reset @a gm4_oa_swim

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/sneak/check.mcfunction

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ execute if score @s[tag=gm4_pneuma_shrieking] gm4_oa_snk_num matches 40 at @s ru
99
effect give @s[tag=gm4_pneuma_vanishing] invisibility 90 0 true
1010
execute at @s[tag=gm4_pneuma_blinding] run effect give @a[distance=..6,tag=!gm4_pneuma_blinding] blindness 7 1 false
1111
effect give @s[tag=gm4_pneuma_feathery] slow_falling 1 0 true
12-
effect give @s[tag=gm4_pneuma_gazing] night_vision 30 0 true
1312
execute at @s[tag=gm4_pneuma_scaling] anchored eyes positioned ^ ^ ^1 align xyz unless block ~ ~ ~ #gm4:no_collision run effect give @s levitation 1 0 true
1413

1514
execute if entity @s[tag=gm4_pneuma_phasing] run function gm4_orb_of_ankou:pneumas/phasing/check_traversable

gm4_orb_of_ankou/soul_essence.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ goat,rushing,0.04%,0.16%,1.0%,3.28%,,30.5,396.3
7373
guardian,bubbly,0.0035%,0.014%,0.088%,0.29%,,348.4,4529.6
7474
guardian,gliding,0.003%,0.012%,0.075%,0.25%,,406.5,5284.6
7575
guardian,pricking,0.002%,0.008%,0.05%,0.16%,,609.8,7926.8
76+
happy_ghast,soaring,0.003%,0.012%,0.075%,0.25%,,406.5,5284.6
7677
hoglin,anchoring,0.02%,0.08%,0.5%,1.64%,,61.0,792.7
7778
hoglin,bashing,0.025%,0.1%,0.625%,2.05%,,48.8,634.1
7879
horse,bounding,0.05%,0.2%,1.25%,4.1%,,24.4,317.1

0 commit comments

Comments
 (0)