diff --git a/gm4/contributors.json b/gm4/contributors.json index c41dd957cd..fc6ab9f973 100644 --- a/gm4/contributors.json +++ b/gm4/contributors.json @@ -130,5 +130,9 @@ { "name": "Venomousbirds", "links": ["https://venomousbirds.artstation.com/"] + }, + { + "name": "MulverineX", + "links": ["https://modrinth.com/user/MulverineX"] } ] diff --git a/gm4_orb_of_ankou/beet.yaml b/gm4_orb_of_ankou/beet.yaml index ca83f6f121..f6ea9731f4 100644 --- a/gm4_orb_of_ankou/beet.yaml +++ b/gm4_orb_of_ankou/beet.yaml @@ -16,6 +16,7 @@ pipeline: - gm4_metallurgy.shamir_model_template - gm4.plugins.extend.module - gm4.plugins.include.lib_custom_crafters + - gm4.plugins.include.lib_player_motion meta: gm4: @@ -23,6 +24,7 @@ meta: required: gm4_metallurgy: 1.5.0 lib_custom_crafters: 3.4.0 + lib_player_motion: 1.0.0 schedule_loops: - main - tick diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/shoot_crossbow.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/shoot_crossbow.json index f9e14b02ea..938f8b279e 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/advancement/triggers/shoot_crossbow.json +++ b/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": { 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 8417f2bbec..dc24f83fc5 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 @@ -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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/main.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/main.mcfunction index dea584cd58..2376ee999e 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/main.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/player.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/player.mcfunction index 0e6af8375f..e47a837903 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/player.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/player_damaged.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/player_damaged.mcfunction index 6f2df0617c..b200b95112 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/player_damaged.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/shot_crossbow.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/shot_crossbow.mcfunction index ed72e8803c..ecc95a8a12 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/advancement_triggers/shot_crossbow.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/agile.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/agile.mcfunction deleted file mode 100644 index fee13ea4ac..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/agile.mcfunction +++ /dev/null @@ -1,5 +0,0 @@ -# @s = player with agile pneuma who is in the air -# run from pneumas/temp_tick/agile - -execute store result score @s gm4_pneuma_data run data get entity @s fall_distance -effect give @s[scores={gm4_pneuma_data=1..}] jump_boost 1 255 true diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/blasting.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/blasting.mcfunction index 8f9525a24e..c6400bbded 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/blasting.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/prepare.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/prepare.mcfunction index 7ca693eb72..9225314364 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/prepare.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/set_motion.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/set_motion.mcfunction index 9d1105df78..80e2fdfd8f 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/set_motion.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/temp_tick.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/temp_tick.mcfunction deleted file mode 100644 index 2a6c42e370..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/temp_tick.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# @s = none -# run from pneumas/dashing/prepare - -scoreboard players add @e[type=armor_stand,tag=gm4_oa_dasher] gm4_oa_marker 1 -kill @e[type=armor_stand,tag=gm4_oa_dasher,scores={gm4_oa_marker=15..}] - -execute as @e[type=armor_stand,tag=gm4_oa_dasher] at @s run function gm4_orb_of_ankou:pneumas/dashing/update_dasher - -execute if entity @e[type=armor_stand,tag=gm4_oa_dasher,limit=1] run schedule function gm4_orb_of_ankou:pneumas/dashing/temp_tick 1t diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/update_dasher.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/update_dasher.mcfunction deleted file mode 100644 index db72767787..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/dashing/update_dasher.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -# keep player on dashing armor stand until it touches the ground -# @s = armor stand dasher -# located at @s -# run from gm4_orb_of_ankou:pneumas/dashing/temp_tick - -scoreboard players operation $current gm4_oa_id = @s gm4_oa_id -ride @a[predicate=gm4_orb_of_ankou:matching_id,distance=..5,limit=1] mount @s - -kill @s[predicate=gm4_orb_of_ankou:on_ground] diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/attempt.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/attempt.mcfunction index b0ac8a5ac4..686fdcf29c 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/attempt.mcfunction +++ b/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] diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/get_pos.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/get_pos.mcfunction new file mode 100644 index 0000000000..e25fd0b4dd --- /dev/null +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/randomize.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/randomize.mcfunction index 851a9a64f9..372f38e997 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/randomize.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/set_ypos.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/set_ypos.mcfunction index 3b71536af2..7ed35a593f 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/set_ypos.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/tp_aec.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/tp_aec.mcfunction deleted file mode 100644 index 94f037f7fc..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/tp_aec.mcfunction +++ /dev/null @@ -1,36 +0,0 @@ -# @s = expeditious tp AEC -# run from pneumas/expeditious/randomize - -execute at @s if score randomX gm4_pneuma_data matches 32.. run tp @s ~32 ~ ~ -execute if score randomX gm4_pneuma_data matches 32.. run scoreboard players remove randomX gm4_pneuma_data 32 -execute at @s if score randomX gm4_pneuma_data matches 16.. run tp @s ~16 ~ ~ -execute if score randomX gm4_pneuma_data matches 16.. run scoreboard players remove randomX gm4_pneuma_data 16 -execute at @s if score randomX gm4_pneuma_data matches 8.. run tp @s ~8 ~ ~ -execute if score randomX gm4_pneuma_data matches 8.. run scoreboard players remove randomX gm4_pneuma_data 8 -execute at @s if score randomX gm4_pneuma_data matches 4.. run tp @s ~4 ~ ~ -execute if score randomX gm4_pneuma_data matches 4.. run scoreboard players remove randomX gm4_pneuma_data 4 -execute at @s if score randomX gm4_pneuma_data matches 2.. run tp @s ~2 ~ ~ -execute if score randomX gm4_pneuma_data matches 2.. run scoreboard players remove randomX gm4_pneuma_data 2 -execute at @s if score randomX gm4_pneuma_data matches 1.. run tp @s ~1 ~ ~ -execute if score randomX gm4_pneuma_data matches 1.. run scoreboard players remove randomX gm4_pneuma_data 1 - -execute at @s if score randomZ gm4_pneuma_data matches 32.. run tp @s ~ ~ ~32 -execute if score randomZ gm4_pneuma_data matches 32.. run scoreboard players remove randomZ gm4_pneuma_data 32 -execute at @s if score randomZ gm4_pneuma_data matches 16.. run tp @s ~ ~ ~16 -execute if score randomZ gm4_pneuma_data matches 16.. run scoreboard players remove randomZ gm4_pneuma_data 16 -execute at @s if score randomZ gm4_pneuma_data matches 8.. run tp @s ~ ~ ~8 -execute if score randomZ gm4_pneuma_data matches 8.. run scoreboard players remove randomZ gm4_pneuma_data 8 -execute at @s if score randomZ gm4_pneuma_data matches 4.. run tp @s ~ ~ ~4 -execute if score randomZ gm4_pneuma_data matches 4.. run scoreboard players remove randomZ gm4_pneuma_data 4 -execute at @s if score randomZ gm4_pneuma_data matches 2.. run tp @s ~ ~ ~2 -execute if score randomZ gm4_pneuma_data matches 2.. run scoreboard players remove randomZ gm4_pneuma_data 2 -execute at @s if score randomZ gm4_pneuma_data matches 1.. run tp @s ~ ~ ~1 -execute if score randomZ gm4_pneuma_data matches 1.. run scoreboard players remove randomZ gm4_pneuma_data 1 - -execute store result entity @s Pos[1] double 1 run scoreboard players get y_pos gm4_pneuma_data -execute at @s run tp @s ~ ~5 ~ -scoreboard players set set_y gm4_pneuma_data 0 -execute at @s run function gm4_orb_of_ankou:pneumas/expeditious/set_ypos - -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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/tp_player.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/tp_player.mcfunction index ed4a4d7cff..a23a6f5d47 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/expeditious/tp_player.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/feigning/apply.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/feigning/apply.mcfunction index fabd4f6f57..5420cd9c00 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/feigning/apply.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/apply.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/apply.mcfunction index f58771c680..7808225850 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/apply.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/ascend.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/ascend.mcfunction index 0059f34b91..b927ea4242 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/ascend.mcfunction +++ b/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 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/back.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/back.mcfunction deleted file mode 100644 index c1cb409f39..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/back.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# @s = player with active soaring pneuma that has been damaged -# run from tick - -tp @s @e[type=marker,tag=gm4_oa_soaring_location,limit=1,sort=nearest] -tag @s remove gm4_oa_soaring_damaged -kill @e[type=marker,tag=gm4_oa_soaring_location,limit=1,sort=nearest] -scoreboard players reset soaring_damaged gm4_pneuma_data diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/damaged.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/damaged.mcfunction deleted file mode 100644 index 735b1dac09..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/damaged.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -# @s = player with active soaring pneuma that has been damaged -# run from pneumas/advancement_triggers/player_damaged - -summon marker ~ ~ ~ {Tags:["gm4_oa_soaring_location"]} -tp @e[type=marker,tag=gm4_oa_soaring_location,limit=1,distance=..0.1] @s -tag @s add gm4_oa_soaring_damaged -schedule function gm4_orb_of_ankou:pneumas/temp_tick/soaring_damaged 1t diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/descend.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/descend.mcfunction new file mode 100644 index 0000000000..35e762fe23 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/descend.mcfunction @@ -0,0 +1,5 @@ +# @s = player with soaring pneuma looking down +# run from pneumas/soaring/apply + +tag @s remove gm4_oa_soaring_idle +attribute @s minecraft:gravity modifier remove gm4_orb_of_ankou:soaring_gravity diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/idle.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/idle.mcfunction index 028d1e3178..8dc754524d 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/idle.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/idle.mcfunction @@ -2,4 +2,6 @@ # run from pneumas/soaring/apply effect clear @s levitation -effect give @s levitation 3 255 true +tp @s +attribute @s minecraft:gravity modifier add gm4_orb_of_ankou:soaring_gravity -0.08 add_value +tag @s add gm4_oa_soaring_idle diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/remove_fall_protection.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/remove_fall_protection.mcfunction new file mode 100644 index 0000000000..005524fee7 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/remove_fall_protection.mcfunction @@ -0,0 +1,5 @@ +# @s = player that was previously soaring, and has landed +# run from main + +tag @s remove gm4_oa_soaring_off_ground +attribute @s minecraft:fall_damage_multiplier modifier remove gm4_orb_of_ankou:soaring_fall_protection diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/toggle.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/toggle.mcfunction index 4d8cf2b2f7..ad053670f5 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/toggle.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/soaring/toggle.mcfunction @@ -7,6 +7,7 @@ tag @s[tag=!gm4_oa_no_soaring] add gm4_oa_soaring_active tag @s remove gm4_oa_no_soaring playsound minecraft:entity.ender_dragon.flap player @s[tag=gm4_oa_soaring_active] ~ ~ ~ 0.4 1.6 playsound minecraft:entity.player.small_fall player @s[tag=!gm4_oa_soaring_active] ~ ~ ~ 0.4 1.6 -effect clear @s[tag=!gm4_oa_soaring_active] levitation +attribute @s[tag=gm4_oa_soaring_active] minecraft:fall_damage_multiplier modifier add gm4_orb_of_ankou:soaring_fall_protection -1024 add_value +attribute @s[tag=!gm4_oa_soaring_active] minecraft:gravity modifier remove gm4_orb_of_ankou:soaring_gravity tag @s add gm4_oa_soaring_toggled diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/agile.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/agile.mcfunction deleted file mode 100644 index 9e99db0fbd..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/agile.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# @s = none -# run from update_tags/check_pneuma - -execute as @a[gamemode=!spectator,tag=gm4_pneuma_agile] at @s if block ~ ~-0.1 ~ #gm4:no_collision if block ~ ~-1.3 ~ #gm4:no_collision if block ~ ~-2.3 ~ #gm4:no_collision if block ~ ~-3.3 ~ #gm4:no_collision run function gm4_orb_of_ankou:pneumas/agile - -execute if entity @a[tag=gm4_pneuma_agile,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/agile 1t diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/soaring_damaged.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/soaring_damaged.mcfunction deleted file mode 100644 index b278525a27..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/soaring_damaged.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -# @s = none -# run from pneumas/soaring/damaged - -execute as @a[gamemode=!spectator,tag=gm4_oa_soaring_damaged] run function gm4_orb_of_ankou:pneumas/soaring/back - -execute if entity @a[tag=gm4_oa_soaring_damaged,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/soaring_damaged 1t diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/striding_revert.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/striding_revert.mcfunction index 4acd5e3fb0..5e698d7655 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/striding_revert.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/pneumas/temp_tick/striding_revert.mcfunction @@ -3,5 +3,6 @@ scoreboard players add @e[type=marker,tag=gm4_oa_striding_block] gm4_oa_marker 1 execute at @e[type=marker,tag=gm4_oa_striding_block,scores={gm4_oa_marker=8..}] if block ~ ~ ~ magma_block run setblock ~ ~ ~ lava +kill @e[type=marker,tag=gm4_oa_striding_block,scores={gm4_oa_marker=8..}] execute if entity @e[type=marker,tag=gm4_oa_striding_block,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/striding_revert 1t diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/destroy.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/destroy.mcfunction index 931201ea20..383a476138 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/destroy.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/destroy.mcfunction @@ -15,6 +15,7 @@ execute if score @s gm4_oa_powder matches 1.. run function gm4_orb_of_ankou:soul execute if score @s gm4_oa_glowstone matches 1.. run function gm4_orb_of_ankou:soul_forge/entities/summon_glowstone_sprite execute if score @s gm4_oa_tears matches 1.. run function gm4_orb_of_ankou:soul_forge/entities/summon_wandering_tear execute if score @s gm4_oa_roses matches 1.. run function gm4_orb_of_ankou:soul_forge/entities/withering_magic +kill @e[type=marker,tag=gm4_oa_wither_rose_catcher,distance=..10] # summon endermites for extra essences stored inside the soul forge execute if score @s gm4_oa_essence matches 1.. run function gm4_orb_of_ankou:soul_forge/entities/summon_extra_essence diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/congealed_shard.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/congealed_shard.mcfunction deleted file mode 100644 index 0bd9c1d44f..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/congealed_shard.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# @s = soul forge to spawn an bat with a soul essence -# run from soul_forge/entities/summon_congealed_shard - -# spawn bat -summon bat ~ ~0.2 ~ {CustomName:{"translate":"entity.gm4.congealed_shard","fallback":"Congealed Soul Shard§"},CustomNameVisible:0b,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"gm4:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_congealed_shard","gm4_oa_ignore","gm4_defused_bat"],drop_chances:{mainhand:2.0f,offhand:1.0f},Motion:[0.0,0.6,0.0],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}]} - -# set loot drop to soul shard -data modify entity @e[type=bat,tag=gm4_oa_unset,limit=1] equipment.mainhand set from storage gm4_orb_of_ankou:temp Item - -# randomize motion in x and z -execute as @e[type=bat,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/randomize_motion - -# visuals -playsound minecraft:entity.bat.hurt hostile @a[distance=..12] ~ ~ ~ 0.7 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/fire_sprite.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/fire_sprite.mcfunction index ce09eb1afd..8a6a95c726 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/fire_sprite.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/fire_sprite.mcfunction @@ -5,7 +5,7 @@ summon minecraft:zombie ~ ~0.2 ~ {Fire:1000000,Motion:[0.0,0.6,0.0],Silent:1b,CustomNameVisible:0b,DeathLootTable:"gm4:empty",Health:10.0f,IsBaby:1b,CanBreakDoors:0b,CanPickUpLoot:0b,Tags:["gm4_oa_unset","gm4_oa_ignore","gm4_oa_fire_sprite"],CustomName:{"translate":"entity.gm4.fire_sprite","fallback":"Fire Sprite§"},Team:"gm4_hide_name",equipment:{head:{id:"minecraft:golden_helmet",count:1,components:{"minecraft:custom_model_data":"entity/fire_sprite","minecraft:enchantment_glint_override":true}}},drop_chances:{head:0F},active_effects:[{id:"minecraft:invisibility",amplifier:0b,duration:1000000,show_particles:0b}],attributes:[{id:"minecraft:follow_range",base:8},{id:"minecraft:attack_damage",base:1},{id:"minecraft:attack_knockback",base:0},{id:"minecraft:spawn_reinforcements",base:0}]} # randomize motion in x and z -execute as @e[type=zombie,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/randomize_motion +execute as @e[type=zombie,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/set_data/randomize_motion # visuals playsound minecraft:entity.blaze.hurt hostile @a[distance=..12] ~ ~ ~ 0.6 1.2 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/living_orb.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/living_orb.mcfunction deleted file mode 100644 index 3ab1ee86ff..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/living_orb.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# @s = soul forge to spawn an silverfish with a soul essence -# run from soul_forge/entities/summon_living_orb - -# spawn silverfish -summon silverfish ~ ~0.2 ~ {CustomName:{"translate":"entity.gm4.living_orb","fallback":"Living Orb§"},CustomNameVisible:0b,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"gm4:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_living_orb","gm4_oa_ignore"],drop_chances:{mainhand:2.0f,offhand:1.0f},Motion:[0.0,0.6,0.0],active_effects:[{id:"minecraft:fire_resistance",amplifier:0b,duration:1000000,show_particles:0b}]} - -# set loot drop to orb of ankou -data modify entity @e[type=silverfish,tag=gm4_oa_unset,limit=1] equipment.mainhand set from storage gm4_orb_of_ankou:temp Item - -# randomize motion in x and z -execute as @e[type=silverfish,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/randomize_motion - -# visuals -playsound minecraft:entity.silverfish.hurt hostile @a[distance=..12] ~ ~ ~ 0.7 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/randomize_motion.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/randomize_motion.mcfunction deleted file mode 100644 index eec2583f6f..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/randomize_motion.mcfunction +++ /dev/null @@ -1,26 +0,0 @@ -# @s = newly spawned entity -# run from soul_forge/entities/severed_soul, soul_forge_entities/fire_sprite, soul_forge/entities/congealed_shard, soul_forge/entites/living_orb, and soul_forge/outputs/fuse_pneuma - -# set precursory values -scoreboard players set modulo_1 gm4_oa_forge 50 -scoreboard players set modulo_2 gm4_oa_forge 71 - -# get own uuid into scoreboard and scale into range -execute store result score motion_x gm4_oa_forge run data get entity @s UUID[0] -scoreboard players operation motion_z gm4_oa_forge = motion_x gm4_oa_forge - -scoreboard players operation motion_z gm4_oa_forge %= modulo_2 gm4_oa_forge - -scoreboard players operation motion_x gm4_oa_forge %= modulo_1 gm4_oa_forge -scoreboard players operation motion_z gm4_oa_forge %= modulo_1 gm4_oa_forge - -# remove 25 so it can be pos or neg -scoreboard players remove motion_x gm4_oa_forge 25 -scoreboard players remove motion_z gm4_oa_forge 25 - -# modify motion -execute store result entity @s Motion[0] double 0.01 run scoreboard players get motion_x gm4_oa_forge -execute store result entity @s Motion[2] double 0.01 run scoreboard players get motion_z gm4_oa_forge - -# mark as modified -tag @s remove gm4_oa_unset diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/congealed_shard.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/congealed_shard.mcfunction new file mode 100644 index 0000000000..d26ed83ee0 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/congealed_shard.mcfunction @@ -0,0 +1,7 @@ +# @s = new congealed shard bat +# run from soul_forge/entities/summon_congealed_shard +# and from soul_forge/entities/summon_extra_shard + +$loot replace entity @s weapon.mainhand loot gm4_orb_of_ankou:items/soul_shard/$(id) +data merge entity @s {CustomName:{"translate":"entity.gm4.congealed_shard","fallback":"Congealed Soul Shard§"},CustomNameVisible:0b,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"gm4:empty",PersistenceRequired:1b,Tags:["gm4_oa_congealed_shard","gm4_oa_ignore","gm4_defused_bat"],drop_chances:{mainhand:2.0f,offhand:1.0f},Motion:[0.0,0.6,0.0],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}]} +function gm4_orb_of_ankou:soul_forge/entities/set_data/randomize_motion diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/get_orb_pneuma.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/get_orb_pneuma.mcfunction new file mode 100644 index 0000000000..6e1b561f2a --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/get_orb_pneuma.mcfunction @@ -0,0 +1,14 @@ +# @s = new living orb silverfish +# run from soul_forge/entities/set_data/loop_orb_pneumas + +# get shard data from loot table +$loot replace entity @s weapon.offhand loot gm4_orb_of_ankou:items/soul_shard/$(id) +data modify storage gm4_orb_of_ankou:temp shard set from entity @s equipment.offhand +item replace entity @s weapon.offhand with minecraft:air + +# set data of soul shard into orb of ankou +data modify storage gm4_orb_of_ankou:temp new_orb.components."minecraft:lore" append from storage gm4_orb_of_ankou:temp shard.components."minecraft:lore"[] +data modify storage gm4_orb_of_ankou:temp new_orb.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas append from storage gm4_orb_of_ankou:temp shard.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas[] +data modify storage gm4_orb_of_ankou:temp new_orb.components."minecraft:enchantments" merge from storage gm4_orb_of_ankou:temp shard.components."minecraft:enchantments" +data modify storage gm4_orb_of_ankou:temp new_orb.components."minecraft:attribute_modifiers" append from storage gm4_orb_of_ankou:temp shard.components."minecraft:attribute_modifiers"[] +data remove storage gm4_orb_of_ankou:temp new_orb.components."minecraft:attribute_modifiers"[{id:"gm4_orb_of_ankou:attack_damage"}] diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/living_orb.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/living_orb.mcfunction new file mode 100644 index 0000000000..01e823eaee --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/living_orb.mcfunction @@ -0,0 +1,25 @@ +# @s = new living orb silverfish +# run from soul_forge/entities/summon_extra_orb +# and from soul_forge/entities/summon_living_orb + +# set default data +data merge entity @s {CustomName:{"translate":"entity.gm4.living_orb","fallback":"Living Orb§"},CustomNameVisible:0b,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"gm4:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_living_orb","gm4_oa_ignore"],drop_chances:{mainhand:2.0f,offhand:1.0f},Motion:[0.0,0.6,0.0],active_effects:[{id:"minecraft:fire_resistance",amplifier:0b,duration:1000000,show_particles:0b}]} + +# get pneuma count, return early if empty +execute store result score pneuma_count gm4_oa_forge run data get storage gm4_orb_of_ankou:temp current_orb.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas +execute if score pneuma_count gm4_oa_forge matches 0 run return run loot replace entity @s weapon.mainhand loot gm4_orb_of_ankou:items/orb_of_ankou + +# set up new orb +loot replace entity @s weapon.offhand loot gm4_orb_of_ankou:items/orb_of_ankou +data modify storage gm4_orb_of_ankou:temp new_orb set from entity @s equipment.offhand +item replace entity @s weapon.offhand with minecraft:air +data merge storage gm4_orb_of_ankou:temp {new_orb:{components:{"minecraft:lore":[{"translate":"text.gm4.orb_of_ankou.pneumas","fallback":"Pneumas:","italic":false,"color":"light_purple"}],"minecraft:firework_explosion":{shape:"small_ball",colors:[I;]}}}} + +# get pneuma data from shard loot tables +execute store result score restore_pneuma_count gm4_oa_forge run data get storage gm4_orb_of_ankou:temp current_orb.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas +function gm4_orb_of_ankou:soul_forge/entities/set_data/loop_orb_pneumas +data modify entity @s equipment.mainhand set from storage gm4_orb_of_ankou:temp new_orb + +# clean up +data remove storage gm4_orb_of_ankou:temp new_orb +data remove storage gm4_orb_of_ankou:temp current_orb diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/loop_orb_pneumas.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/loop_orb_pneumas.mcfunction new file mode 100644 index 0000000000..69620af2fe --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/loop_orb_pneumas.mcfunction @@ -0,0 +1,8 @@ +# @s = new living orb silverfish +# run from soul_forge/entities/set_data/living_orb + +# get next pneuma +function gm4_orb_of_ankou:soul_forge/entities/set_data/get_orb_pneuma with storage gm4_orb_of_ankou:temp current_orb.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas[0] +data remove storage gm4_orb_of_ankou:temp current_orb.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas[0] +scoreboard players remove restore_pneuma_count gm4_oa_forge 1 +execute if score restore_pneuma_count gm4_oa_forge matches 1.. run function gm4_orb_of_ankou:soul_forge/entities/set_data/loop_orb_pneumas diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/randomize_motion.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/randomize_motion.mcfunction new file mode 100644 index 0000000000..359ec1983a --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/randomize_motion.mcfunction @@ -0,0 +1,9 @@ +# @s = newly spawned entity +# run from soul_forge/entities/severed_soul, soul_forge_entities/fire_sprite, soul_forge/entities/congealed_shard, soul_forge/entites/living_orb, and soul_forge/outputs/fuse_pneuma + +# modify motion +execute store result entity @s Motion[0] double 0.01 run random value -25..25 +execute store result entity @s Motion[2] double 0.01 run random value -25..25 + +# mark as modified +tag @s remove gm4_oa_unset diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/severed_soul.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/severed_soul.mcfunction new file mode 100644 index 0000000000..10045b16a4 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/set_data/severed_soul.mcfunction @@ -0,0 +1,7 @@ +# @s = new severed soul endermite +# run from soul_forge/entities/summon_extra_essence +# and from soul_forge/entities/summon_failed_essence + +$loot replace entity @s weapon.mainhand loot gm4_orb_of_ankou:items/soul_essence/$(id) +data merge entity @s {CustomName:{"translate":"entity.gm4.severed_soul","fallback":"Severed Soul§"},CustomNameVisible:0b,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"gm4:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_severed_soul","gm4_oa_ignore"],drop_chances:{mainhand:2.0f,offhand:1.0f},Motion:[0.0,0.6,0.0],active_effects:[{id:"minecraft:fire_resistance",amplifier:0b,duration:1000000,show_particles:0b}]} +function gm4_orb_of_ankou:soul_forge/entities/set_data/randomize_motion diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/severed_soul.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/severed_soul.mcfunction deleted file mode 100644 index a4b5b6c7f2..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/severed_soul.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -# @s = soul forge to spawn an endermite with a soul essence -# run from both soul_forge/entities/summon_failed_essence and soul_forge/entities/summon_congealed_essence - -# spawn endermite -summon endermite ~ ~0.2 ~ {CustomName:{"translate":"entity.gm4.severed_soul","fallback":"Severed Soul§"},CustomNameVisible:0b,Team:"gm4_hide_name",Health:2.0f,DeathLootTable:"gm4:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_severed_soul","gm4_oa_ignore"],drop_chances:{mainhand:2.0f,offhand:1.0f},Motion:[0.0,0.6,0.0],active_effects:[{id:"minecraft:fire_resistance",amplifier:0b,duration:1000000,show_particles:0b}]} - -# set loot drop to soul essence -data modify entity @e[type=endermite,tag=gm4_oa_unset,limit=1] equipment.mainhand set from storage gm4_orb_of_ankou:temp equipment.feet - -# randomize motion in x and z -execute as @e[type=endermite,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/randomize_motion - -# visuals -playsound minecraft:entity.endermite.hurt hostile @a[distance=..12] ~ ~ ~ 0.7 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_congealed_shard.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_congealed_shard.mcfunction index 10c2600f03..0268afdca0 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_congealed_shard.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_congealed_shard.mcfunction @@ -1,8 +1,11 @@ # @s = soul shard item in a soul forge that already has an shard # run from both soul_forge/recipes/check_shard and soul_forge/recipes/add_shard -# summon bat -function gm4_orb_of_ankou:soul_forge/entities/congealed_shard +# spawn bat +execute positioned ~ ~0.2 ~ summon bat run function gm4_orb_of_ankou:soul_forge/entities/set_data/congealed_shard with storage gm4_orb_of_ankou:temp Item.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas[-1] + +# visuals +playsound minecraft:entity.bat.hurt hostile @a[distance=..12] ~ ~ ~ 0.7 1 # loop scoreboard players remove shard_count gm4_oa_forge 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_essence.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_essence.mcfunction index ca7132f5d0..64217bdafe 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_essence.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_essence.mcfunction @@ -2,8 +2,10 @@ # run from soul_forge/destroy # summon endermite -data modify storage gm4_orb_of_ankou:temp equipment.feet.components set from storage gm4_orb_of_ankou:temp equipment.legs.components -function gm4_orb_of_ankou:soul_forge/entities/severed_soul +execute positioned ~ ~0.2 ~ summon endermite run function gm4_orb_of_ankou:soul_forge/entities/set_data/severed_soul with storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_data".gm4_orb_of_ankou.stored_pneuma + +# visuals +playsound minecraft:entity.endermite.hurt hostile @a[distance=..12] ~ ~ ~ 0.7 1 # loop scoreboard players remove @s gm4_oa_essence 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_orb.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_orb.mcfunction index 934a16cabb..94b22292b3 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_orb.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_orb.mcfunction @@ -2,13 +2,8 @@ # run from soul_forge/destroy # spawn silverfish -summon silverfish ~ ~0.2 ~ {CustomName:{"translate":"entity.gm4.living_orb","fallback":"Living Orb§"},CustomNameVisible:0b,Team:"gm4_hide_name",DeathLootTable:"gm4:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_living_orb","gm4_oa_ignore"],drop_chances:{mainhand:2.0f,offhand:1.0f},Motion:[0.0,0.6,0.0],active_effects:[{id:"minecraft:fire_resistance",amplifier:0b,duration:1000000,show_particles:0b}]} - -# set loot drop to orb of ankou -data modify entity @e[type=silverfish,tag=gm4_oa_unset,limit=1] equipment.mainhand set from storage gm4_orb_of_ankou:temp ArmorItems[3] - -# randomize motion in x and z -execute as @e[type=silverfish,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/randomize_motion +data modify storage gm4_orb_of_ankou:temp current_orb set from storage gm4_orb_of_ankou:temp equipment.head +execute positioned ~ ~0.2 ~ summon silverfish run function gm4_orb_of_ankou:soul_forge/entities/set_data/living_orb # visuals playsound minecraft:entity.silverfish.hurt hostile @a[distance=..12] ~ ~ ~ 0.7 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_shard.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_shard.mcfunction index 96f55365a9..b989ee0406 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_shard.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_extra_shard.mcfunction @@ -2,13 +2,7 @@ # run from soul_forge/destroy # spawn bat -summon bat ~ ~0.2 ~ {CustomName:{"translate":"entity.gm4.congealed_shard","fallback":"Congealed Soul Shard§"},CustomNameVisible:0b,Team:"gm4_hide_name",DeathLootTable:"gm4:empty",PersistenceRequired:1b,Tags:["gm4_oa_unset","gm4_oa_congealed_shard","gm4_oa_ignore","gm4_defused_bat"],drop_chances:{mainhand:2.0f,offhand:1.0f},Motion:[0.0,0.6,0.0],active_effects:[{id:"minecraft:fire_resistance",amplifier:0b,duration:1000000,show_particles:0b}]} - -# set loot drop to soul shard -data modify entity @e[type=bat,tag=gm4_oa_unset,limit=1] equipment.mainhand set from storage gm4_orb_of_ankou:temp equipment.chest - -# randomize motion in x and z -execute as @e[type=bat,tag=gm4_oa_unset,limit=1] run function gm4_orb_of_ankou:soul_forge/entities/randomize_motion +execute positioned ~ ~0.2 ~ summon bat run function gm4_orb_of_ankou:soul_forge/entities/set_data/congealed_shard with storage gm4_orb_of_ankou:temp equipment.chest.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas[-1] # visuals playsound minecraft:entity.bat.hurt hostile @a[distance=..12] ~ ~ ~ 0.7 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_failed_essence.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_failed_essence.mcfunction index 949d607260..29d7e23565 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_failed_essence.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_failed_essence.mcfunction @@ -2,7 +2,7 @@ # run from soul_forge/destroy # summon endermite -function gm4_orb_of_ankou:soul_forge/entities/severed_soul +execute positioned ~ ~0.2 ~ summon endermite run function gm4_orb_of_ankou:soul_forge/entities/set_data/severed_soul with storage gm4_orb_of_ankou:temp equipment.feet.components."minecraft:custom_data".gm4_orb_of_ankou.stored_pneuma # loop scoreboard players remove failed_count gm4_oa_essence 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_living_orb.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_living_orb.mcfunction index dd1f1788fe..316c80f24e 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_living_orb.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_living_orb.mcfunction @@ -1,8 +1,12 @@ # @s = orb of ankou item in a soul forge that already has an orb # run from both soul_forge/recipes/check_orb and soul_forge/recipes/add_orb -# summon silverfish -function gm4_orb_of_ankou:soul_forge/entities/living_orb +# spawn silverfish +data modify storage gm4_orb_of_ankou:temp current_orb set from storage gm4_orb_of_ankou:temp Item +execute positioned ~ ~0.2 ~ summon silverfish run function gm4_orb_of_ankou:soul_forge/entities/set_data/living_orb + +# visuals +playsound minecraft:entity.silverfish.hurt hostile @a[distance=..12] ~ ~ ~ 0.7 1 # loop scoreboard players remove orb_count gm4_oa_forge 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_wandering_tear.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_wandering_tear.mcfunction index 22946f31b7..5331a7d0cd 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_wandering_tear.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/summon_wandering_tear.mcfunction @@ -1,8 +1,11 @@ # @s = soul forge without fire with extra ghast tears in storage # run from soul_forge/destroy -# summon vex -function gm4_orb_of_ankou:soul_forge/entities/wandering_tear +# spawn vex +summon minecraft:vex ~ ~0.2 ~ {Silent:1b,Glowing:1b,CustomNameVisible:0b,life_ticks:1200,DeathLootTable:"gm4:empty",Tags:["gm4_oa_ignore","gm4_oa_wandering_tear"],CustomName:{"translate":"entity.gm4.wandering_tear","fallback":"Wandering Tear§"},Team:"gm4_hide_name",active_effects:[{id:"minecraft:invisibility",amplifier:0b,duration:1000000,show_particles:0b}],attributes:[{id:"minecraft:follow_range",base:48},{id:"minecraft:attack_damage",base:3}]} + +# visuals +playsound minecraft:entity.vex.hurt hostile @a[distance=..12] ~ ~ ~ 0.6 1.2 # loop scoreboard players remove @s gm4_oa_tears 1 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/wandering_tear.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/wandering_tear.mcfunction deleted file mode 100644 index 8165d3aa39..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/entities/wandering_tear.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -# @s = soul forge to spawn a wandering tear vex -# run from soul_forge/entities/summon_wandering_tear - -# spawn vex -summon minecraft:vex ~ ~0.2 ~ {Silent:1b,Glowing:1b,CustomNameVisible:0b,life_ticks:1200,DeathLootTable:"gm4:empty",Tags:["gm4_oa_ignore","gm4_oa_wandering_tear"],CustomName:{"translate":"entity.gm4.wandering_tear","fallback":"Wandering Tear§"},Team:"gm4_hide_name",active_effects:[{id:"minecraft:invisibility",amplifier:0b,duration:1000000,show_particles:0b}],attributes:[{id:"minecraft:follow_range",base:48},{id:"minecraft:attack_damage",base:3}]} - -# visuals -playsound minecraft:entity.vex.hurt hostile @a[distance=..12] ~ ~ ~ 0.6 1.2 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/check_fuse.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/check_fuse.mcfunction index a4c15db8be..1c51fdc30f 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/check_fuse.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/check_fuse.mcfunction @@ -18,4 +18,4 @@ execute if score valid_shard gm4_oa_forge matches 1 if score pneuma_count gm4_oa # if all the checks pass, fuse the shard with the orb execute if score valid_shard gm4_oa_forge matches 1 run function gm4_orb_of_ankou:soul_forge/outputs/fuse_pneuma -data remove storage gm4_orb_of_ankoou:temp Orb +data remove storage gm4_orb_of_ankou:temp Orb diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/create_shard.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/create_shard.mcfunction index be95a8b08d..b3d1f31a24 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/create_shard.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/create_shard.mcfunction @@ -2,23 +2,7 @@ # run from soul_forge/destroy # spawn bat -summon minecraft:bat ~ ~ ~ {CustomName:{"translate":"entity.gm4.possessed_shard","fallback":"Possessed Soul Shard§"},CustomNameVisible:0b,Team:"gm4_hide_name",DeathLootTable:"gm4:empty",PersistenceRequired:1b,Health:2.0f,Tags:["gm4_oa_unset","gm4_oa_possessed_soul_shard","gm4_oa_ignore","gm4_defused_bat"],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}],drop_chances:{head:2F},equipment:{head:{id:"minecraft:flint",count:1,components:{"minecraft:enchantment_glint_override":true,"minecraft:custom_name":{"translate":"item.gm4.soul_shard","fallback":"Soul Shard","italic":false,"color":"white"},"minecraft:attribute_modifiers":[{type:"minecraft:attack_damage",id:"gm4_orb_of_ankou:attack_damage",slot:"offhand",amount:-0.2,operation:"add_multiplied_base"}],"minecraft:custom_data":{gm4_orb_of_ankou:{item:"soul_shard"}}}}}} - -# set data of soul essence into soul shard -data modify storage gm4_orb_of_ankou:temp Drop set from entity @e[type=bat,tag=gm4_oa_unset,limit=1] equipment.head -data modify storage gm4_orb_of_ankou:temp Drop.components."minecraft:custom_model_data" set from storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_model_data" -data modify storage gm4_orb_of_ankou:temp Drop.components."minecraft:lore"[] set from storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:lore"[0] -data modify storage gm4_orb_of_ankou:temp Drop.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas[] set from storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_data".gm4_orb_of_ankou.stored_pneuma -data modify storage gm4_orb_of_ankou:temp Drop.components."minecraft:attribute_modifiers" append from storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_data".gm4_orb_of_ankou.stored_attributes[] -# TODO 1.20.5: verify that this combines the enchantments correctly -data modify storage gm4_orb_of_ankou:temp Drop.components."minecraft:enchantments" merge from storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_data".gm4_orb_of_ankou.stored_enchantments -data modify storage gm4_orb_of_ankou:temp Drop.components."minecraft:custom_data".gm4_orb_of_ankou.stored_enchantments set from storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_data".gm4_orb_of_ankou.stored_enchantments -data modify storage gm4_orb_of_ankou:temp Drop.components."minecraft:custom_data".gm4_orb_of_ankou.stored_attributes set from storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_data".gm4_orb_of_ankou.stored_attributes -data modify storage gm4_orb_of_ankou:temp Drop.components."minecraft:custom_data".gm4_orb_of_ankou.stored_color set from storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_data".gm4_orb_of_ankou.stored_color - -data modify entity @e[type=bat,tag=gm4_oa_unset,limit=1] equipment.head set from storage gm4_orb_of_ankou:temp Drop -data remove storage gm4_orb_of_ankou:temp Drop -tag @e[type=bat] remove gm4_oa_unset +execute summon bat run function gm4_orb_of_ankou:soul_forge/outputs/set_shard_loot with storage gm4_orb_of_ankou:temp equipment.legs.components."minecraft:custom_data".gm4_orb_of_ankou.stored_pneuma # loop if extra sets of 13 scoreboard players remove @s gm4_oa_essence 13 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/fuse_pneuma.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/fuse_pneuma.mcfunction index 6bd22ba57e..45addd1867 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/fuse_pneuma.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/fuse_pneuma.mcfunction @@ -12,9 +12,9 @@ data modify storage gm4_orb_of_ankou:temp Item.components."minecraft:lore"[0] se data modify storage gm4_orb_of_ankou:temp Item.components."minecraft:lore" append from storage gm4_orb_of_ankou:temp equipment.chest.components."minecraft:lore"[] data modify storage gm4_orb_of_ankou:temp Item.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas append from storage gm4_orb_of_ankou:temp equipment.chest.components."minecraft:custom_data".gm4_orb_of_ankou.pneumas[] -# TODO 1.20.5: verify that this combines the enchantments correctly -data modify storage gm4_orb_of_ankou:temp Item.components."minecraft:enchantments" merge from storage gm4_orb_of_ankou:temp equipment.chest.components."minecraft:custom_data".gm4_orb_of_ankou.stored_enchantments -data modify storage gm4_orb_of_ankou:temp Item.components."minecraft:attribute_modifiers" append from storage gm4_orb_of_ankou:temp equipment.chest.components."minecraft:custom_data".gm4_orb_of_ankou.stored_attributes[] +data modify storage gm4_orb_of_ankou:temp Item.components."minecraft:enchantments" merge from storage gm4_orb_of_ankou:temp equipment.chest.components."minecraft:enchantments" +data modify storage gm4_orb_of_ankou:temp Item.components."minecraft:attribute_modifiers" append from storage gm4_orb_of_ankou:temp equipment.chest.components."minecraft:attribute_modifiers"[] +data remove storage gm4_orb_of_ankou:temp Item.components."minecraft:attribute_modifiers"[{id:"gm4_orb_of_ankou:attack_damage"}] #custom color execute if score pneuma_count gm4_oa_forge matches 0 run data merge storage gm4_orb_of_ankou:temp {Item:{components:{"minecraft:firework_explosion":{shape:"small_ball",colors:[I;]}}}} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/set_shard_loot.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/set_shard_loot.mcfunction new file mode 100644 index 0000000000..dcf1021fcb --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/outputs/set_shard_loot.mcfunction @@ -0,0 +1,5 @@ +# @s = new soul shard bat +# run from soul_forge/outputs/create_shard + +$loot replace entity @s armor.head loot gm4_orb_of_ankou:items/soul_shard/$(id) +data merge entity @s {CustomName:{"translate":"entity.gm4.possessed_shard","fallback":"Possessed Soul Shard§"},CustomNameVisible:0b,Team:"gm4_hide_name",DeathLootTable:"gm4:empty",PersistenceRequired:1b,Health:2.0f,Tags:["gm4_oa_possessed_soul_shard","gm4_oa_ignore","gm4_defused_bat"],active_effects:[{id:'minecraft:fire_resistance',amplifier:0b,duration:1000000,show_particles:0b}],drop_chances:{head:2F}} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/move_indicator.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/move_indicator.mcfunction index a398aaa56d..f7dee1af5b 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/move_indicator.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/move_indicator.mcfunction @@ -1,29 +1,16 @@ # @s = wither_rose_catcher marker at @s # run from soul_forge/wither_roses/summon_indicator -#move the AEC to the chosen x and z -execute at @s if score random_x gm4_oa_roses matches 8.. run tp @s ~8 ~ ~ -execute if score random_x gm4_oa_roses matches 8.. run scoreboard players remove random_x gm4_oa_roses 8 -execute at @s if score random_x gm4_oa_roses matches 4.. run tp @s ~4 ~ ~ -execute if score random_x gm4_oa_roses matches 4.. run scoreboard players remove random_x gm4_oa_roses 4 -execute at @s if score random_x gm4_oa_roses matches 2.. run tp @s ~2 ~ ~ -execute if score random_x gm4_oa_roses matches 2.. run scoreboard players remove random_x gm4_oa_roses 2 -execute at @s if score random_x gm4_oa_roses matches 1.. run tp @s ~1 ~ ~ -execute if score random_x gm4_oa_roses matches 1.. run scoreboard players remove random_x gm4_oa_roses 1 -execute at @s if score random_z gm4_oa_roses matches 8.. run tp @s ~ ~ ~8 -execute if score random_z gm4_oa_roses matches 8.. run scoreboard players remove random_z gm4_oa_roses 8 -execute at @s if score random_z gm4_oa_roses matches 4.. run tp @s ~ ~ ~4 -execute if score random_z gm4_oa_roses matches 4.. run scoreboard players remove random_z gm4_oa_roses 4 -execute at @s if score random_z gm4_oa_roses matches 2.. run tp @s ~ ~ ~2 -execute if score random_z gm4_oa_roses matches 2.. run scoreboard players remove random_z gm4_oa_roses 2 -execute at @s if score random_z gm4_oa_roses matches 1.. run tp @s ~ ~ ~1 -execute if score random_z gm4_oa_roses matches 1.. run scoreboard players remove random_z gm4_oa_roses 1 +# move the to the randomized position +$tp ~$(x) ~1 ~$(z) -#kill if not in air or on unsupported block -execute at @s if block ~ ~ ~ #gm4:no_collision unless block ~ ~-1 ~ #gm4:no_collision run tag @s add gm4_oa_rose_indicator_valid +# kill if not in air or on unsupported block +execute at @s if block ~ ~ ~ #gm4:no_collision unless block ~ ~-1 ~ #gm4:no_collision unless block ~ ~-1 ~ obsidian run tag @s add gm4_oa_rose_indicator_valid +execute if entity @s[tag=!gm4_oa_rose_indicator_valid] run return run kill @s -kill @s[tag=!gm4_oa_rose_indicator_valid] +# set data +data merge entity @s {CustomName:"gm4_oa_wither_rose_catcher",Tags:["gm4_oa_wither_rose_catcher"]} # play sound to indicate -execute at @s[tag=gm4_oa_rose_indicator_valid] run playsound minecraft:entity.wither.ambient block @a ~ ~ ~ 0.6 1.4 +execute at @s run playsound minecraft:entity.wither.ambient block @a ~ ~ ~ 0.6 1.4 diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/steps.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/steps.mcfunction index ca029e6fc0..fc82fd66a7 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/steps.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/steps.mcfunction @@ -7,9 +7,9 @@ scoreboard players reset @s[scores={gm4_oa_forge=10..}] gm4_oa_forge # every 160 ticks (8 seconds): spawn an indicator, wait 80 ticks (4 seconds) then consume the wither rose at that indicator if possible execute if score @s gm4_oa_forge matches 2 run function gm4_orb_of_ankou:soul_forge/wither_roses/summon_indicator -scoreboard players add @e[type=marker,tag=gm4_oa_wither_rose_catcher,distance=..8,limit=1,sort=nearest] gm4_oa_marker 16 -execute if score @s gm4_oa_forge matches 8 at @e[type=marker,tag=gm4_oa_wither_rose_catcher,scores={gm4_oa_marker=112..},distance=..8,limit=1,sort=nearest] if block ~ ~ ~ wither_rose run function gm4_orb_of_ankou:soul_forge/wither_roses/consume -kill @e[type=marker,tag=gm4_oa_wither_rose_catcher,scores={gm4_oa_marker=112..},distance=..8] +scoreboard players add @e[type=marker,tag=gm4_oa_wither_rose_catcher,distance=..10,limit=1,sort=nearest] gm4_oa_marker 16 +execute if score @s gm4_oa_forge matches 8 at @e[type=marker,tag=gm4_oa_wither_rose_catcher,scores={gm4_oa_marker=112..},distance=..10,limit=1,sort=nearest] if block ~ ~ ~ wither_rose run function gm4_orb_of_ankou:soul_forge/wither_roses/consume +kill @e[type=marker,tag=gm4_oa_wither_rose_catcher,scores={gm4_oa_marker=112..},distance=..10] # indicator particles execute at @e[type=marker,tag=gm4_oa_wither_rose_catcher] run particle witch ~ ~ ~ 0 .2 0 0 7 normal diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/summon_indicator.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/summon_indicator.mcfunction index 71be90ebd2..75589236ce 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/summon_indicator.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/soul_forge/wither_roses/summon_indicator.mcfunction @@ -1,20 +1,10 @@ # @s = soul forge with an orb and shard # run from soul_forge/wither_roses/steps -summon marker ~-6 ~1 ~-6 {CustomName:"gm4_oa_wither_rose_catcher",Tags:["gm4_oa_wither_rose_catcher","gm4_oa_unset"]} - #calculate random position -execute store result score random_x gm4_oa_roses run data get entity @e[type=marker,tag=gm4_oa_wither_rose_catcher,tag=gm4_oa_unset,limit=1] UUID[0] -scoreboard players operation random_z gm4_oa_roses = random_x gm4_oa_roses - -scoreboard players set modulo_1 gm4_oa_roses 13 -scoreboard players operation random_z gm4_oa_roses %= modulo_1 gm4_oa_roses - -scoreboard players set modulo_2 gm4_oa_roses 12 -scoreboard players operation random_x gm4_oa_roses %= modulo_2 gm4_oa_roses -scoreboard players operation random_z gm4_oa_roses %= modulo_2 gm4_oa_roses +execute store result storage gm4_orb_of_ankou:temp pos.x int 1 run random value -6..6 +execute store result storage gm4_orb_of_ankou:temp pos.z int 1 run random value -6..6 #move the entity -execute as @e[type=marker,tag=gm4_oa_wither_rose_catcher,tag=gm4_oa_unset] at @s run function gm4_orb_of_ankou:soul_forge/wither_roses/move_indicator - -tag @e[type=marker,tag=gm4_oa_wither_rose_catcher,tag=gm4_oa_unset] remove gm4_oa_unset +execute summon marker run function gm4_orb_of_ankou:soul_forge/wither_roses/move_indicator with storage gm4_orb_of_ankou:temp pos +data remove storage gm4_orb_of_ankou:temp pos diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/check_offhand.mcfunction b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/check_offhand.mcfunction index c9742e05d0..2a8d0482c8 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/check_offhand.mcfunction +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/function/update_tags/check_offhand.mcfunction @@ -6,3 +6,5 @@ advancement revoke @s only gm4_orb_of_ankou:check_player/check_inventory execute if entity @s[tag=gm4_has_pneuma] run function gm4_orb_of_ankou:update_tags/remove_tags execute if entity @s[predicate=gm4_orb_of_ankou:has_pneuma] run function gm4_orb_of_ankou:update_tags/check_pneuma + +execute as @s[tag=!gm4_pneuma_soaring,tag=gm4_oa_soaring_active] at @s run function gm4_orb_of_ankou:pneumas/soaring/toggle 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 9986bd5eb2..b64cf879fd 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 @@ -4,7 +4,6 @@ tag @s add gm4_has_pneuma tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/aggressive] add gm4_pneuma_aggressive -tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/agile] add gm4_pneuma_agile tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/bargaining] add gm4_pneuma_bargaining tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/blasting] add gm4_pneuma_blasting tag @s[predicate=gm4_orb_of_ankou:pneuma_equipped/blinding] add gm4_pneuma_blinding @@ -50,7 +49,6 @@ scoreboard players reset @s gm4_oa_bow_freezing scoreboard players reset @s gm4_oa_bow_tranquilizing # run tick functions -execute if entity @a[gamemode=!spectator,tag=gm4_pneuma_agile,limit=1] run schedule function gm4_orb_of_ankou:pneumas/temp_tick/agile 1t 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 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 1d8ff6fffd..f5ad1649a7 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 @@ -38,4 +38,5 @@ tag @s remove gm4_pneuma_withering tag @s remove gm4_sneak_pneuma tag @s remove gm4_has_pneuma -tag @s remove gm4_oa_soaring_active +tag @s remove gm4_oa_soaring_idle +tag @s remove gm4_oa_soaring_toggled diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/orb_of_ankou.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/orb_of_ankou.json index ef6ee8ce5e..8c8d846ac6 100644 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/orb_of_ankou.json +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/orb_of_ankou.json @@ -19,15 +19,22 @@ ] }, "minecraft:tooltip_display": { - "hidden_components": [ - "minecraft:firework_explosion" - ] - } + "hidden_components": [ + "minecraft:firework_explosion" + ] + }, + "minecraft:damage_resistant": { + "types": "#minecraft:is_fire" + }, + "minecraft:equippable": { + "slot": "offhand" + }, + "minecraft:max_stack_size": 1 } }, { "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'orb'}}" + "tag": "{gm4_orb_of_ankou:{item:'orb'},smithed:{ignore:{functionality:1b,crafting:1b}}}" }, { "function": "minecraft:set_name", diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/aggressive.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/aggressive.json deleted file mode 100644 index d8f715b435..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/aggressive.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_aggressive", - "fallback": "Aggressive", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/aggressive" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'aggressive'},stored_color:[10682368]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/agile.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/agile.json deleted file mode 100644 index 37dea46204..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/agile.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_agile", - "fallback": "Agile", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/agile" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'agile'},stored_color:[16769574]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/anchoring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/anchoring.json deleted file mode 100644 index 9f8c639514..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/anchoring.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_anchoring", - "fallback": "Anchoring", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/anchoring" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'anchoring'},stored_attributes:[{AttributeName:'minecraft:knockback_resistance',Name:'minecraft:knockback_resistance',Amount:0.9d,Operation:0,UUID:[0,959327,0,859402],Slot:'offhand'}],stored_color:[1648550]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bargaining.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bargaining.json deleted file mode 100644 index ab13cdbd10..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bargaining.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_bargaining", - "fallback": "Bargaining", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/bargaining" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'bargaining'},stored_color:[1090333]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bashing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bashing.json deleted file mode 100644 index c7715f4a8a..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bashing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_bashing", - "fallback": "Bashing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/bashing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'bashing'},stored_attributes:[{AttributeName:'minecraft:attack_speed',Name:'minecraft:attack_speed',Amount:-0.4d,Operation:1,UUID:[0,399214,0,360169],Slot:'offhand'},{AttributeName:'minecraft:attack_damage',Name:'minecraft:attack_damage',Amount:0.7d,Operation:1,UUID:[0,787852,0,423204],Slot:'offhand'}],stored_color:[13181000]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/blasting.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/blasting.json deleted file mode 100644 index f9998e901b..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/blasting.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_blasting", - "fallback": "Blasting", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/blasting" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'blasting'},stored_color:[16761136]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/blinding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/blinding.json deleted file mode 100644 index 76d05a6f0a..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/blinding.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_blinding", - "fallback": "Blinding", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/blinding" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'blinding'},stored_color:[3809425]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bounding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bounding.json deleted file mode 100644 index 157b0cf82a..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bounding.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_bounding", - "fallback": "Bounding", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/bounding" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'bounding'},stored_color:[7921776]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bubbly.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bubbly.json deleted file mode 100644 index b4d065c36d..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/bubbly.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_bubbly", - "fallback": "Bubbly", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/bubbly" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'bubbly'},stored_color:[5294074]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/conjuring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/conjuring.json deleted file mode 100644 index 4736ee6607..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/conjuring.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_conjuring", - "fallback": "Conjuring", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/conjuring" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'conjuring'},stored_color:[2953835]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/dashing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/dashing.json deleted file mode 100644 index 736d842846..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/dashing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_dashing", - "fallback": "Dashing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/dashing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'dashing'},stored_color:[14735149]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/depriving.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/depriving.json deleted file mode 100644 index 405f8afb1a..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/depriving.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_depriving", - "fallback": "Depriving", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/depriving" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'depriving'},stored_color:[13943899]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/draining.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/draining.json deleted file mode 100644 index 1435ea6d2a..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/draining.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_draining", - "fallback": "Draining", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/draining" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'draining'},stored_color:[6377247]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/enduring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/enduring.json deleted file mode 100644 index c304f16314..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/enduring.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_enduring", - "fallback": "Enduring", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/enduring" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'enduring'},stored_attributes:[{AttributeName:'minecraft:max_health',Name:'minecraft:max_health',Amount:8,Operation:0,UUID:[0,585761,0,502439],Slot:'offhand'},{AttributeName:'minecraft:movement_speed',Name:'minecraft:movement_speed',Amount:-0.2d,Operation:1,UUID:[0,944632,0,806703],Slot:'offhand'}],stored_color:[5815552]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/expeditious.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/expeditious.json deleted file mode 100644 index d71c8f0ef9..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/expeditious.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_expeditious", - "fallback": "Expeditious", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/expeditious" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'expeditious'},stored_color:[14037247]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/feathery.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/feathery.json deleted file mode 100644 index c677928a17..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/feathery.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_feathery", - "fallback": "Feathery", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/feathery" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'feathery'},stored_color:[14806509]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/feigning.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/feigning.json deleted file mode 100644 index 07f500f986..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/feigning.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_feigning", - "fallback": "Feigning", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/feigning" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'feigning'},stored_color:[16406506]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/freezing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/freezing.json deleted file mode 100644 index 09d5dfdd2d..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/freezing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_freezing", - "fallback": "Freezing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/freezing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'freezing'},stored_color:[5559779]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/gazing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/gazing.json deleted file mode 100644 index 35a703dd53..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/gazing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_gazing", - "fallback": "Gazing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/gazing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'gazing'},stored_color:[6814213]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/gliding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/gliding.json deleted file mode 100644 index 9330a1e512..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/gliding.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_gliding", - "fallback": "Gliding", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/gliding" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'gliding'},stored_color:[3108845]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/hawkeye.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/hawkeye.json deleted file mode 100644 index 28abe2d042..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/hawkeye.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_hawkeye", - "fallback": "Hawkeye", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/hawkeye", - "minecraft:custom_data": { - "gm4_orb_of_ankou": { - "item": "soul_essence", - "stored_pneuma": { - "id": "hawkeye" - }, - "stored_color": [ - 15548437 - ] - } - } - } - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/incombustible.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/incombustible.json deleted file mode 100644 index fcb8f4d04c..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/incombustible.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_incombustible", - "fallback": "Incombustible", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/incombustible" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'incombustible'},stored_color:[15238935]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/lifeless.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/lifeless.json deleted file mode 100644 index c5e056603e..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/lifeless.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_lifeless", - "fallback": "Lifeless", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/lifeless" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'lifeless'},stored_color:[12761127]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/neutralizing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/neutralizing.json deleted file mode 100644 index 7344fb326a..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/neutralizing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_neutralizing", - "fallback": "Neutralizing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/neutralizing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'neutralizing'},stored_color:[6365875]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/phasing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/phasing.json deleted file mode 100644 index 09695fd2bb..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/phasing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_phasing", - "fallback": "Phasing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/phasing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'phasing'},stored_color:[11202779]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/pricking.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/pricking.json deleted file mode 100644 index 2611948f9f..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/pricking.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_pricking", - "fallback": "Pricking", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/pricking" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'pricking'},stored_enchantments:[{id:'minecraft:thorns',lvl:5}],stored_color:[8375363]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/retreating.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/retreating.json deleted file mode 100644 index f225fd426d..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/retreating.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_retreating", - "fallback": "Retreating", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/retreating" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'retreating'},stored_color:[13381501]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/rushing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/rushing.json deleted file mode 100644 index 3a073b7dcf..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/rushing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_rushing", - "fallback": "Rushing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/rushing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'rushing'},stored_color:[14245691]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/scaling.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/scaling.json deleted file mode 100644 index 315746f951..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/scaling.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_scaling", - "fallback": "Scaling", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/scaling" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'scaling'},stored_color:[8587519]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/shrieking.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/shrieking.json deleted file mode 100644 index 6f0e86eca2..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/shrieking.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_shrieking", - "fallback": "Shrieking", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/shrieking" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'shrieking'},stored_color:[831664]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/sniffing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/sniffing.json deleted file mode 100644 index e98f36662f..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/sniffing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_sniffing", - "fallback": "Sniffing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/sniffing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'sniffing'},stored_color:[5482509]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/soaring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/soaring.json deleted file mode 100644 index d373ebfd01..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/soaring.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_soaring", - "fallback": "Soaring", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/soaring" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'soaring'},stored_attributes:[{AttributeName:'minecraft:max_health',Name:'minecraft:max_health',Amount:-0.2d,Operation:1,UUID:[0,972157,0,324820],Slot:'offhand'}],stored_color:[9295344]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/striding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/striding.json deleted file mode 100644 index ed96e83afd..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/striding.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_striding", - "fallback": "Striding", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/striding" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'striding'},stored_color:[15223575]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/synergetic.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/synergetic.json deleted file mode 100644 index a0b0d81e4e..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/synergetic.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_synergetic", - "fallback": "Synergetic", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/synergetic" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'synergetic'},stored_color:[15790159]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/tranquilizing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/tranquilizing.json deleted file mode 100644 index e82db1a364..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/tranquilizing.json +++ /dev/null @@ -1,55 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_tranquilizing", - "fallback": "Tranquilizing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/tranquilizing", - "minecraft:custom_data": { - "gm4_orb_of_ankou": { - "item": "soul_essence", - "stored_pneuma": { - "id": "tranquilizing" - }, - "stored_color": [ - 5465649 - ] - } - } - } - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/vanishing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/vanishing.json deleted file mode 100644 index 06fb11da63..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/vanishing.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_vanishing", - "fallback": "Vanishing", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/vanishing" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'vanishing'},stored_color:[8864176]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/venomous.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/venomous.json deleted file mode 100644 index 745bb6b3fc..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/venomous.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_venomous", - "fallback": "Venomous", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/venomous" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'venomous'},stored_color:[5424161]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/volatile.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/volatile.json deleted file mode 100644 index 81322cbab0..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/volatile.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_volatile", - "fallback": "Volatile", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/volatile" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'volatile'},stored_color:[2474538]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/withering.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/withering.json deleted file mode 100644 index 1b15a09603..0000000000 --- a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_essence/withering.json +++ /dev/null @@ -1,48 +0,0 @@ -{ - "type": "minecraft:generic", - "pools": [ - { - "rolls": 1, - "entries": [ - { - "type": "minecraft:item", - "name": "minecraft:black_dye", - "functions": [ - { - "function": "minecraft:set_lore", - "mode": "append", - "lore": [ - { - "translate": "text.gm4.pneuma_withering", - "fallback": "Withering", - "italic": false, - "color": "blue" - } - ] - }, - { - "function": "minecraft:set_name", - "name": { - "translate": "item.gm4.soul_essence", - "fallback": "Soul Essence", - "italic": false, - "color": "white" - } - }, - { - "function": "minecraft:set_components", - "components": { - "minecraft:enchantment_glint_override": true, - "minecraft:custom_model_data": "pneuma/withering" - } - }, - { - "function": "minecraft:set_custom_data", - "tag": "{gm4_orb_of_ankou:{item:\"soul_essence\",stored_pneuma:{id:\"withering\"},stored_color:[4067968]}}" - } - ] - } - ] - } - ] -} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/aggressive.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/aggressive.json new file mode 100644 index 0000000000..e7860212a5 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/aggressive.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_aggressive", + "fallback": "Aggressive", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/aggressive", + "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:'aggressive'}],stored_color:[10682368],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/agile.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/agile.json new file mode 100644 index 0000000000..6c24b598a7 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/agile.json @@ -0,0 +1,70 @@ +{ + "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_agile", + "fallback": "Agile", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/agile", + "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" + }, + { + "attribute": "minecraft:fall_damage_multiplier", + "id": "gm4_orb_of_ankou:agile_fall_damage_multiplier", + "amount": -1024, + "operation": "add_value", + "slot": "offhand" + } + ] + }, + { + "function": "minecraft:set_custom_data", + "tag": "{gm4_orb_of_ankou:{item:'soul_shard',pneumas:[{id:'agile'}],stored_color:[16769574],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/anchoring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/anchoring.json new file mode 100644 index 0000000000..1a0fe9dd41 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/anchoring.json @@ -0,0 +1,70 @@ +{ + "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_anchoring", + "fallback": "Anchoring", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/anchoring", + "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" + }, + { + "attribute": "minecraft:knockback_resistance", + "id": "gm4_orb_of_ankou:anchoring_knockback_resistance", + "amount": 0.9, + "operation": "add_value", + "slot": "offhand" + } + ] + }, + { + "function": "minecraft:set_custom_data", + "tag": "{gm4_orb_of_ankou:{item:'soul_shard',pneumas:[{id:'anchoring'}],stored_color:[1648550],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bargaining.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bargaining.json new file mode 100644 index 0000000000..04ce1304ca --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bargaining.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_bargaining", + "fallback": "Bargaining", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/bargaining", + "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:'bargaining'}],stored_color:[1090333],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bashing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bashing.json new file mode 100644 index 0000000000..66930ed804 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bashing.json @@ -0,0 +1,77 @@ +{ + "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_bashing", + "fallback": "Bashing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/bashing", + "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" + }, + { + "attribute": "minecraft:attack_speed", + "id": "gm4_orb_of_ankou:bashing_attack_speed", + "amount": -0.4, + "operation": "add_multiplied_base", + "slot": "offhand" + }, + { + "attribute": "minecraft:attack_damage", + "id": "gm4_orb_of_ankou:bashing_attack_damage", + "amount": 0.7, + "operation": "add_multiplied_base", + "slot": "offhand" + } + ] + }, + { + "function": "minecraft:set_custom_data", + "tag": "{gm4_orb_of_ankou:{item:'soul_shard',pneumas:[{id:'bashing'}],stored_color:[13181000],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blasting.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blasting.json new file mode 100644 index 0000000000..8219613beb --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blasting.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_blasting", + "fallback": "Blasting", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/blasting", + "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:'blasting'}],stored_color:[16761136],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blinding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blinding.json new file mode 100644 index 0000000000..93c285450e --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/blinding.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_blinding", + "fallback": "Blinding", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/blinding", + "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:'blinding'}],stored_color:[3809425],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bounding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bounding.json new file mode 100644 index 0000000000..32551b14ad --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bounding.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_bounding", + "fallback": "Bounding", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/bounding", + "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:'bounding'}],stored_color:[7921776],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bubbly.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bubbly.json new file mode 100644 index 0000000000..e6dc3592fa --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/bubbly.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_bubbly", + "fallback": "Bubbly", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/bubbly", + "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:'bubbly'}],stored_color:[5294074],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/conjuring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/conjuring.json new file mode 100644 index 0000000000..9d388d7f81 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/conjuring.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_conjuring", + "fallback": "Conjuring", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/conjuring", + "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:'conjuring'}],stored_color:[2953835],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/dashing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/dashing.json new file mode 100644 index 0000000000..5b7b64f659 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/dashing.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_dashing", + "fallback": "Dashing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/dashing", + "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:'dashing'}],stored_color:[14735149],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/depriving.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/depriving.json new file mode 100644 index 0000000000..7de107380a --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/depriving.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_depriving", + "fallback": "Depriving", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/depriving", + "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:'depriving'}],stored_color:[13943899],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/draining.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/draining.json new file mode 100644 index 0000000000..6b4df7deb8 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/draining.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_draining", + "fallback": "Draining", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/draining", + "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:'draining'}],stored_color:[6377247],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/enduring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/enduring.json new file mode 100644 index 0000000000..622bd43f61 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/enduring.json @@ -0,0 +1,77 @@ +{ + "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_enduring", + "fallback": "Enduring", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/enduring", + "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" + }, + { + "attribute": "minecraft:max_health", + "id": "gm4_orb_of_ankou:enduring_max_health", + "amount": 8, + "operation": "add_value", + "slot": "offhand" + }, + { + "attribute": "minecraft:movement_speed", + "id": "gm4_orb_of_ankou:enduring_movement_speed", + "amount": -0.2, + "operation": "add_multiplied_base", + "slot": "offhand" + } + ] + }, + { + "function": "minecraft:set_custom_data", + "tag": "{gm4_orb_of_ankou:{item:'soul_shard',pneumas:[{id:'enduring'}],stored_color:[5815552],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/expeditious.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/expeditious.json new file mode 100644 index 0000000000..a64b7ffb3c --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/expeditious.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_expeditious", + "fallback": "Expeditious", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/expeditious", + "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:'expeditious'}],stored_color:[14037247],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feathery.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feathery.json new file mode 100644 index 0000000000..d7d02d234f --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feathery.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_feathery", + "fallback": "Feathery", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/feathery", + "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:'feathery'}],stored_color:[14806509],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feigning.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feigning.json new file mode 100644 index 0000000000..0de9487579 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/feigning.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_feigning", + "fallback": "Feigning", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/feigning", + "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:'feigning'}],stored_color:[16406506],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/freezing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/freezing.json new file mode 100644 index 0000000000..7406325ad3 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/freezing.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_freezing", + "fallback": "Freezing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/freezing", + "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:'freezing'}],stored_color:[5559779],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gazing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gazing.json new file mode 100644 index 0000000000..7d8aea9414 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gazing.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_gazing", + "fallback": "Gazing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/gazing", + "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:'gazing'}],stored_color:[6814213],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gliding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gliding.json new file mode 100644 index 0000000000..d8b9df16c2 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/gliding.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_gliding", + "fallback": "Gliding", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/gliding", + "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:'gliding'}],stored_color:[3108845],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/hawkeye.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/hawkeye.json new file mode 100644 index 0000000000..fd38dd353b --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/hawkeye.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_hawkeye", + "fallback": "Hawkeye", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/hawkeye", + "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:'hawkeye'}],stored_color:[15548437],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/incombustible.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/incombustible.json new file mode 100644 index 0000000000..87eb182028 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/incombustible.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_incombustible", + "fallback": "Incombustible", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/incombustible", + "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:'incombustible'}],stored_color:[15238935],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/lifeless.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/lifeless.json new file mode 100644 index 0000000000..74e02fd279 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/lifeless.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_lifeless", + "fallback": "Lifeless", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/lifeless", + "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:'lifeless'}],stored_color:[12761127],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/neutralizing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/neutralizing.json new file mode 100644 index 0000000000..a0f88d545f --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/neutralizing.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_neutralizing", + "fallback": "Neutralizing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/neutralizing", + "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:'neutralizing'}],stored_color:[6365875],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/phasing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/phasing.json new file mode 100644 index 0000000000..cea78ee131 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/phasing.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_phasing", + "fallback": "Phasing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/phasing", + "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:'phasing'}],stored_color:[11202779],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/pricking.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/pricking.json new file mode 100644 index 0000000000..cb5fff089a --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/pricking.json @@ -0,0 +1,69 @@ +{ + "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_pricking", + "fallback": "Pricking", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/pricking", + "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_enchantments", + "enchantments": { + "minecraft:thorns": 5 + } + }, + { + "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:'pricking'}],stored_color:[8375363],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/retreating.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/retreating.json new file mode 100644 index 0000000000..80eb2c200d --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/retreating.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_retreating", + "fallback": "Retreating", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/retreating", + "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:'retreating'}],stored_color:[13381501],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/rushing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/rushing.json new file mode 100644 index 0000000000..96ba835266 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/rushing.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_rushing", + "fallback": "Rushing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/rushing", + "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:'rushing'}],stored_color:[14245691],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/scaling.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/scaling.json new file mode 100644 index 0000000000..3e978020d1 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/scaling.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_scaling", + "fallback": "Scaling", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/scaling", + "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:'scaling'}],stored_color:[8587519],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/shrieking.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/shrieking.json new file mode 100644 index 0000000000..49b1d3c7db --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/shrieking.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_shrieking", + "fallback": "Shrieking", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/shrieking", + "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:'shrieking'}],stored_color:[831664],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/sniffing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/sniffing.json new file mode 100644 index 0000000000..bb194acdcb --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/sniffing.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_sniffing", + "fallback": "Sniffing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/sniffing", + "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:'sniffing'}],stored_color:[5482509],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/soaring.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/soaring.json new file mode 100644 index 0000000000..0283683bd8 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/soaring.json @@ -0,0 +1,70 @@ +{ + "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_soaring", + "fallback": "Soaring", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/soaring", + "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" + }, + { + "attribute": "minecraft:max_health", + "id": "gm4_orb_of_ankou:soaring_max_health", + "amount": -0.2, + "operation": "add_multiplied_base", + "slot": "offhand" + } + ] + }, + { + "function": "minecraft:set_custom_data", + "tag": "{gm4_orb_of_ankou:{item:'soul_shard',pneumas:[{id:'soaring'}],stored_color:[9295344],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/striding.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/striding.json new file mode 100644 index 0000000000..0334c624c6 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/striding.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_striding", + "fallback": "Striding", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/striding", + "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:'striding'}],stored_color:[15223575],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/synergetic.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/synergetic.json new file mode 100644 index 0000000000..e4ed835286 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/synergetic.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_synergetic", + "fallback": "Synergetic", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/synergetic", + "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:'synergetic'}],stored_color:[15790159],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/tranquilizing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/tranquilizing.json new file mode 100644 index 0000000000..f18d74f2cc --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/tranquilizing.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_tranquilizing", + "fallback": "Tranquilizing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/tranquilizing", + "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:'tranquilizing'}],stored_color:[5465649],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/vanishing.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/vanishing.json new file mode 100644 index 0000000000..ddd627aedf --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/vanishing.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_vanishing", + "fallback": "Vanishing", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/vanishing", + "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:'vanishing'}],stored_color:[8864176],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/venomous.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/venomous.json new file mode 100644 index 0000000000..7186b61f71 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/venomous.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_venomous", + "fallback": "Venomous", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/venomous", + "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:'venomous'}],stored_color:[5424161],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/volatile.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/volatile.json new file mode 100644 index 0000000000..8a0677bf49 --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/volatile.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_volatile", + "fallback": "Volatile", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/volatile", + "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:'volatile'}],stored_color:[2474538],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/withering.json b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/withering.json new file mode 100644 index 0000000000..162042e31e --- /dev/null +++ b/gm4_orb_of_ankou/data/gm4_orb_of_ankou/loot_table/items/soul_shard/withering.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_withering", + "fallback": "Withering", + "italic": false, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": true, + "minecraft:custom_model_data": "pneuma/withering", + "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:'withering'}],stored_color:[4067968],smithed:{ignore:{functionality:1b,crafting:1b}}}}" + } + ] + } + ] + } + ] +} diff --git a/gm4_orb_of_ankou/generate_pneumas.py b/gm4_orb_of_ankou/generate_pneumas.py index d63e3bb085..4e8b9912de 100644 --- a/gm4_orb_of_ankou/generate_pneumas.py +++ b/gm4_orb_of_ankou/generate_pneumas.py @@ -13,6 +13,7 @@ def beet_default(ctx: Context): read_csv() generate_corripio(ctx) generate_pneuma_predicates(ctx) + generate_soul_essence_loot_tables(ctx) def generate_corripio(ctx: Context): @@ -116,6 +117,61 @@ def looting_chance(base: float,lvl: int) -> float: return min(1.0,round(base * (1 + (3 * (lvl**3))),6)) +def generate_soul_essence_loot_tables(ctx: Context): + for pneuma in pneumas: + custom_data = "{gm4_orb_of_ankou:{item:'soul_essence',stored_pneuma:{id:'" + pneuma + "'}},smithed:{ignore:{functionality:1b,crafting:1b}}}" + ctx.data[f"gm4_orb_of_ankou:items/soul_essence/{pneuma}"] = LootTable({ + "type": "minecraft:generic", + "pools": [ + { + "rolls": 1, + "entries": [ + { + "type": "minecraft:item", + "name": "minecraft:black_dye", + "functions": [ + { + "function": "minecraft:set_lore", + "mode": "append", + "lore": [ + { + "translate": f"text.gm4.pneuma_{pneuma}", + "fallback": pneuma.replace("_", " ").title(), + "italic": False, + "color": "blue" + } + ] + }, + { + "function": "minecraft:set_name", + "name": { + "translate": "item.gm4.soul_essence", + "fallback": "Soul Essence", + "italic": False, + "color": "white" + } + }, + { + "function": "minecraft:set_components", + "components": { + "minecraft:enchantment_glint_override": True, + "minecraft:custom_model_data": f"pneuma/{pneuma}", + "minecraft:damage_resistant": { + "types": "#minecraft:is_fire" + }, + } + }, + { + "function": "minecraft:set_custom_data", + "tag": custom_data + } + ] + } + ] + } + ] + }) + def read_csv(): # read csv file diff --git a/lib_player_motion/LICENSE.md b/lib_player_motion/LICENSE.md new file mode 100644 index 0000000000..789563fc8d --- /dev/null +++ b/lib_player_motion/LICENSE.md @@ -0,0 +1,45 @@ +MIT License + +Copyright (c) 2025 Gamemode 4 Development + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- + +MIT License + +Copyright (c) 2024 BigPapi13, MulverineX + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/lib_player_motion/README.md b/lib_player_motion/README.md new file mode 100644 index 0000000000..c77b0656b7 --- /dev/null +++ b/lib_player_motion/README.md @@ -0,0 +1,18 @@ +# lib_player_motion +The [Player Motion](https://modrinth.com/datapack/player_motion) library prefixed with the GM4 namespace and properly versioned to prevent conflicts with other versions of player motion. + +## changes +The following usage changes have been made to the original player motion library: +- The scoreboard objective `gm4_player_motion.api.launch` should be used instead of `player_motion.api.launch` when setting the parameters for the launch. +- The function tags `#gm4_player_motion:launch_xyz` and `#gm4_player_motion:launch_looking` function tags should be used instead of the `player_motion:api/launch_xyz` and `player_motion:api/launch_looking` functions. + +The following file changes have been made to the original player motion library: +- The `#minecraft:load` function tag has been removed in favor of lantern load. +- The `player_motion` namespace has been changed to `gm4_player_motion` to prevent potential conflicts with other versions of the player motion library. +- The `player_motion:internal/technical/load` function has been moved to `gm4_player_motion:load` as per GM4 file conventions. +- The `#gm4_player_motion:launch_xyz` and `#gm4_player_motion:launch_looking` functions tags have been added as version-checked API calls. + +The following implementation changes have been made to the original player motion library: +- All scoreboard objectives and storage references use `gm4_player_motion` instead of `player_motion` to prevent potential conflicts with other versions of the player motion library. +- The UUID for the marker used to get vectors has been changed to a different UUID to prevent potential conflicts with other versions of the player motion library. +- The marker is kept at 29999998 0 7133 instead of 0 0 0 to prevent forceloading 0 0; instead the GM4 forceloaded chunk is used to keep the marker selectable. diff --git a/lib_player_motion/beet.yaml b/lib_player_motion/beet.yaml new file mode 100644 index 0000000000..6073c2a1c8 --- /dev/null +++ b/lib_player_motion/beet.yaml @@ -0,0 +1,23 @@ +id: gm4_player_motion +name: Gamemode 4 Player Motion +version: 1.0.0 + +data_pack: + load: + data: data + +pipeline: + - gm4.plugins.extend.library + - gm4.plugins.include.lib_forceload + +meta: + gm4: + versioning: + required: + lib_forceload: 1.5.0 + schedule_loops: [internal/technical/tick] + credits: + Original Creator: + - MulverineX + Adapted for GM4 by: + - BPR diff --git a/lib_player_motion/data/gm4_player_motion/function/api/launch_looking.mcfunction b/lib_player_motion/data/gm4_player_motion/function/api/launch_looking.mcfunction new file mode 100644 index 0000000000..10efba7fe5 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/api/launch_looking.mcfunction @@ -0,0 +1,18 @@ +#> gm4_player_motion:api/launch_looking +# Launches the player in the input direction +execute if entity @s[type=!player] run return fail +execute on vehicle run return fail + +scoreboard players set $function_called gm4_player_motion.internal.dummy 1 +tag @s add gm4_player_motion.launch + +execute store result storage gm4_player_motion:math strength double 0.0001 run scoreboard players get $strength gm4_player_motion.api.launch +execute as 9a347e6c-1ce5-434a-b717-6707d51f4299 in minecraft:overworld positioned 0.0 0.0 0.0 run function gm4_player_motion:internal/math/looking_to_xyz with storage gm4_player_motion:math +# ^ changed UUID to prevent potential conflict +execute store result score $out gm4_player_motion.internal.motion.x run data get storage gm4_player_motion:math motion[0] 10000 +execute store result score $out gm4_player_motion.internal.motion.y run data get storage gm4_player_motion:math motion[1] 10000 +execute store result score $out gm4_player_motion.internal.motion.z run data get storage gm4_player_motion:math motion[2] 10000 + +scoreboard players operation @s gm4_player_motion.internal.motion.x += $out gm4_player_motion.internal.motion.x +scoreboard players operation @s gm4_player_motion.internal.motion.y += $out gm4_player_motion.internal.motion.y +scoreboard players operation @s gm4_player_motion.internal.motion.z += $out gm4_player_motion.internal.motion.z diff --git a/lib_player_motion/data/gm4_player_motion/function/api/launch_xyz.mcfunction b/lib_player_motion/data/gm4_player_motion/function/api/launch_xyz.mcfunction new file mode 100644 index 0000000000..147268dd9c --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/api/launch_xyz.mcfunction @@ -0,0 +1,11 @@ +#> gm4_player_motion-1.4:api/launch_xyz +# Launches the player in the input direction +execute if entity @s[type=!player] run return fail +execute on vehicle run return fail + +scoreboard players set $function_called gm4_player_motion.internal.dummy 1 +tag @s add gm4_player_motion.launch + +scoreboard players operation @s gm4_player_motion.internal.motion.x += $x gm4_player_motion.api.launch +scoreboard players operation @s gm4_player_motion.internal.motion.y += $y gm4_player_motion.api.launch +scoreboard players operation @s gm4_player_motion.internal.motion.z += $z gm4_player_motion.api.launch \ No newline at end of file diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/launch/exp_pos.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/launch/exp_pos.mcfunction new file mode 100644 index 0000000000..9e1bab8767 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/launch/exp_pos.mcfunction @@ -0,0 +1,3 @@ +#> gm4_player_motion:internal/launch/exp_pos +$tp 9a347e6c-1ce5-434a-b717-6707d51f4299f ^ ^ ^$(d) +# ^ (GM4) changed UUID to prevent potential conflict diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/launch/gamemode/get.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/launch/gamemode/get.mcfunction new file mode 100644 index 0000000000..8ef0e55965 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/launch/gamemode/get.mcfunction @@ -0,0 +1,5 @@ +#> gm4_player_motion:internal/launch/gamemode/get +execute if entity @s[gamemode=survival] run return run scoreboard players set $mode gm4_player_motion.internal.gamemode 0 +execute if entity @s[gamemode=creative] run return run scoreboard players set $mode gm4_player_motion.internal.gamemode 1 +execute if entity @s[gamemode=adventure] run return run scoreboard players set $mode gm4_player_motion.internal.gamemode 2 +execute if entity @s[gamemode=spectator] run scoreboard players set $mode gm4_player_motion.internal.gamemode 3 diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/launch/gamemode/restore.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/launch/gamemode/restore.mcfunction new file mode 100644 index 0000000000..b1fb857e70 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/launch/gamemode/restore.mcfunction @@ -0,0 +1,5 @@ +#> gm4_player_motion:internal/launch/gamemode/restore +execute if score $mode gm4_player_motion.internal.gamemode matches 0 run return run gamemode survival @s +execute if score $mode gm4_player_motion.internal.gamemode matches 1 run return run gamemode creative @s +execute if score $mode gm4_player_motion.internal.gamemode matches 2 run return run gamemode adventure @s +execute if score $mode gm4_player_motion.internal.gamemode matches 3 run gamemode spectator @s diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/launch/main.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/launch/main.mcfunction new file mode 100644 index 0000000000..ea4d5e15fe --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/launch/main.mcfunction @@ -0,0 +1,33 @@ +#> gm4_player_motion:internal/launch/main +# Launches players in the input direction + +execute \ + store result storage gm4_player_motion:math motion[0] double 0.0001 \ + store result storage gm4_player_motion:math motion_x double 0.0001 run \ + scoreboard players operation $motion_x gm4_player_motion.internal.math = @s gm4_player_motion.internal.motion.x +execute \ + store result storage gm4_player_motion:math motion[1] double 0.0001 \ + store result storage gm4_player_motion:math motion_y double 0.0001 run \ + scoreboard players operation $motion_y gm4_player_motion.internal.math = @s gm4_player_motion.internal.motion.y +execute \ + store result storage gm4_player_motion:math motion[2] double 0.0001 \ + store result storage gm4_player_motion:math motion_z double 0.0001 run \ + scoreboard players operation $motion_z gm4_player_motion.internal.math = @s gm4_player_motion.internal.motion.z + +execute in minecraft:overworld run function gm4_player_motion:internal/math/main +attribute @s knockback_resistance modifier add gm4_player_motion:disable_knockback_resistance -1 add_multiplied_total +function gm4_player_motion:internal/launch/gamemode/get +gamemode creative +tp ~ ~10000 ~ +execute rotated as @s positioned ~ ~10000 ~ run function gm4_player_motion:internal/summon/main with storage gm4_player_motion:math +tp ~ ~ ~ +function gm4_player_motion:internal/launch/gamemode/restore +attribute @s knockback_resistance modifier remove gm4_player_motion:disable_knockback_resistance + +scoreboard players set $function_called gm4_player_motion.internal.dummy 0 +tag @s remove gm4_player_motion.launch + +# Reset scoreboards +scoreboard players reset @s gm4_player_motion.internal.motion.x +scoreboard players reset @s gm4_player_motion.internal.motion.y +scoreboard players reset @s gm4_player_motion.internal.motion.z diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/math/eyelevel.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/math/eyelevel.mcfunction new file mode 100644 index 0000000000..d97c6c6771 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/math/eyelevel.mcfunction @@ -0,0 +1,9 @@ +#> gm4_player_motion:internal/math/eyelevel +# eyelevel=y(eyes)-y(player) +execute anchored eyes positioned ^ ^ ^ if entity @s[distance=...41] run \ + return run scoreboard players set $eyelevel gm4_player_motion.internal.math 40 + +execute anchored eyes positioned ^ ^ ^ if entity @s[distance=..1.27] run \ + return run scoreboard players set $eyelevel gm4_player_motion.internal.math 127 + +scoreboard players set $eyelevel gm4_player_motion.internal.math 162 diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/sine.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/sine.mcfunction new file mode 100644 index 0000000000..7c32511359 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/sine.mcfunction @@ -0,0 +1,4 @@ +# > gm4_player_motion:internal/math/full_power/sine +$execute store result score $n_full_exp gm4_player_motion.internal.math run data get storage gm4_player_motion:trig arr[$(angle)] +scoreboard players operation $n_full_exp gm4_player_motion.internal.math *= $motion_y gm4_player_motion.internal.math +execute store result score $sub_power gm4_player_motion.internal.math run scoreboard players operation $n_full_exp gm4_player_motion.internal.math /= #constant.1000 gm4_player_motion.internal.const diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/tp.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/tp.mcfunction new file mode 100644 index 0000000000..e037114bb1 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/tp.mcfunction @@ -0,0 +1,9 @@ +# > gm4_player_motion:internal/math/full_power/tp +execute store result storage gm4_player_motion:math pos[0] double 0.1 run scoreboard players get $motion_x gm4_player_motion.internal.math +execute store result storage gm4_player_motion:math pos[1] double 0.1 run scoreboard players get $motion_y gm4_player_motion.internal.math +execute store result storage gm4_player_motion:math pos[2] double 0.1 run scoreboard players get $motion_z gm4_player_motion.internal.math +data modify entity @s Pos set from storage gm4_player_motion:math pos +execute at @s facing 0.0 0.0 0.0 run tp @s 0 0 0 0 ~ +execute store result storage gm4_player_motion:math magnitude.angle int 1 run data get entity @s Rotation[1] 100 +tp @s 29999998.0 0.0 7133.0 +# ^ (GM4) move entity back to GM4 forceloaded chunk diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/trig.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/trig.mcfunction new file mode 100644 index 0000000000..735c3b3d2f --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/math/full_power/trig.mcfunction @@ -0,0 +1,4 @@ +# > gm4_player_motion:internal/math/full_power/trig +execute as 9a347e6c-1ce5-434a-b717-6707d51f4299 run function gm4_player_motion:internal/math/full_power/tp +# ^ (GM4) changed UUID to prevent potential conflict +function gm4_player_motion:internal/math/full_power/sine with storage gm4_player_motion:math magnitude diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/math/looking_to_xyz.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/math/looking_to_xyz.mcfunction new file mode 100644 index 0000000000..178718adcb --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/math/looking_to_xyz.mcfunction @@ -0,0 +1,5 @@ +#> gm4_player_motion:internal/math/looking_to_xyz +$tp @s ^ ^ ^$(strength) +data modify storage gm4_player_motion:math motion set from entity @s Pos +tp @s 29999998.0 0.0 7133.0 +# ^ (GM4) changed to move back to GM4 forceloaded chunk coords diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/math/main.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/math/main.mcfunction new file mode 100644 index 0000000000..0576428e16 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/math/main.mcfunction @@ -0,0 +1,114 @@ +#> gm4_player_motion:internal/math/main + +# full_power=sqrt(motion_x²+motion_y²+motion_z²) + # Save sign of $motion_y + execute store success score $negative_sine gm4_player_motion.internal.math \ + if score $motion_y gm4_player_motion.internal.math matches ..-1 + + # Normalize + execute if score $motion_x gm4_player_motion.internal.math matches ..-1 run \ + scoreboard players operation $motion_x gm4_player_motion.internal.math *= #constant.-1 gm4_player_motion.internal.const + + execute if score $motion_y gm4_player_motion.internal.math matches ..-1 run \ + scoreboard players operation $motion_y gm4_player_motion.internal.math *= #constant.-1 gm4_player_motion.internal.const + + execute if score $motion_z gm4_player_motion.internal.math matches ..-1 run \ + scoreboard players operation $motion_z gm4_player_motion.internal.math *= #constant.-1 gm4_player_motion.internal.const + + # Sets angle before exchange + scoreboard players set $angle gm4_player_motion.internal.math 0 + + execute if score $motion_y gm4_player_motion.internal.math matches 0 run \ + scoreboard players set $angle gm4_player_motion.internal.math 1 + + # SuperSwordTW's method. Credit: https://github.com/SuperSwordTW/Distance-Trig-Calc-3d + execute if score $motion_y gm4_player_motion.internal.math matches 0 run \ + scoreboard players operation $motion_y gm4_player_motion.internal.math >< $motion_x gm4_player_motion.internal.math + + execute if score $motion_y gm4_player_motion.internal.math matches 0 run \ + scoreboard players operation $motion_y gm4_player_motion.internal.math >< $motion_z gm4_player_motion.internal.math + + function gm4_player_motion:internal/math/full_power/trig + +# n_full_exp=floor(full_power/0.865) + scoreboard players operation $n_full_exp gm4_player_motion.internal.math /= #constant.fpc gm4_player_motion.internal.const + +# Change back the angle + execute if score $angle gm4_player_motion.internal.math matches 1 run data modify storage gm4_player_motion:math magnitude.angle set value 0 + +# eyelevel=y(eyes)-y(player) + function gm4_player_motion:internal/math/eyelevel + +# sub power operations + # sub_power=floor(full_power%0.8) + scoreboard players operation $sub_power gm4_player_motion.internal.math %= #constant.fpc gm4_player_motion.internal.const + + # d12=1-sub_power + scoreboard players set $d12 gm4_player_motion.internal.math 10000 + scoreboard players operation $d12 gm4_player_motion.internal.math -= $sub_power gm4_player_motion.internal.math + + # Formula d=-(eyelevel*sinα + d12*12 * cos(arcsin(cosα*eyelevel/(d12*12)))) + + # d12 = d12*12 + scoreboard players operation $d12 gm4_player_motion.internal.math *= #constant.12 gm4_player_motion.internal.const + + # Obtain sinα and cosα + function gm4_player_motion:internal/math/trig/sine with storage gm4_player_motion:math magnitude + + # cosα *= eyelevel, record cosα for later use + scoreboard players operation $cosine gm4_player_motion.internal.math *= $eyelevel gm4_player_motion.internal.math + scoreboard players operation $cosine1 gm4_player_motion.internal.math = $cosine gm4_player_motion.internal.math + + # cosα /= d12 = cosα*eyelevel / (d12*12) + scoreboard players operation $cosine gm4_player_motion.internal.math *= #constant.10 gm4_player_motion.internal.const + + scoreboard players operation $cosine gm4_player_motion.internal.math /= $d12 gm4_player_motion.internal.math + + # obtain cos(arcsin(cosα*eyelevel/(d12*12)))) + execute store result storage gm4_player_motion:math magnitude.quotient int 1 run scoreboard players get $cosine gm4_player_motion.internal.math + + function gm4_player_motion:internal/math/trig/arcsine with storage gm4_player_motion:math magnitude + + # cos(arcsin(cosα*eyelevel/(d12)))) *= d12 + scoreboard players operation $d gm4_player_motion.internal.math *= $d12 gm4_player_motion.internal.math + + scoreboard players operation $d gm4_player_motion.internal.math /= #constant.1000 gm4_player_motion.internal.const + + # sinα *= eyelevel, record sine for later use + scoreboard players operation $sine gm4_player_motion.internal.math *= $eyelevel gm4_player_motion.internal.math + + scoreboard players operation $sine gm4_player_motion.internal.math /= #constant.10 gm4_player_motion.internal.const + + scoreboard players operation $sine1 gm4_player_motion.internal.math = $sine gm4_player_motion.internal.math + + # d += sine + execute store result storage gm4_player_motion:math d double -0.0001 run \ + scoreboard players operation $d gm4_player_motion.internal.math += $sine gm4_player_motion.internal.math + + +# full power operations + # d12=1-fpc(0.8) = 0.2 + scoreboard players set $d12 gm4_player_motion.internal.math 2000 + + #full_d = -(eyelevel*sinα + (d12*12)*cos(arcsin(cosα*eyelevel/(d12*12)))) + + # d12 = d12*12 + scoreboard players operation $d12 gm4_player_motion.internal.math *= #constant.12 gm4_player_motion.internal.const + + # cosine1 = cosα*eyelevel, cosine1 /= d12 + scoreboard players operation $cosine1 gm4_player_motion.internal.math *= #constant.10 gm4_player_motion.internal.const + + scoreboard players operation $cosine1 gm4_player_motion.internal.math /= $d12 gm4_player_motion.internal.math + + # Obtain cos(arcsin(cosine1)) + execute store result storage gm4_player_motion:math magnitude.quotient int 1 run scoreboard players get $cosine1 gm4_player_motion.internal.math + + function gm4_player_motion:internal/math/trig/arcsine with storage gm4_player_motion:math magnitude + + # cos(arcsin(cosα*eyelevel/(d12)))) *= d12 + scoreboard players operation $d gm4_player_motion.internal.math *= $d12 gm4_player_motion.internal.math + scoreboard players operation $d gm4_player_motion.internal.math /= #constant.1000 gm4_player_motion.internal.const + + # d += sine1 + execute store result storage gm4_player_motion:math full_d double -0.0001 run \ + scoreboard players operation $d gm4_player_motion.internal.math += $sine1 gm4_player_motion.internal.math diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/math/trig/arcsine.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/math/trig/arcsine.mcfunction new file mode 100644 index 0000000000..fdbb467bce --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/math/trig/arcsine.mcfunction @@ -0,0 +1 @@ +$execute store result score $d gm4_player_motion.internal.math run data get storage gm4_player_motion:arcsine arr[$(quotient)] \ No newline at end of file diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/math/trig/sine.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/math/trig/sine.mcfunction new file mode 100644 index 0000000000..dea3105f5e --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/math/trig/sine.mcfunction @@ -0,0 +1,3 @@ +$execute store result score $sine gm4_player_motion.internal.math run data get storage gm4_player_motion:sine arr[$(angle)] +execute if score $negative_sine gm4_player_motion.internal.math matches 1 run scoreboard players operation $sine gm4_player_motion.internal.math *= #constant.-1 gm4_player_motion.internal.const +$execute store result score $cosine gm4_player_motion.internal.math run data get storage gm4_player_motion:cosine arr[$(angle)] \ No newline at end of file diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/summon/crystal.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/summon/crystal.mcfunction new file mode 100644 index 0000000000..e14979e555 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/summon/crystal.mcfunction @@ -0,0 +1,3 @@ +#> gm4_player_motion:internal/summon/crystal +$execute if score $n_full_exp gm4_player_motion.internal.math matches 1.. anchored eyes positioned ^ ^ ^$(full_d) run function gm4_player_motion:internal/summon/loop +$execute anchored eyes positioned ^ ^ ^$(d) summon end_crystal run damage @s 0 diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/summon/loop.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/summon/loop.mcfunction new file mode 100644 index 0000000000..9b865cd272 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/summon/loop.mcfunction @@ -0,0 +1,4 @@ +#> gm4_player_motion:internal/summon/loop +scoreboard players remove $n_full_exp gm4_player_motion.internal.math 1 +execute summon end_crystal run damage @s 0 +execute if score $n_full_exp gm4_player_motion.internal.math matches 1.. run function gm4_player_motion:internal/summon/loop diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/summon/main.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/summon/main.mcfunction new file mode 100644 index 0000000000..54148f51ad --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/summon/main.mcfunction @@ -0,0 +1,2 @@ +#> gm4_player_motion:internal/summon/main +$execute facing ~$(motion_x) ~$(motion_y) ~$(motion_z) run function gm4_player_motion:internal/summon/crystal with storage gm4_player_motion:math diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/technical/tick.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/technical/tick.mcfunction new file mode 100644 index 0000000000..7b6b6d58ee --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/technical/tick.mcfunction @@ -0,0 +1,6 @@ +#> gm4_player_motion:internal/technical/tick +# TICK FUNCTION +schedule function gm4_player_motion:internal/technical/tick 1t append + +# LAUNCH PLAYERS +execute if score $function_called gm4_player_motion.internal.dummy matches 1 as @a[tag=gm4_player_motion.launch] at @s run function gm4_player_motion:internal/launch/main diff --git a/lib_player_motion/data/gm4_player_motion/function/internal/technical/trig.mcfunction b/lib_player_motion/data/gm4_player_motion/function/internal/technical/trig.mcfunction new file mode 100644 index 0000000000..b16f2fe9d8 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/internal/technical/trig.mcfunction @@ -0,0 +1,4 @@ + data modify storage gm4_player_motion:trig arr set value [10000000,5729580,2864790,1909860,1432390,1145920,954929,818511,716197,636620,572958,520871,477465,440737,409255,381972,358099,337034,318310,301557,286479,272837,260436,249112,238733,229183,220369,212207,204628,197572,190986,184825,179050,173624,168517,163703,159155,154854,150779,146913,143240,139746,136419,133247,130218,127325,124557,121907,119367,116931,114593,112346,110185,108106,106104,104175,102315,100520,98787,97113,95494,93929,92414,90947,89526,88149,86813,85518,84260,83039,81853,80700,79579,78489,77428,76396,75391,74412,73458,72528,71622,70737,69875,69033,68211,67409,66625,65859,65111,64379,63664,62965,62280,61611,60955,60314,59685,59070,58467,57877,57298,56731,56175,55629,55095,54570,54055,53550,53054,52568,52090,51621,51160,50707,50262,49825,49396,48974,48559,48151,47749,47355,46967,46585,46209,45840,45476,45118,44766,44419,44077,43741,43409,43083,42761,42445,42133,41825,41522,41224,40929,40639,40353,40071,39792,39518,39247,38980,38717,38457,38201,37948,37699,37452,37209,36969,36732,36498,36267,36039,35814,35592,35372,35155,34941,34729,34520,34313,34109,33907,33708,33511,33316,33123,32933,32745,32559,32375,32193,32014,31836,31660,31486,31314,31144,30976,30809,30644,30481,30320,30161,30003,29847,29692,29539,29388,29238,29089,28943,28797,28653,28511,28370,28230,28092,27955,27819,27685,27552,27420,27289,27160,27032,26905,26779,26655,26532,26409,26288,26168,26049,25932,25815,25699,25584,25471,25358,25247,25136,25026,24917,24810,24703,24597,24492,24388,24284,24182,24080,23980,23880,23781,23682,23585,23488,23393,23298,23203,23110,23017,22925,22834,22743,22653,22564,22476,22388,22301,22215,22129,22044,21959,21876,21793,21710,21628,21547,21466,21386,21307,21228,21150,21072,20995,20918,20842,20767,20692,20618,20544,20470,20398,20325,20254,20182,20112,20041,19972,19902,19833,19765,19697,19630,19563,19496,19430,19365,19300,19235,19171,19107,19043,18980,18918,18856,18794,18733,18672,18611,18551,18491,18432,18373,18314,18256,18198,18140,18083,18026,17970,17914,17858,17803,17748,17693,17638,17584,17531,17477,17424,17371,17319,17267,17215,17164,17112,17062,17011,16961,16911,16861,16812,16763,16714,16665,16617,16569,16521,16474,16427,16380,16333,16287,16241,16195,16149,16104,16059,16014,15970,15925,15881,15838,15794,15751,15708,15665,15622,15580,15538,15496,15454,15412,15371,15330,15289,15249,15208,15168,15128,15088,15049,15010,14970,14931,14893,14854,14816,14778,14740,14702,14665,14627,14590,14553,14516,14480,14443,14407,14371,14335,14299,14264,14229,14193,14158,14124,14089,14054,14020,13986,13952,13918,13885,13851,13818,13785,13752,13719,13686,13654,13621,13589,13557,13525,13493,13462,13430,13399,13368,13337,13306,13275,13244,13214,13184,13153,13123,13093,13064,13034,13005,12975,12946,12917,12888,12859,12830,12802,12773,12745,12717,12689,12661,12633,12605,12578,12550,12523,12496,12468,12442,12415,12388,12361,12335,12308,12282,12256,12230,12204,12178,12152,12127,12101,12076,12050,12025,12000,11975,11950,11925,11901,11876,11852,11827,11803,11779,11755,11731,11707,11683,11659,11636,11612,11589,11566,11542,11519,11496,11473,11450,11428,11405,11382,11360,11338,11315,11293,11271,11249,11227,11205,11183,11162,11140,11118,11097,11076,11054,11033,11012,10991,10970,10949,10928,10908,10887,10866,10846,10825,10805,10785,10765,10745,10725,10705,10685,10665,10645,10626,10606,10586,10567,10548,10528,10509,10490,10471,10452,10433,10414,10395,10377,10358,10339,10321,10302,10284,10265,10247,10229,10211,10193,10175,10157,10139,10121,10103,10086,10068,10050,10033,10015,9998,9981,9963,9946,9929,9912,9895,9878,9861,9844,9827,9811,9794,9777,9761,9744,9728,9711,9695,9679,9663,9646,9630,9614,9598,9582,9566,9550,9535,9519,9503,9487,9472,9456,9441,9425,9410,9395,9379,9364,9349,9334,9319,9304,9289,9274,9259,9244,9229,9214,9200,9185,9170,9156,9141,9127,9112,9098,9084,9069,9055,9041,9027,9013,8999,8985,8971,8957,8943,8929,8915,8901,8888,8874,8860,8847,8833,8820,8806,8793,8779,8766,8753,8739,8726,8713,8700,8687,8674,8661,8648,8635,8622,8609,8596,8583,8571,8558,8545,8533,8520,8507,8495,8482,8470,8458,8445,8433,8421,8408,8396,8384,8372,8360,8347,8335,8323,8311,8299,8287,8276,8264,8252,8240,8228,8217,8205,8193,8182,8170,8159,8147,8136,8124,8113,8101,8090,8079,8067,8056,8045,8034,8023,8011,8000,7989,7978,7967,7956,7945,7934,7923,7913,7902,7891,7880,7870,7859,7848,7837,7827,7816,7806,7795,7785,7774,7764,7753,7743,7733,7722,7712,7702,7691,7681,7671,7661,7651,7641,7630,7620,7610,7600,7590,7580,7570,7561,7551,7541,7531,7521,7511,7502,7492,7482,7473,7463,7453,7444,7434,7425,7415,7406,7396,7387,7377,7368,7358,7349,7340,7330,7321,7312,7303,7294,7284,7275,7266,7257,7248,7239,7230,7221,7212,7203,7194,7185,7176,7167,7158,7149,7140,7132,7123,7114,7105,7097,7088,7079,7071,7062,7053,7045,7036,7028,7019,7011,7002,6994,6985,6977,6968,6960,6952,6943,6935,6927,6919,6910,6902,6894,6886,6877,6869,6861,6853,6845,6837,6829,6821,6813,6805,6797,6789,6781,6773,6765,6757,6749,6741,6734,6726,6718,6710,6702,6695,6687,6679,6671,6664,6656,6649,6641,6633,6626,6618,6611,6603,6596,6588,6581,6573,6566,6558,6551,6543,6536,6529,6521,6514,6507,6499,6492,6485,6478,6470,6463,6456,6449,6442,6435,6427,6420,6413,6406,6399,6392,6385,6378,6371,6364,6357,6350,6343,6336,6329,6322,6315,6309,6302,6295,6288,6281,6274,6268,6261,6254,6247,6241,6234,6227,6221,6214,6207,6201,6194,6187,6181,6174,6168,6161,6155,6148,6142,6135,6129,6122,6116,6109,6103,6097,6090,6084,6077,6071,6065,6058,6052,6046,6039,6033,6027,6021,6014,6008,6002,5996,5990,5983,5977,5971,5965,5959,5953,5947,5941,5935,5929,5922,5916,5910,5904,5898,5892,5887,5881,5875,5869,5863,5857,5851,5845,5839,5833,5828,5822,5816,5810,5804,5798,5793,5787,5781,5775,5770,5764,5758,5753,5747,5741,5736,5730,5724,5719,5713,5707,5702,5696,5691,5685,5680,5674,5669,5663,5657,5652,5647,5641,5636,5630,5625,5619,5614,5608,5603,5598,5592,5587,5582,5576,5571,5566,5560,5555,5550,5544,5539,5534,5529,5523,5518,5513,5508,5502,5497,5492,5487,5482,5477,5471,5466,5461,5456,5451,5446,5441,5436,5431,5426,5421,5416,5410,5405,5400,5395,5390,5385,5381,5376,5371,5366,5361,5356,5351,5346,5341,5336,5331,5326,5322,5317,5312,5307,5302,5297,5293,5288,5283,5278,5273,5269,5264,5259,5254,5250,5245,5240,5236,5231,5226,5222,5217,5212,5208,5203,5198,5194,5189,5184,5180,5175,5171,5166,5162,5157,5152,5148,5143,5139,5134,5130,5125,5121,5116,5112,5107,5103,5098,5094,5090,5085,5081,5076,5072,5068,5063,5059,5054,5050,5046,5041,5037,5033,5028,5024,5020,5015,5011,5007,5002,4998,4994,4990,4985,4981,4977,4973,4968,4964,4960,4956,4952,4947,4943,4939,4935,4931,4927,4922,4918,4914,4910,4906,4902,4898,4894,4890,4885,4881,4877,4873,4869,4865,4861,4857,4853,4849,4845,4841,4837,4833,4829,4825,4821,4817,4813,4809,4805,4801,4797,4793,4790,4786,4782,4778,4774,4770,4766,4762,4758,4755,4751,4747,4743,4739,4735,4732,4728,4724,4720,4716,4713,4709,4705,4701,4697,4694,4690,4686,4682,4679,4675,4671,4668,4664,4660,4656,4653,4649,4645,4642,4638,4634,4631,4627,4623,4620,4616,4612,4609,4605,4602,4598,4594,4591,4587,4584,4580,4576,4573,4569,4566,4562,4559,4555,4552,4548,4545,4541,4538,4534,4531,4527,4524,4520,4517,4513,4510,4506,4503,4499,4496,4492,4489,4486,4482,4479,4475,4472,4469,4465,4462,4458,4455,4452,4448,4445,4442,4438,4435,4432,4428,4425,4422,4418,4415,4412,4408,4405,4402,4398,4395,4392,4389,4385,4382,4379,4375,4372,4369,4366,4362,4359,4356,4353,4350,4346,4343,4340,4337,4334,4330,4327,4324,4321,4318,4315,4311,4308,4305,4302,4299,4296,4293,4289,4286,4283,4280,4277,4274,4271,4268,4265,4261,4258,4255,4252,4249,4246,4243,4240,4237,4234,4231,4228,4225,4222,4219,4216,4213,4210,4207,4204,4201,4198,4195,4192,4189,4186,4183,4180,4177,4174,4171,4168,4165,4162,4159,4156,4153,4151,4148,4145,4142,4139,4136,4133,4130,4127,4124,4122,4119,4116,4113,4110,4107,4104,4101,4099,4096,4093,4090,4087,4084,4082,4079,4076,4073,4070,4068,4065,4062,4059,4056,4054,4051,4048,4045,4043,4040,4037,4034,4032,4029,4026,4023,4021,4018,4015,4012,4010,4007,4004,4002,3999,3996,3993,3991,3988,3985,3983,3980,3977,3975,3972,3969,3967,3964,3961,3959,3956,3953,3951,3948,3946,3943,3940,3938,3935,3932,3930,3927,3925,3922,3919,3917,3914,3912,3909,3906,3904,3901,3899,3896,3894,3891,3889,3886,3883,3881,3878,3876,3873,3871,3868,3866,3863,3861,3858,3856,3853,3851,3848,3846,3843,3841,3838,3836,3833,3831,3828,3826,3823,3821,3818,3816,3814,3811,3809,3806,3804,3801,3799,3796,3794,3792,3789,3787,3784,3782,3780,3777,3775,3772,3770,3768,3765,3763,3760,3758,3756,3753,3751,3749,3746,3744,3741,3739,3737,3734,3732,3730,3727,3725,3723,3720,3718,3716,3713,3711,3709,3706,3704,3702,3700,3697,3695,3693,3690,3688,3686,3684,3681,3679,3677,3674,3672,3670,3668,3665,3663,3661,3659,3656,3654,3652,3650,3647,3645,3643,3641,3639,3636,3634,3632,3630,3627,3625,3623,3621,3619,3616,3614,3612,3610,3608,3606,3603,3601,3599,3597,3595,3592,3590,3588,3586,3584,3582,3580,3577,3575,3573,3571,3569,3567,3565,3562,3560,3558,3556,3554,3552,3550,3548,3546,3543,3541,3539,3537,3535,3533,3531,3529,3527,3525,3523,3520,3518,3516,3514,3512,3510,3508,3506,3504,3502,3500,3498,3496,3494,3492,3490,3488,3486,3484,3481,3479,3477,3475,3473,3471,3469,3467,3465,3463,3461,3459,3457,3455,3453,3451,3449,3447,3445,3443,3441,3439,3437,3435,3434,3432,3430,3428,3426,3424,3422,3420,3418,3416,3414,3412,3410,3408,3406,3404,3402,3400,3398,3397,3395,3393,3391,3389,3387,3385,3383,3381,3379,3377,3376,3374,3372,3370,3368,3366,3364,3362,3360,3358,3357,3355,3353,3351,3349,3347,3345,3344,3342,3340,3338,3336,3334,3332,3331,3329,3327,3325,3323,3321,3319,3318,3316,3314,3312,3310,3309,3307,3305,3303,3301,3299,3298,3296,3294,3292,3290,3289,3287,3285,3283,3281,3280,3278,3276,3274,3273,3271,3269,3267,3265,3264,3262,3260,3258,3257,3255,3253,3251,3250,3248,3246,3244,3243,3241,3239,3237,3236,3234,3232,3230,3229,3227,3225,3223,3222,3220,3218,3217,3215,3213,3211,3210,3208,3206,3205,3203,3201,3199,3198,3196,3194,3193,3191,3189,3188,3186,3184,3183,3181,3179,3178,3176,3174,3173,3171,3169,3168,3166,3164,3163,3161,3159,3158,3156,3154,3153,3151,3149,3148,3146,3144,3143,3141,3140,3138,3136,3135,3133,3131,3130,3128,3127,3125,3123,3122,3120,3119,3117,3115,3114,3112,3111,3109,3107,3106,3104,3103,3101,3099,3098,3096,3095,3093,3091,3090,3088,3087,3085,3084,3082,3080,3079,3077,3076,3074,3073,3071,3069,3068,3066,3065,3063,3062,3060,3059,3057,3056,3054,3052,3051,3049,3048,3046,3045,3043,3042,3040,3039,3037,3036,3034,3033,3031,3030,3028,3027,3025,3024,3022,3021,3019,3018,3016,3015,3013,3012,3010,3009,3007,3006,3004,3003,3001,3000,2998,2997,2995,2994,2992,2991,2989,2988,2986,2985,2983,2982,2981,2979,2978,2976,2975,2973,2972,2970,2969,2967,2966,2965,2963,2962,2960,2959,2957,2956,2955,2953,2952,2950,2949,2947,2946,2944,2943,2942,2940,2939,2937,2936,2935,2933,2932,2930,2929,2928,2926,2925,2923,2922,2921,2919,2918,2916,2915,2914,2912,2911,2909,2908,2907,2905,2904,2902,2901,2900,2898,2897,2896,2894,2893,2891,2890,2889,2887,2886,2885,2883,2882,2881,2879,2878,2876,2875,2874,2872,2871,2870,2868,2867,2866,2864,2863,2862,2860,2859,2858,2856,2855,2854,2852,2851,2850,2848,2847,2846,2844,2843,2842,2840,2839,2838,2836,2835,2834,2832,2831,2830,2829,2827,2826,2825,2823,2822,2821,2819,2818,2817,2816,2814,2813,2812,2810,2809,2808,2807,2805,2804,2803,2801,2800,2799,2798,2796,2795,2794,2792,2791,2790,2789,2787,2786,2785,2784,2782,2781,2780,2779,2777,2776,2775,2774,2772,2771,2770,2769,2767,2766,2765,2764,2762,2761,2760,2759,2757,2756,2755,2754,2752,2751,2750,2749,2747,2746,2745,2744,2743,2741,2740,2739,2738,2736,2735,2734,2733,2732,2730,2729,2728,2727,2726,2724,2723,2722,2721,2720,2718,2717,2716,2715,2714,2712,2711,2710,2709,2708,2706,2705,2704,2703,2702,2701,2699,2698,2697,2696,2695,2693,2692,2691,2690,2689,2688,2686,2685,2684,2683,2682,2681,2679,2678,2677,2676,2675,2674,2672,2671,2670,2669,2668,2667,2666,2664,2663,2662,2661,2660,2659,2657,2656,2655,2654,2653,2652,2651,2650,2648,2647,2646,2645,2644,2643,2642,2640,2639,2638,2637,2636,2635,2634,2633,2631,2630,2629,2628,2627,2626,2625,2624,2623,2621,2620,2619,2618,2617,2616,2615,2614,2613,2612,2610,2609,2608,2607,2606,2605,2604,2603,2602,2601,2599,2598,2597,2596,2595,2594,2593,2592,2591,2590,2589,2588,2586,2585,2584,2583,2582,2581,2580,2579,2578,2577,2576,2575,2574,2573,2572,2570,2569,2568,2567,2566,2565,2564,2563,2562,2561,2560,2559,2558,2557,2556,2555,2554,2553,2551,2550,2549,2548,2547,2546,2545,2544,2543,2542,2541,2540,2539,2538,2537,2536,2535,2534,2533,2532,2531,2530,2529,2528,2527,2526,2525,2524,2523,2522,2521,2519,2518,2517,2516,2515,2514,2513,2512,2511,2510,2509,2508,2507,2506,2505,2504,2503,2502,2501,2500,2499,2498,2497,2496,2495,2494,2493,2492,2491,2490,2489,2488,2487,2486,2485,2484,2483,2482,2481,2480,2479,2479,2478,2477,2476,2475,2474,2473,2472,2471,2470,2469,2468,2467,2466,2465,2464,2463,2462,2461,2460,2459,2458,2457,2456,2455,2454,2453,2452,2451,2450,2449,2448,2448,2447,2446,2445,2444,2443,2442,2441,2440,2439,2438,2437,2436,2435,2434,2433,2432,2431,2430,2430,2429,2428,2427,2426,2425,2424,2423,2422,2421,2420,2419,2418,2417,2416,2416,2415,2414,2413,2412,2411,2410,2409,2408,2407,2406,2405,2404,2404,2403,2402,2401,2400,2399,2398,2397,2396,2395,2394,2394,2393,2392,2391,2390,2389,2388,2387,2386,2385,2384,2384,2383,2382,2381,2380,2379,2378,2377,2376,2375,2375,2374,2373,2372,2371,2370,2369,2368,2367,2367,2366,2365,2364,2363,2362,2361,2360,2360,2359,2358,2357,2356,2355,2354,2353,2352,2352,2351,2350,2349,2348,2347,2346,2346,2345,2344,2343,2342,2341,2340,2339,2339,2338,2337,2336,2335,2334,2333,2333,2332,2331,2330,2329,2328,2327,2327,2326,2325,2324,2323,2322,2321,2321,2320,2319,2318,2317,2316,2316,2315,2314,2313,2312,2311,2310,2310,2309,2308,2307,2306,2305,2305,2304,2303,2302,2301,2300,2300,2299,2298,2297,2296,2295,2295,2294,2293,2292,2291,2291,2290,2289,2288,2287,2286,2286,2285,2284,2283,2282,2281,2281,2280,2279,2278,2277,2277,2276,2275,2274,2273,2273,2272,2271,2270,2269,2269,2268,2267,2266,2265,2264,2264,2263,2262,2261,2260,2260,2259,2258,2257,2256,2256,2255,2254,2253,2252,2252,2251,2250,2249,2249,2248,2247,2246,2245,2245,2244,2243,2242,2241,2241,2240,2239,2238,2238,2237,2236,2235,2234,2234,2233,2232,2231,2231,2230,2229,2228,2227,2227,2226,2225,2224,2224,2223,2222,2221,2220,2220,2219,2218,2217,2217,2216,2215,2214,2214,2213,2212,2211,2211,2210,2209,2208,2207,2207,2206,2205,2204,2204,2203,2202,2201,2201,2200,2199,2198,2198,2197,2196,2195,2195,2194,2193,2192,2192,2191,2190,2189,2189,2188,2187,2186,2186,2185,2184,2184,2183,2182,2181,2181,2180,2179,2178,2178,2177,2176,2175,2175,2174,2173,2172,2172,2171,2170,2170,2169,2168,2167,2167,2166,2165,2164,2164,2163,2162,2162,2161,2160,2159,2159,2158,2157,2157,2156,2155,2154,2154,2153,2152,2151,2151,2150,2149,2149,2148,2147,2146,2146,2145,2144,2144,2143,2142,2142,2141,2140,2139,2139,2138,2137,2137,2136,2135,2134,2134,2133,2132,2132,2131,2130,2130,2129,2128,2127,2127,2126,2125,2125,2124,2123,2123,2122,2121,2121,2120,2119,2118,2118,2117,2116,2116,2115,2114,2114,2113,2112,2112,2111,2110,2109,2109,2108,2107,2107,2106,2105,2105,2104,2103,2103,2102,2101,2101,2100,2099,2099,2098,2097,2097,2096,2095,2095,2094,2093,2093,2092,2091,2091,2090,2089,2089,2088,2087,2087,2086,2085,2085,2084,2083,2083,2082,2081,2081,2080,2079,2079,2078,2077,2077,2076,2075,2075,2074,2073,2073,2072,2071,2071,2070,2069,2069,2068,2067,2067,2066,2065,2065,2064,2063,2063,2062,2062,2061,2060,2060,2059,2058,2058,2057,2056,2056,2055,2054,2054,2053,2052,2052,2051,2051,2050,2049,2049,2048,2047,2047,2046,2045,2045,2044,2044,2043,2042,2042,2041,2040,2040,2039,2038,2038,2037,2037,2036,2035,2035,2034,2033,2033,2032,2032,2031,2030,2030,2029,2028,2028,2027,2027,2026,2025,2025,2024,2023,2023,2022,2022,2021,2020,2020,2019,2018,2018,2017,2017,2016,2015,2015,2014,2014,2013,2012,2012,2011,2010,2010,2009,2009,2008,2007,2007,2006,2006,2005,2004,2004,2003,2003,2002,2001,2001,2000,2000,1999,1998,1998,1997,1996,1996,1995,1995,1994,1993,1993,1992,1992,1991,1990,1990,1989,1989,1988,1987,1987,1986,1986,1985,1985,1984,1983,1983,1982,1982,1981,1980,1980,1979,1979,1978,1977,1977,1976,1976,1975,1974,1974,1973,1973,1972,1972,1971,1970,1970,1969,1969,1968,1967,1967,1966,1966,1965,1965,1964,1963,1963,1962,1962,1961,1961,1960,1959,1959,1958,1958,1957,1956,1956,1955,1955,1954,1954,1953,1952,1952,1951,1951,1950,1950,1949,1948,1948,1947,1947,1946,1946,1945,1944,1944,1943,1943,1942,1942,1941,1941,1940,1939,1939,1938,1938,1937,1937,1936,1935,1935,1934,1934,1933,1933,1932,1932,1931,1930,1930,1929,1929,1928,1928,1927,1927,1926,1925,1925,1924,1924,1923,1923,1922,1922,1921,1920,1920,1919,1919,1918,1918,1917,1917,1916,1916,1915,1914,1914,1913,1913,1912,1912,1911,1911,1910,1910,1909,1908,1908,1907,1907,1906,1906,1905,1905,1904,1904,1903,1903,1902,1901,1901,1900,1900,1899,1899,1898,1898,1897,1897,1896,1896,1895,1895,1894,1893,1893,1892,1892,1891,1891,1890,1890,1889,1889,1888,1888,1887,1887,1886,1886,1885,1884,1884,1883,1883,1882,1882,1881,1881,1880,1880,1879,1879,1878,1878,1877,1877,1876,1876,1875,1875,1874,1874,1873,1872,1872,1871,1871,1870,1870,1869,1869,1868,1868,1867,1867,1866,1866,1865,1865,1864,1864,1863,1863,1862,1862,1861,1861,1860,1860,1859,1859,1858,1858,1857,1857,1856,1856,1855,1855,1854,1854,1853,1853,1852,1852,1851,1851,1850,1850,1849,1849,1848,1848,1847,1847,1846,1846,1845,1845,1844,1844,1843,1843,1842,1842,1841,1841,1840,1840,1839,1839,1838,1838,1837,1837,1836,1836,1835,1835,1834,1834,1833,1833,1832,1832,1831,1831,1830,1830,1829,1829,1828,1828,1827,1827,1826,1826,1825,1825,1824,1824,1823,1823,1822,1822,1821,1821,1820,1820,1819,1819,1819,1818,1818,1817,1817,1816,1816,1815,1815,1814,1814,1813,1813,1812,1812,1811,1811,1810,1810,1809,1809,1808,1808,1807,1807,1807,1806,1806,1805,1805,1804,1804,1803,1803,1802,1802,1801,1801,1800,1800,1799,1799,1799,1798,1798,1797,1797,1796,1796,1795,1795,1794,1794,1793,1793,1792,1792,1792,1791,1791,1790,1790,1789,1789,1788,1788,1787,1787,1786,1786,1785,1785,1785,1784,1784,1783,1783,1782,1782,1781,1781,1780,1780,1780,1779,1779,1778,1778,1777,1777,1776,1776,1775,1775,1774,1774,1774,1773,1773,1772,1772,1771,1771,1770,1770,1770,1769,1769,1768,1768,1767,1767,1766,1766,1765,1765,1765,1764,1764,1763,1763,1762,1762,1761,1761,1761,1760,1760,1759,1759,1758,1758,1757,1757,1757,1756,1756,1755,1755,1754,1754,1753,1753,1753,1752,1752,1751,1751,1750,1750,1749,1749,1749,1748,1748,1747,1747,1746,1746,1746,1745,1745,1744,1744,1743,1743,1743,1742,1742,1741,1741,1740,1740,1739,1739,1739,1738,1738,1737,1737,1736,1736,1736,1735,1735,1734,1734,1733,1733,1733,1732,1732,1731,1731,1730,1730,1730,1729,1729,1728,1728,1727,1727,1727,1726,1726,1725,1725,1725,1724,1724,1723,1723,1722,1722,1722,1721,1721,1720,1720,1719,1719,1719,1718,1718,1717,1717,1717,1716,1716,1715,1715,1714,1714,1714,1713,1713,1712,1712,1712,1711,1711,1710,1710,1709,1709,1709,1708,1708,1707,1707,1707,1706,1706,1705,1705,1704,1704,1704,1703,1703,1702,1702,1702,1701,1701,1700,1700,1700,1699,1699,1698,1698,1698,1697,1697,1696,1696,1696,1695,1695,1694,1694,1693,1693,1693,1692,1692,1691,1691,1691,1690,1690,1689,1689,1689,1688,1688,1687,1687,1687,1686,1686,1685,1685,1685,1684,1684,1683,1683,1683,1682,1682,1681,1681,1681,1680,1680,1679,1679,1679,1678,1678,1678,1677,1677,1676,1676,1676,1675,1675,1674,1674,1674,1673,1673,1672,1672,1672,1671,1671,1670,1670,1670,1669,1669,1668,1668,1668,1667,1667,1667,1666,1666,1665,1665,1665,1664,1664,1663,1663,1663,1662,1662,1662,1661,1661,1660,1660,1660,1659,1659,1658,1658,1658,1657,1657,1657,1656,1656,1655,1655,1655,1654,1654,1653,1653,1653,1652,1652,1652,1651,1651,1650,1650,1650,1649,1649,1649,1648,1648,1647,1647,1647,1646,1646,1646,1645,1645,1644,1644,1644,1643,1643,1643,1642,1642,1641,1641,1641,1640,1640,1640,1639,1639,1638,1638,1638,1637,1637,1637,1636,1636,1635,1635,1635,1634,1634,1634,1633,1633,1633,1632,1632,1631,1631,1631,1630,1630,1630,1629,1629,1629,1628,1628,1627,1627,1627,1626,1626,1626,1625,1625,1624,1624,1624,1623,1623,1623,1622,1622,1622,1621,1621,1621,1620,1620,1619,1619,1619,1618,1618,1618,1617,1617,1617,1616,1616,1615,1615,1615,1614,1614,1614,1613,1613,1613,1612,1612,1612,1611,1611,1610,1610,1610,1609,1609,1609,1608,1608,1608,1607,1607,1607,1606,1606,1606,1605,1605,1604,1604,1604,1603,1603,1603,1602,1602,1602,1601,1601,1601,1600,1600,1600,1599,1599,1599,1598,1598,1597,1597,1597,1596,1596,1596,1595,1595,1595,1594,1594,1594,1593,1593,1593,1592,1592,1592,1591,1591,1591,1590,1590,1590,1589,1589,1589,1588,1588,1587,1587,1587,1586,1586,1586,1585,1585,1585,1584,1584,1584,1583,1583,1583,1582,1582,1582,1581,1581,1581,1580,1580,1580,1579,1579,1579,1578,1578,1578,1577,1577,1577,1576,1576,1576,1575,1575,1575,1574,1574,1574,1573,1573,1573,1572,1572,1572,1571,1571,1571,1570,1570,1570,1569,1569,1569,1568,1568,1568,1567,1567,1567,1566,1566,1566,1565,1565,1565,1564,1564,1564,1563,1563,1563,1562,1562,1562,1561,1561,1561,1560,1560,1560,1559,1559,1559,1558,1558,1558,1557,1557,1557,1557,1556,1556,1556,1555,1555,1555,1554,1554,1554,1553,1553,1553,1552,1552,1552,1551,1551,1551,1550,1550,1550,1549,1549,1549,1548,1548,1548,1548,1547,1547,1547,1546,1546,1546,1545,1545,1545,1544,1544,1544,1543,1543,1543,1542,1542,1542,1541,1541,1541,1541,1540,1540,1540,1539,1539,1539,1538,1538,1538,1537,1537,1537,1536,1536,1536,1536,1535,1535,1535,1534,1534,1534,1533,1533,1533,1532,1532,1532,1531,1531,1531,1531,1530,1530,1530,1529,1529,1529,1528,1528,1528,1527,1527,1527,1527,1526,1526,1526,1525,1525,1525,1524,1524,1524,1523,1523,1523,1523,1522,1522,1522,1521,1521,1521,1520,1520,1520,1519,1519,1519,1519,1518,1518,1518,1517,1517,1517,1516,1516,1516,1516,1515,1515,1515,1514,1514,1514,1513,1513,1513,1513,1512,1512,1512,1511,1511,1511,1510,1510,1510,1510,1509,1509,1509,1508,1508,1508,1507,1507,1507,1507,1506,1506,1506,1505,1505,1505,1505,1504,1504,1504,1503,1503,1503,1502,1502,1502,1502,1501,1501,1501,1500,1500,1500,1500,1499,1499,1499,1498,1498,1498,1497,1497,1497,1497,1496,1496,1496,1495,1495,1495,1495,1494,1494,1494,1493,1493,1493,1493,1492,1492,1492,1491,1491,1491,1491,1490,1490,1490,1489,1489,1489,1489,1488,1488,1488,1487,1487,1487,1486,1486,1486,1486,1485,1485,1485,1485,1484,1484,1484,1483,1483,1483,1483,1482,1482,1482,1481,1481,1481,1481,1480,1480,1480,1479,1479,1479,1479,1478,1478,1478,1477,1477,1477,1477,1476,1476,1476,1475,1475,1475,1475,1474,1474,1474,1474,1473,1473,1473,1472,1472,1472,1472,1471,1471,1471,1470,1470,1470,1470,1469,1469,1469,1469,1468,1468,1468,1467,1467,1467,1467,1466,1466,1466,1466,1465,1465,1465,1464,1464,1464,1464,1463,1463,1463,1462,1462,1462,1462,1461,1461,1461,1461,1460,1460,1460,1460,1459,1459,1459,1458,1458,1458,1458,1457,1457,1457,1457,1456,1456,1456,1455,1455,1455,1455,1454,1454,1454,1454,1453,1453,1453,1453,1452,1452,1452,1451,1451,1451,1451,1450,1450,1450,1450,1449,1449,1449,1449,1448,1448,1448,1447,1447,1447,1447,1446,1446,1446,1446,1445,1445,1445,1445,1444,1444,1444,1443,1443,1443,1443,1442,1442,1442,1442,1441,1441,1441,1441,1440,1440,1440,1440,1439,1439,1439,1439,1438,1438,1438,1437,1437,1437,1437,1436,1436,1436,1436,1435,1435,1435,1435,1434,1434,1434,1434,1433,1433,1433,1433,1432,1432,1432,1432,1431,1431,1431,1431,1430,1430,1430,1430,1429,1429,1429,1429,1428,1428,1428,1427,1427,1427,1427,1426,1426,1426,1426,1425,1425,1425,1425,1424,1424,1424,1424,1423,1423,1423,1423,1422,1422,1422,1422,1421,1421,1421,1421,1420,1420,1420,1420,1419,1419,1419,1419,1418,1418,1418,1418,1417,1417,1417,1417,1416,1416,1416,1416,1415,1415,1415,1415,1414,1414,1414,1414,1413,1413,1413,1413,1412,1412,1412,1412,1411,1411,1411,1411,1411,1410,1410,1410,1410,1409,1409,1409,1409,1408,1408,1408,1408,1407,1407,1407,1407,1406,1406,1406,1406,1405,1405,1405,1405,1404,1404,1404,1404,1403,1403,1403,1403,1402,1402,1402,1402,1402,1401,1401,1401,1401,1400,1400,1400,1400,1399,1399,1399,1399,1398,1398,1398,1398,1397,1397,1397,1397,1397,1396,1396,1396,1396,1395,1395,1395,1395,1394,1394,1394,1394,1393,1393,1393,1393,1392,1392,1392,1392,1392,1391,1391,1391,1391,1390,1390,1390,1390,1389,1389,1389,1389,1388,1388,1388,1388,1388,1387,1387,1387,1387,1386,1386,1386,1386,1385,1385,1385,1385,1385,1384,1384,1384,1384,1383,1383,1383,1383,1382,1382,1382,1382,1382,1381,1381,1381,1381,1380,1380,1380,1380,1379,1379,1379,1379,1379,1378,1378,1378,1378,1377,1377,1377,1377,1377,1376,1376,1376,1376,1375,1375,1375,1375,1374,1374,1374,1374,1374,1373,1373,1373,1373,1372,1372,1372,1372,1372,1371,1371,1371,1371,1370,1370,1370,1370,1370,1369,1369,1369,1369,1368,1368,1368,1368,1367,1367,1367,1367,1367,1366,1366,1366,1366,1365,1365,1365,1365,1365,1364,1364,1364,1364,1364,1363,1363,1363,1363,1362,1362,1362,1362,1362,1361,1361,1361,1361,1360,1360,1360,1360,1360,1359,1359,1359,1359,1358,1358,1358,1358,1358,1357,1357,1357,1357,1356,1356,1356,1356,1356,1355,1355,1355,1355,1355,1354,1354,1354,1354,1353,1353,1353,1353,1353,1352,1352,1352,1352,1352,1351,1351,1351,1351,1350,1350,1350,1350,1350,1349,1349,1349,1349,1349,1348,1348,1348,1348,1347,1347,1347,1347,1347,1346,1346,1346,1346,1346,1345,1345,1345,1345,1344,1344,1344,1344,1344,1343,1343,1343,1343,1343,1342,1342,1342,1342,1342,1341,1341,1341,1341,1341,1340,1340,1340,1340,1339,1339,1339,1339,1339,1338,1338,1338,1338,1338,1337,1337,1337,1337,1337,1336,1336,1336,1336,1336,1335,1335,1335,1335,1334,1334,1334,1334,1334,1333,1333,1333,1333,1333,1332,1332,1332,1332,1332,1331,1331,1331,1331,1331,1330,1330,1330,1330,1330,1329,1329,1329,1329,1329,1328,1328,1328,1328,1328,1327,1327,1327,1327,1327,1326,1326,1326,1326,1326,1325,1325,1325,1325,1325,1324,1324,1324,1324,1324,1323,1323,1323,1323,1323,1322,1322,1322,1322,1322,1321,1321,1321,1321,1321,1320,1320,1320,1320,1320,1319,1319,1319,1319,1319,1318,1318,1318,1318,1318,1317,1317,1317,1317,1317,1316,1316,1316,1316,1316,1315,1315,1315,1315,1315,1314,1314,1314,1314,1314,1313,1313,1313,1313,1313,1312,1312,1312,1312,1312,1311,1311,1311,1311,1311,1310,1310,1310,1310,1310,1310,1309,1309,1309,1309,1309,1308,1308,1308,1308,1308,1307,1307,1307,1307,1307,1306,1306,1306,1306,1306,1305,1305,1305,1305,1305,1305,1304,1304,1304,1304,1304,1303,1303,1303,1303,1303,1302,1302,1302,1302,1302,1301,1301,1301,1301,1301,1301,1300,1300,1300,1300,1300,1299,1299,1299,1299,1299,1298,1298,1298,1298,1298,1298,1297,1297,1297,1297,1297,1296,1296,1296,1296,1296,1295,1295,1295,1295,1295,1295,1294,1294,1294,1294,1294,1293,1293,1293,1293,1293,1292,1292,1292,1292,1292,1292,1291,1291,1291,1291,1291,1290,1290,1290,1290,1290,1290,1289,1289,1289,1289,1289,1288,1288,1288,1288,1288,1288,1287,1287,1287,1287,1287,1286,1286,1286,1286,1286,1286,1285,1285,1285,1285,1285,1284,1284,1284,1284,1284,1284,1283,1283,1283,1283,1283,1282,1282,1282,1282,1282,1282,1281,1281,1281,1281,1281,1280,1280,1280,1280,1280,1280,1279,1279,1279,1279,1279,1279,1278,1278,1278,1278,1278,1277,1277,1277,1277,1277,1277,1276,1276,1276,1276,1276,1276,1275,1275,1275,1275,1275,1274,1274,1274,1274,1274,1274,1273,1273,1273,1273,1273,1273,1272,1272,1272,1272,1272,1271,1271,1271,1271,1271,1271,1270,1270,1270,1270,1270,1270,1269,1269,1269,1269,1269,1269,1268,1268,1268,1268,1268,1267,1267,1267,1267,1267,1267,1266,1266,1266,1266,1266,1266,1265,1265,1265,1265,1265,1265,1264,1264,1264,1264,1264,1264,1263,1263,1263,1263,1263,1263,1262,1262,1262,1262,1262,1261,1261,1261,1261,1261,1261,1260,1260,1260,1260,1260,1260,1259,1259,1259,1259,1259,1259,1258,1258,1258,1258,1258,1258,1257,1257,1257,1257,1257,1257,1256,1256,1256,1256,1256,1256,1255,1255,1255,1255,1255,1255,1254,1254,1254,1254,1254,1254,1253,1253,1253,1253,1253,1253,1252,1252,1252,1252,1252,1252,1251,1251,1251,1251,1251,1251,1250,1250,1250,1250,1250,1250,1250,1249,1249,1249,1249,1249,1249,1248,1248,1248,1248,1248,1248,1247,1247,1247,1247,1247,1247,1246,1246,1246,1246,1246,1246,1245,1245,1245,1245,1245,1245,1244,1244,1244,1244,1244,1244,1244,1243,1243,1243,1243,1243,1243,1242,1242,1242,1242,1242,1242,1241,1241,1241,1241,1241,1241,1240,1240,1240,1240,1240,1240,1240,1239,1239,1239,1239,1239,1239,1238,1238,1238,1238,1238,1238,1237,1237,1237,1237,1237,1237,1237,1236,1236,1236,1236,1236,1236,1235,1235,1235,1235,1235,1235,1234,1234,1234,1234,1234,1234,1234,1233,1233,1233,1233,1233,1233,1232,1232,1232,1232,1232,1232,1232,1231,1231,1231,1231,1231,1231,1230,1230,1230,1230,1230,1230,1230,1229,1229,1229,1229,1229,1229,1228,1228,1228,1228,1228,1228,1228,1227,1227,1227,1227,1227,1227,1226,1226,1226,1226,1226,1226,1226,1225,1225,1225,1225,1225,1225,1224,1224,1224,1224,1224,1224,1224,1223,1223,1223,1223,1223,1223,1223,1222,1222,1222,1222,1222,1222,1221,1221,1221,1221,1221,1221,1221,1220,1220,1220,1220,1220,1220,1220,1219,1219,1219,1219,1219,1219,1218,1218,1218,1218,1218,1218,1218,1217,1217,1217,1217,1217,1217,1217,1216,1216,1216,1216,1216,1216,1216,1215,1215,1215,1215,1215,1215,1215,1214,1214,1214,1214,1214,1214,1213,1213,1213,1213,1213,1213,1213,1212,1212,1212,1212,1212,1212,1212,1211,1211,1211,1211,1211,1211,1211,1210,1210,1210,1210,1210,1210,1210,1209,1209,1209,1209,1209,1209,1209,1208,1208,1208,1208,1208,1208,1208,1207,1207,1207,1207,1207,1207,1207,1206,1206,1206,1206,1206,1206,1206,1205,1205,1205,1205,1205,1205,1205,1204,1204,1204,1204,1204,1204,1204,1203,1203,1203,1203,1203,1203,1203,1202,1202,1202,1202,1202,1202,1202,1201,1201,1201,1201,1201,1201,1201,1201,1200,1200,1200,1200,1200,1200,1200,1199,1199,1199,1199,1199,1199,1199,1198,1198,1198,1198,1198,1198,1198,1197,1197,1197,1197,1197,1197,1197,1196,1196,1196,1196,1196,1196,1196,1196,1195,1195,1195,1195,1195,1195,1195,1194,1194,1194,1194,1194,1194,1194,1193,1193,1193,1193,1193,1193,1193,1193,1192,1192,1192,1192,1192,1192,1192,1191,1191,1191,1191,1191,1191,1191,1191,1190,1190,1190,1190,1190,1190,1190,1189,1189,1189,1189,1189,1189,1189,1189,1188,1188,1188,1188,1188,1188,1188,1187,1187,1187,1187,1187,1187,1187,1187,1186,1186,1186,1186,1186,1186,1186,1185,1185,1185,1185,1185,1185,1185,1185,1184,1184,1184,1184,1184,1184,1184,1183,1183,1183,1183,1183,1183,1183,1183,1182,1182,1182,1182,1182,1182,1182,1182,1181,1181,1181,1181,1181,1181,1181,1180,1180,1180,1180,1180,1180,1180,1180,1179,1179,1179,1179,1179,1179,1179,1179,1178,1178,1178,1178,1178,1178,1178,1178,1177,1177,1177,1177,1177,1177,1177,1177,1176,1176,1176,1176,1176,1176,1176,1175,1175,1175,1175,1175,1175,1175,1175,1174,1174,1174,1174,1174,1174,1174,1174,1173,1173,1173,1173,1173,1173,1173,1173,1172,1172,1172,1172,1172,1172,1172,1172,1171,1171,1171,1171,1171,1171,1171,1171,1170,1170,1170,1170,1170,1170,1170,1170,1169,1169,1169,1169,1169,1169,1169,1169,1168,1168,1168,1168,1168,1168,1168,1168,1167,1167,1167,1167,1167,1167,1167,1167,1167,1166,1166,1166,1166,1166,1166,1166,1166,1165,1165,1165,1165,1165,1165,1165,1165,1164,1164,1164,1164,1164,1164,1164,1164,1163,1163,1163,1163,1163,1163,1163,1163,1162,1162,1162,1162,1162,1162,1162,1162,1162,1161,1161,1161,1161,1161,1161,1161,1161,1160,1160,1160,1160,1160,1160,1160,1160,1159,1159,1159,1159,1159,1159,1159,1159,1159,1158,1158,1158,1158,1158,1158,1158,1158,1157,1157,1157,1157,1157,1157,1157,1157,1157,1156,1156,1156,1156,1156,1156,1156,1156,1155,1155,1155,1155,1155,1155,1155,1155,1155,1154,1154,1154,1154,1154,1154,1154,1154,1154,1153,1153,1153,1153,1153,1153,1153,1153,1152,1152,1152,1152,1152,1152,1152,1152,1152,1151,1151,1151,1151,1151,1151,1151,1151,1151,1150,1150,1150,1150,1150,1150,1150,1150,1149,1149,1149,1149,1149,1149,1149,1149,1149,1148,1148,1148,1148,1148,1148,1148,1148,1148,1147,1147,1147,1147,1147,1147,1147,1147,1147,1146,1146,1146,1146,1146,1146,1146,1146,1146,1145,1145,1145,1145,1145,1145,1145,1145,1145,1144,1144,1144,1144,1144,1144,1144,1144,1144,1143,1143,1143,1143,1143,1143,1143,1143,1143,1142,1142,1142,1142,1142,1142,1142,1142,1142,1141,1141,1141,1141,1141,1141,1141,1141,1141,1140,1140,1140,1140,1140,1140,1140,1140,1140,1139,1139,1139,1139,1139,1139,1139,1139,1139,1138,1138,1138,1138,1138,1138,1138,1138,1138,1138,1137,1137,1137,1137,1137,1137,1137,1137,1137,1136,1136,1136,1136,1136,1136,1136,1136,1136,1135,1135,1135,1135,1135,1135,1135,1135,1135,1135,1134,1134,1134,1134,1134,1134,1134,1134,1134,1133,1133,1133,1133,1133,1133,1133,1133,1133,1132,1132,1132,1132,1132,1132,1132,1132,1132,1132,1131,1131,1131,1131,1131,1131,1131,1131,1131,1130,1130,1130,1130,1130,1130,1130,1130,1130,1130,1129,1129,1129,1129,1129,1129,1129,1129,1129,1129,1128,1128,1128,1128,1128,1128,1128,1128,1128,1127,1127,1127,1127,1127,1127,1127,1127,1127,1127,1126,1126,1126,1126,1126,1126,1126,1126,1126,1126,1125,1125,1125,1125,1125,1125,1125,1125,1125,1125,1124,1124,1124,1124,1124,1124,1124,1124,1124,1124,1123,1123,1123,1123,1123,1123,1123,1123,1123,1123,1122,1122,1122,1122,1122,1122,1122,1122,1122,1122,1121,1121,1121,1121,1121,1121,1121,1121,1121,1121,1120,1120,1120,1120,1120,1120,1120,1120,1120,1120,1119,1119,1119,1119,1119,1119,1119,1119,1119,1119,1118,1118,1118,1118,1118,1118,1118,1118,1118,1118,1117,1117,1117,1117,1117,1117,1117,1117,1117,1117,1117,1116,1116,1116,1116,1116,1116,1116,1116,1116,1116,1115,1115,1115,1115,1115,1115,1115,1115,1115,1115,1114,1114,1114,1114,1114,1114,1114,1114,1114,1114,1114,1113,1113,1113,1113,1113,1113,1113,1113,1113,1113,1112,1112,1112,1112,1112,1112,1112,1112,1112,1112,1112,1111,1111,1111,1111,1111,1111,1111,1111,1111,1111,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1110,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1109,1108,1108,1108,1108,1108,1108,1108,1108,1108,1108,1108,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1107,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1106,1105,1105,1105,1105,1105,1105,1105,1105,1105,1105,1105,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1104,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1103,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1102,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1101,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1100,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1099,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1098,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1097,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1096,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1095,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1094,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1093,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1092,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1091,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1090,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1089,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1088,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1087,1086,1086,1086,1086,1086,1086,1086,1086,1086,1086,1086,1086,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1085,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1084,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1083,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1082,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1081,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1080,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1079,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1078,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1077,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1076,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1075,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1074,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1073,1072,1072,1072,1072,1072,1072,1072,1072,1072,1072,1072,1072,1072,1072,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1071,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1070,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1069,1068,1068,1068,1068,1068,1068,1068,1068,1068,1068,1068,1068,1068,1068,1067,1067,1067,1067,1067,1067,1067,1067,1067,1067,1067,1067,1067,1067,1066,1066,1066,1066,1066,1066,1066,1066,1066,1066,1066,1066,1066,1066,1066,1065,1065,1065,1065,1065,1065,1065,1065,1065,1065,1065,1065,1065,1065,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1064,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1063,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1062,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1061,1060,1060,1060,1060,1060,1060,1060,1060,1060,1060,1060,1060,1060,1060,1060,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1059,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1058,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1057,1056,1056,1056,1056,1056,1056,1056,1056,1056,1056,1056,1056,1056,1056,1056,1056,1055,1055,1055,1055,1055,1055,1055,1055,1055,1055,1055,1055,1055,1055,1055,1055,1054,1054,1054,1054,1054,1054,1054,1054,1054,1054,1054,1054,1054,1054,1054,1054,1054,1053,1053,1053,1053,1053,1053,1053,1053,1053,1053,1053,1053,1053,1053,1053,1053,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1052,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1051,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1050,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1049,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1048,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1047,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1046,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1045,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1044,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1043,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1042,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1041,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1040,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1039,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1038,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1037,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1036,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1035,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1034,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1033,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1032,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1031,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1030,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1029,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1028,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1027,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1026,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1025,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1024,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1023,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1022,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1021,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1020,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1019,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1018,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1017,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1016,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1015,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1014,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1013,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1012,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1011,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1010,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1009,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1008,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1007,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1006,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1005,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1004,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1003,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1002,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1001,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000,1000] + data modify storage gm4_player_motion:sine arr set value [0,0,0,0,0,0,1,1,1,1,1,1,2,2,2,2,2,2,3,3,3,3,3,4,4,4,4,4,4,5,5,5,5,5,5,6,6,6,6,6,6,7,7,7,7,7,8,8,8,8,8,8,9,9,9,9,9,9,10,10,10,10,10,10,11,11,11,11,11,12,12,12,12,12,12,13,13,13,13,13,13,14,14,14,14,14,15,15,15,15,15,15,16,16,16,16,16,16,17,17,17,17,17,17,18,18,18,18,18,19,19,19,19,19,19,20,20,20,20,20,20,21,21,21,21,21,21,22,22,22,22,22,23,23,23,23,23,23,24,24,24,24,24,24,25,25,25,25,25,26,26,26,26,26,26,27,27,27,27,27,27,28,28,28,28,28,28,29,29,29,29,29,30,30,30,30,30,30,31,31,31,31,31,31,32,32,32,32,32,32,33,33,33,33,33,34,34,34,34,34,34,35,35,35,35,35,35,36,36,36,36,36,36,37,37,37,37,37,38,38,38,38,38,38,39,39,39,39,39,39,40,40,40,40,40,41,41,41,41,41,41,42,42,42,42,42,42,43,43,43,43,43,43,44,44,44,44,44,45,45,45,45,45,45,46,46,46,46,46,46,47,47,47,47,47,47,48,48,48,48,48,49,49,49,49,49,49,50,50,50,50,50,50,51,51,51,51,51,51,52,52,52,52,52,53,53,53,53,53,53,54,54,54,54,54,54,55,55,55,55,55,55,56,56,56,56,56,57,57,57,57,57,57,58,58,58,58,58,58,59,59,59,59,59,60,60,60,60,60,60,61,61,61,61,61,61,62,62,62,62,62,62,63,63,63,63,63,64,64,64,64,64,64,65,65,65,65,65,65,66,66,66,66,66,66,67,67,67,67,67,68,68,68,68,68,68,69,69,69,69,69,69,70,70,70,70,70,70,71,71,71,71,71,72,72,72,72,72,72,73,73,73,73,73,73,74,74,74,74,74,74,75,75,75,75,75,76,76,76,76,76,76,77,77,77,77,77,77,78,78,78,78,78,78,79,79,79,79,79,80,80,80,80,80,80,81,81,81,81,81,81,82,82,82,82,82,82,83,83,83,83,83,84,84,84,84,84,84,85,85,85,85,85,85,86,86,86,86,86,86,87,87,87,87,87,88,88,88,88,88,88,89,89,89,89,89,89,90,90,90,90,90,90,91,91,91,91,91,92,92,92,92,92,92,93,93,93,93,93,93,94,94,94,94,94,94,95,95,95,95,95,96,96,96,96,96,96,97,97,97,97,97,97,98,98,98,98,98,98,99,99,99,99,99,100,100,100,100,100,100,101,101,101,101,101,101,102,102,102,102,102,102,103,103,103,103,103,104,104,104,104,104,104,105,105,105,105,105,105,106,106,106,106,106,106,107,107,107,107,107,107,108,108,108,108,108,109,109,109,109,109,109,110,110,110,110,110,110,111,111,111,111,111,111,112,112,112,112,112,113,113,113,113,113,113,114,114,114,114,114,114,115,115,115,115,115,115,116,116,116,116,116,117,117,117,117,117,117,118,118,118,118,118,118,119,119,119,119,119,119,120,120,120,120,120,121,121,121,121,121,121,122,122,122,122,122,122,123,123,123,123,123,123,124,124,124,124,124,124,125,125,125,125,125,126,126,126,126,126,126,127,127,127,127,127,127,128,128,128,128,128,128,129,129,129,129,129,130,130,130,130,130,130,131,131,131,131,131,131,132,132,132,132,132,132,133,133,133,133,133,133,134,134,134,134,134,135,135,135,135,135,135,136,136,136,136,136,136,137,137,137,137,137,137,138,138,138,138,138,139,139,139,139,139,139,140,140,140,140,140,140,141,141,141,141,141,141,142,142,142,142,142,142,143,143,143,143,143,144,144,144,144,144,144,145,145,145,145,145,145,146,146,146,146,146,146,147,147,147,147,147,147,148,148,148,148,148,149,149,149,149,149,149,150,150,150,150,150,150,151,151,151,151,151,151,152,152,152,152,152,152,153,153,153,153,153,154,154,154,154,154,154,155,155,155,155,155,155,156,156,156,156,156,156,157,157,157,157,157,157,158,158,158,158,158,159,159,159,159,159,159,160,160,160,160,160,160,161,161,161,161,161,161,162,162,162,162,162,162,163,163,163,163,163,164,164,164,164,164,164,165,165,165,165,165,165,166,166,166,166,166,166,167,167,167,167,167,167,168,168,168,168,168,169,169,169,169,169,169,170,170,170,170,170,170,171,171,171,171,171,171,172,172,172,172,172,172,173,173,173,173,173,173,174,174,174,174,174,175,175,175,175,175,175,176,176,176,176,176,176,177,177,177,177,177,177,178,178,178,178,178,178,179,179,179,179,179,180,180,180,180,180,180,181,181,181,181,181,181,182,182,182,182,182,182,183,183,183,183,183,183,184,184,184,184,184,184,185,185,185,185,185,186,186,186,186,186,186,187,187,187,187,187,187,188,188,188,188,188,188,189,189,189,189,189,189,190,190,190,190,190,190,191,191,191,191,191,192,192,192,192,192,192,193,193,193,193,193,193,194,194,194,194,194,194,195,195,195,195,195,195,196,196,196,196,196,196,197,197,197,197,197,197,198,198,198,198,198,199,199,199,199,199,199,200,200,200,200,200,200,201,201,201,201,201,201,202,202,202,202,202,202,203,203,203,203,203,203,204,204,204,204,204,205,205,205,205,205,205,206,206,206,206,206,206,207,207,207,207,207,207,208,208,208,208,208,208,209,209,209,209,209,209,210,210,210,210,210,210,211,211,211,211,211,212,212,212,212,212,212,213,213,213,213,213,213,214,214,214,214,214,214,215,215,215,215,215,215,216,216,216,216,216,216,217,217,217,217,217,217,218,218,218,218,218,218,219,219,219,219,219,220,220,220,220,220,220,221,221,221,221,221,221,222,222,222,222,222,222,223,223,223,223,223,223,224,224,224,224,224,224,225,225,225,225,225,225,226,226,226,226,226,226,227,227,227,227,227,228,228,228,228,228,228,229,229,229,229,229,229,230,230,230,230,230,230,231,231,231,231,231,231,232,232,232,232,232,232,233,233,233,233,233,233,234,234,234,234,234,234,235,235,235,235,235,235,236,236,236,236,236,237,237,237,237,237,237,238,238,238,238,238,238,239,239,239,239,239,239,240,240,240,240,240,240,241,241,241,241,241,241,242,242,242,242,242,242,243,243,243,243,243,243,244,244,244,244,244,244,245,245,245,245,245,245,246,246,246,246,246,246,247,247,247,247,247,248,248,248,248,248,248,249,249,249,249,249,249,250,250,250,250,250,250,251,251,251,251,251,251,252,252,252,252,252,252,253,253,253,253,253,253,254,254,254,254,254,254,255,255,255,255,255,255,256,256,256,256,256,256,257,257,257,257,257,257,258,258,258,258,258,258,259,259,259,259,259,259,260,260,260,260,260,261,261,261,261,261,261,262,262,262,262,262,262,263,263,263,263,263,263,264,264,264,264,264,264,265,265,265,265,265,265,266,266,266,266,266,266,267,267,267,267,267,267,268,268,268,268,268,268,269,269,269,269,269,269,270,270,270,270,270,270,271,271,271,271,271,271,272,272,272,272,272,272,273,273,273,273,273,273,274,274,274,274,274,274,275,275,275,275,275,275,276,276,276,276,276,276,277,277,277,277,277,277,278,278,278,278,278,278,279,279,279,279,279,279,280,280,280,280,280,281,281,281,281,281,281,282,282,282,282,282,282,283,283,283,283,283,283,284,284,284,284,284,284,285,285,285,285,285,285,286,286,286,286,286,286,287,287,287,287,287,287,288,288,288,288,288,288,289,289,289,289,289,289,290,290,290,290,290,290,291,291,291,291,291,291,292,292,292,292,292,292,293,293,293,293,293,293,294,294,294,294,294,294,295,295,295,295,295,295,296,296,296,296,296,296,297,297,297,297,297,297,298,298,298,298,298,298,299,299,299,299,299,299,300,300,300,300,300,300,301,301,301,301,301,301,302,302,302,302,302,302,303,303,303,303,303,303,304,304,304,304,304,304,305,305,305,305,305,305,306,306,306,306,306,306,307,307,307,307,307,307,308,308,308,308,308,308,309,309,309,309,309,309,310,310,310,310,310,310,311,311,311,311,311,311,312,312,312,312,312,312,312,313,313,313,313,313,313,314,314,314,314,314,314,315,315,315,315,315,315,316,316,316,316,316,316,317,317,317,317,317,317,318,318,318,318,318,318,319,319,319,319,319,319,320,320,320,320,320,320,321,321,321,321,321,321,322,322,322,322,322,322,323,323,323,323,323,323,324,324,324,324,324,324,325,325,325,325,325,325,326,326,326,326,326,326,327,327,327,327,327,327,328,328,328,328,328,328,329,329,329,329,329,329,330,330,330,330,330,330,331,331,331,331,331,331,331,332,332,332,332,332,332,333,333,333,333,333,333,334,334,334,334,334,334,335,335,335,335,335,335,336,336,336,336,336,336,337,337,337,337,337,337,338,338,338,338,338,338,339,339,339,339,339,339,340,340,340,340,340,340,341,341,341,341,341,341,342,342,342,342,342,342,343,343,343,343,343,343,343,344,344,344,344,344,344,345,345,345,345,345,345,346,346,346,346,346,346,347,347,347,347,347,347,348,348,348,348,348,348,349,349,349,349,349,349,350,350,350,350,350,350,351,351,351,351,351,351,352,352,352,352,352,352,352,353,353,353,353,353,353,354,354,354,354,354,354,355,355,355,355,355,355,356,356,356,356,356,356,357,357,357,357,357,357,358,358,358,358,358,358,359,359,359,359,359,359,359,360,360,360,360,360,360,361,361,361,361,361,361,362,362,362,362,362,362,363,363,363,363,363,363,364,364,364,364,364,364,365,365,365,365,365,365,366,366,366,366,366,366,366,367,367,367,367,367,367,368,368,368,368,368,368,369,369,369,369,369,369,370,370,370,370,370,370,371,371,371,371,371,371,372,372,372,372,372,372,372,373,373,373,373,373,373,374,374,374,374,374,374,375,375,375,375,375,375,376,376,376,376,376,376,377,377,377,377,377,377,378,378,378,378,378,378,378,379,379,379,379,379,379,380,380,380,380,380,380,381,381,381,381,381,381,382,382,382,382,382,382,383,383,383,383,383,383,383,384,384,384,384,384,384,385,385,385,385,385,385,386,386,386,386,386,386,387,387,387,387,387,387,387,388,388,388,388,388,388,389,389,389,389,389,389,390,390,390,390,390,390,391,391,391,391,391,391,392,392,392,392,392,392,392,393,393,393,393,393,393,394,394,394,394,394,394,395,395,395,395,395,395,396,396,396,396,396,396,396,397,397,397,397,397,397,398,398,398,398,398,398,399,399,399,399,399,399,400,400,400,400,400,400,400,401,401,401,401,401,401,402,402,402,402,402,402,403,403,403,403,403,403,404,404,404,404,404,404,404,405,405,405,405,405,405,406,406,406,406,406,406,407,407,407,407,407,407,408,408,408,408,408,408,408,409,409,409,409,409,409,410,410,410,410,410,410,411,411,411,411,411,411,411,412,412,412,412,412,412,413,413,413,413,413,413,414,414,414,414,414,414,415,415,415,415,415,415,415,416,416,416,416,416,416,417,417,417,417,417,417,418,418,418,418,418,418,418,419,419,419,419,419,419,420,420,420,420,420,420,421,421,421,421,421,421,421,422,422,422,422,422,422,423,423,423,423,423,423,424,424,424,424,424,424,424,425,425,425,425,425,425,426,426,426,426,426,426,427,427,427,427,427,427,427,428,428,428,428,428,428,429,429,429,429,429,429,430,430,430,430,430,430,430,431,431,431,431,431,431,432,432,432,432,432,432,433,433,433,433,433,433,433,434,434,434,434,434,434,435,435,435,435,435,435,436,436,436,436,436,436,436,437,437,437,437,437,437,438,438,438,438,438,438,438,439,439,439,439,439,439,440,440,440,440,440,440,441,441,441,441,441,441,441,442,442,442,442,442,442,443,443,443,443,443,443,444,444,444,444,444,444,444,445,445,445,445,445,445,446,446,446,446,446,446,446,447,447,447,447,447,447,448,448,448,448,448,448,449,449,449,449,449,449,449,450,450,450,450,450,450,451,451,451,451,451,451,451,452,452,452,452,452,452,453,453,453,453,453,453,453,454,454,454,454,454,454,455,455,455,455,455,455,456,456,456,456,456,456,456,457,457,457,457,457,457,458,458,458,458,458,458,458,459,459,459,459,459,459,460,460,460,460,460,460,460,461,461,461,461,461,461,462,462,462,462,462,462,462,463,463,463,463,463,463,464,464,464,464,464,464,464,465,465,465,465,465,465,466,466,466,466,466,466,467,467,467,467,467,467,467,468,468,468,468,468,468,469,469,469,469,469,469,469,470,470,470,470,470,470,471,471,471,471,471,471,471,472,472,472,472,472,472,473,473,473,473,473,473,473,474,474,474,474,474,474,475,475,475,475,475,475,475,476,476,476,476,476,476,477,477,477,477,477,477,477,478,478,478,478,478,478,478,479,479,479,479,479,479,480,480,480,480,480,480,480,481,481,481,481,481,481,482,482,482,482,482,482,482,483,483,483,483,483,483,484,484,484,484,484,484,484,485,485,485,485,485,485,486,486,486,486,486,486,486,487,487,487,487,487,487,488,488,488,488,488,488,488,489,489,489,489,489,489,489,490,490,490,490,490,490,491,491,491,491,491,491,491,492,492,492,492,492,492,493,493,493,493,493,493,493,494,494,494,494,494,494,495,495,495,495,495,495,495,496,496,496,496,496,496,496,497,497,497,497,497,497,498,498,498,498,498,498,498,499,499,499,499,499,499,500,500,500,500,500,500,500,501,501,501,501,501,501,501,502,502,502,502,502,502,503,503,503,503,503,503,503,504,504,504,504,504,504,504,505,505,505,505,505,505,506,506,506,506,506,506,506,507,507,507,507,507,507,507,508,508,508,508,508,508,509,509,509,509,509,509,509,510,510,510,510,510,510,510,511,511,511,511,511,511,512,512,512,512,512,512,512,513,513,513,513,513,513,513,514,514,514,514,514,514,515,515,515,515,515,515,515,516,516,516,516,516,516,516,517,517,517,517,517,517,518,518,518,518,518,518,518,519,519,519,519,519,519,519,520,520,520,520,520,520,521,521,521,521,521,521,521,522,522,522,522,522,522,522,523,523,523,523,523,523,523,524,524,524,524,524,524,525,525,525,525,525,525,525,526,526,526,526,526,526,526,527,527,527,527,527,527,527,528,528,528,528,528,528,529,529,529,529,529,529,529,530,530,530,530,530,530,530,531,531,531,531,531,531,531,532,532,532,532,532,532,533,533,533,533,533,533,533,534,534,534,534,534,534,534,535,535,535,535,535,535,535,536,536,536,536,536,536,537,537,537,537,537,537,537,538,538,538,538,538,538,538,539,539,539,539,539,539,539,540,540,540,540,540,540,540,541,541,541,541,541,541,542,542,542,542,542,542,542,543,543,543,543,543,543,543,544,544,544,544,544,544,544,545,545,545,545,545,545,545,546,546,546,546,546,546,546,547,547,547,547,547,547,548,548,548,548,548,548,548,549,549,549,549,549,549,549,550,550,550,550,550,550,550,551,551,551,551,551,551,551,552,552,552,552,552,552,552,553,553,553,553,553,553,553,554,554,554,554,554,554,554,555,555,555,555,555,555,556,556,556,556,556,556,556,557,557,557,557,557,557,557,558,558,558,558,558,558,558,559,559,559,559,559,559,559,560,560,560,560,560,560,560,561,561,561,561,561,561,561,562,562,562,562,562,562,562,563,563,563,563,563,563,563,564,564,564,564,564,564,564,565,565,565,565,565,565,565,566,566,566,566,566,566,566,567,567,567,567,567,567,567,568,568,568,568,568,568,568,569,569,569,569,569,569,569,570,570,570,570,570,570,571,571,571,571,571,571,571,572,572,572,572,572,572,572,573,573,573,573,573,573,573,574,574,574,574,574,574,574,575,575,575,575,575,575,575,576,576,576,576,576,576,576,577,577,577,577,577,577,577,578,578,578,578,578,578,578,578,579,579,579,579,579,579,579,580,580,580,580,580,580,580,581,581,581,581,581,581,581,582,582,582,582,582,582,582,583,583,583,583,583,583,583,584,584,584,584,584,584,584,585,585,585,585,585,585,585,586,586,586,586,586,586,586,587,587,587,587,587,587,587,588,588,588,588,588,588,588,589,589,589,589,589,589,589,590,590,590,590,590,590,590,591,591,591,591,591,591,591,592,592,592,592,592,592,592,592,593,593,593,593,593,593,593,594,594,594,594,594,594,594,595,595,595,595,595,595,595,596,596,596,596,596,596,596,597,597,597,597,597,597,597,598,598,598,598,598,598,598,599,599,599,599,599,599,599,600,600,600,600,600,600,600,600,601,601,601,601,601,601,601,602,602,602,602,602,602,602,603,603,603,603,603,603,603,604,604,604,604,604,604,604,605,605,605,605,605,605,605,605,606,606,606,606,606,606,606,607,607,607,607,607,607,607,608,608,608,608,608,608,608,609,609,609,609,609,609,609,610,610,610,610,610,610,610,610,611,611,611,611,611,611,611,612,612,612,612,612,612,612,613,613,613,613,613,613,613,614,614,614,614,614,614,614,614,615,615,615,615,615,615,615,616,616,616,616,616,616,616,617,617,617,617,617,617,617,617,618,618,618,618,618,618,618,619,619,619,619,619,619,619,620,620,620,620,620,620,620,621,621,621,621,621,621,621,621,622,622,622,622,622,622,622,623,623,623,623,623,623,623,624,624,624,624,624,624,624,624,625,625,625,625,625,625,625,626,626,626,626,626,626,626,627,627,627,627,627,627,627,627,628,628,628,628,628,628,628,629,629,629,629,629,629,629,629,630,630,630,630,630,630,630,631,631,631,631,631,631,631,632,632,632,632,632,632,632,632,633,633,633,633,633,633,633,634,634,634,634,634,634,634,635,635,635,635,635,635,635,635,636,636,636,636,636,636,636,637,637,637,637,637,637,637,637,638,638,638,638,638,638,638,639,639,639,639,639,639,639,639,640,640,640,640,640,640,640,641,641,641,641,641,641,641,641,642,642,642,642,642,642,642,643,643,643,643,643,643,643,643,644,644,644,644,644,644,644,645,645,645,645,645,645,645,645,646,646,646,646,646,646,646,647,647,647,647,647,647,647,647,648,648,648,648,648,648,648,649,649,649,649,649,649,649,649,650,650,650,650,650,650,650,651,651,651,651,651,651,651,651,652,652,652,652,652,652,652,653,653,653,653,653,653,653,653,654,654,654,654,654,654,654,655,655,655,655,655,655,655,655,656,656,656,656,656,656,656,656,657,657,657,657,657,657,657,658,658,658,658,658,658,658,658,659,659,659,659,659,659,659,660,660,660,660,660,660,660,660,661,661,661,661,661,661,661,661,662,662,662,662,662,662,662,663,663,663,663,663,663,663,663,664,664,664,664,664,664,664,664,665,665,665,665,665,665,665,666,666,666,666,666,666,666,666,667,667,667,667,667,667,667,667,668,668,668,668,668,668,668,669,669,669,669,669,669,669,669,670,670,670,670,670,670,670,670,671,671,671,671,671,671,671,671,672,672,672,672,672,672,672,673,673,673,673,673,673,673,673,674,674,674,674,674,674,674,674,675,675,675,675,675,675,675,675,676,676,676,676,676,676,676,677,677,677,677,677,677,677,677,678,678,678,678,678,678,678,678,679,679,679,679,679,679,679,679,680,680,680,680,680,680,680,680,681,681,681,681,681,681,681,681,682,682,682,682,682,682,682,683,683,683,683,683,683,683,683,684,684,684,684,684,684,684,684,685,685,685,685,685,685,685,685,686,686,686,686,686,686,686,686,687,687,687,687,687,687,687,687,688,688,688,688,688,688,688,688,689,689,689,689,689,689,689,689,690,690,690,690,690,690,690,691,691,691,691,691,691,691,691,692,692,692,692,692,692,692,692,693,693,693,693,693,693,693,693,694,694,694,694,694,694,694,694,695,695,695,695,695,695,695,695,696,696,696,696,696,696,696,696,697,697,697,697,697,697,697,697,698,698,698,698,698,698,698,698,699,699,699,699,699,699,699,699,700,700,700,700,700,700,700,700,701,701,701,701,701,701,701,701,702,702,702,702,702,702,702,702,703,703,703,703,703,703,703,703,704,704,704,704,704,704,704,704,705,705,705,705,705,705,705,705,705,706,706,706,706,706,706,706,706,707,707,707,707,707,707,707,707,708,708,708,708,708,708,708,708,709,709,709,709,709,709,709,709,710,710,710,710,710,710,710,710,711,711,711,711,711,711,711,711,712,712,712,712,712,712,712,712,713,713,713,713,713,713,713,713,713,714,714,714,714,714,714,714,714,715,715,715,715,715,715,715,715,716,716,716,716,716,716,716,716,717,717,717,717,717,717,717,717,718,718,718,718,718,718,718,718,718,719,719,719,719,719,719,719,719,720,720,720,720,720,720,720,720,721,721,721,721,721,721,721,721,722,722,722,722,722,722,722,722,722,723,723,723,723,723,723,723,723,724,724,724,724,724,724,724,724,725,725,725,725,725,725,725,725,725,726,726,726,726,726,726,726,726,727,727,727,727,727,727,727,727,728,728,728,728,728,728,728,728,728,729,729,729,729,729,729,729,729,730,730,730,730,730,730,730,730,730,731,731,731,731,731,731,731,731,732,732,732,732,732,732,732,732,733,733,733,733,733,733,733,733,733,734,734,734,734,734,734,734,734,735,735,735,735,735,735,735,735,735,736,736,736,736,736,736,736,736,737,737,737,737,737,737,737,737,737,738,738,738,738,738,738,738,738,739,739,739,739,739,739,739,739,739,740,740,740,740,740,740,740,740,741,741,741,741,741,741,741,741,741,742,742,742,742,742,742,742,742,743,743,743,743,743,743,743,743,743,744,744,744,744,744,744,744,744,745,745,745,745,745,745,745,745,745,746,746,746,746,746,746,746,746,746,747,747,747,747,747,747,747,747,748,748,748,748,748,748,748,748,748,749,749,749,749,749,749,749,749,749,750,750,750,750,750,750,750,750,751,751,751,751,751,751,751,751,751,752,752,752,752,752,752,752,752,752,753,753,753,753,753,753,753,753,754,754,754,754,754,754,754,754,754,755,755,755,755,755,755,755,755,755,756,756,756,756,756,756,756,756,756,757,757,757,757,757,757,757,757,758,758,758,758,758,758,758,758,758,759,759,759,759,759,759,759,759,759,760,760,760,760,760,760,760,760,760,761,761,761,761,761,761,761,761,761,762,762,762,762,762,762,762,762,763,763,763,763,763,763,763,763,763,764,764,764,764,764,764,764,764,764,765,765,765,765,765,765,765,765,765,766,766,766,766,766,766,766,766,766,767,767,767,767,767,767,767,767,767,768,768,768,768,768,768,768,768,768,769,769,769,769,769,769,769,769,769,770,770,770,770,770,770,770,770,770,771,771,771,771,771,771,771,771,771,772,772,772,772,772,772,772,772,772,773,773,773,773,773,773,773,773,773,774,774,774,774,774,774,774,774,774,775,775,775,775,775,775,775,775,775,776,776,776,776,776,776,776,776,776,777,777,777,777,777,777,777,777,777,778,778,778,778,778,778,778,778,778,779,779,779,779,779,779,779,779,779,779,780,780,780,780,780,780,780,780,780,781,781,781,781,781,781,781,781,781,782,782,782,782,782,782,782,782,782,783,783,783,783,783,783,783,783,783,784,784,784,784,784,784,784,784,784,784,785,785,785,785,785,785,785,785,785,786,786,786,786,786,786,786,786,786,787,787,787,787,787,787,787,787,787,788,788,788,788,788,788,788,788,788,788,789,789,789,789,789,789,789,789,789,790,790,790,790,790,790,790,790,790,791,791,791,791,791,791,791,791,791,791,792,792,792,792,792,792,792,792,792,793,793,793,793,793,793,793,793,793,793,794,794,794,794,794,794,794,794,794,795,795,795,795,795,795,795,795,795,796,796,796,796,796,796,796,796,796,796,797,797,797,797,797,797,797,797,797,798,798,798,798,798,798,798,798,798,798,799,799,799,799,799,799,799,799,799,799,800,800,800,800,800,800,800,800,800,801,801,801,801,801,801,801,801,801,801,802,802,802,802,802,802,802,802,802,803,803,803,803,803,803,803,803,803,803,804,804,804,804,804,804,804,804,804,804,805,805,805,805,805,805,805,805,805,806,806,806,806,806,806,806,806,806,806,807,807,807,807,807,807,807,807,807,807,808,808,808,808,808,808,808,808,808,809,809,809,809,809,809,809,809,809,809,810,810,810,810,810,810,810,810,810,810,811,811,811,811,811,811,811,811,811,811,812,812,812,812,812,812,812,812,812,812,813,813,813,813,813,813,813,813,813,814,814,814,814,814,814,814,814,814,814,815,815,815,815,815,815,815,815,815,815,816,816,816,816,816,816,816,816,816,816,817,817,817,817,817,817,817,817,817,817,818,818,818,818,818,818,818,818,818,818,819,819,819,819,819,819,819,819,819,819,820,820,820,820,820,820,820,820,820,820,821,821,821,821,821,821,821,821,821,821,822,822,822,822,822,822,822,822,822,822,823,823,823,823,823,823,823,823,823,823,824,824,824,824,824,824,824,824,824,824,825,825,825,825,825,825,825,825,825,825,825,826,826,826,826,826,826,826,826,826,826,827,827,827,827,827,827,827,827,827,827,828,828,828,828,828,828,828,828,828,828,829,829,829,829,829,829,829,829,829,829,830,830,830,830,830,830,830,830,830,830,830,831,831,831,831,831,831,831,831,831,831,832,832,832,832,832,832,832,832,832,832,833,833,833,833,833,833,833,833,833,833,833,834,834,834,834,834,834,834,834,834,834,835,835,835,835,835,835,835,835,835,835,835,836,836,836,836,836,836,836,836,836,836,837,837,837,837,837,837,837,837,837,837,838,838,838,838,838,838,838,838,838,838,838,839,839,839,839,839,839,839,839,839,839,839,840,840,840,840,840,840,840,840,840,840,841,841,841,841,841,841,841,841,841,841,841,842,842,842,842,842,842,842,842,842,842,843,843,843,843,843,843,843,843,843,843,843,844,844,844,844,844,844,844,844,844,844,844,845,845,845,845,845,845,845,845,845,845,846,846,846,846,846,846,846,846,846,846,846,847,847,847,847,847,847,847,847,847,847,847,848,848,848,848,848,848,848,848,848,848,848,849,849,849,849,849,849,849,849,849,849,849,850,850,850,850,850,850,850,850,850,850,850,851,851,851,851,851,851,851,851,851,851,852,852,852,852,852,852,852,852,852,852,852,853,853,853,853,853,853,853,853,853,853,853,854,854,854,854,854,854,854,854,854,854,854,855,855,855,855,855,855,855,855,855,855,855,855,856,856,856,856,856,856,856,856,856,856,856,857,857,857,857,857,857,857,857,857,857,857,858,858,858,858,858,858,858,858,858,858,858,859,859,859,859,859,859,859,859,859,859,859,860,860,860,860,860,860,860,860,860,860,860,861,861,861,861,861,861,861,861,861,861,861,861,862,862,862,862,862,862,862,862,862,862,862,863,863,863,863,863,863,863,863,863,863,863,864,864,864,864,864,864,864,864,864,864,864,864,865,865,865,865,865,865,865,865,865,865,865,866,866,866,866,866,866,866,866,866,866,866,866,867,867,867,867,867,867,867,867,867,867,867,868,868,868,868,868,868,868,868,868,868,868,868,869,869,869,869,869,869,869,869,869,869,869,870,870,870,870,870,870,870,870,870,870,870,870,871,871,871,871,871,871,871,871,871,871,871,871,872,872,872,872,872,872,872,872,872,872,872,873,873,873,873,873,873,873,873,873,873,873,873,874,874,874,874,874,874,874,874,874,874,874,874,875,875,875,875,875,875,875,875,875,875,875,875,876,876,876,876,876,876,876,876,876,876,876,876,877,877,877,877,877,877,877,877,877,877,877,877,878,878,878,878,878,878,878,878,878,878,878,878,879,879,879,879,879,879,879,879,879,879,879,879,880,880,880,880,880,880,880,880,880,880,880,880,881,881,881,881,881,881,881,881,881,881,881,881,882,882,882,882,882,882,882,882,882,882,882,882,883,883,883,883,883,883,883,883,883,883,883,883,884,884,884,884,884,884,884,884,884,884,884,884,884,885,885,885,885,885,885,885,885,885,885,885,885,886,886,886,886,886,886,886,886,886,886,886,886,887,887,887,887,887,887,887,887,887,887,887,887,887,888,888,888,888,888,888,888,888,888,888,888,888,889,889,889,889,889,889,889,889,889,889,889,889,889,890,890,890,890,890,890,890,890,890,890,890,890,891,891,891,891,891,891,891,891,891,891,891,891,891,892,892,892,892,892,892,892,892,892,892,892,892,892,893,893,893,893,893,893,893,893,893,893,893,893,893,894,894,894,894,894,894,894,894,894,894,894,894,895,895,895,895,895,895,895,895,895,895,895,895,895,896,896,896,896,896,896,896,896,896,896,896,896,896,897,897,897,897,897,897,897,897,897,897,897,897,897,898,898,898,898,898,898,898,898,898,898,898,898,898,899,899,899,899,899,899,899,899,899,899,899,899,899,900,900,900,900,900,900,900,900,900,900,900,900,900,901,901,901,901,901,901,901,901,901,901,901,901,901,901,902,902,902,902,902,902,902,902,902,902,902,902,902,903,903,903,903,903,903,903,903,903,903,903,903,903,904,904,904,904,904,904,904,904,904,904,904,904,904,904,905,905,905,905,905,905,905,905,905,905,905,905,905,906,906,906,906,906,906,906,906,906,906,906,906,906,906,907,907,907,907,907,907,907,907,907,907,907,907,907,907,908,908,908,908,908,908,908,908,908,908,908,908,908,909,909,909,909,909,909,909,909,909,909,909,909,909,909,910,910,910,910,910,910,910,910,910,910,910,910,910,910,911,911,911,911,911,911,911,911,911,911,911,911,911,911,912,912,912,912,912,912,912,912,912,912,912,912,912,912,913,913,913,913,913,913,913,913,913,913,913,913,913,913,914,914,914,914,914,914,914,914,914,914,914,914,914,914,915,915,915,915,915,915,915,915,915,915,915,915,915,915,916,916,916,916,916,916,916,916,916,916,916,916,916,916,916,917,917,917,917,917,917,917,917,917,917,917,917,917,917,918,918,918,918,918,918,918,918,918,918,918,918,918,918,918,919,919,919,919,919,919,919,919,919,919,919,919,919,919,920,920,920,920,920,920,920,920,920,920,920,920,920,920,920,921,921,921,921,921,921,921,921,921,921,921,921,921,921,921,922,922,922,922,922,922,922,922,922,922,922,922,922,922,923,923,923,923,923,923,923,923,923,923,923,923,923,923,923,924,924,924,924,924,924,924,924,924,924,924,924,924,924,924,925,925,925,925,925,925,925,925,925,925,925,925,925,925,925,926,926,926,926,926,926,926,926,926,926,926,926,926,926,926,926,927,927,927,927,927,927,927,927,927,927,927,927,927,927,927,928,928,928,928,928,928,928,928,928,928,928,928,928,928,928,929,929,929,929,929,929,929,929,929,929,929,929,929,929,929,929,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,930,931,931,931,931,931,931,931,931,931,931,931,931,931,931,931,932,932,932,932,932,932,932,932,932,932,932,932,932,932,932,932,933,933,933,933,933,933,933,933,933,933,933,933,933,933,933,933,934,934,934,934,934,934,934,934,934,934,934,934,934,934,934,934,935,935,935,935,935,935,935,935,935,935,935,935,935,935,935,935,935,936,936,936,936,936,936,936,936,936,936,936,936,936,936,936,936,937,937,937,937,937,937,937,937,937,937,937,937,937,937,937,937,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,938,939,939,939,939,939,939,939,939,939,939,939,939,939,939,939,939,939,940,940,940,940,940,940,940,940,940,940,940,940,940,940,940,940,940,941,941,941,941,941,941,941,941,941,941,941,941,941,941,941,941,941,942,942,942,942,942,942,942,942,942,942,942,942,942,942,942,942,942,943,943,943,943,943,943,943,943,943,943,943,943,943,943,943,943,943,944,944,944,944,944,944,944,944,944,944,944,944,944,944,944,944,944,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,945,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,946,947,947,947,947,947,947,947,947,947,947,947,947,947,947,947,947,947,947,948,948,948,948,948,948,948,948,948,948,948,948,948,948,948,948,948,948,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,949,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,950,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,951,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,952,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,953,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,954,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,955,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,956,957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,957,958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,958,959,959,959,959,959,959,959,959,959,959,959,959,959,959,959,959,959,959,959,959,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,960,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,961,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,962,963,963,963,963,963,963,963,963,963,963,963,963,963,963,963,963,963,963,963,963,963,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,964,965,965,965,965,965,965,965,965,965,965,965,965,965,965,965,965,965,965,965,965,965,965,966,966,966,966,966,966,966,966,966,966,966,966,966,966,966,966,966,966,966,966,966,966,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,967,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,968,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,969,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,970,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,971,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,972,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,973,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,974,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,975,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,976,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,977,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,978,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,979,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,980,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,981,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,982,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,983,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,984,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,985,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,986,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,987,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,988,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,989,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,990,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,991,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,992,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,993,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,994,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,995,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,996,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,997,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,1000] + data modify storage gm4_player_motion:arcsine arr set value [1000,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,999,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,998,997,997,997,997,997,997,997,997,997,997,997,997,997,997,996,996,996,996,996,996,996,996,996,996,996,996,995,995,995,995,995,995,995,995,995,995,994,994,994,994,994,994,994,994,994,994,993,993,993,993,993,993,993,993,993,992,992,992,992,992,992,992,992,991,991,991,991,991,991,991,990,990,990,990,990,990,990,990,989,989,989,989,989,989,988,988,988,988,988,988,988,987,987,987,987,987,987,986,986,986,986,986,986,985,985,985,985,985,985,984,984,984,984,984,984,983,983,983,983,983,982,982,982,982,982,981,981,981,981,981,981,980,980,980,980,979,979,979,979,979,978,978,978,978,978,977,977,977,977,977,976,976,976,976,975,975,975,975,975,974,974,974,974,973,973,973,973,972,972,972,972,971,971,971,971,971,970,970,970,970,969,969,969,969,968,968,968,967,967,967,967,966,966,966,966,965,965,965,965,964,964,964,963,963,963,963,962,962,962,962,961,961,961,960,960,960,960,959,959,959,958,958,958,957,957,957,957,956,956,956,955,955,955,954,954,954,953,953,953,952,952,952,952,951,951,951,950,950,950,949,949,949,948,948,948,947,947,947,946,946,946,945,945,945,944,944,943,943,943,942,942,942,941,941,941,940,940,940,939,939,938,938,938,937,937,937,936,936,936,935,935,934,934,934,933,933,932,932,932,931,931,931,930,930,929,929,929,928,928,927,927,927,926,926,925,925,924,924,924,923,923,922,922,922,921,921,920,920,919,919,919,918,918,917,917,916,916,916,915,915,914,914,913,913,912,912,912,911,911,910,910,909,909,908,908,907,907,907,906,906,905,905,904,904,903,903,902,902,901,901,900,900,899,899,898,898,897,897,897,896,896,895,895,894,894,893,893,892,892,891,891,890,889,889,888,888,887,887,886,886,885,885,884,884,883,883,882,882,881,881,880,879,879,878,878,877,877,876,876,875,875,874,873,873,872,872,871,871,870,870,869,868,868,867,867,866,866,865,864,864,863,863,862,861,861,860,860,859,858,858,857,857,856,855,855,854,854,853,852,852,851,851,850,849,849,848,847,847,846,846,845,844,844,843,842,842,841,841,840,839,839,838,837,837,836,835,835,834,833,833,832,831,831,830,829,829,828,827,827,826,825,825,824,823,823,822,821,820,820,819,818,818,817,816,816,815,814,813,813,812,811,811,810,809,808,808,807,806,805,805,804,803,802,802,801,800,800,799,798,797,796,796,795,794,793,793,792,791,790,790,789,788,787,786,786,785,784,783,783,782,781,780,779,779,778,777,776,775,774,774,773,772,771,770,770,769,768,767,766,765,765,764,763,762,761,760,759,759,758,757,756,755,754,753,753,752,751,750,749,748,747,746,745,745,744,743,742,741,740,739,738,737,736,735,735,734,733,732,731,730,729,728,727,726,725,724,723,722,721,720,719,719,718,717,716,715,714,713,712,711,710,709,708,707,706,705,704,703,702,701,700,699,698,697,696,695,693,692,691,690,689,688,687,686,685,684,683,682,681,680,679,678,676,675,674,673,672,671,670,669,668,667,665,664,663,662,661,660,659,658,656,655,654,653,652,651,649,648,647,646,645,644,642,641,640,639,638,636,635,634,633,631,630,629,628,627,625,624,623,622,620,619,618,616,615,614,613,611,610,609,607,606,605,603,602,601,600,598,597,595,594,593,591,590,589,587,586,585,583,582,580,579,578,576,575,573,572,570,569,568,566,565,563,562,560,559,557,556,554,553,551,550,548,547,545,544,542,541,539,537,536,534,533,531,529,528,526,525,523,521,520,518,516,515,513,511,510,508,506,505,503,501,500,498,496,494,493,491,489,487,485,484,482,480,478,476,474,473,471,469,467,465,463,461,459,457,455,454,452,450,448,446,444,442,439,437,435,433,431,429,427,425,423,421,418,416,414,412,410,407,405,403,401,398,396,394,391,389,387,384,382,379,377,375,372,370,367,365,362,359,357,354,352,349,346,343,341,338,335,332,329,327,324,321,318,315,312,309,306,302,299,296,293,290,286,283,280,276,273,269,265,262,258,254,250,247,243,239,234,230,226,222,217,213,208,203,198,194,188,183,178,172,166,160,154,147,141,133,126,118,109,99,89,77,63,44,0] + data modify storage gm4_player_motion:cosine arr set value [10000,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9999,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9998,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9997,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9996,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9995,9994,9994,9994,9994,9994,9994,9994,9994,9994,9994,9994,9994,9994,9994,9994,9994,9994,9993,9993,9993,9993,9993,9993,9993,9993,9993,9993,9993,9993,9993,9993,9993,9993,9992,9992,9992,9992,9992,9992,9992,9992,9992,9992,9992,9992,9992,9992,9992,9991,9991,9991,9991,9991,9991,9991,9991,9991,9991,9991,9991,9991,9991,9990,9990,9990,9990,9990,9990,9990,9990,9990,9990,9990,9990,9990,9989,9989,9989,9989,9989,9989,9989,9989,9989,9989,9989,9989,9988,9988,9988,9988,9988,9988,9988,9988,9988,9988,9988,9988,9987,9987,9987,9987,9987,9987,9987,9987,9987,9987,9987,9987,9986,9986,9986,9986,9986,9986,9986,9986,9986,9986,9986,9985,9985,9985,9985,9985,9985,9985,9985,9985,9985,9984,9984,9984,9984,9984,9984,9984,9984,9984,9984,9984,9983,9983,9983,9983,9983,9983,9983,9983,9983,9983,9982,9982,9982,9982,9982,9982,9982,9982,9982,9981,9981,9981,9981,9981,9981,9981,9981,9981,9981,9980,9980,9980,9980,9980,9980,9980,9980,9980,9979,9979,9979,9979,9979,9979,9979,9979,9979,9978,9978,9978,9978,9978,9978,9978,9978,9978,9977,9977,9977,9977,9977,9977,9977,9977,9976,9976,9976,9976,9976,9976,9976,9976,9976,9975,9975,9975,9975,9975,9975,9975,9975,9974,9974,9974,9974,9974,9974,9974,9974,9973,9973,9973,9973,9973,9973,9973,9973,9972,9972,9972,9972,9972,9972,9972,9971,9971,9971,9971,9971,9971,9971,9971,9970,9970,9970,9970,9970,9970,9970,9969,9969,9969,9969,9969,9969,9969,9969,9968,9968,9968,9968,9968,9968,9968,9967,9967,9967,9967,9967,9967,9967,9966,9966,9966,9966,9966,9966,9966,9965,9965,9965,9965,9965,9965,9965,9964,9964,9964,9964,9964,9964,9964,9963,9963,9963,9963,9963,9963,9963,9962,9962,9962,9962,9962,9962,9961,9961,9961,9961,9961,9961,9961,9960,9960,9960,9960,9960,9960,9959,9959,9959,9959,9959,9959,9959,9958,9958,9958,9958,9958,9958,9957,9957,9957,9957,9957,9957,9956,9956,9956,9956,9956,9956,9955,9955,9955,9955,9955,9955,9954,9954,9954,9954,9954,9954,9953,9953,9953,9953,9953,9953,9952,9952,9952,9952,9952,9952,9951,9951,9951,9951,9951,9951,9950,9950,9950,9950,9950,9950,9949,9949,9949,9949,9949,9948,9948,9948,9948,9948,9948,9947,9947,9947,9947,9947,9947,9946,9946,9946,9946,9946,9945,9945,9945,9945,9945,9945,9944,9944,9944,9944,9944,9943,9943,9943,9943,9943,9943,9942,9942,9942,9942,9942,9941,9941,9941,9941,9941,9940,9940,9940,9940,9940,9939,9939,9939,9939,9939,9939,9938,9938,9938,9938,9938,9937,9937,9937,9937,9937,9936,9936,9936,9936,9936,9935,9935,9935,9935,9935,9934,9934,9934,9934,9934,9933,9933,9933,9933,9933,9932,9932,9932,9932,9932,9931,9931,9931,9931,9931,9930,9930,9930,9930,9930,9929,9929,9929,9929,9929,9928,9928,9928,9928,9927,9927,9927,9927,9927,9926,9926,9926,9926,9926,9925,9925,9925,9925,9925,9924,9924,9924,9924,9923,9923,9923,9923,9923,9922,9922,9922,9922,9922,9921,9921,9921,9921,9920,9920,9920,9920,9920,9919,9919,9919,9919,9918,9918,9918,9918,9918,9917,9917,9917,9917,9916,9916,9916,9916,9916,9915,9915,9915,9915,9914,9914,9914,9914,9913,9913,9913,9913,9913,9912,9912,9912,9912,9911,9911,9911,9911,9910,9910,9910,9910,9910,9909,9909,9909,9909,9908,9908,9908,9908,9907,9907,9907,9907,9907,9906,9906,9906,9906,9905,9905,9905,9905,9904,9904,9904,9904,9903,9903,9903,9903,9902,9902,9902,9902,9901,9901,9901,9901,9900,9900,9900,9900,9899,9899,9899,9899,9899,9898,9898,9898,9898,9897,9897,9897,9897,9896,9896,9896,9896,9895,9895,9895,9895,9894,9894,9894,9893,9893,9893,9893,9892,9892,9892,9892,9891,9891,9891,9891,9890,9890,9890,9890,9889,9889,9889,9889,9888,9888,9888,9888,9887,9887,9887,9887,9886,9886,9886,9885,9885,9885,9885,9884,9884,9884,9884,9883,9883,9883,9883,9882,9882,9882,9882,9881,9881,9881,9880,9880,9880,9880,9879,9879,9879,9879,9878,9878,9878,9877,9877,9877,9877,9876,9876,9876,9876,9875,9875,9875,9874,9874,9874,9874,9873,9873,9873,9873,9872,9872,9872,9871,9871,9871,9871,9870,9870,9870,9869,9869,9869,9869,9868,9868,9868,9867,9867,9867,9867,9866,9866,9866,9866,9865,9865,9865,9864,9864,9864,9864,9863,9863,9863,9862,9862,9862,9861,9861,9861,9861,9860,9860,9860,9859,9859,9859,9859,9858,9858,9858,9857,9857,9857,9857,9856,9856,9856,9855,9855,9855,9854,9854,9854,9854,9853,9853,9853,9852,9852,9852,9851,9851,9851,9851,9850,9850,9850,9849,9849,9849,9848,9848,9848,9848,9847,9847,9847,9846,9846,9846,9845,9845,9845,9845,9844,9844,9844,9843,9843,9843,9842,9842,9842,9841,9841,9841,9841,9840,9840,9840,9839,9839,9839,9838,9838,9838,9837,9837,9837,9836,9836,9836,9836,9835,9835,9835,9834,9834,9834,9833,9833,9833,9832,9832,9832,9831,9831,9831,9830,9830,9830,9829,9829,9829,9829,9828,9828,9828,9827,9827,9827,9826,9826,9826,9825,9825,9825,9824,9824,9824,9823,9823,9823,9822,9822,9822,9821,9821,9821,9820,9820,9820,9819,9819,9819,9818,9818,9818,9817,9817,9817,9816,9816,9816,9815,9815,9815,9814,9814,9814,9813,9813,9813,9812,9812,9812,9811,9811,9811,9810,9810,9810,9809,9809,9809,9808,9808,9808,9807,9807,9807,9806,9806,9806,9805,9805,9805,9804,9804,9804,9803,9803,9803,9802,9802,9802,9801,9801,9800,9800,9800,9799,9799,9799,9798,9798,9798,9797,9797,9797,9796,9796,9796,9795,9795,9795,9794,9794,9793,9793,9793,9792,9792,9792,9791,9791,9791,9790,9790,9790,9789,9789,9789,9788,9788,9787,9787,9787,9786,9786,9786,9785,9785,9785,9784,9784,9784,9783,9783,9782,9782,9782,9781,9781,9781,9780,9780,9780,9779,9779,9778,9778,9778,9777,9777,9777,9776,9776,9775,9775,9775,9774,9774,9774,9773,9773,9773,9772,9772,9771,9771,9771,9770,9770,9770,9769,9769,9768,9768,9768,9767,9767,9767,9766,9766,9765,9765,9765,9764,9764,9764,9763,9763,9762,9762,9762,9761,9761,9761,9760,9760,9759,9759,9759,9758,9758,9758,9757,9757,9756,9756,9756,9755,9755,9754,9754,9754,9753,9753,9753,9752,9752,9751,9751,9751,9750,9750,9749,9749,9749,9748,9748,9748,9747,9747,9746,9746,9746,9745,9745,9744,9744,9744,9743,9743,9742,9742,9742,9741,9741,9740,9740,9740,9739,9739,9738,9738,9738,9737,9737,9736,9736,9736,9735,9735,9734,9734,9734,9733,9733,9732,9732,9732,9731,9731,9730,9730,9730,9729,9729,9728,9728,9728,9727,9727,9726,9726,9726,9725,9725,9724,9724,9724,9723,9723,9722,9722,9722,9721,9721,9720,9720,9720,9719,9719,9718,9718,9717,9717,9717,9716,9716,9715,9715,9715,9714,9714,9713,9713,9713,9712,9712,9711,9711,9710,9710,9710,9709,9709,9708,9708,9708,9707,9707,9706,9706,9705,9705,9705,9704,9704,9703,9703,9702,9702,9702,9701,9701,9700,9700,9699,9699,9699,9698,9698,9697,9697,9697,9696,9696,9695,9695,9694,9694,9694,9693,9693,9692,9692,9691,9691,9691,9690,9690,9689,9689,9688,9688,9687,9687,9687,9686,9686,9685,9685,9684,9684,9684,9683,9683,9682,9682,9681,9681,9681,9680,9680,9679,9679,9678,9678,9677,9677,9677,9676,9676,9675,9675,9674,9674,9674,9673,9673,9672,9672,9671,9671,9670,9670,9670,9669,9669,9668,9668,9667,9667,9666,9666,9666,9665,9665,9664,9664,9663,9663,9662,9662,9661,9661,9661,9660,9660,9659,9659,9658,9658,9657,9657,9656,9656,9656,9655,9655,9654,9654,9653,9653,9652,9652,9651,9651,9651,9650,9650,9649,9649,9648,9648,9647,9647,9646,9646,9646,9645,9645,9644,9644,9643,9643,9642,9642,9641,9641,9640,9640,9640,9639,9639,9638,9638,9637,9637,9636,9636,9635,9635,9634,9634,9633,9633,9633,9632,9632,9631,9631,9630,9630,9629,9629,9628,9628,9627,9627,9626,9626,9625,9625,9625,9624,9624,9623,9623,9622,9622,9621,9621,9620,9620,9619,9619,9618,9618,9617,9617,9616,9616,9615,9615,9615,9614,9614,9613,9613,9612,9612,9611,9611,9610,9610,9609,9609,9608,9608,9607,9607,9606,9606,9605,9605,9604,9604,9603,9603,9602,9602,9601,9601,9600,9600,9600,9599,9599,9598,9598,9597,9597,9596,9596,9595,9595,9594,9594,9593,9593,9592,9592,9591,9591,9590,9590,9589,9589,9588,9588,9587,9587,9586,9586,9585,9585,9584,9584,9583,9583,9582,9582,9581,9581,9580,9580,9579,9579,9578,9578,9577,9577,9576,9576,9575,9575,9574,9574,9573,9573,9572,9572,9571,9571,9570,9570,9569,9569,9568,9568,9567,9567,9566,9566,9565,9565,9564,9564,9563,9563,9562,9562,9561,9561,9560,9559,9559,9558,9558,9557,9557,9556,9556,9555,9555,9554,9554,9553,9553,9552,9552,9551,9551,9550,9550,9549,9549,9548,9548,9547,9547,9546,9546,9545,9545,9544,9543,9543,9542,9542,9541,9541,9540,9540,9539,9539,9538,9538,9537,9537,9536,9536,9535,9535,9534,9534,9533,9532,9532,9531,9531,9530,9530,9529,9529,9528,9528,9527,9527,9526,9526,9525,9525,9524,9523,9523,9522,9522,9521,9521,9520,9520,9519,9519,9518,9518,9517,9517,9516,9515,9515,9514,9514,9513,9513,9512,9512,9511,9511,9510,9510,9509,9508,9508,9507,9507,9506,9506,9505,9505,9504,9504,9503,9502,9502,9501,9501,9500,9500,9499,9499,9498,9498,9497,9496,9496,9495,9495,9494,9494,9493,9493,9492,9492,9491,9490,9490,9489,9489,9488,9488,9487,9487,9486,9486,9485,9484,9484,9483,9483,9482,9482,9481,9481,9480,9479,9479,9478,9478,9477,9477,9476,9476,9475,9474,9474,9473,9473,9472,9472,9471,9470,9470,9469,9469,9468,9468,9467,9467,9466,9465,9465,9464,9464,9463,9463,9462,9461,9461,9460,9460,9459,9459,9458,9458,9457,9456,9456,9455,9455,9454,9454,9453,9452,9452,9451,9451,9450,9450,9449,9448,9448,9447,9447,9446,9446,9445,9444,9444,9443,9443,9442,9442,9441,9440,9440,9439,9439,9438,9438,9437,9436,9436,9435,9435,9434,9433,9433,9432,9432,9431,9431,9430,9429,9429,9428,9428,9427,9426,9426,9425,9425,9424,9424,9423,9422,9422,9421,9421,9420,9419,9419,9418,9418,9417,9417,9416,9415,9415,9414,9414,9413,9412,9412,9411,9411,9410,9409,9409,9408,9408,9407,9407,9406,9405,9405,9404,9404,9403,9402,9402,9401,9401,9400,9399,9399,9398,9398,9397,9396,9396,9395,9395,9394,9393,9393,9392,9392,9391,9390,9390,9389,9389,9388,9387,9387,9386,9386,9385,9384,9384,9383,9383,9382,9381,9381,9380,9380,9379,9378,9378,9377,9377,9376,9375,9375,9374,9374,9373,9372,9372,9371,9370,9370,9369,9369,9368,9367,9367,9366,9366,9365,9364,9364,9363,9363,9362,9361,9361,9360,9359,9359,9358,9358,9357,9356,9356,9355,9355,9354,9353,9353,9352,9351,9351,9350,9350,9349,9348,9348,9347,9347,9346,9345,9345,9344,9343,9343,9342,9342,9341,9340,9340,9339,9338,9338,9337,9337,9336,9335,9335,9334,9333,9333,9332,9332,9331,9330,9330,9329,9328,9328,9327,9327,9326,9325,9325,9324,9323,9323,9322,9321,9321,9320,9320,9319,9318,9318,9317,9316,9316,9315,9315,9314,9313,9313,9312,9311,9311,9310,9309,9309,9308,9308,9307,9306,9306,9305,9304,9304,9303,9302,9302,9301,9300,9300,9299,9299,9298,9297,9297,9296,9295,9295,9294,9293,9293,9292,9291,9291,9290,9290,9289,9288,9288,9287,9286,9286,9285,9284,9284,9283,9282,9282,9281,9280,9280,9279,9279,9278,9277,9277,9276,9275,9275,9274,9273,9273,9272,9271,9271,9270,9269,9269,9268,9267,9267,9266,9265,9265,9264,9263,9263,9262,9261,9261,9260,9260,9259,9258,9258,9257,9256,9256,9255,9254,9254,9253,9252,9252,9251,9250,9250,9249,9248,9248,9247,9246,9246,9245,9244,9244,9243,9242,9242,9241,9240,9240,9239,9238,9238,9237,9236,9236,9235,9234,9234,9233,9232,9232,9231,9230,9230,9229,9228,9228,9227,9226,9226,9225,9224,9224,9223,9222,9222,9221,9220,9219,9219,9218,9217,9217,9216,9215,9215,9214,9213,9213,9212,9211,9211,9210,9209,9209,9208,9207,9207,9206,9205,9205,9204,9203,9203,9202,9201,9200,9200,9199,9198,9198,9197,9196,9196,9195,9194,9194,9193,9192,9192,9191,9190,9189,9189,9188,9187,9187,9186,9185,9185,9184,9183,9183,9182,9181,9181,9180,9179,9178,9178,9177,9176,9176,9175,9174,9174,9173,9172,9171,9171,9170,9169,9169,9168,9167,9167,9166,9165,9165,9164,9163,9162,9162,9161,9160,9160,9159,9158,9158,9157,9156,9155,9155,9154,9153,9153,9152,9151,9151,9150,9149,9148,9148,9147,9146,9146,9145,9144,9143,9143,9142,9141,9141,9140,9139,9139,9138,9137,9136,9136,9135,9134,9134,9133,9132,9131,9131,9130,9129,9129,9128,9127,9126,9126,9125,9124,9124,9123,9122,9121,9121,9120,9119,9119,9118,9117,9116,9116,9115,9114,9114,9113,9112,9111,9111,9110,9109,9108,9108,9107,9106,9106,9105,9104,9103,9103,9102,9101,9101,9100,9099,9098,9098,9097,9096,9095,9095,9094,9093,9093,9092,9091,9090,9090,9089,9088,9087,9087,9086,9085,9085,9084,9083,9082,9082,9081,9080,9079,9079,9078,9077,9077,9076,9075,9074,9074,9073,9072,9071,9071,9070,9069,9068,9068,9067,9066,9066,9065,9064,9063,9063,9062,9061,9060,9060,9059,9058,9057,9057,9056,9055,9054,9054,9053,9052,9051,9051,9050,9049,9049,9048,9047,9046,9046,9045,9044,9043,9043,9042,9041,9040,9040,9039,9038,9037,9037,9036,9035,9034,9034,9033,9032,9031,9031,9030,9029,9028,9028,9027,9026,9025,9025,9024,9023,9022,9022,9021,9020,9019,9019,9018,9017,9016,9016,9015,9014,9013,9013,9012,9011,9010,9010,9009,9008,9007,9006,9006,9005,9004,9003,9003,9002,9001,9000,9000,8999,8998,8997,8997,8996,8995,8994,8994,8993,8992,8991,8990,8990,8989,8988,8987,8987,8986,8985,8984,8984,8983,8982,8981,8981,8980,8979,8978,8977,8977,8976,8975,8974,8974,8973,8972,8971,8971,8970,8969,8968,8967,8967,8966,8965,8964,8964,8963,8962,8961,8960,8960,8959,8958,8957,8957,8956,8955,8954,8954,8953,8952,8951,8950,8950,8949,8948,8947,8947,8946,8945,8944,8943,8943,8942,8941,8940,8939,8939,8938,8937,8936,8936,8935,8934,8933,8932,8932,8931,8930,8929,8929,8928,8927,8926,8925,8925,8924,8923,8922,8921,8921,8920,8919,8918,8917,8917,8916,8915,8914,8914,8913,8912,8911,8910,8910,8909,8908,8907,8906,8906,8905,8904,8903,8902,8902,8901,8900,8899,8898,8898,8897,8896,8895,8894,8894,8893,8892,8891,8890,8890,8889,8888,8887,8886,8886,8885,8884,8883,8882,8882,8881,8880,8879,8878,8878,8877,8876,8875,8874,8874,8873,8872,8871,8870,8870,8869,8868,8867,8866,8866,8865,8864,8863,8862,8862,8861,8860,8859,8858,8857,8857,8856,8855,8854,8853,8853,8852,8851,8850,8849,8849,8848,8847,8846,8845,8844,8844,8843,8842,8841,8840,8840,8839,8838,8837,8836,8836,8835,8834,8833,8832,8831,8831,8830,8829,8828,8827,8827,8826,8825,8824,8823,8822,8822,8821,8820,8819,8818,8817,8817,8816,8815,8814,8813,8813,8812,8811,8810,8809,8808,8808,8807,8806,8805,8804,8803,8803,8802,8801,8800,8799,8798,8798,8797,8796,8795,8794,8793,8793,8792,8791,8790,8789,8789,8788,8787,8786,8785,8784,8784,8783,8782,8781,8780,8779,8778,8778,8777,8776,8775,8774,8773,8773,8772,8771,8770,8769,8768,8768,8767,8766,8765,8764,8763,8763,8762,8761,8760,8759,8758,8758,8757,8756,8755,8754,8753,8752,8752,8751,8750,8749,8748,8747,8747,8746,8745,8744,8743,8742,8741,8741,8740,8739,8738,8737,8736,8736,8735,8734,8733,8732,8731,8730,8730,8729,8728,8727,8726,8725,8724,8724,8723,8722,8721,8720,8719,8718,8718,8717,8716,8715,8714,8713,8712,8712,8711,8710,8709,8708,8707,8706,8706,8705,8704,8703,8702,8701,8700,8700,8699,8698,8697,8696,8695,8694,8694,8693,8692,8691,8690,8689,8688,8688,8687,8686,8685,8684,8683,8682,8681,8681,8680,8679,8678,8677,8676,8675,8675,8674,8673,8672,8671,8670,8669,8668,8668,8667,8666,8665,8664,8663,8662,8661,8661,8660,8659,8658,8657,8656,8655,8655,8654,8653,8652,8651,8650,8649,8648,8648,8647,8646,8645,8644,8643,8642,8641,8640,8640,8639,8638,8637,8636,8635,8634,8633,8633,8632,8631,8630,8629,8628,8627,8626,8626,8625,8624,8623,8622,8621,8620,8619,8618,8618,8617,8616,8615,8614,8613,8612,8611,8610,8610,8609,8608,8607,8606,8605,8604,8603,8602,8602,8601,8600,8599,8598,8597,8596,8595,8594,8594,8593,8592,8591,8590,8589,8588,8587,8586,8586,8585,8584,8583,8582,8581,8580,8579,8578,8577,8577,8576,8575,8574,8573,8572,8571,8570,8569,8568,8568,8567,8566,8565,8564,8563,8562,8561,8560,8559,8559,8558,8557,8556,8555,8554,8553,8552,8551,8550,8550,8549,8548,8547,8546,8545,8544,8543,8542,8541,8540,8540,8539,8538,8537,8536,8535,8534,8533,8532,8531,8530,8530,8529,8528,8527,8526,8525,8524,8523,8522,8521,8520,8520,8519,8518,8517,8516,8515,8514,8513,8512,8511,8510,8509,8509,8508,8507,8506,8505,8504,8503,8502,8501,8500,8499,8498,8498,8497,8496,8495,8494,8493,8492,8491,8490,8489,8488,8487,8486,8486,8485,8484,8483,8482,8481,8480,8479,8478,8477,8476,8475,8474,8474,8473,8472,8471,8470,8469,8468,8467,8466,8465,8464,8463,8462,8461,8461,8460,8459,8458,8457,8456,8455,8454,8453,8452,8451,8450,8449,8448,8447,8447,8446,8445,8444,8443,8442,8441,8440,8439,8438,8437,8436,8435,8434,8433,8432,8432,8431,8430,8429,8428,8427,8426,8425,8424,8423,8422,8421,8420,8419,8418,8417,8416,8416,8415,8414,8413,8412,8411,8410,8409,8408,8407,8406,8405,8404,8403,8402,8401,8400,8399,8399,8398,8397,8396,8395,8394,8393,8392,8391,8390,8389,8388,8387,8386,8385,8384,8383,8382,8381,8380,8380,8379,8378,8377,8376,8375,8374,8373,8372,8371,8370,8369,8368,8367,8366,8365,8364,8363,8362,8361,8360,8359,8359,8358,8357,8356,8355,8354,8353,8352,8351,8350,8349,8348,8347,8346,8345,8344,8343,8342,8341,8340,8339,8338,8337,8336,8335,8335,8334,8333,8332,8331,8330,8329,8328,8327,8326,8325,8324,8323,8322,8321,8320,8319,8318,8317,8316,8315,8314,8313,8312,8311,8310,8309,8308,8307,8306,8305,8304,8304,8303,8302,8301,8300,8299,8298,8297,8296,8295,8294,8293,8292,8291,8290,8289,8288,8287,8286,8285,8284,8283,8282,8281,8280,8279,8278,8277,8276,8275,8274,8273,8272,8271,8270,8269,8268,8267,8266,8265,8264,8263,8262,8261,8260,8259,8259,8258,8257,8256,8255,8254,8253,8252,8251,8250,8249,8248,8247,8246,8245,8244,8243,8242,8241,8240,8239,8238,8237,8236,8235,8234,8233,8232,8231,8230,8229,8228,8227,8226,8225,8224,8223,8222,8221,8220,8219,8218,8217,8216,8215,8214,8213,8212,8211,8210,8209,8208,8207,8206,8205,8204,8203,8202,8201,8200,8199,8198,8197,8196,8195,8194,8193,8192,8191,8190,8189,8188,8187,8186,8185,8184,8183,8182,8181,8180,8179,8178,8177,8176,8175,8174,8173,8172,8171,8170,8169,8168,8167,8166,8165,8164,8163,8162,8161,8160,8159,8158,8157,8156,8155,8154,8153,8152,8151,8150,8149,8148,8147,8146,8145,8144,8143,8142,8141,8140,8139,8138,8137,8136,8135,8134,8133,8132,8131,8129,8128,8127,8126,8125,8124,8123,8122,8121,8120,8119,8118,8117,8116,8115,8114,8113,8112,8111,8110,8109,8108,8107,8106,8105,8104,8103,8102,8101,8100,8099,8098,8097,8096,8095,8094,8093,8092,8091,8090,8089,8088,8087,8086,8085,8084,8082,8081,8080,8079,8078,8077,8076,8075,8074,8073,8072,8071,8070,8069,8068,8067,8066,8065,8064,8063,8062,8061,8060,8059,8058,8057,8056,8055,8054,8053,8052,8051,8049,8048,8047,8046,8045,8044,8043,8042,8041,8040,8039,8038,8037,8036,8035,8034,8033,8032,8031,8030,8029,8028,8027,8026,8025,8024,8022,8021,8020,8019,8018,8017,8016,8015,8014,8013,8012,8011,8010,8009,8008,8007,8006,8005,8004,8003,8002,8001,7999,7998,7997,7996,7995,7994,7993,7992,7991,7990,7989,7988,7987,7986,7985,7984,7983,7982,7981,7980,7978,7977,7976,7975,7974,7973,7972,7971,7970,7969,7968,7967,7966,7965,7964,7963,7962,7961,7960,7958,7957,7956,7955,7954,7953,7952,7951,7950,7949,7948,7947,7946,7945,7944,7943,7942,7940,7939,7938,7937,7936,7935,7934,7933,7932,7931,7930,7929,7928,7927,7926,7925,7923,7922,7921,7920,7919,7918,7917,7916,7915,7914,7913,7912,7911,7910,7909,7907,7906,7905,7904,7903,7902,7901,7900,7899,7898,7897,7896,7895,7894,7892,7891,7890,7889,7888,7887,7886,7885,7884,7883,7882,7881,7880,7879,7877,7876,7875,7874,7873,7872,7871,7870,7869,7868,7867,7866,7865,7863,7862,7861,7860,7859,7858,7857,7856,7855,7854,7853,7852,7851,7849,7848,7847,7846,7845,7844,7843,7842,7841,7840,7839,7838,7836,7835,7834,7833,7832,7831,7830,7829,7828,7827,7826,7824,7823,7822,7821,7820,7819,7818,7817,7816,7815,7814,7813,7811,7810,7809,7808,7807,7806,7805,7804,7803,7802,7801,7799,7798,7797,7796,7795,7794,7793,7792,7791,7790,7789,7787,7786,7785,7784,7783,7782,7781,7780,7779,7778,7776,7775,7774,7773,7772,7771,7770,7769,7768,7767,7765,7764,7763,7762,7761,7760,7759,7758,7757,7756,7754,7753,7752,7751,7750,7749,7748,7747,7746,7745,7743,7742,7741,7740,7739,7738,7737,7736,7735,7733,7732,7731,7730,7729,7728,7727,7726,7725,7724,7722,7721,7720,7719,7718,7717,7716,7715,7714,7712,7711,7710,7709,7708,7707,7706,7705,7704,7702,7701,7700,7699,7698,7697,7696,7695,7693,7692,7691,7690,7689,7688,7687,7686,7685,7683,7682,7681,7680,7679,7678,7677,7676,7675,7673,7672,7671,7670,7669,7668,7667,7666,7664,7663,7662,7661,7660,7659,7658,7657,7655,7654,7653,7652,7651,7650,7649,7648,7646,7645,7644,7643,7642,7641,7640,7639,7637,7636,7635,7634,7633,7632,7631,7630,7628,7627,7626,7625,7624,7623,7622,7621,7619,7618,7617,7616,7615,7614,7613,7611,7610,7609,7608,7607,7606,7605,7604,7602,7601,7600,7599,7598,7597,7596,7594,7593,7592,7591,7590,7589,7588,7587,7585,7584,7583,7582,7581,7580,7579,7577,7576,7575,7574,7573,7572,7571,7569,7568,7567,7566,7565,7564,7563,7561,7560,7559,7558,7557,7556,7555,7553,7552,7551,7550,7549,7548,7547,7545,7544,7543,7542,7541,7540,7539,7537,7536,7535,7534,7533,7532,7531,7529,7528,7527,7526,7525,7524,7522,7521,7520,7519,7518,7517,7516,7514,7513,7512,7511,7510,7509,7508,7506,7505,7504,7503,7502,7501,7499,7498,7497,7496,7495,7494,7493,7491,7490,7489,7488,7487,7486,7484,7483,7482,7481,7480,7479,7477,7476,7475,7474,7473,7472,7471,7469,7468,7467,7466,7465,7464,7462,7461,7460,7459,7458,7457,7455,7454,7453,7452,7451,7450,7448,7447,7446,7445,7444,7443,7441,7440,7439,7438,7437,7436,7434,7433,7432,7431,7430,7429,7427,7426,7425,7424,7423,7422,7420,7419,7418,7417,7416,7415,7413,7412,7411,7410,7409,7408,7406,7405,7404,7403,7402,7401,7399,7398,7397,7396,7395,7393,7392,7391,7390,7389,7388,7386,7385,7384,7383,7382,7381,7379,7378,7377,7376,7375,7373,7372,7371,7370,7369,7368,7366,7365,7364,7363,7362,7360,7359,7358,7357,7356,7355,7353,7352,7351,7350,7349,7347,7346,7345,7344,7343,7342,7340,7339,7338,7337,7336,7334,7333,7332,7331,7330,7328,7327,7326,7325,7324,7323,7321,7320,7319,7318,7317,7315,7314,7313,7312,7311,7309,7308,7307,7306,7305,7304,7302,7301,7300,7299,7298,7296,7295,7294,7293,7292,7290,7289,7288,7287,7286,7284,7283,7282,7281,7280,7278,7277,7276,7275,7274,7272,7271,7270,7269,7268,7266,7265,7264,7263,7262,7260,7259,7258,7257,7256,7254,7253,7252,7251,7250,7248,7247,7246,7245,7244,7242,7241,7240,7239,7238,7236,7235,7234,7233,7232,7230,7229,7228,7227,7226,7224,7223,7222,7221,7220,7218,7217,7216,7215,7213,7212,7211,7210,7209,7207,7206,7205,7204,7203,7201,7200,7199,7198,7197,7195,7194,7193,7192,7190,7189,7188,7187,7186,7184,7183,7182,7181,7180,7178,7177,7176,7175,7173,7172,7171,7170,7169,7167,7166,7165,7164,7163,7161,7160,7159,7158,7156,7155,7154,7153,7152,7150,7149,7148,7147,7145,7144,7143,7142,7141,7139,7138,7137,7136,7134,7133,7132,7131,7130,7128,7127,7126,7125,7123,7122,7121,7120,7119,7117,7116,7115,7114,7112,7111,7110,7109,7107,7106,7105,7104,7103,7101,7100,7099,7098,7096,7095,7094,7093,7092,7090,7089,7088,7087,7085,7084,7083,7082,7080,7079,7078,7077,7076,7074,7073,7072,7071,7069,7068,7067,7066,7064,7063,7062,7061,7059,7058,7057,7056,7055,7053,7052,7051,7050,7048,7047,7046,7045,7043,7042,7041,7040,7038,7037,7036,7035,7033,7032,7031,7030,7028,7027,7026,7025,7024,7022,7021,7020,7019,7017,7016,7015,7014,7012,7011,7010,7009,7007,7006,7005,7004,7002,7001,7000,6999,6997,6996,6995,6994,6992,6991,6990,6989,6987,6986,6985,6984,6982,6981,6980,6979,6977,6976,6975,6974,6972,6971,6970,6969,6967,6966,6965,6964,6962,6961,6960,6959,6957,6956,6955,6954,6952,6951,6950,6949,6947,6946,6945,6944,6942,6941,6940,6939,6937,6936,6935,6934,6932,6931,6930,6928,6927,6926,6925,6923,6922,6921,6920,6918,6917,6916,6915,6913,6912,6911,6910,6908,6907,6906,6905,6903,6902,6901,6899,6898,6897,6896,6894,6893,6892,6891,6889,6888,6887,6886,6884,6883,6882,6881,6879,6878,6877,6875,6874,6873,6872,6870,6869,6868,6867,6865,6864,6863,6861,6860,6859,6858,6856,6855,6854,6853,6851,6850,6849,6848,6846,6845,6844,6842,6841,6840,6839,6837,6836,6835,6834,6832,6831,6830,6828,6827,6826,6825,6823,6822,6821,6819,6818,6817,6816,6814,6813,6812,6811,6809,6808,6807,6805,6804,6803,6802,6800,6799,6798,6796,6795,6794,6793,6791,6790,6789,6788,6786,6785,6784,6782,6781,6780,6779,6777,6776,6775,6773,6772,6771,6770,6768,6767,6766,6764,6763,6762,6761,6759,6758,6757,6755,6754,6753,6752,6750,6749,6748,6746,6745,6744,6743,6741,6740,6739,6737,6736,6735,6733,6732,6731,6730,6728,6727,6726,6724,6723,6722,6721,6719,6718,6717,6715,6714,6713,6712,6710,6709,6708,6706,6705,6704,6702,6701,6700,6699,6697,6696,6695,6693,6692,6691,6690,6688,6687,6686,6684,6683,6682,6680,6679,6678,6677,6675,6674,6673,6671,6670,6669,6667,6666,6665,6664,6662,6661,6660,6658,6657,6656,6654,6653,6652,6651,6649,6648,6647,6645,6644,6643,6641,6640,6639,6637,6636,6635,6634,6632,6631,6630,6628,6627,6626,6624,6623,6622,6620,6619,6618,6617,6615,6614,6613,6611,6610,6609,6607,6606,6605,6603,6602,6601,6600,6598,6597,6596,6594,6593,6592,6590,6589,6588,6586,6585,6584,6582,6581,6580,6579,6577,6576,6575,6573,6572,6571,6569,6568,6567,6565,6564,6563,6561,6560,6559,6557,6556,6555,6554,6552,6551,6550,6548,6547,6546,6544,6543,6542,6540,6539,6538,6536,6535,6534,6532,6531,6530,6528,6527,6526,6524,6523,6522,6520,6519,6518,6517,6515,6514,6513,6511,6510,6509,6507,6506,6505,6503,6502,6501,6499,6498,6497,6495,6494,6493,6491,6490,6489,6487,6486,6485,6483,6482,6481,6479,6478,6477,6475,6474,6473,6471,6470,6469,6467,6466,6465,6463,6462,6461,6459,6458,6457,6455,6454,6453,6451,6450,6449,6447,6446,6445,6443,6442,6441,6439,6438,6437,6435,6434,6433,6431,6430,6429,6427,6426,6425,6423,6422,6421,6419,6418,6417,6415,6414,6413,6411,6410,6409,6407,6406,6405,6403,6402,6401,6399,6398,6397,6395,6394,6393,6391,6390,6389,6387,6386,6384,6383,6382,6380,6379,6378,6376,6375,6374,6372,6371,6370,6368,6367,6366,6364,6363,6362,6360,6359,6358,6356,6355,6354,6352,6351,6350,6348,6347,6345,6344,6343,6341,6340,6339,6337,6336,6335,6333,6332,6331,6329,6328,6327,6325,6324,6322,6321,6320,6318,6317,6316,6314,6313,6312,6310,6309,6308,6306,6305,6304,6302,6301,6299,6298,6297,6295,6294,6293,6291,6290,6289,6287,6286,6285,6283,6282,6280,6279,6278,6276,6275,6274,6272,6271,6270,6268,6267,6266,6264,6263,6261,6260,6259,6257,6256,6255,6253,6252,6251,6249,6248,6246,6245,6244,6242,6241,6240,6238,6237,6236,6234,6233,6231,6230,6229,6227,6226,6225,6223,6222,6221,6219,6218,6216,6215,6214,6212,6211,6210,6208,6207,6206,6204,6203,6201,6200,6199,6197,6196,6195,6193,6192,6190,6189,6188,6186,6185,6184,6182,6181,6179,6178,6177,6175,6174,6173,6171,6170,6168,6167,6166,6164,6163,6162,6160,6159,6157,6156,6155,6153,6152,6151,6149,6148,6146,6145,6144,6142,6141,6140,6138,6137,6135,6134,6133,6131,6130,6129,6127,6126,6124,6123,6122,6120,6119,6118,6116,6115,6113,6112,6111,6109,6108,6106,6105,6104,6102,6101,6100,6098,6097,6095,6094,6093,6091,6090,6088,6087,6086,6084,6083,6082,6080,6079,6077,6076,6075,6073,6072,6070,6069,6068,6066,6065,6064,6062,6061,6059,6058,6057,6055,6054,6052,6051,6050,6048,6047,6045,6044,6043,6041,6040,6039,6037,6036,6034,6033,6032,6030,6029,6027,6026,6025,6023,6022,6020,6019,6018,6016,6015,6013,6012,6011,6009,6008,6006,6005,6004,6002,6001,6000,5998,5997,5995,5994,5993,5991,5990,5988,5987,5986,5984,5983,5981,5980,5979,5977,5976,5974,5973,5972,5970,5969,5967,5966,5965,5963,5962,5960,5959,5958,5956,5955,5953,5952,5951,5949,5948,5946,5945,5944,5942,5941,5939,5938,5936,5935,5934,5932,5931,5929,5928,5927,5925,5924,5922,5921,5920,5918,5917,5915,5914,5913,5911,5910,5908,5907,5906,5904,5903,5901,5900,5899,5897,5896,5894,5893,5891,5890,5889,5887,5886,5884,5883,5882,5880,5879,5877,5876,5875,5873,5872,5870,5869,5867,5866,5865,5863,5862,5860,5859,5858,5856,5855,5853,5852,5850,5849,5848,5846,5845,5843,5842,5841,5839,5838,5836,5835,5833,5832,5831,5829,5828,5826,5825,5824,5822,5821,5819,5818,5816,5815,5814,5812,5811,5809,5808,5807,5805,5804,5802,5801,5799,5798,5797,5795,5794,5792,5791,5789,5788,5787,5785,5784,5782,5781,5780,5778,5777,5775,5774,5772,5771,5770,5768,5767,5765,5764,5762,5761,5760,5758,5757,5755,5754,5752,5751,5750,5748,5747,5745,5744,5742,5741,5740,5738,5737,5735,5734,5732,5731,5730,5728,5727,5725,5724,5722,5721,5720,5718,5717,5715,5714,5712,5711,5710,5708,5707,5705,5704,5702,5701,5699,5698,5697,5695,5694,5692,5691,5689,5688,5687,5685,5684,5682,5681,5679,5678,5677,5675,5674,5672,5671,5669,5668,5666,5665,5664,5662,5661,5659,5658,5656,5655,5653,5652,5651,5649,5648,5646,5645,5643,5642,5641,5639,5638,5636,5635,5633,5632,5630,5629,5628,5626,5625,5623,5622,5620,5619,5617,5616,5615,5613,5612,5610,5609,5607,5606,5604,5603,5602,5600,5599,5597,5596,5594,5593,5591,5590,5589,5587,5586,5584,5583,5581,5580,5578,5577,5576,5574,5573,5571,5570,5568,5567,5565,5564,5562,5561,5560,5558,5557,5555,5554,5552,5551,5549,5548,5546,5545,5544,5542,5541,5539,5538,5536,5535,5533,5532,5531,5529,5528,5526,5525,5523,5522,5520,5519,5517,5516,5515,5513,5512,5510,5509,5507,5506,5504,5503,5501,5500,5498,5497,5496,5494,5493,5491,5490,5488,5487,5485,5484,5482,5481,5480,5478,5477,5475,5474,5472,5471,5469,5468,5466,5465,5463,5462,5461,5459,5458,5456,5455,5453,5452,5450,5449,5447,5446,5444,5443,5441,5440,5439,5437,5436,5434,5433,5431,5430,5428,5427,5425,5424,5422,5421,5420,5418,5417,5415,5414,5412,5411,5409,5408,5406,5405,5403,5402,5400,5399,5397,5396,5395,5393,5392,5390,5389,5387,5386,5384,5383,5381,5380,5378,5377,5375,5374,5372,5371,5370,5368,5367,5365,5364,5362,5361,5359,5358,5356,5355,5353,5352,5350,5349,5347,5346,5344,5343,5342,5340,5339,5337,5336,5334,5333,5331,5330,5328,5327,5325,5324,5322,5321,5319,5318,5316,5315,5313,5312,5311,5309,5308,5306,5305,5303,5302,5300,5299,5297,5296,5294,5293,5291,5290,5288,5287,5285,5284,5282,5281,5279,5278,5276,5275,5274,5272,5271,5269,5268,5266,5265,5263,5262,5260,5259,5257,5256,5254,5253,5251,5250,5248,5247,5245,5244,5242,5241,5239,5238,5236,5235,5233,5232,5230,5229,5227,5226,5224,5223,5222,5220,5219,5217,5216,5214,5213,5211,5210,5208,5207,5205,5204,5202,5201,5199,5198,5196,5195,5193,5192,5190,5189,5187,5186,5184,5183,5181,5180,5178,5177,5175,5174,5172,5171,5169,5168,5166,5165,5163,5162,5160,5159,5157,5156,5154,5153,5151,5150,5148,5147,5145,5144,5142,5141,5139,5138,5136,5135,5133,5132,5130,5129,5127,5126,5124,5123,5121,5120,5118,5117,5115,5114,5112,5111,5109,5108,5106,5105,5103,5102,5100,5099,5097,5096,5094,5093,5091,5090,5088,5087,5085,5084,5082,5081,5079,5078,5076,5075,5073,5072,5070,5069,5067,5066,5064,5063,5061,5060,5058,5057,5055,5054,5052,5051,5049,5048,5046,5045,5043,5042,5040,5039,5037,5036,5034,5033,5031,5030,5028,5027,5025,5024,5022,5021,5019,5018,5016,5015,5013,5012,5010,5009,5007,5006,5004,5003,5001,5000,4998,4996,4995,4993,4992,4990,4989,4987,4986,4984,4983,4981,4980,4978,4977,4975,4974,4972,4971,4969,4968,4966,4965,4963,4962,4960,4959,4957,4956,4954,4953,4951,4950,4948,4947,4945,4943,4942,4940,4939,4937,4936,4934,4933,4931,4930,4928,4927,4925,4924,4922,4921,4919,4918,4916,4915,4913,4912,4910,4909,4907,4905,4904,4902,4901,4899,4898,4896,4895,4893,4892,4890,4889,4887,4886,4884,4883,4881,4880,4878,4877,4875,4874,4872,4870,4869,4867,4866,4864,4863,4861,4860,4858,4857,4855,4854,4852,4851,4849,4848,4846,4845,4843,4841,4840,4838,4837,4835,4834,4832,4831,4829,4828,4826,4825,4823,4822,4820,4819,4817,4816,4814,4812,4811,4809,4808,4806,4805,4803,4802,4800,4799,4797,4796,4794,4793,4791,4789,4788,4786,4785,4783,4782,4780,4779,4777,4776,4774,4773,4771,4770,4768,4766,4765,4763,4762,4760,4759,4757,4756,4754,4753,4751,4750,4748,4747,4745,4743,4742,4740,4739,4737,4736,4734,4733,4731,4730,4728,4727,4725,4723,4722,4720,4719,4717,4716,4714,4713,4711,4710,4708,4707,4705,4703,4702,4700,4699,4697,4696,4694,4693,4691,4690,4688,4687,4685,4683,4682,4680,4679,4677,4676,4674,4673,4671,4670,4668,4666,4665,4663,4662,4660,4659,4657,4656,4654,4653,4651,4649,4648,4646,4645,4643,4642,4640,4639,4637,4636,4634,4632,4631,4629,4628,4626,4625,4623,4622,4620,4619,4617,4615,4614,4612,4611,4609,4608,4606,4605,4603,4601,4600,4598,4597,4595,4594,4592,4591,4589,4588,4586,4584,4583,4581,4580,4578,4577,4575,4574,4572,4570,4569,4567,4566,4564,4563,4561,4560,4558,4557,4555,4553,4552,4550,4549,4547,4546,4544,4543,4541,4539,4538,4536,4535,4533,4532,4530,4529,4527,4525,4524,4522,4521,4519,4518,4516,4515,4513,4511,4510,4508,4507,4505,4504,4502,4500,4499,4497,4496,4494,4493,4491,4490,4488,4486,4485,4483,4482,4480,4479,4477,4476,4474,4472,4471,4469,4468,4466,4465,4463,4461,4460,4458,4457,4455,4454,4452,4451,4449,4447,4446,4444,4443,4441,4440,4438,4436,4435,4433,4432,4430,4429,4427,4426,4424,4422,4421,4419,4418,4416,4415,4413,4411,4410,4408,4407,4405,4404,4402,4400,4399,4397,4396,4394,4393,4391,4389,4388,4386,4385,4383,4382,4380,4379,4377,4375,4374,4372,4371,4369,4368,4366,4364,4363,4361,4360,4358,4357,4355,4353,4352,4350,4349,4347,4346,4344,4342,4341,4339,4338,4336,4335,4333,4331,4330,4328,4327,4325,4324,4322,4320,4319,4317,4316,4314,4312,4311,4309,4308,4306,4305,4303,4301,4300,4298,4297,4295,4294,4292,4290,4289,4287,4286,4284,4283,4281,4279,4278,4276,4275,4273,4272,4270,4268,4267,4265,4264,4262,4260,4259,4257,4256,4254,4253,4251,4249,4248,4246,4245,4243,4241,4240,4238,4237,4235,4234,4232,4230,4229,4227,4226,4224,4223,4221,4219,4218,4216,4215,4213,4211,4210,4208,4207,4205,4204,4202,4200,4199,4197,4196,4194,4192,4191,4189,4188,4186,4185,4183,4181,4180,4178,4177,4175,4173,4172,4170,4169,4167,4165,4164,4162,4161,4159,4158,4156,4154,4153,4151,4150,4148,4146,4145,4143,4142,4140,4138,4137,4135,4134,4132,4131,4129,4127,4126,4124,4123,4121,4119,4118,4116,4115,4113,4111,4110,4108,4107,4105,4104,4102,4100,4099,4097,4096,4094,4092,4091,4089,4088,4086,4084,4083,4081,4080,4078,4076,4075,4073,4072,4070,4068,4067,4065,4064,4062,4060,4059,4057,4056,4054,4053,4051,4049,4048,4046,4045,4043,4041,4040,4038,4037,4035,4033,4032,4030,4029,4027,4025,4024,4022,4021,4019,4017,4016,4014,4013,4011,4009,4008,4006,4005,4003,4001,4000,3998,3997,3995,3993,3992,3990,3989,3987,3985,3984,3982,3981,3979,3977,3976,3974,3973,3971,3969,3968,3966,3965,3963,3961,3960,3958,3957,3955,3953,3952,3950,3949,3947,3945,3944,3942,3941,3939,3937,3936,3934,3933,3931,3929,3928,3926,3924,3923,3921,3920,3918,3916,3915,3913,3912,3910,3908,3907,3905,3904,3902,3900,3899,3897,3896,3894,3892,3891,3889,3888,3886,3884,3883,3881,3879,3878,3876,3875,3873,3871,3870,3868,3867,3865,3863,3862,3860,3859,3857,3855,3854,3852,3851,3849,3847,3846,3844,3842,3841,3839,3838,3836,3834,3833,3831,3830,3828,3826,3825,3823,3821,3820,3818,3817,3815,3813,3812,3810,3809,3807,3805,3804,3802,3801,3799,3797,3796,3794,3792,3791,3789,3788,3786,3784,3783,3781,3780,3778,3776,3775,3773,3771,3770,3768,3767,3765,3763,3762,3760,3759,3757,3755,3754,3752,3750,3749,3747,3746,3744,3742,3741,3739,3737,3736,3734,3733,3731,3729,3728,3726,3725,3723,3721,3720,3718,3716,3715,3713,3712,3710,3708,3707,3705,3703,3702,3700,3699,3697,3695,3694,3692,3690,3689,3687,3686,3684,3682,3681,3679,3677,3676,3674,3673,3671,3669,3668,3666,3665,3663,3661,3660,3658,3656,3655,3653,3652,3650,3648,3647,3645,3643,3642,3640,3639,3637,3635,3634,3632,3630,3629,3627,3626,3624,3622,3621,3619,3617,3616,3614,3612,3611,3609,3608,3606,3604,3603,3601,3599,3598,3596,3595,3593,3591,3590,3588,3586,3585,3583,3582,3580,3578,3577,3575,3573,3572,3570,3569,3567,3565,3564,3562,3560,3559,3557,3555,3554,3552,3551,3549,3547,3546,3544,3542,3541,3539,3538,3536,3534,3533,3531,3529,3528,3526,3524,3523,3521,3520,3518,3516,3515,3513,3511,3510,3508,3506,3505,3503,3502,3500,3498,3497,3495,3493,3492,3490,3488,3487,3485,3484,3482,3480,3479,3477,3475,3474,3472,3470,3469,3467,3466,3464,3462,3461,3459,3457,3456,3454,3452,3451,3449,3448,3446,3444,3443,3441,3439,3438,3436,3434,3433,3431,3430,3428,3426,3425,3423,3421,3420,3418,3416,3415,3413,3411,3410,3408,3407,3405,3403,3402,3400,3398,3397,3395,3393,3392,3390,3389,3387,3385,3384,3382,3380,3379,3377,3375,3374,3372,3370,3369,3367,3366,3364,3362,3361,3359,3357,3356,3354,3352,3351,3349,3347,3346,3344,3343,3341,3339,3338,3336,3334,3333,3331,3329,3328,3326,3324,3323,3321,3319,3318,3316,3315,3313,3311,3310,3308,3306,3305,3303,3301,3300,3298,3296,3295,3293,3291,3290,3288,3287,3285,3283,3282,3280,3278,3277,3275,3273,3272,3270,3268,3267,3265,3263,3262,3260,3258,3257,3255,3254,3252,3250,3249,3247,3245,3244,3242,3240,3239,3237,3235,3234,3232,3230,3229,3227,3225,3224,3222,3221,3219,3217,3216,3214,3212,3211,3209,3207,3206,3204,3202,3201,3199,3197,3196,3194,3192,3191,3189,3187,3186,3184,3182,3181,3179,3178,3176,3174,3173,3171,3169,3168,3166,3164,3163,3161,3159,3158,3156,3154,3153,3151,3149,3148,3146,3144,3143,3141,3139,3138,3136,3134,3133,3131,3129,3128,3126,3125,3123,3121,3120,3118,3116,3115,3113,3111,3110,3108,3106,3105,3103,3101,3100,3098,3096,3095,3093,3091,3090,3088,3086,3085,3083,3081,3080,3078,3076,3075,3073,3071,3070,3068,3066,3065,3063,3061,3060,3058,3056,3055,3053,3051,3050,3048,3046,3045,3043,3041,3040,3038,3037,3035,3033,3032,3030,3028,3027,3025,3023,3022,3020,3018,3017,3015,3013,3012,3010,3008,3007,3005,3003,3002,3000,2998,2997,2995,2993,2992,2990,2988,2987,2985,2983,2982,2980,2978,2977,2975,2973,2972,2970,2968,2967,2965,2963,2962,2960,2958,2957,2955,2953,2952,2950,2948,2947,2945,2943,2942,2940,2938,2937,2935,2933,2932,2930,2928,2927,2925,2923,2922,2920,2918,2917,2915,2913,2912,2910,2908,2907,2905,2903,2902,2900,2898,2897,2895,2893,2891,2890,2888,2886,2885,2883,2881,2880,2878,2876,2875,2873,2871,2870,2868,2866,2865,2863,2861,2860,2858,2856,2855,2853,2851,2850,2848,2846,2845,2843,2841,2840,2838,2836,2835,2833,2831,2830,2828,2826,2825,2823,2821,2820,2818,2816,2815,2813,2811,2810,2808,2806,2804,2803,2801,2799,2798,2796,2794,2793,2791,2789,2788,2786,2784,2783,2781,2779,2778,2776,2774,2773,2771,2769,2768,2766,2764,2763,2761,2759,2758,2756,2754,2753,2751,2749,2747,2746,2744,2742,2741,2739,2737,2736,2734,2732,2731,2729,2727,2726,2724,2722,2721,2719,2717,2716,2714,2712,2711,2709,2707,2706,2704,2702,2700,2699,2697,2695,2694,2692,2690,2689,2687,2685,2684,2682,2680,2679,2677,2675,2674,2672,2670,2669,2667,2665,2663,2662,2660,2658,2657,2655,2653,2652,2650,2648,2647,2645,2643,2642,2640,2638,2637,2635,2633,2631,2630,2628,2626,2625,2623,2621,2620,2618,2616,2615,2613,2611,2610,2608,2606,2605,2603,2601,2599,2598,2596,2594,2593,2591,2589,2588,2586,2584,2583,2581,2579,2578,2576,2574,2573,2571,2569,2567,2566,2564,2562,2561,2559,2557,2556,2554,2552,2551,2549,2547,2546,2544,2542,2540,2539,2537,2535,2534,2532,2530,2529,2527,2525,2524,2522,2520,2519,2517,2515,2513,2512,2510,2508,2507,2505,2503,2502,2500,2498,2497,2495,2493,2491,2490,2488,2486,2485,2483,2481,2480,2478,2476,2475,2473,2471,2469,2468,2466,2464,2463,2461,2459,2458,2456,2454,2453,2451,2449,2447,2446,2444,2442,2441,2439,2437,2436,2434,2432,2431,2429,2427,2425,2424,2422,2420,2419,2417,2415,2414,2412,2410,2409,2407,2405,2403,2402,2400,2398,2397,2395,2393,2392,2390,2388,2387,2385,2383,2381,2380,2378,2376,2375,2373,2371,2370,2368,2366,2364,2363,2361,2359,2358,2356,2354,2353,2351,2349,2348,2346,2344,2342,2341,2339,2337,2336,2334,2332,2331,2329,2327,2325,2324,2322,2320,2319,2317,2315,2314,2312,2310,2308,2307,2305,2303,2302,2300,2298,2297,2295,2293,2292,2290,2288,2286,2285,2283,2281,2280,2278,2276,2275,2273,2271,2269,2268,2266,2264,2263,2261,2259,2258,2256,2254,2252,2251,2249,2247,2246,2244,2242,2241,2239,2237,2235,2234,2232,2230,2229,2227,2225,2223,2222,2220,2218,2217,2215,2213,2212,2210,2208,2206,2205,2203,2201,2200,2198,2196,2195,2193,2191,2189,2188,2186,2184,2183,2181,2179,2178,2176,2174,2172,2171,2169,2167,2166,2164,2162,2160,2159,2157,2155,2154,2152,2150,2149,2147,2145,2143,2142,2140,2138,2137,2135,2133,2132,2130,2128,2126,2125,2123,2121,2120,2118,2116,2114,2113,2111,2109,2108,2106,2104,2103,2101,2099,2097,2096,2094,2092,2091,2089,2087,2085,2084,2082,2080,2079,2077,2075,2073,2072,2070,2068,2067,2065,2063,2062,2060,2058,2056,2055,2053,2051,2050,2048,2046,2044,2043,2041,2039,2038,2036,2034,2032,2031,2029,2027,2026,2024,2022,2021,2019,2017,2015,2014,2012,2010,2009,2007,2005,2003,2002,2000,1998,1997,1995,1993,1991,1990,1988,1986,1985,1983,1981,1979,1978,1976,1974,1973,1971,1969,1968,1966,1964,1962,1961,1959,1957,1956,1954,1952,1950,1949,1947,1945,1944,1942,1940,1938,1937,1935,1933,1932,1930,1928,1926,1925,1923,1921,1920,1918,1916,1914,1913,1911,1909,1908,1906,1904,1902,1901,1899,1897,1896,1894,1892,1890,1889,1887,1885,1884,1882,1880,1878,1877,1875,1873,1872,1870,1868,1866,1865,1863,1861,1860,1858,1856,1854,1853,1851,1849,1848,1846,1844,1842,1841,1839,1837,1836,1834,1832,1830,1829,1827,1825,1824,1822,1820,1818,1817,1815,1813,1812,1810,1808,1806,1805,1803,1801,1800,1798,1796,1794,1793,1791,1789,1788,1786,1784,1782,1781,1779,1777,1776,1774,1772,1770,1769,1767,1765,1763,1762,1760,1758,1757,1755,1753,1751,1750,1748,1746,1745,1743,1741,1739,1738,1736,1734,1733,1731,1729,1727,1726,1724,1722,1721,1719,1717,1715,1714,1712,1710,1708,1707,1705,1703,1702,1700,1698,1696,1695,1693,1691,1690,1688,1686,1684,1683,1681,1679,1678,1676,1674,1672,1671,1669,1667,1665,1664,1662,1660,1659,1657,1655,1653,1652,1650,1648,1647,1645,1643,1641,1640,1638,1636,1634,1633,1631,1629,1628,1626,1624,1622,1621,1619,1617,1616,1614,1612,1610,1609,1607,1605,1603,1602,1600,1598,1597,1595,1593,1591,1590,1588,1586,1585,1583,1581,1579,1578,1576,1574,1572,1571,1569,1567,1566,1564,1562,1560,1559,1557,1555,1554,1552,1550,1548,1547,1545,1543,1541,1540,1538,1536,1535,1533,1531,1529,1528,1526,1524,1522,1521,1519,1517,1516,1514,1512,1510,1509,1507,1505,1503,1502,1500,1498,1497,1495,1493,1491,1490,1488,1486,1484,1483,1481,1479,1478,1476,1474,1472,1471,1469,1467,1466,1464,1462,1460,1459,1457,1455,1453,1452,1450,1448,1447,1445,1443,1441,1440,1438,1436,1434,1433,1431,1429,1428,1426,1424,1422,1421,1419,1417,1415,1414,1412,1410,1409,1407,1405,1403,1402,1400,1398,1396,1395,1393,1391,1390,1388,1386,1384,1383,1381,1379,1377,1376,1374,1372,1370,1369,1367,1365,1364,1362,1360,1358,1357,1355,1353,1351,1350,1348,1346,1345,1343,1341,1339,1338,1336,1334,1332,1331,1329,1327,1326,1324,1322,1320,1319,1317,1315,1313,1312,1310,1308,1306,1305,1303,1301,1300,1298,1296,1294,1293,1291,1289,1287,1286,1284,1282,1281,1279,1277,1275,1274,1272,1270,1268,1267,1265,1263,1261,1260,1258,1256,1255,1253,1251,1249,1248,1246,1244,1242,1241,1239,1237,1236,1234,1232,1230,1229,1227,1225,1223,1222,1220,1218,1216,1215,1213,1211,1210,1208,1206,1204,1203,1201,1199,1197,1196,1194,1192,1190,1189,1187,1185,1184,1182,1180,1178,1177,1175,1173,1171,1170,1168,1166,1164,1163,1161,1159,1158,1156,1154,1152,1151,1149,1147,1145,1144,1142,1140,1138,1137,1135,1133,1132,1130,1128,1126,1125,1123,1121,1119,1118,1116,1114,1112,1111,1109,1107,1106,1104,1102,1100,1099,1097,1095,1093,1092,1090,1088,1086,1085,1083,1081,1079,1078,1076,1074,1073,1071,1069,1067,1066,1064,1062,1060,1059,1057,1055,1053,1052,1050,1048,1047,1045,1043,1041,1040,1038,1036,1034,1033,1031,1029,1027,1026,1024,1022,1020,1019,1017,1015,1014,1012,1010,1008,1007,1005,1003,1001,1000,998,996,994,993,991,989,987,986,984,982,981,979,977,975,974,972,970,968,967,965,963,961,960,958,956,954,953,951,949,948,946,944,942,941,939,937,935,934,932,930,928,927,925,923,921,920,918,916,915,913,911,909,908,906,904,902,901,899,897,895,894,892,890,888,887,885,883,881,880,878,876,875,873,871,869,868,866,864,862,861,859,857,855,854,852,850,848,847,845,843,841,840,838,836,835,833,831,829,828,826,824,822,821,819,817,815,814,812,810,808,807,805,803,801,800,798,796,795,793,791,789,788,786,784,782,781,779,777,775,774,772,770,768,767,765,763,761,760,758,756,755,753,751,749,748,746,744,742,741,739,737,735,734,732,730,728,727,725,723,721,720,718,716,714,713,711,709,708,706,704,702,701,699,697,695,694,692,690,688,687,685,683,681,680,678,676,674,673,671,669,667,666,664,662,660,659,657,655,654,652,650,648,647,645,643,641,640,638,636,634,633,631,629,627,626,624,622,620,619,617,615,613,612,610,608,607,605,603,601,600,598,596,594,593,591,589,587,586,584,582,580,579,577,575,573,572,570,568,566,565,563,561,559,558,556,554,552,551,549,547,546,544,542,540,539,537,535,533,532,530,528,526,525,523,521,519,518,516,514,512,511,509,507,505,504,502,500,498,497,495,493,491,490,488,486,485,483,481,479,478,476,474,472,471,469,467,465,464,462,460,458,457,455,453,451,450,448,446,444,443,441,439,437,436,434,432,430,429,427,425,423,422,420,418,417,415,413,411,410,408,406,404,403,401,399,397,396,394,392,390,389,387,385,383,382,380,378,376,375,373,371,369,368,366,364,362,361,359,357,355,354,352,350,348,347,345,343,342,340,338,336,335,333,331,329,328,326,324,322,321,319,317,315,314,312,310,308,307,305,303,301,300,298,296,294,293,291,289,287,286,284,282,280,279,277,275,273,272,270,268,267,265,263,261,260,258,256,254,253,251,249,247,246,244,242,240,239,237,235,233,232,230,228,226,225,223,221,219,218,216,214,212,211,209,207,205,204,202,200,198,197,195,193,191,190,188,186,184,183,181,179,178,176,174,172,171,169,167,165,164,162,160,158,157,155,153,151,150,148,146,144,143,141,139,137,136,134,132,130,129,127,125,123,122,120,118,116,115,113,111,109,108,106,104,102,101,99,97,95,94,92,90,89,87,85,83,82,80,78,76,75,73,71,69,68,66,64,62,61,59,57,55,54,52,50,48,47,45,43,41,40,38,36,34,33,31,29,27,26,24,22,20,19,17,15,13,12,10,8,6,5,3,1,0] diff --git a/lib_player_motion/data/gm4_player_motion/function/load.mcfunction b/lib_player_motion/data/gm4_player_motion/function/load.mcfunction new file mode 100644 index 0000000000..c52589a217 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/load.mcfunction @@ -0,0 +1,37 @@ +# (GM4) moved from internal/technical/load +# LOAD FUNCTION + +# STORAGE +data modify storage gm4_player_motion:math unitvector set value [0.0d,0.0d,0.0d] +data modify storage gm4_player_motion:math motion set value [0.0d,0.0d,0.0d] +data modify storage gm4_player_motion:math pos set value [0.0d,0.0d,0.0d] + +# TICK FUNCTION +schedule function gm4_player_motion:internal/technical/tick 1t append + +# SCORES +scoreboard objectives add gm4_player_motion.api.launch dummy +scoreboard objectives add gm4_player_motion.internal.dummy dummy +scoreboard objectives add gm4_player_motion.internal.math dummy + scoreboard objectives add gm4_player_motion.internal.math.sqrt dummy +scoreboard objectives add gm4_player_motion.internal.const dummy + scoreboard players set #constant.-1 gm4_player_motion.internal.const -1 + scoreboard players set #constant.2 gm4_player_motion.internal.const 2 + scoreboard players set #constant.10 gm4_player_motion.internal.const 10 + scoreboard players set #constant.12 gm4_player_motion.internal.const 12 + scoreboard players set #constant.1000 gm4_player_motion.internal.const 1000 + scoreboard players set #constant.100 gm4_player_motion.internal.const 100 + scoreboard players set #constant.fpc gm4_player_motion.internal.const 8000 +scoreboard objectives add gm4_player_motion.internal.motion.x dummy +scoreboard objectives add gm4_player_motion.internal.motion.y dummy +scoreboard objectives add gm4_player_motion.internal.motion.z dummy +scoreboard objectives add gm4_player_motion.internal.gamemode dummy + +# MARKER +kill 9a347e6c-1ce5-434a-b717-6707d51f4299 +# ^ (GM4) changed UUID to prevent potential conflict +summon marker 29999998.0 0.0 7133.0 {UUID:[I; -1707835796, 484787018, -1223203065, -719371623], Tags:["smithed.strict", "smithed.entity"]} +# ^ (GM4) changed position to GM4 forceloaded chunk and changed UUID to prevent potential conflict + +# TRIG LOOKUP TABLE: +function gm4_player_motion:internal/technical/trig diff --git a/lib_player_motion/data/gm4_player_motion/function/resolve_load/launch_looking.mcfunction b/lib_player_motion/data/gm4_player_motion/function/resolve_load/launch_looking.mcfunction new file mode 100644 index 0000000000..dcdfe2f1f4 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/resolve_load/launch_looking.mcfunction @@ -0,0 +1 @@ +execute if score gm4_player_motion load.status matches 1 if score gm4_lore_minor load.status matches 0.. run function gm4_player_motion:api/launch_looking diff --git a/lib_player_motion/data/gm4_player_motion/function/resolve_load/launch_xyz.mcfunction b/lib_player_motion/data/gm4_player_motion/function/resolve_load/launch_xyz.mcfunction new file mode 100644 index 0000000000..c8bbc90ee6 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/function/resolve_load/launch_xyz.mcfunction @@ -0,0 +1 @@ +execute if score gm4_player_motion load.status matches 1 if score gm4_lore_minor load.status matches 0.. run function gm4_player_motion:api/launch_xyz diff --git a/lib_player_motion/data/gm4_player_motion/tags/function/launch_looking.json b/lib_player_motion/data/gm4_player_motion/tags/function/launch_looking.json new file mode 100644 index 0000000000..a9e501f12a --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/tags/function/launch_looking.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gm4_player_motion:resolve_load/launch_looking" + ] +} diff --git a/lib_player_motion/data/gm4_player_motion/tags/function/launch_xyz.json b/lib_player_motion/data/gm4_player_motion/tags/function/launch_xyz.json new file mode 100644 index 0000000000..c752516198 --- /dev/null +++ b/lib_player_motion/data/gm4_player_motion/tags/function/launch_xyz.json @@ -0,0 +1,5 @@ +{ + "values": [ + "gm4_player_motion:resolve_load/launch_xyz" + ] +}