Orb of Ankou 1.21.5

gm4/contributors.json

@@ -130,5 +130,9 @@
     {
         "name": "Venomousbirds",
         "links": ["https://venomousbirds.artstation.com/"]
+    },
+    {
+        "name": "MulverineX",
+        "links": ["https://modrinth.com/user/MulverineX"]
     }
 ]

gm4_orb_of_ankou/beet.yaml

@@ -16,13 +16,15 @@ pipeline:
   - gm4_metallurgy.shamir_model_template
   - gm4.plugins.extend.module
   - gm4.plugins.include.lib_custom_crafters
+  - gm4.plugins.include.lib_player_motion
 
 meta:
   gm4:
     versioning:
       required:
         gm4_metallurgy: 1.5.0
         lib_custom_crafters: 3.4.0
+        lib_player_motion: 1.0.0
       schedule_loops:
         - main
         - tick

gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/shoot_crossbow.json

@@ -2,17 +2,7 @@
   "criteria": {
     "crossbow_shot": {
       "trigger": "minecraft:shot_crossbow",
-      "conditions": {
-        "item": {
-          "components": {
-            "minecraft:charged_projectiles": [
-              {
-                "id": "minecraft:arrow"
-              }
-            ]
-          }
-        }
-      }
+      "conditions": {}
     }
   },
   "rewards": {

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/init.mcfunction

@@ -21,6 +21,7 @@ scoreboard objectives add gm4_oa_snk_num dummy
 scoreboard objectives add gm4_oa_marker dummy
 scoreboard objectives add gm4_oa_feign_t dummy
 scoreboard objectives add gm4_oa_sniff dummy
+scoreboard objectives add gm4_oa_jump_stop dummy
 scoreboard objectives add gm4_health health
 scoreboard objectives add gm4_oa_sneak minecraft.custom:minecraft.sneak_time
 scoreboard objectives add gm4_oa_swim minecraft.custom:minecraft.swim_one_cm

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/main.mcfunction

@@ -10,8 +10,7 @@ effect give @a[gamemode=!spectator,tag=gm4_pneuma_gliding,scores={gm4_oa_swim=1.
 scoreboard players reset @a gm4_oa_swim
 
 # soaring
-tag @a[tag=gm4_oa_soaring_off_ground,nbt={OnGround:1b}] remove gm4_oa_soaring_off_ground
-effect give @a[gamemode=!spectator,tag=gm4_oa_soaring_off_ground] jump_boost 2 255 true
+execute as @a[tag=gm4_oa_soaring_off_ground,nbt={OnGround:1b}] run function gm4_orb_of_ankou:pneumas/soaring/remove_fall_protection
 
 # sniffing
 scoreboard players remove @a[scores={gm4_oa_sniff=1..}] gm4_oa_sniff 1

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/player.mcfunction

@@ -10,3 +10,6 @@ execute at @s[tag=gm4_pneuma_synergetic] run function gm4_orb_of_ankou:pneumas/s
 # soaring
 execute at @s[tag=gm4_oa_soaring_active] run function gm4_orb_of_ankou:pneumas/soaring/apply
 
+# disable jump revert
+scoreboard players remove @a[scores={gm4_oa_jump_stop=1..}] gm4_oa_jump_stop 1
+execute as @a[scores={gm4_oa_jump_stop=1}] run attribute @s minecraft:jump_strength modifier remove gm4_orb_of_ankou:prevent_jump

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/player_damaged.mcfunction

@@ -10,5 +10,3 @@ effect give @s[tag=gm4_pneuma_aggressive] strength 3 1 true
 execute if entity @s[tag=gm4_pneuma_volatile] run function gm4_orb_of_ankou:pneumas/volatile
 
 execute if entity @s[tag=gm4_pneuma_feigning,scores={gm4_health=..10}] run function gm4_orb_of_ankou:pneumas/feigning/apply
-
-execute if entity @s[tag=gm4_oa_soaring_off_ground] run function gm4_orb_of_ankou:pneumas/soaring/damaged

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/shot_crossbow.mcfunction

@@ -2,4 +2,4 @@
 # run from advancement "trigers/shoot_crossbow"
 
 advancement revoke @s only gm4_orb_of_ankou:triggers/shoot_crossbow
-execute if entity @s[tag=gm4_pneuma_blasting,nbt={Inventory:[{id:"minecraft:blaze_powder"}]}] run function gm4_orb_of_ankou:pneumas/blasting
+execute if entity @s[tag=gm4_pneuma_blasting,nbt={Inventory:[{id:"minecraft:blaze_powder"}]}] if entity @e[type=minecraft:arrow,limit=1,distance=..2] run function gm4_orb_of_ankou:pneumas/blasting

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/blasting.mcfunction

@@ -2,10 +2,10 @@
 # run from advancement_triggers/shoot_crossbow
 
 # summon fireball at player's location
-summon minecraft:small_fireball ~ ~1 ~ {Tags:["gm4_oa_fireball"],power:[0.0,0.0,0.0],Motion:[0.0,0.0,0.0]}
+summon minecraft:small_fireball ~ ~1 ~ {Tags:["gm4_oa_fireball"],Motion:[0.0,0.0,0.0]}
 
 # copy motion of arrow to fireball
-data modify entity @e[type=small_fireball,tag=gm4_oa_fireball,distance=..2,limit=1] power set from entity @e[type=minecraft:arrow,limit=1,distance=..2] Motion
+data modify entity @e[type=small_fireball,tag=gm4_oa_fireball,distance=..2,limit=1] Motion set from entity @e[type=minecraft:arrow,limit=1,distance=..2] Motion
 kill @e[type=arrow,distance=..2,limit=1]
 
 # clear blaze powder from player

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/prepare.mcfunction

@@ -1,25 +1,23 @@
 # @s = player with dashing pneuma who stopped sneaking
 # run from pneumas/sneak/stopped
 
-execute rotated ~ 0 if block ^ ^0.9 ^.1 #gm4:no_collision if block ^ ^0.5 ^1.1 #gm4:no_collision run summon armor_stand ^ ^0.5 ^1 {Invisible:1b,Small:1b,Invulnerable:1b,CustomName:"Dashing Stand",Tags:["gm4_oa_dasher","gm4_oa_new_dasher","smithed.entity","smithed.strict"],attributes:[{id:"minecraft:max_health",base:1.0}]}
+execute rotated ~ 0 if block ^ ^0.9 ^.1 #gm4:no_collision if block ^ ^0.5 ^1.1 #gm4:no_collision run summon marker ^ ^0.5 ^1 {CustomName:"Dashing Vector",Tags:["gm4_oa_dash_vector"]}
 scoreboard players operation $current gm4_oa_id = @s gm4_oa_id
 
 # store player pos
 data modify storage gm4_oa_dashing:temp Pos set from entity @s Pos
-execute store result score $target_x gm4_pneuma_data run data get storage gm4_oa_dashing:temp Pos[0] 100
-execute store result score $target_z gm4_pneuma_data run data get storage gm4_oa_dashing:temp Pos[2] 100
+execute store result score $target_x gm4_pneuma_data run data get storage gm4_oa_dashing:temp Pos[0] 1000
+execute store result score $target_z gm4_pneuma_data run data get storage gm4_oa_dashing:temp Pos[2] 1000
 
 # store sneak count
-execute if score @s gm4_oa_snk_num matches 10..19 run scoreboard players set $multiplier gm4_pneuma_data 1
-execute if score @s gm4_oa_snk_num matches 20..39 run scoreboard players set $multiplier gm4_pneuma_data 2
-execute if score @s gm4_oa_snk_num matches 40..59 run scoreboard players set $multiplier gm4_pneuma_data 3
-execute if score @s gm4_oa_snk_num matches 60.. run scoreboard players set $multiplier gm4_pneuma_data 4
+execute if score @s gm4_oa_snk_num matches 10..19 run scoreboard players set $multiplier gm4_pneuma_data 8
+execute if score @s gm4_oa_snk_num matches 20..39 run scoreboard players set $multiplier gm4_pneuma_data 14
+execute if score @s gm4_oa_snk_num matches 40..59 run scoreboard players set $multiplier gm4_pneuma_data 18
+execute if score @s gm4_oa_snk_num matches 60.. run scoreboard players set $multiplier gm4_pneuma_data 24
 
-# give armor stand motion
-ride @s mount @e[type=armor_stand,tag=gm4_oa_new_dasher,distance=..3,limit=1]
-execute as @e[type=armor_stand,tag=gm4_oa_new_dasher,distance=..3,limit=1] at @s run function gm4_orb_of_ankou:pneumas/dashing/set_motion
-tag @e[type=armor_stand,tag=gm4_oa_new_dasher,distance=..3,limit=1] remove gm4_oa_new_dasher
-playsound minecraft:entity.player.small_fall player @a[distance=..8] ~ ~ ~ 0.7 0.6
+# set motion
+tag @s add gm4_oa_dasher
+execute as @e[type=marker,tag=gm4_oa_dash_vector,distance=..3,limit=1] run function gm4_orb_of_ankou:pneumas/dashing/set_motion
+tag @s remove gm4_oa_dasher
 
-# keep player on dash trajectory
-schedule function gm4_orb_of_ankou:pneumas/dashing/temp_tick 1t
+playsound minecraft:entity.player.small_fall player @a[distance=..8] ~ ~ ~ 0.7 0.6

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/set_motion.mcfunction

@@ -1,12 +1,11 @@
-
-
-# link armor stand to player
-scoreboard players operation @s gm4_oa_id = $current gm4_oa_id
+# @s = dash marker
+# located at player who started dashing
+# run from pneumas/dashing/prepare
 
 # get vector
 data modify storage gm4_oa_dashing:temp Pos set from entity @s Pos
-execute store result score $motion_x gm4_pneuma_data run data get storage gm4_oa_dashing:temp Pos[0] 100
-execute store result score $motion_z gm4_pneuma_data run data get storage gm4_oa_dashing:temp Pos[2] 100
+execute store result score $motion_x gm4_pneuma_data run data get storage gm4_oa_dashing:temp Pos[0] 1000
+execute store result score $motion_z gm4_pneuma_data run data get storage gm4_oa_dashing:temp Pos[2] 1000
 
 scoreboard players operation $motion_x gm4_pneuma_data -= $target_x gm4_pneuma_data
 scoreboard players operation $motion_z gm4_pneuma_data -= $target_z gm4_pneuma_data
@@ -16,9 +15,11 @@ scoreboard players operation $motion_x gm4_pneuma_data *= $multiplier gm4_pneuma
 scoreboard players operation $motion_z gm4_pneuma_data *= $multiplier gm4_pneuma_data
 
 # set motion
-execute store result entity @s Motion[0] double 0.0045 run scoreboard players get $motion_x gm4_pneuma_data
-execute store result entity @s Motion[2] double 0.0045 run scoreboard players get $motion_z gm4_pneuma_data
-data modify entity @s Motion[1] set value 0.4d
+scoreboard players operation $x gm4_player_motion.api.launch = $motion_x gm4_pneuma_data
+scoreboard players set $y gm4_player_motion.api.launch 5200
+scoreboard players operation $z gm4_player_motion.api.launch = $motion_z gm4_pneuma_data
+execute as @a[tag=gm4_oa_dasher,limit=1] run function #gm4_player_motion:launch_xyz
 
 ## clean up
 data remove storage gm4_oa_dashing:temp Pos
+kill @s

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/attempt.mcfunction

@@ -1,26 +1,6 @@
 # @s = player with expeditious pneuma who stopped sneaking
 # run from pneumas/sneak/stopped
 
-summon marker ~ ~ ~ {CustomName:"Expeditious TP",Tags:["gm4_oa_expeditious"]}
-tp @e[type=marker,tag=gm4_oa_expeditious,limit=1] @s
-
-scoreboard players set @s gm4_pneuma_data 0
-scoreboard players set @s[scores={gm4_oa_snk_num=10..19}] gm4_pneuma_data 9
-scoreboard players set @s[scores={gm4_oa_snk_num=20..39}] gm4_pneuma_data 17
-scoreboard players set @s[scores={gm4_oa_snk_num=40..59}] gm4_pneuma_data 25
-scoreboard players set @s[scores={gm4_oa_snk_num=60..}] gm4_pneuma_data 33
-
-execute if score @s gm4_pneuma_data matches 9 run tp @e[type=marker,tag=gm4_oa_expeditious,limit=1] ~-4 ~ ~-4
-execute if score @s gm4_pneuma_data matches 17 run tp @e[type=marker,tag=gm4_oa_expeditious,limit=1] ~-8 ~ ~-8
-execute if score @s gm4_pneuma_data matches 25 run tp @e[type=marker,tag=gm4_oa_expeditious,limit=1] ~-12 ~ ~-12
-execute if score @s gm4_pneuma_data matches 33 run tp @e[type=marker,tag=gm4_oa_expeditious,limit=1] ~-16 ~ ~-16
-
-execute store result score y_pos gm4_pneuma_data run data get entity @s Pos[1]
-execute store result score randomX gm4_pneuma_data run data get entity @e[type=marker,tag=gm4_oa_expeditious,limit=1] UUID[0]
+execute if score @s gm4_oa_snk_num matches ..9 run return fail
 scoreboard players set expeditious_attempt gm4_pneuma_data 0
-tag @s add gm4_expeditious_player
 function gm4_orb_of_ankou:pneumas/expeditious/randomize
-tag @s remove gm4_expeditious_player
-
-execute if score expeditious_safe gm4_pneuma_data matches 1 run function gm4_orb_of_ankou:pneumas/expeditious/tp_player
-kill @e[type=marker,tag=gm4_oa_expeditious]

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/get_pos.mcfunction

@@ -0,0 +1,10 @@
+# @s = player with expeditious pneuma who stopped sneaking
+# run from pneumas/expeditious/randomize
+
+# check column for safe location
+scoreboard players set set_y gm4_pneuma_data 0
+$execute positioned ~$(x) ~5 ~$(z) run function gm4_orb_of_ankou:pneumas/expeditious/set_ypos
+
+# try another column (at most 12 times) if entire column was not safe
+scoreboard players add expeditious_attempt gm4_pneuma_data 1
+execute unless score expeditious_attempt gm4_pneuma_data matches 12.. run function gm4_orb_of_ankou:pneumas/expeditious/randomize

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/randomize.mcfunction

@@ -1,11 +1,15 @@
 # @s = player with expeditious pneuma who stopped sneaking
 # run from pneumas/expeditious/attempt
 
-scoreboard players operation randomZ gm4_pneuma_data = randomX gm4_pneuma_data
-scoreboard players set #10 gm4_pneuma_data 10
-scoreboard players operation randomZ gm4_pneuma_data %= #10 gm4_pneuma_data
+# get sneak-number-based distance
+execute if score @s gm4_oa_snk_num matches 10..19 store result storage gm4_orb_of_ankou:temp pos.x int 1 run random value -4..4
+execute if score @s gm4_oa_snk_num matches 10..19 store result storage gm4_orb_of_ankou:temp pos.z int 1 run random value -4..4
+execute if score @s gm4_oa_snk_num matches 20..39 store result storage gm4_orb_of_ankou:temp pos.x int 1 run random value -8..8
+execute if score @s gm4_oa_snk_num matches 20..39 store result storage gm4_orb_of_ankou:temp pos.z int 1 run random value -8..8
+execute if score @s gm4_oa_snk_num matches 40..59 store result storage gm4_orb_of_ankou:temp pos.x int 1 run random value -12..12
+execute if score @s gm4_oa_snk_num matches 40..59 store result storage gm4_orb_of_ankou:temp pos.z int 1 run random value -12..12
+execute if score @s gm4_oa_snk_num matches 60.. store result storage gm4_orb_of_ankou:temp pos.x int 1 run random value -16..16
+execute if score @s gm4_oa_snk_num matches 60.. store result storage gm4_orb_of_ankou:temp pos.z int 1 run random value -16..16
 
-scoreboard players operation randomX gm4_pneuma_data %= @a[tag=gm4_expeditious_player,limit=1] gm4_pneuma_data
-scoreboard players operation randomZ gm4_pneuma_data %= @a[tag=gm4_expeditious_player,limit=1] gm4_pneuma_data
-
-execute as @e[type=marker,tag=gm4_oa_expeditious,limit=1] at @s run function gm4_orb_of_ankou:pneumas/expeditious/tp_aec
+function gm4_orb_of_ankou:pneumas/expeditious/get_pos with storage gm4_orb_of_ankou:temp pos
+data remove storage gm4_orb_of_ankou:temp pos

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/set_ypos.mcfunction

@@ -1,9 +1,10 @@
-# @s = expeditious tp AEC
+# @s = player with expeditious pneuma who stopped sneaking
+# located at a random distance from player
 # run from pneumas/expeditious/tp_aec
 
-execute at @s run tp @s ~ ~-1 ~
+# tp if block is safe
+execute if block ~ ~ ~ #gm4:no_collision unless block ~ ~-1 ~ #gm4:no_collision run function gm4_orb_of_ankou:pneumas/expeditious/tp_player
+
+# check 1 block down
 scoreboard players add set_y gm4_pneuma_data 1
-scoreboard players set expeditious_safe gm4_pneuma_data 0
-execute at @s if block ~ ~ ~ #gm4:no_collision unless block ~ ~-1 ~ #gm4:no_collision run scoreboard players set expeditious_safe gm4_pneuma_data 1
-execute if score expeditious_safe gm4_pneuma_data matches 1 run scoreboard players set expeditious_attempt gm4_pneuma_data 12
-execute unless score set_y gm4_pneuma_data matches 11.. at @s unless score expeditious_safe gm4_pneuma_data matches 1 run function gm4_orb_of_ankou:pneumas/expeditious/set_ypos
+execute unless score set_y gm4_pneuma_data matches 11.. positioned ~ ~-1 ~ run function gm4_orb_of_ankou:pneumas/expeditious/set_ypos

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/tp_player.mcfunction

@@ -1,10 +1,16 @@
 # @s = player with expeditious pneuma who stopped sneaking
-# run from pneumas/expeditious/attempt
+# located at a safe block, random distance from player
+# run from pneumas/expeditious/set_ypos
 
-particle minecraft:explosion ~ ~.3 ~ .3 .4 .3 2 0
-tp @s @e[type=marker,tag=gm4_oa_expeditious,limit=1]
-playsound minecraft:item.chorus_fruit.teleport player @a[distance=..15] ~ ~ ~ 1 1
-execute at @s run particle minecraft:portal ~ ~.2 ~ 0 -1 0 3 20
+# prevent reroll
+scoreboard players set set_y gm4_pneuma_data 11
+scoreboard players set expeditious_attempt gm4_pneuma_data 12
+
+# move player
+execute at @s run playsound minecraft:item.chorus_fruit.teleport player @a[distance=..15] ~ ~ ~ 1 1
+execute at @s run particle minecraft:explosion ~ ~.3 ~ .3 .4 .3 2 0
+tp @s ~ ~ ~
+particle minecraft:portal ~ ~.2 ~ 0 -1 0 3 20
 
 # compatibility with other modules
 function #gm4_orb_of_ankou:pneumas/expeditious/tp_player

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/feigning/apply.mcfunction

@@ -6,8 +6,9 @@ effect give @s invisibility 10 255 true
 effect give @s resistance 10 255 true
 effect give @s slowness 10 255 true
 effect give @s weakness 10 255 true
-effect give @s jump_boost 10 128 true
 effect give @s regeneration 10 0 false
+attribute @s minecraft:jump_strength modifier add gm4_orb_of_ankou:prevent_jump -1024 add_multiplied_total
+scoreboard players set @s gm4_oa_jump_stop 13
 
 # set data of hostile mobs
 tag @e[type=#gm4_orb_of_ankou:feigning_affected,distance=..50] add gm4_oa_feigning

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/apply.mcfunction

@@ -1,11 +1,11 @@
-# @s = player with soaring pneuma
+# @s = player with soaring pneuma activated
 # run from main
 
-execute if entity @s[x_rotation=-79.99..79.99] run function gm4_orb_of_ankou:pneumas/soaring/idle
+execute if entity @s[tag=!gm4_oa_soaring_idle] run function gm4_orb_of_ankou:pneumas/soaring/idle
 
 execute if entity @s[x_rotation=-90..-80] run function gm4_orb_of_ankou:pneumas/soaring/ascend
 
-execute if entity @s[x_rotation=80..90] run effect clear @s levitation
+execute if entity @s[x_rotation=80..90] run function gm4_orb_of_ankou:pneumas/soaring/descend
 
 effect give @s slow_falling 3 0 true
 tag @s add gm4_oa_soaring_off_ground

gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/ascend.mcfunction

@@ -1,5 +1,5 @@
 # @s = player with soaring pneuma looking up
 # run from pneumas/soaring/apply
 
-effect clear @s levitation
+tag @s remove gm4_oa_soaring_idle
 effect give @s levitation 2 3 true