Skip to content

Commit

Permalink
🩹 リソース定義を一部修正
Browse files Browse the repository at this point in the history
  • Loading branch information
haiiro2gou committed Nov 29, 2024
1 parent 56bd148 commit 5364aca
Show file tree
Hide file tree
Showing 267 changed files with 433 additions and 428 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#
# @within function
# asset:artifact/0001.book_of_all-seeing/click/find_target_entity
# asset:artifact/0001.book_of_all-seeing/click/2.check_condition
# asset:artifact/0001.book_of_all-seeing/click/check

# 0 1 2 3 4 5 6 7 8 9 0 1 2 3 4 5 6 7 8 9 0
# |-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|-|
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
# チェック
execute as @a[scores={02.Trigger=1..}] run function asset:artifact/0002.blessing/click/on_trigger
# ループ
execute if entity @a[scores={02.Trigger=0},limit=1] run schedule function asset:artifact/0002.blessing/click/listener 1t
execute if entity @a[scores={02.Trigger=0},limit=1] run schedule function asset:artifact/0002.blessing/click/listener 1t
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

# 出力
tellraw @s {"text":"能力ボーナスを一つ選んでください"}
tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/click 02.Trigger set 1"},"color":"gold"},{"text":" 体力(現在値: +","color":"white"},{"score":{"name": "$BonusHealth","objective":"Global"},"color":"aqua"},{"text":") +","color":"white"},{"text":"1","color":"aqua"}]
tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/click 02.Trigger set 2"},"color":"gold"},{"text":" 魔力(現在値: +","color":"white"},{"score":{"name": "$BonusMP","objective":"Global"},"color":"aqua"},{"text":") +","color":"white"},{"text":"2","color":"aqua"}]
tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/click 02.Trigger set 3"},"color":"gold"},{"text":" 攻撃(現在値: +","color":"white"},{"score":{"name": "$BonusAttack","objective":"Global"},"color":"aqua"},{"text":"%) +","color":"white"},{"text":"1","color":"aqua"},{"text":"%","color":"white"}]
tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/click 02.Trigger set 4"},"color":"gold"},{"text":" 防御(現在値: +","color":"white"},{"score":{"name": "$BonusDefense","objective":"Global"},"color":"aqua"},{"text":"%) +","color":"white"},{"text":"1","color":"aqua"},{"text":"%","color":"white"}]
tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 1"},"color":"gold"},{"text":" 体力(現在値: +","color":"white"},{"score":{"name": "$BonusHealth","objective":"Global"},"color":"aqua"},{"text":") +","color":"white"},{"text":"1","color":"aqua"}]
tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 2"},"color":"gold"},{"text":" 魔力(現在値: +","color":"white"},{"score":{"name": "$BonusMP","objective":"Global"},"color":"aqua"},{"text":") +","color":"white"},{"text":"2","color":"aqua"}]
tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 3"},"color":"gold"},{"text":" 攻撃(現在値: +","color":"white"},{"score":{"name": "$BonusAttack","objective":"Global"},"color":"aqua"},{"text":"%) +","color":"white"},{"text":"1","color":"aqua"},{"text":"%","color":"white"}]
tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 4"},"color":"gold"},{"text":" 防御(現在値: +","color":"white"},{"score":{"name": "$BonusDefense","objective":"Global"},"color":"aqua"},{"text":"%) +","color":"white"},{"text":"1","color":"aqua"},{"text":"%","color":"white"}]
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@

#> 定義類はここに
# @within function asset:artifact/0002.blessing/click/**
scoreboard objectives add 02.Trigger click
scoreboard objectives add 02.Trigger trigger
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ execute if predicate lib:random_pass_per/20 run effect give @s levitation 10 3 t
execute if predicate lib:random_pass_per/10 run effect give @s wither 10 50 true
execute if predicate lib:random_pass_per/10 run effect give @s speed 10 255 true
execute if predicate lib:random_pass_per/10 run effect give @s poison 30 5 false
particle witch ~ ~ ~ 1 1 1 0.1 100 force @a[distance=..10]
particle witch ~ ~ ~ 1 1 1 0.1 100 force @a[distance=..10]
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
effect give @a[tag=X.MagicShield] resistance 1 3

# 再帰
execute if entity @a[tag=X.MagicShield,limit=1] run schedule function asset:artifact/0033.magic_shield/click/3.1.loop 1t replace
execute if entity @a[tag=X.MagicShield,limit=1] run schedule function asset:artifact/0033.magic_shield/click/3.1.loop 1t replace
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
execute as @e[type=armor_stand,tag=MalleusMaleficarumIndicator] if predicate asset:artifact/0035.malleus_maleficarum/is_ride_on_enderpearl at @s run function asset:artifact/0035.malleus_maleficarum/click/3.1.1.flying

# 次tickのmanager実行予約
execute if entity @e[type=armor_stand,tag=MalleusMaleficarumIndicator,predicate=asset:artifact/0035.malleus_maleficarum/is_ride_on_enderpearl] run schedule function asset:artifact/0035.malleus_maleficarum/click/3.1.entity_manager 1t replace
execute if entity @e[type=armor_stand,tag=MalleusMaleficarumIndicator,predicate=asset:artifact/0035.malleus_maleficarum/is_ride_on_enderpearl] run schedule function asset:artifact/0035.malleus_maleficarum/click/3.1.entity_manager 1t replace
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
execute if data storage api: {OnGround:1b} run tag @a[tag=25.EffectClear] remove 25.EffectClear

# 着地していない場合、次tickも実行
execute if entity @a[tag=25.EffectClear,limit=1] run schedule function asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/3.1.effectclear 1t replace
execute if entity @a[tag=25.EffectClear,limit=1] run schedule function asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/3.1.effectclear 1t replace
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
particle minecraft:rain ~ ~ ~ 0 2 0 1 100
particle minecraft:bubble_pop ~ ~ ~ 0.1 2 0.1 0 100
playsound minecraft:block.bubble_column.upwards_inside player @a ~ ~ ~ 1 2 0
playsound minecraft:block.bubble_column.upwards_inside player @a ~ ~ ~ 1 2 0
playsound minecraft:block.bubble_column.upwards_inside player @a ~ ~ ~ 1 2 0
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
function api:data_get/fall_distance
execute store result score $FallDistance Temporary run data get storage api: FallDistance
execute if score $FallDistance Temporary matches 2.. run tag @s add 25.Landing
scoreboard players reset $FallDistance
scoreboard players reset $FallDistance
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@ scoreboard players add @a[tag=26.Owner] 26.TickCount 1
execute as @a[tag=26.Owner,scores={26.TickCount=60..}] run function asset:artifact/0078.self_destruct_order/click/explosion

# 再起処理
execute if entity @a[tag=26.Owner, limit=1] run schedule function asset:artifact/0078.self_destruct_order/click/count_down 1t
execute if entity @a[tag=26.Owner, limit=1] run schedule function asset:artifact/0078.self_destruct_order/click/count_down 1t
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
#
#
# @within function asset:artifact/0088.fertility_hoe/click/2.check_condition
# @within function asset:artifact/0088.fertility_hoe/click/check

scoreboard players set $LayerCrops Temporary 0
execute store result score $LayerCrops Temporary run clone ~-4 ~ ~-4 ~4 ~ ~4 ~-4 ~ ~-4 filtered #asset:artifact/0088.fertility_hoe/grow_target force
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
fill ~-4 ~ ~-4 ~4 ~ ~4 sweet_berry_bush[age=3] replace sweet_berry_bush
fill ~-4 ~ ~-4 ~4 ~ ~4 cave_vines[berries=true] replace cave_vines
fill ~-4 ~ ~-4 ~4 ~ ~4 cave_vines_plant[berries=true] replace cave_vines_plant
fill ~-4 ~ ~-4 ~4 ~ ~4 nether_wart[age=3] replace nether_wart
fill ~-4 ~ ~-4 ~4 ~ ~4 nether_wart[age=3] replace nether_wart
Original file line number Diff line number Diff line change
Expand Up @@ -4,33 +4,34 @@
#
# @within function asset:artifact/alias/88/click/check

# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね
function asset:artifact/common/check_condition/auto
# 他にアイテム等確認する場合はここに書く
# ゲームモード確認
execute if entity @s[gamemode=!survival,gamemode=!creative] run tag @s remove CanUsed
execute if entity @s[gamemode=!survival,gamemode=!creative] run function lib:message/artifact/can_not_use_here
# アイテム確認
execute store result score $BoneMeal Temporary run clear @s bone_meal 0
execute if score $BoneMeal Temporary matches ..7 run tag @s remove CanUsed
execute if score $BoneMeal Temporary matches ..7 run function lib:message/artifact/dont_have_require_items

# 周囲のブロック判定 //y座標によって場合分け //1層ずつ判定とっていくよ
# 取得
scoreboard players set $AroundCrops Temporary 0
execute positioned ~ ~-4 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~-3 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~-2 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~-1 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~ ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~1 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~2 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~3 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~4 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check

# なかったら
execute if entity @s[tag=CanUsed] if score $AroundCrops Temporary matches 0 run tellraw @s [{"text": "近くに作物がある必要があります。"}]
execute if score $AroundCrops Temporary matches 0 run tag @s remove CanUsed

# CanUsedタグをチェックして.mcfunctionを実行する
execute if entity @s[tag=CanUsed] run function asset:artifact/0088.fertility_hoe/click/
# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね
function asset:artifact/common/check_condition/auto
# 他にアイテム等確認する場合はここに書く
# ゲームモード確認
execute if entity @s[gamemode=!survival,gamemode=!creative] run tag @s remove CanUsed
execute if entity @s[gamemode=!survival,gamemode=!creative] run function lib:message/artifact/can_not_use_here
# アイテム確認
execute store result score $BoneMeal Temporary run clear @s bone_meal 0
execute if score $BoneMeal Temporary matches ..7 run tag @s remove CanUsed
execute if score $BoneMeal Temporary matches ..7 run function lib:message/artifact/dont_have_require_items

# 周囲のブロック判定 //y座標によって場合分け //1層ずつ判定とっていくよ
# 取得
scoreboard players set $AroundCrops Temporary 0
execute positioned ~ ~-4 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~-3 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~-2 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~-1 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~ ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~1 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~2 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~3 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check
execute positioned ~ ~4 ~ run function asset:artifact/0088.fertility_hoe/click/2.1.layer_check

# なかったら
execute if entity @s[tag=CanUsed] if score $AroundCrops Temporary matches 0 run tellraw @s [{"text": "近くに作物がある必要があります。"}]
execute if score $AroundCrops Temporary matches 0 run tag @s remove CanUsed

# CanUsedタグをチェックして.mcfunctionを実行する
execute if entity @s[tag=CanUsed] run function asset:artifact/0088.fertility_hoe/click/

Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
# 実行
function lib:damage/
# 開放
function lib:damage/reset
function lib:damage/reset
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@
execute as @e[type=endermite,tag=TNTStick] at @s run tp @e[type=#lib:living,type=!player,tag=!Uninterferable,tag=!TNTStick,distance=..2,sort=nearest,limit=1]

# ループさせる
execute as @e[type=endermite,tag=TNTStick,limit=1] run schedule function asset:artifact/0107.dispenser_canon/click/3.1.sticky 1t
execute as @e[type=endermite,tag=TNTStick,limit=1] run schedule function asset:artifact/0107.dispenser_canon/click/3.1.sticky 1t
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,4 @@
# @within
# function asset:artifact/0107.dispenser_canon/click/
# function asset:artifact/0107.dispenser_canon/click/3.1.sticky
#declare tag TNTStick
#declare tag TNTStick
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
execute if entity @e[type=cat,tag=48.CalledCat,scores={48.CatTime=600..},limit=1] as @e[type=cat,tag=48.CalledCat,scores={48.CatTime=600..}] at @s run function asset:artifact/0152.call_cat/click/3.1.2.goodbye_cat

# ネコがいるなら次tick予約
execute if entity @e[type=cat,tag=48.CalledCat,limit=1] run schedule function asset:artifact/0152.call_cat/click/3.1.entity_manager 1t replace
execute if entity @e[type=cat,tag=48.CalledCat,limit=1] run schedule function asset:artifact/0152.call_cat/click/3.1.entity_manager 1t replace
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
execute if entity @s[tag=Landing] run function asset:artifact/0172.icicle/click/5.laser_summon

# 再起
execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..10] run function asset:artifact/0172.icicle/click/4.block_check
execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..10] run function asset:artifact/0172.icicle/click/4.block_check
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,4 @@
execute as @e[type=area_effect_cloud,tag=4S.Laser] at @s run function asset:artifact/0172.icicle/click/laser/1.laser

# ループする
execute if entity @e[type=area_effect_cloud,tag=4S.Laser,limit=1] run schedule function asset:artifact/0172.icicle/click/laser/schedule 1t replace
execute if entity @e[type=area_effect_cloud,tag=4S.Laser,limit=1] run schedule function asset:artifact/0172.icicle/click/laser/schedule 1t replace
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# 次tick以降用にschedule予約
schedule function asset:artifact/0190.amor_wand/click/vfx/task 1t
# リセット
tag @e[type=marker,tag=Init,distance=..0.01] remove Init
tag @e[type=marker,tag=Init,distance=..0.01] remove Init
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# 次tick以降用にschedule予約
schedule function asset:artifact/0191.horus_wand/click/vfx/task 1t
# リセット
tag @e[type=marker,tag=Init,distance=..0.01] remove Init
tag @e[type=marker,tag=Init,distance=..0.01] remove Init
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@
# 次tick以降用にschedule予約
schedule function asset:artifact/0192.falcios_wand/click/vfx/task 1t
# リセット
tag @e[type=marker,tag=Init,distance=..0.01] remove Init
tag @e[type=marker,tag=Init,distance=..0.01] remove Init
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
# インデックス
#
# @within function asset:artifact/0210.terra_blade/click/2.check_condition
# @within function asset:artifact/0210.terra_blade/click/check

#> tags
# @within function asset:artifact/0210.terra_blade/click/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,4 +17,4 @@
execute as @e[type=armor_stand,tag=5U.ShotInit] at @s run function asset:artifact/0210.terra_blade/click/3.2.terra_shot_init

# ループスタート
function asset:artifact/0210.terra_blade/click/3.1.terra_shot_tick
function asset:artifact/0210.terra_blade/click/3.1.terra_shot_tick
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,4 @@
scoreboard players set @e[type=armor_stand,tag=5U.Init,distance=..5] 5U.Life 20

# スケジュールループを開始
schedule function asset:artifact/0210.terra_blade/click/sword/sword_schedule 1t replace
schedule function asset:artifact/0210.terra_blade/click/sword/sword_schedule 1t replace
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,4 @@
execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..80] run function asset:artifact/0212.anti_materiel_rifle/click/3.1.bullet

# タグを消す
tag @s remove Landing
tag @s remove Landing
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#
#
#
# @within function asset:artifact/0233.reversal/click/2.check_condition
# @within function asset:artifact/0233.reversal/click/check

playsound minecraft:block.note_block.bass player @s ~ ~ ~ 2 0.7
function lib:message/artifact/condition_not_met
Original file line number Diff line number Diff line change
Expand Up @@ -29,4 +29,4 @@

# 体力設定
scoreboard players operation $Set Lib = $SCUserHealth Temporary
function lib:score_to_health_wrapper/set
function lib:score_to_health_wrapper/set
Loading

0 comments on commit 5364aca

Please sign in to comment.