From 16c24ba239e783188d5f1b573e749a298364800e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Sat, 30 Nov 2024 22:25:36 +0900 Subject: [PATCH] =?UTF-8?q?:alien:=20=E7=A5=9E=E5=99=A8=E4=BF=AE=E6=AD=A3?= =?UTF-8?q?=20id600=E3=81=BE=E3=81=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../_index.d.mcfunction | 6 + .../0001.book_of_all-seeing/click/.mcfunction | 4 +- .../click/_index.d.mcfunction | 6 - .../click/check.mcfunction | 2 +- .../0002.blessing/_index.d.mcfunction | 6 + .../artifact/0002.blessing/click/.mcfunction | 2 +- .../0002.blessing/click/_index.d.mcfunction | 6 - .../0002.blessing/click/check.mcfunction | 4 +- .../click/show_trigger_chat.mcfunction | 4 +- .../artifact/0002.blessing/load.mcfunction | 4 +- .../0002.blessing/random_name/.mcfunction | 30 +++++ .../random_name/set.m.mcfunction | 8 ++ .../0002.blessing/register.mcfunction | 96 ++++++++------- .../{click => }/rejoin_process.mcfunction | 4 +- .../0003.humanity/use_item/.mcfunction | 4 +- .../0005.musket_matchlock/_index.d.mcfunction | 7 ++ .../0005.musket_matchlock/click/.mcfunction | 11 +- .../click/_index.d.mcfunction | 12 -- .../click/check.mcfunction | 17 +-- .../.mcfunction} | 14 +-- .../damage.mcfunction} | 4 +- .../flying.mcfunction} | 8 +- .../0005.musket_matchlock/load.mcfunction | 4 +- .../0007.nitrogen_fixater/click/.mcfunction | 10 +- .../click/check.mcfunction | 19 ++- .../click/.mcfunction | 4 +- .../0010.attack_order/click/.mcfunction | 4 +- .../0012.sketchy_herb/use_item/.mcfunction | 4 +- .../0016.golem_core/click/.mcfunction | 14 +-- .../0016.golem_core/click/check.mcfunction | 15 +-- .../attack_melee/.mcfunction | 6 +- ...ffect.mcfunction => add_effect.mcfunction} | 0 .../0019.scripture/attack_melee/.mcfunction | 3 +- .../0022.amen_ra_rod/click/.mcfunction | 4 +- .../0033.magic_shield/click/.mcfunction | 10 +- .../click/1.1.damage_trigger.mcfunction | 8 -- .../click/3.1.loop.mcfunction | 14 --- .../click/3.2.damage.mcfunction | 12 -- .../click/_index.d.mcfunction | 6 - .../0033.magic_shield/click/check.mcfunction | 9 -- .../click/rejoin_process.mcfunction | 8 -- .../_index.d.mcfunction | 6 + .../click/.mcfunction | 9 +- .../click/3.1.1.flying.mcfunction | 6 +- .../click/3.1.2.witchification.mcfunction | 12 +- .../click/3.1.entity_manager.mcfunction | 9 +- .../click/_index.d.mcfunction | 7 -- .../{click => }/rejoin_process.mcfunction | 4 +- .../0043.fruit_of_wisdom/use_item/.mcfunction | 25 ++-- .../0046.ritual_wand/click/.mcfunction | 2 +- .../attack_melee/.mcfunction | 8 +- .../attack_melee/.mcfunction | 4 +- .../attack_melee/check.mcfunction | 5 +- .../0071.ariadne_thread/click/.mcfunction | 4 +- .../attack_melee/.mcfunction | 4 +- .../attack_melee/check.mcfunction | 16 +-- .../0075.whirlpool_wand/click/.mcfunction | 2 +- .../{attack_melee => }/_index.d.mcfunction | 4 +- .../attack_melee/.mcfunction | 2 +- .../attack_melee/3.1.effectclear.mcfunction | 6 +- .../attack_melee/3.2.attack.mcfunction | 4 +- .../3.3.landing_attack.mcfunction | 4 +- .../rejoin_process.mcfunction | 4 +- .../_index.d.mcfunction | 7 ++ .../click/.mcfunction | 6 +- .../click/_index.d.mcfunction | 7 -- .../click/count_down.mcfunction | 4 +- .../0078.self_destruct_order/load.mcfunction | 4 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../click/.mcfunction | 12 +- .../0087.sheep_blessing/click/.mcfunction | 2 +- .../0088.fertility_hoe/_index.d.mcfunction | 7 ++ .../0088.fertility_hoe/click/.mcfunction | 21 ++-- .../click/2.1.layer_check.mcfunction | 8 +- .../click/_index.d.mcfunction | 7 -- .../0088.fertility_hoe/click/check.mcfunction | 63 +++++----- .../0090.leather_armor_set/click/.mcfunction | 7 +- .../0091.iron_armor_set/click/.mcfunction | 4 +- .../0092.golden_armor_set/click/.mcfunction | 4 +- .../0093.diamond_armor_set/click/.mcfunction | 4 +- .../click/.mcfunction | 4 +- .../0103.necronomicon/click/.mcfunction | 8 +- .../0105.secret_meat/use_item/.mcfunction | 2 +- .../attack_melee/.mcfunction | 5 +- .../0107.dispenser_canon/_index.d.mcfunction | 7 ++ .../0107.dispenser_canon/click/.mcfunction | 9 +- .../click/_index.d.mcfunction | 8 -- .../0108.vacuum_hopper/click/.mcfunction | 10 +- .../0122.lunatic_lay/click/.mcfunction | 30 ++--- .../artifact/0125.storm_bow/click/.mcfunction | 9 +- .../0125.storm_bow/click/check.mcfunction | 16 +-- .../artifact/0135.amrita/use_item/.mcfunction | 10 +- .../0136.hi_amrita/use_item/.mcfunction | 10 +- .../0137.aure_amrita/use_item/.mcfunction | 10 +- .../0138.mystica_amrita/use_item/.mcfunction | 10 +- .../artifact/0139.soma/use_item/.mcfunction | 10 +- .../0140.hi_soma/use_item/.mcfunction | 10 +- .../0141.aure_soma/use_item/.mcfunction | 10 +- .../0142.mystica_soma/use_item/.mcfunction | 8 +- .../artifact/0143.nectar/use_item/.mcfunction | 4 +- .../0144.hi_nectar/use_item/.mcfunction | 4 +- .../0145.aure_nectar/use_item/.mcfunction | 2 +- .../0146.mystica_nectar/use_item/.mcfunction | 2 +- .../{click => }/_index.d.mcfunction | 6 +- .../artifact/0152.call_cat/click/.mcfunction | 77 ++++++------ .../click/3.1.2.goodbye_cat.mcfunction | 3 +- .../artifact/0152.call_cat/load.mcfunction | 5 +- .../0158.mp_extractor/click/.mcfunction | 7 +- .../0158.mp_extractor/click/check.mcfunction | 17 +-- .../use_item/.mcfunction | 8 +- .../artifact/0162.rations/click/.mcfunction | 4 +- .../0164.blessing_boots/tick/.mcfunction | 4 +- .../0165.blessing_leggings/tick/.mcfunction | 4 +- .../0166.blessing_armor/tick/.mcfunction | 4 +- .../0167.blessing_helmet/tick/.mcfunction | 4 +- .../{click => }/_index.d.mcfunction | 4 +- .../artifact/0172.icicle/click/.mcfunction | 5 +- .../click/laser/schedule.mcfunction | 4 +- .../artifact/0172.icicle/load.mcfunction | 4 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../click/.mcfunction | 2 +- .../0184.increasable_cookie/click/.mcfunction | 6 +- .../use_item/.mcfunction | 6 +- .../0187.chloranthy_wand/click/.mcfunction | 4 +- .../click/.mcfunction | 15 +-- .../click/check.mcfunction | 16 +-- .../0189.crystal_rod/click/.mcfunction | 2 +- .../0190.amor_wand/_index.d.mcfunction | 6 + .../artifact/0190.amor_wand/click/.mcfunction | 4 +- .../0190.amor_wand/click/_index.d.mcfunction | 6 - .../0190.amor_wand/click/vfx/.mcfunction | 4 +- .../artifact/0190.amor_wand/load.mcfunction | 2 +- .../0191.horus_wand/_index.d.mcfunction | 6 + .../0191.horus_wand/click/.mcfunction | 4 +- .../0191.horus_wand/click/_index.d.mcfunction | 6 - .../0191.horus_wand/click/vfx/.mcfunction | 4 +- .../artifact/0191.horus_wand/load.mcfunction | 2 +- .../0192.falcios_wand/_index.d.mcfunction | 6 + .../0192.falcios_wand/click/.mcfunction | 4 +- .../click/_index.d.mcfunction | 6 - .../0192.falcios_wand/click/vfx/.mcfunction | 4 +- .../0192.falcios_wand/load.mcfunction | 2 +- .../0201.cowardly_soul/damage/.mcfunction | 4 +- .../0204.spelunker_shoes/tick/.mcfunction | 4 +- .../tick/check.mcfunction | 18 +-- .../0207.life_is_transitory/tick/.mcfunction | 4 +- .../0210.terra_blade/_index.d.mcfunction | 14 +++ .../0210.terra_blade/click/.mcfunction | 6 +- .../click/3.1.terra_shot_tick.mcfunction | 4 +- .../click/3.2.terra_shot_init.mcfunction | 2 +- .../click/3.3.terra_shot_main.mcfunction | 8 +- .../click/3.5.terra_shot_hit.mcfunction | 4 +- .../click/_index.d.mcfunction | 14 --- .../click/event/random_position.mcfunction | 12 +- .../click/sword/sword_schedule.mcfunction | 2 +- .../artifact/0210.terra_blade/load.mcfunction | 2 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../_index.d.mcfunction | 8 ++ .../click/.mcfunction | 4 +- .../click/_index.d.mcfunction | 8 -- .../0214.web_shooter/click/.mcfunction | 2 +- .../0214.web_shooter/click/check.mcfunction | 5 +- .../artifact/0217.fish/use_item/.mcfunction | 2 +- .../0218.iron_storm/_index.d.mcfunction | 6 + .../0218.iron_storm/click/.mcfunction | 12 +- .../0218.iron_storm/click/_index.d.mcfunction | 7 -- .../artifact/0218.iron_storm/load.mcfunction | 2 +- .../0219.abyss_sword/attack_melee/.mcfunction | 2 +- .../0224.onegai_muscle_1/click/.mcfunction | 25 ++-- .../0225.onegai_muscle_2/click/.mcfunction | 23 ++-- .../0226.onegai_muscle_3/click/.mcfunction | 25 ++-- .../0227.onegai_muscle_4/click/.mcfunction | 23 ++-- .../artifact/0233.reversal/click/.mcfunction | 2 +- .../0233.reversal/click/set_mp.mcfunction | 1 + .../artifact/0233.reversal/load.mcfunction | 2 +- .../0236.health_exchanger/click/.mcfunction | 90 +++++++------- .../click/check.mcfunction | 52 ++++----- .../0237.schrodingers_cat/click/.mcfunction | 31 ++--- .../0244.skewer/kill_melee/.mcfunction | 4 +- .../0245.skewered_meat/use_item/.mcfunction | 4 +- .../0246.magical_cane/_index.d.mcfunction | 6 + .../attack_melee/.mcfunction | 10 +- .../attack_melee/_index.d.mcfunction | 6 - .../0247.heavenly_herb/damage/.mcfunction | 4 +- .../attack_projectile/.mcfunction | 6 +- .../attack_projectile/.mcfunction | 2 +- .../attack_projectile/.mcfunction | 2 +- .../0252.void_transaction/click/.mcfunction | 2 +- .../damage_entity/.mcfunction | 9 +- .../damage_entity/check.mcfunction | 7 -- .../0258.chen_dream_pillow/click/.mcfunction | 8 +- .../artifact/0260.heal_lv.1/click/.mcfunction | 5 +- .../0261.holy_symbol_lv.1/_index.d.mcfunction | 6 + .../0261.holy_symbol_lv.1/click/.mcfunction | 6 +- .../click/_index.d.mcfunction | 6 - .../click/recursive.mcfunction | 2 +- .../0261.holy_symbol_lv.1/load.mcfunction | 2 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../{click => }/_index.d.mcfunction | 4 +- .../0262.angel_ray_lv.1/click/.mcfunction | 5 +- .../click/effect/.mcfunction | 4 +- .../0262.angel_ray_lv.1/load.mcfunction | 2 +- .../artifact/0264.heal_lv.5/click/.mcfunction | 5 +- .../0265.holy_symbol_lv.5/_index.d.mcfunction | 6 + .../0265.holy_symbol_lv.5/click/.mcfunction | 6 +- .../click/_index.d.mcfunction | 6 - .../click/recursive.mcfunction | 2 +- .../0265.holy_symbol_lv.5/load.mcfunction | 2 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../{click => }/_index.d.mcfunction | 4 +- .../0266.angel_ray_lv.5/click/.mcfunction | 5 +- .../click/effect/.mcfunction | 4 +- .../0266.angel_ray_lv.5/load.mcfunction | 2 +- .../0268.heal_lv.10/click/.mcfunction | 5 +- .../_index.d.mcfunction | 6 + .../0269.holy_symbol_lv.10/click/.mcfunction | 6 +- .../click/_index.d.mcfunction | 6 - .../click/recursive.mcfunction | 2 +- .../0269.holy_symbol_lv.10/load.mcfunction | 2 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../{click => }/_index.d.mcfunction | 4 +- .../0270.angel_ray_lv.10/click/.mcfunction | 5 +- .../click/effect/.mcfunction | 4 +- .../0270.angel_ray_lv.10/load.mcfunction | 2 +- .../0272.infinity_food/use_item/.mcfunction | 6 +- .../0273.tonbo_gaeri/attack_melee/.mcfunction | 5 +- .../0277.nudist_carnival/damage/.mcfunction | 4 +- .../damage/check.mcfunction | 12 +- .../0278.reveille/_index.d.mcfunction | 6 + .../artifact/0278.reveille/click/.mcfunction | 6 +- .../0278.reveille/click/_index.d.mcfunction | 7 -- .../0278.reveille/click/check.mcfunction | 15 ++- .../artifact/0278.reveille/load.mcfunction | 2 +- .../attack_melee/.mcfunction | 9 +- .../click/.mcfunction | 52 +++++---- .../click/check.mcfunction | 14 ++- .../0292.craving_sword/kill_melee/.mcfunction | 4 +- ...unction.mcfunction => _index.d.mcfunction} | 6 +- .../click/.mcfunction | 4 +- .../click/check.mcfunction | 7 +- .../click/fairy/2.tick.mcfunction | 6 +- .../click/fairy/4.shoot.mcfunction | 5 +- .../click/fairy/5.disapper.mcfunction | 4 +- .../click/shot/2.tick.mcfunction | 6 +- .../click/shot/4.hit.mcfunction | 4 +- .../load.mcfunction | 2 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../click/.mcfunction | 2 +- .../click/check.mcfunction | 13 +-- .../0312.fire_sword/attack_melee/.mcfunction | 13 ++- .../attack_melee/.mcfunction | 14 +-- .../_index.d.mcfunction | 7 ++ .../attack_melee/.mcfunction | 14 +-- .../attack_melee/_index.d.mcfunction | 7 -- .../0315.water_sword/attack_melee/.mcfunction | 11 +- .../attack_melee/.mcfunction | 13 ++- .../attack_melee/.mcfunction | 13 +-- .../attack_melee/_index.d.mcfunction | 7 -- .../attack_melee/.mcfunction | 9 +- .../attack_melee/.mcfunction | 10 +- .../_index.d.mcfunction | 8 ++ .../attack_melee/.mcfunction | 4 +- .../attack_melee/_index.d.mcfunction | 8 -- .../artifact/0322.ice_cane/click/.mcfunction | 4 +- .../0322.ice_cane/click/check.mcfunction | 6 +- .../attack_projectile/.mcfunction | 2 +- .../attack_projectile/.mcfunction | 6 +- .../attack_projectile/check.mcfunction | 16 +-- .../0333.koukisin/attack_melee/.mcfunction | 4 +- .../0342.super_dragon_bell/click/.mcfunction | 13 ++- .../0346.gather_around/click/.mcfunction | 2 +- .../attack_melee/.mcfunction | 4 +- .../artifact/0355.barrel/_index.d.mcfunction | 6 + .../artifact/0355.barrel/click/.mcfunction | 15 +-- .../click/3.1.tick_base.mcfunction | 4 +- .../0355.barrel/click/_index.d.mcfunction | 8 -- .../0358.cyfosio/attack_melee/.mcfunction | 4 +- .../0361.rainbow_crystal/click/.mcfunction | 4 +- .../attack_melee/.mcfunction | 18 +-- .../0365.bloodthirsty_sword/click/.mcfunction | 4 +- .../0368.fire_spell/click/.mcfunction | 4 +- .../0369.fire_magic/_index.d.mcfunction | 10 ++ .../0369.fire_magic/click/.mcfunction | 4 +- .../0369.fire_magic/click/3.1.tick.mcfunction | 4 +- .../0369.fire_magic/click/_index.d.mcfunction | 11 -- .../artifact/0369.fire_magic/load.mcfunction | 2 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../0370.burn_sorcery/_index.d.mcfunction | 7 ++ .../0370.burn_sorcery/click/.mcfunction | 4 +- .../click/3.1.shoot.mcfunction | 3 +- .../click/3.2.damage.mcfunction | 4 +- .../click/_index.d.mcfunction | 8 -- .../click/particle.1.mcfunction | 3 +- .../0371.water_spell/click/.mcfunction | 4 +- .../click/3.1.attack.mcfunction | 4 +- .../0372.water_magic/_index.d.mcfunction | 7 ++ .../0372.water_magic/click/.mcfunction | 4 +- .../click/_index.d.mcfunction | 8 -- .../artifact/0372.water_magic/load.mcfunction | 2 +- .../0373.ice_sorcery/_index.d.mcfunction | 7 ++ .../0373.ice_sorcery/click/.mcfunction | 4 +- .../click/3.1.beamshot.mcfunction | 4 +- .../click/3.2.beamshot2.mcfunction | 4 +- .../click/3.3.beam.mcfunction | 5 +- .../click/_index.d.mcfunction | 9 -- .../click/rejoin_process.mcfunction | 7 -- .../artifact/0373.ice_sorcery/load.mcfunction | 2 +- .../rejoin_process.mcfunction | 7 ++ .../0374.thunder_spell/_index.d.mcfunction | 6 + .../0374.thunder_spell/click/.mcfunction | 4 +- .../click/3.1.line.mcfunction | 3 +- .../click/3.2.damage.mcfunction | 4 +- .../click/_index.d.mcfunction | 8 -- .../0375.thunder_magic/_index.d.mcfunction | 6 + .../0375.thunder_magic/click/.mcfunction | 4 +- .../click/3.1.circle_particle.mcfunction | 3 +- .../click/3.2.damage.mcfunction | 3 +- .../click/_index.d.mcfunction | 8 -- .../0376.ray_sorcery/_index.d.mcfunction | 7 ++ .../0376.ray_sorcery/click/.mcfunction | 4 +- .../click/3.1.shoot.mcfunction | 3 +- .../click/3.2.damage.mcfunction | 4 +- .../click/_index.d.mcfunction | 8 -- .../0379.miracle_rod/_index.d.mcfunction | 9 ++ .../0379.miracle_rod/click/.mcfunction | 4 +- .../click/3.2.magic_circle.mcfunction | 4 +- .../click/3.3.shoot.mcfunction | 3 +- .../click/3.4.damage.mcfunction | 4 +- .../click/_index.d.mcfunction | 10 -- .../artifact/0379.miracle_rod/load.mcfunction | 2 +- .../0382.haru_urara/attack_melee/.mcfunction | 4 +- .../0383.i_scream_ice_cream/click/.mcfunction | 9 +- .../{click => }/_index.d.mcfunction | 10 +- .../click/.mcfunction | 25 ++-- .../click/check.mcfunction | 27 +++-- .../0431.weather_lock_cane/click/.mcfunction | 2 +- .../click/vfx/thunder2.mcfunction | 3 +- .../click/weather/.mcfunction | 2 +- .../click/weather/clear.mcfunction | 2 +- .../0431.weather_lock_cane/load.mcfunction | 2 +- .../{click => }/rejoin_process.mcfunction | 4 +- .../use_item/.mcfunction | 4 +- .../attack_melee/.mcfunction | 4 +- .../attack_melee/3.1.message.mcfunction | 3 +- .../artifact/0454.kinoko/use_item/.mcfunction | 17 +-- .../0455.takenoko/use_item/.mcfunction | 17 +-- .../use_item/.mcfunction | 2 +- .../artifact/0462.456_dice/click/.mcfunction | 10 +- .../0467.cosmo_blue_flash/_index.d.mcfunction | 7 ++ .../0467.cosmo_blue_flash/click/.mcfunction | 4 +- .../click/_index.d.mcfunction | 7 -- .../click/shot.mcfunction | 4 +- .../0468.raging_demon/_index.d.mcfunction | 6 + .../0468.raging_demon/tick/.mcfunction | 4 +- .../tick/_index.d.mcfunction | 7 -- .../0468.raging_demon/tick/check.mcfunction | 4 +- .../tick/check_target.mcfunction | 1 + .../_index.d.mcfunction | 10 ++ .../click/.mcfunction | 28 ++--- .../click/3.1.check_critical.mcfunction | 4 +- .../click/_index.d.mcfunction | 15 --- .../artifact/0501.infinity/click/.mcfunction | 6 +- .../0515.time_medicine/use_item/.mcfunction | 3 +- .../artifact/0522.humanism/click/.mcfunction | 10 +- .../0522.humanism/click/mp_heal.mcfunction | 6 +- .../0529.safety_helmet/damage/.mcfunction | 4 +- .../attack_melee/.mcfunction | 11 +- .../attack_melee/check.mcfunction | 27 +++++ .../enroll_pool.mcfunction | 2 +- .../register.mcfunction | 98 ++++++++-------- .../attack_melee/check.mcfunction | 19 +-- .../register.mcfunction | 96 +++++++-------- .../attack_melee/check.mcfunction | 8 ++ .../register.mcfunction | 97 +++++++-------- .../attack_melee/check.mcfunction | 8 ++ .../0537.all_night_boots/register.mcfunction | 97 +++++++-------- .../damage_entity/.mcfunction | 16 +++ .../damage_entity/check.mcfunction | 10 ++ .../0554.catastrophe/register.mcfunction | 96 +++++++-------- .../damage_entity/.mcfunction | 15 --- .../damage_entity/check.mcfunction | 8 ++ .../0555.catastrophe/register.mcfunction | 96 +++++++-------- .../damage_entity/check.mcfunction | 8 ++ .../0556.catastrophe/register.mcfunction | 96 +++++++-------- .../damage_entity/check.mcfunction | 8 ++ .../0557.catastrophe/register.mcfunction | 96 +++++++-------- .../attack_melee/.mcfunction | 20 ++++ .../attack_melee/check.mcfunction | 10 ++ .../0558.solitariness/register.mcfunction | 96 +++++++-------- .../attack_melee/.mcfunction | 19 --- .../attack_melee/check.mcfunction | 8 ++ .../0559.solitariness/register.mcfunction | 96 +++++++-------- .../attack_melee/check.mcfunction | 8 ++ .../0560.solitariness/register.mcfunction | 96 +++++++-------- .../attack_melee/check.mcfunction | 8 ++ .../0561.solitariness/register.mcfunction | 96 +++++++-------- .../0562.heartland/register.mcfunction | 100 ++++++++-------- .../artifact/0562.heartland/tick/.mcfunction | 12 ++ .../0563.heartland/register.mcfunction | 97 +++++++-------- .../artifact/0563.heartland/tick/.mcfunction | 7 -- .../0563.heartland/tick/check.mcfunction | 7 -- .../0564.heartland/register.mcfunction | 97 +++++++-------- .../0565.heartland/register.mcfunction | 98 ++++++++-------- .../0573.final_prism/_index.d.mcfunction | 6 + .../0573.final_prism/keep_sneak/.mcfunction | 8 +- .../keep_sneak/_index.d.mcfunction | 7 -- .../artifact/0573.final_prism/load.mcfunction | 2 +- .../0600.xtal/attack_melee/.mcfunction | 4 +- .../0600.xtal/attack_melee/5.slash.mcfunction | 3 +- .../particle/particle_2.mcfunction | 5 +- .../attack_melee/schedule.mcfunction | 5 +- .../artifact/0600.xtal/load.mcfunction | 2 +- .../rejoin_process.mcfunction | 4 +- .../alias/1053/equip/check.mcfunction | 7 ++ .../alias/1104/use_item/check.mcfunction | 7 ++ .../{535 => 534}/attack_melee/.mcfunction | 4 +- .../alias/534/attack_melee/check.mcfunction | 7 ++ .../artifact/alias/534/register.mcfunction | 2 +- .../alias/535/attack_melee/check.mcfunction | 2 +- .../alias/536/attack_melee/check.mcfunction | 7 ++ .../alias/537/attack_melee/check.mcfunction | 7 ++ .../{555 => 554}/damage_entity/.mcfunction | 4 +- .../alias/554/damage_entity/check.mcfunction | 7 ++ .../alias/555/damage_entity/check.mcfunction | 7 ++ .../alias/556/damage_entity/check.mcfunction | 7 ++ .../alias/557/damage_entity/check.mcfunction | 7 ++ .../{559 => 558}/attack_melee/.mcfunction | 4 +- .../alias/558/attack_melee/check.mcfunction | 7 ++ .../alias/559/attack_melee/check.mcfunction | 7 ++ .../alias/560/attack_melee/check.mcfunction | 7 ++ .../alias/561/attack_melee/check.mcfunction | 7 ++ .../alias/{563 => 562}/tick/.mcfunction | 4 +- .../artifact/alias/563/tick/check.mcfunction | 7 -- .../alias/801/damage_entity/check.mcfunction | 7 ++ .../artifact/alias/932/equip/.mcfunction | 7 ++ .../artifact/alias/960/equip/check.mcfunction | 7 ++ .../tags/functions/artifact/enroll_pool.json | 2 +- Asset/data/asset/tags/functions/rejoin.json | 110 +++++++++--------- 438 files changed, 2584 insertions(+), 2349 deletions(-) create mode 100644 Asset/data/asset/functions/artifact/0001.book_of_all-seeing/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0002.blessing/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0002.blessing/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0002.blessing/random_name/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0002.blessing/random_name/set.m.mcfunction rename Asset/data/asset/functions/artifact/0002.blessing/{click => }/rejoin_process.mcfunction (60%) create mode 100644 Asset/data/asset/functions/artifact/0005.musket_matchlock/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0005.musket_matchlock/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0005.musket_matchlock/click/{3.1.entity_manager.mcfunction => entity/.mcfunction} (54%) rename Asset/data/asset/functions/artifact/0005.musket_matchlock/click/{3.1.2.damage.mcfunction => entity/damage.mcfunction} (96%) rename Asset/data/asset/functions/artifact/0005.musket_matchlock/click/{3.1.1.flying.mcfunction => entity/flying.mcfunction} (77%) rename Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/{3.1.add_effect.mcfunction => add_effect.mcfunction} (100%) delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/click/1.1.damage_trigger.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/click/3.1.loop.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/click/3.2.damage.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/click/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/click/check.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0033.magic_shield/click/rejoin_process.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0035.malleus_maleficarum/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0035.malleus_maleficarum/{click => }/rejoin_process.mcfunction (75%) rename Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/{attack_melee => }/_index.d.mcfunction (58%) rename Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/{attack_melee => }/rejoin_process.mcfunction (65%) create mode 100644 Asset/data/asset/functions/artifact/0078.self_destruct_order/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0078.self_destruct_order/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0078.self_destruct_order/{click => }/rejoin_process.mcfunction (62%) create mode 100644 Asset/data/asset/functions/artifact/0088.fertility_hoe/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0088.fertility_hoe/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0107.dispenser_canon/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0107.dispenser_canon/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0152.call_cat/{click => }/_index.d.mcfunction (83%) rename Asset/data/asset/functions/artifact/0172.icicle/{click => }/_index.d.mcfunction (55%) rename Asset/data/asset/functions/artifact/0172.icicle/{click => }/rejoin_process.mcfunction (69%) create mode 100644 Asset/data/asset/functions/artifact/0190.amor_wand/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0190.amor_wand/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0191.horus_wand/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0191.horus_wand/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0192.falcios_wand/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0192.falcios_wand/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0210.terra_blade/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0210.terra_blade/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0210.terra_blade/{click => }/rejoin_process.mcfunction (79%) create mode 100644 Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0218.iron_storm/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0218.iron_storm/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0246.magical_cane/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0246.magical_cane/attack_melee/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0253.holy_barrier/damage_entity/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/{click => }/rejoin_process.mcfunction (67%) rename Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/{click => }/_index.d.mcfunction (50%) create mode 100644 Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/{click => }/rejoin_process.mcfunction (67%) rename Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/{click => }/_index.d.mcfunction (51%) create mode 100644 Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/{click => }/rejoin_process.mcfunction (67%) rename Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/{click => }/_index.d.mcfunction (50%) create mode 100644 Asset/data/asset/functions/artifact/0278.reveille/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0278.reveille/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0295.call_elemental_familiar/{click/_index.d.mcfunction.mcfunction => _index.d.mcfunction} (67%) rename Asset/data/asset/functions/artifact/0295.call_elemental_familiar/{click => }/rejoin_process.mcfunction (78%) create mode 100644 Asset/data/asset/functions/artifact/0314.blasting_fire_sword/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0314.blasting_fire_sword/attack_melee/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0317.sea_storm_sword/attack_melee/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0320.divine_thunder_sword/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0320.divine_thunder_sword/attack_melee/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0355.barrel/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0355.barrel/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0369.fire_magic/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0369.fire_magic/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0369.fire_magic/{click => }/rejoin_process.mcfunction (63%) create mode 100644 Asset/data/asset/functions/artifact/0370.burn_sorcery/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0370.burn_sorcery/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0372.water_magic/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0372.water_magic/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0373.ice_sorcery/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0373.ice_sorcery/click/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0373.ice_sorcery/click/rejoin_process.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0373.ice_sorcery/rejoin_process.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0374.thunder_spell/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0374.thunder_spell/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0375.thunder_magic/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0375.thunder_magic/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0376.ray_sorcery/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0376.ray_sorcery/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0379.miracle_rod/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0379.miracle_rod/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/{click => }/_index.d.mcfunction (63%) rename Asset/data/asset/functions/artifact/0431.weather_lock_cane/{click => }/rejoin_process.mcfunction (81%) create mode 100644 Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0468.raging_demon/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0468.raging_demon/tick/_index.d.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/_index.d.mcfunction rename Asset/data/asset/functions/artifact/{0535.all_night_chestplate => 0534.all_night_helmet}/attack_melee/.mcfunction (78%) create mode 100644 Asset/data/asset/functions/artifact/0534.all_night_helmet/attack_melee/check.mcfunction rename Asset/data/asset/functions/artifact/{0534.all_night_hellmet => 0534.all_night_helmet}/enroll_pool.mcfunction (76%) rename Asset/data/asset/functions/artifact/{0534.all_night_hellmet => 0534.all_night_helmet}/register.mcfunction (92%) create mode 100644 Asset/data/asset/functions/artifact/0536.all_night_leggings/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0537.all_night_boots/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0554.catastrophe/damage_entity/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0554.catastrophe/damage_entity/check.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0555.catastrophe/damage_entity/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0555.catastrophe/damage_entity/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0556.catastrophe/damage_entity/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0557.catastrophe/damage_entity/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0558.solitariness/attack_melee/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0558.solitariness/attack_melee/check.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0559.solitariness/attack_melee/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0559.solitariness/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0560.solitariness/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0561.solitariness/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0562.heartland/tick/.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0563.heartland/tick/.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0563.heartland/tick/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/0573.final_prism/_index.d.mcfunction delete mode 100644 Asset/data/asset/functions/artifact/0573.final_prism/keep_sneak/_index.d.mcfunction rename Asset/data/asset/functions/artifact/0600.xtal/{attack_melee => }/rejoin_process.mcfunction (66%) create mode 100644 Asset/data/asset/functions/artifact/alias/1053/equip/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/1104/use_item/check.mcfunction rename Asset/data/asset/functions/artifact/alias/{535 => 534}/attack_melee/.mcfunction (55%) create mode 100644 Asset/data/asset/functions/artifact/alias/534/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/536/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/537/attack_melee/check.mcfunction rename Asset/data/asset/functions/artifact/alias/{555 => 554}/damage_entity/.mcfunction (57%) create mode 100644 Asset/data/asset/functions/artifact/alias/554/damage_entity/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/555/damage_entity/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/556/damage_entity/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/557/damage_entity/check.mcfunction rename Asset/data/asset/functions/artifact/alias/{559 => 558}/attack_melee/.mcfunction (57%) create mode 100644 Asset/data/asset/functions/artifact/alias/558/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/559/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/560/attack_melee/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/561/attack_melee/check.mcfunction rename Asset/data/asset/functions/artifact/alias/{563 => 562}/tick/.mcfunction (59%) delete mode 100644 Asset/data/asset/functions/artifact/alias/563/tick/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/801/damage_entity/check.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/932/equip/.mcfunction create mode 100644 Asset/data/asset/functions/artifact/alias/960/equip/check.mcfunction diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/_index.d.mcfunction new file mode 100644 index 000000000..082153ef1 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0001.book_of_all-seeing/_index.d +# @private + +#> Private +# @within function asset:artifact/0001.book_of_all-seeing/** + #declare tag 01.Target diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/.mcfunction index 010814a7f..3bad297a8 100644 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0001.book_of_all-seeing/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/1/click/ @@ -13,4 +13,4 @@ execute as @e[type=#lib:living,type=!player,tag=01.Target,distance=..30,limit=1] run function asset:artifact/0001.book_of_all-seeing/click/print_defense_messages # リセット - tag @e[type=#lib:living,type=!player,tag=01.Target,distance=..30,limit=1] remove 01.Target \ No newline at end of file + tag @e[type=#lib:living,type=!player,tag=01.Target,distance=..30,limit=1] remove 01.Target diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/_index.d.mcfunction deleted file mode 100644 index 580b974f3..000000000 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0001.book_of_all-seeing/click/_index.d -# @private - -#> Private -# @within function asset:artifact/0001.book_of_all-seeing/click/** - #declare tag 01.Target \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/check.mcfunction b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/check.mcfunction index 1607bbaae..5f94bf221 100644 --- a/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0001.book_of_all-seeing/click/check.mcfunction @@ -4,4 +4,4 @@ # # @within function asset:artifact/alias/1/click/check - execute if entity @s[tag=CanUsed] unless entity @e[type=#lib:living,type=!player,tag=01.Target,distance=..30] run tellraw @s {"text":"対象を視界に捉えていません。","color":"red"} \ No newline at end of file +execute if entity @s[tag=CanUsed] unless entity @e[type=#lib:living,type=!player,tag=01.Target,distance=..30] run tellraw @s {"text":"対象を視界に捉えていません。","color":"red"} diff --git a/Asset/data/asset/functions/artifact/0002.blessing/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/_index.d.mcfunction new file mode 100644 index 000000000..08e5c51cb --- /dev/null +++ b/Asset/data/asset/functions/artifact/0002.blessing/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0002.blessing/_index.d +# @private + +#> Private +# @within function asset:artifact/0002.blessing/** + #declare tag 01.Target diff --git a/Asset/data/asset/functions/artifact/0002.blessing/click/.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/click/.mcfunction index 7818b5250..9ce470a6d 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0002.blessing/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/2/click/ diff --git a/Asset/data/asset/functions/artifact/0002.blessing/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/click/_index.d.mcfunction deleted file mode 100644 index 3fd78e662..000000000 --- a/Asset/data/asset/functions/artifact/0002.blessing/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0002.blessing/click/_index.d -# @private - -#> Private -# @within function asset:artifact/0002.blessing/click/** - #declare tag 01.Target \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0002.blessing/click/check.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/click/check.mcfunction index 595cfb22b..514d68d13 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/click/check.mcfunction @@ -4,5 +4,5 @@ # # @within function asset:artifact/alias/2/click/check - execute if score @s 02.Trigger matches 0 run tellraw @s [{"text":"前回の能力ボーナスが未選択です","color":"red"}] - execute if score @s 02.Trigger matches 0 run function asset:artifact/0002.blessing/click/show_trigger_chat \ No newline at end of file +execute if score @s 02.Trigger matches 0 run tellraw @s [{"text":"前回の能力ボーナスが未選択です","color":"red"}] +execute if score @s 02.Trigger matches 0 run function asset:artifact/0002.blessing/click/show_trigger_chat diff --git a/Asset/data/asset/functions/artifact/0002.blessing/click/show_trigger_chat.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/click/show_trigger_chat.mcfunction index c6b1b0f36..635f1d5fe 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/click/show_trigger_chat.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/click/show_trigger_chat.mcfunction @@ -2,7 +2,9 @@ # # # -# @within function asset:artifact/0002.blessing/click/* +# @within function +# asset:artifact/0002.blessing/click/* +# asset:artifact/0002.blessing/rejoin_process # 出力 tellraw @s {"text":"能力ボーナスを一つ選んでください"} diff --git a/Asset/data/asset/functions/artifact/0002.blessing/load.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/load.mcfunction index 7a63131dc..4c3c9614c 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0002.blessing/click/** - scoreboard objectives add 02.Trigger trigger \ No newline at end of file +# @within function asset:artifact/0002.blessing/** + scoreboard objectives add 02.Trigger trigger diff --git a/Asset/data/asset/functions/artifact/0002.blessing/random_name/.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/random_name/.mcfunction new file mode 100644 index 000000000..ccbe87338 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0002.blessing/random_name/.mcfunction @@ -0,0 +1,30 @@ +#> asset:artifact/0002.blessing/random_name/ +# +# +# +# @within function asset:artifact/0002.blessing/register + +#> Length +# @private + #declare score_holder $CandidatesLength + #declare score_holder $Argument.Index + +# セッション開ける + function lib:array/session/open +# 名前候補リスト + data modify storage lib: Array set value ['深淵','奈落','天空','始原','神威','太陽','生命','満月','星雲','極光','蒼天','夜闇'] +# 候補リストの長さを取得 + execute store result score $CandidatesLength Temporary if data storage lib: Array[] +# ターゲットの名前をランダムに決める + execute store result score $Argument.Index Lib run function lib:random/ + scoreboard players operation $Argument.Index Lib %= $CandidatesLength Temporary +# 移動 + function lib:array/move +# 取得 + data modify storage asset:temp 02.Name set from storage lib: Array[-1] +# 代入 + function asset:artifact/0002.blessing/random_name/set.m with storage asset:temp 02 +# リセット + function lib:array/session/close + scoreboard players reset $CandidatesLength + data remove storage asset:temp 02 diff --git a/Asset/data/asset/functions/artifact/0002.blessing/random_name/set.m.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/random_name/set.m.mcfunction new file mode 100644 index 000000000..77c0b163e --- /dev/null +++ b/Asset/data/asset/functions/artifact/0002.blessing/random_name/set.m.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0002.blessing/random_name/set.m +# +# +# +# @input args Name : string +# @within function asset:artifact/0002.blessing/random_name/ + +$data modify storage asset:artifact Name set value '[{"text":"$(Name)の祝福"}]' diff --git a/Asset/data/asset/functions/artifact/0002.blessing/register.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/register.mcfunction index 5da60119f..2505d44c3 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/register.mcfunction @@ -4,53 +4,49 @@ # # @within function asset:artifact/alias/2/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 2 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" -# 神器の名前 (TextComponentString) - function asset:artifact/0002.blessing/give/get_random_name - data modify storage asset:artifact Name set value '[{"storage":"asset:temp","nbt":"02.Name"},{"text":"の祝福"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"この世界を浄化する者に祝福を与える"}'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - data modify storage asset:artifact RemainingCount set value 1 -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "auto" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "click" -# 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value "ALL" -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - # data modify storage asset:artifact CustomNBT set value {} - -# 神器の入手用function - function asset:artifact/common/give \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 2 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:carrot_on_a_stick" +# 神器の名前 (TextComponentString) + function asset:artifact/0002.blessing/random_name/ +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"この世界を浄化する者に祝福を与える"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + data modify storage asset:artifact RemainingCount set value 1 +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "auto" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "click" +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value "ALL" +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + # data modify storage asset:artifact CustomNBT set value {} diff --git a/Asset/data/asset/functions/artifact/0002.blessing/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/rejoin_process.mcfunction similarity index 60% rename from Asset/data/asset/functions/artifact/0002.blessing/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0002.blessing/rejoin_process.mcfunction index 30c83cc09..5f3faba55 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/rejoin_process.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/0002.blessing/click/rejoin_process +#> asset:artifact/0002.blessing/rejoin_process # # 使い方は必ずwikiを見ること # # @within tag/function asset:rejoin -execute if score @s 02.Trigger matches 0 run function asset:artifact/0002.blessing/click/show_trigger_chat \ No newline at end of file +execute if score @s 02.Trigger matches 0 run function asset:artifact/0002.blessing/click/show_trigger_chat diff --git a/Asset/data/asset/functions/artifact/0003.humanity/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0003.humanity/use_item/.mcfunction index 63512aca4..7c953b6a9 100644 --- a/Asset/data/asset/functions/artifact/0003.humanity/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0003.humanity/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0003.humanity/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/3/use_item/ @@ -30,4 +30,4 @@ # リセット execute if score @s Temporary matches 0 run function lib:heal/reset - scoreboard players reset @s Temporary \ No newline at end of file + scoreboard players reset @s Temporary diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/_index.d.mcfunction new file mode 100644 index 000000000..31371ca65 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0005.musket_matchlock/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0005.musket_matchlock/_index.d +# @private + +#> main +# @within function asset:artifact/0005.musket_matchlock/** + #declare tag 5.MatchlockIndicator + #declare tag 5.MatchlockEntity diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/.mcfunction index ac8fcbb87..96eb6501a 100644 --- a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/.mcfunction @@ -1,13 +1,14 @@ #> asset:artifact/0005.musket_matchlock/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/5/click/ -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う - function asset:artifact/common/use/auto +#> private +# @private + #declare tag 5.MatchlockInit + #declare tag 5.SpreadMarker -# ここから先は神器側の効果の処理を書く # 火薬消費 clear @s gunpowder 1 @@ -31,7 +32,7 @@ execute as @e[type=snowball,tag=5.MatchlockInit,distance=..3] at @s facing entity @e[type=marker,tag=5.SpreadMarker,limit=1] feet run function lib:motion/ # 命中したことを管理するscheduleをセット - schedule function asset:artifact/0005.musket_matchlock/click/3.1.entity_manager 1t replace + schedule function asset:artifact/0005.musket_matchlock/click/entity/ 1t replace # 反動 tp @s ~ ~ ~ ~ ~-10 diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/_index.d.mcfunction deleted file mode 100644 index 03efff121..000000000 --- a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/_index.d.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:artifact/0005.musket_matchlock/click/_index.d -# @private - -#> tag -# @within function asset:artifact/0005.musket_matchlock/click/** - #declare - -#> main -# @within function asset:artifact/0005.musket_matchlock/click/** - #declare tag 5.MatchlockIndicator - #declare tag 5.MatchlockEntity - diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/check.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/check.mcfunction index c0cff176e..843a75916 100644 --- a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/check.mcfunction @@ -4,11 +4,12 @@ # # @within function asset:artifact/alias/5/click/check -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く - function asset:artifact/common/check_condition/auto -# 他にアイテム等確認する場合はここに書く - # 火薬を持ってるかチェック - execute store result score $5.GunpowderCount Temporary run clear @s gunpowder 0 - execute if score $5.GunpowderCount Temporary matches 0 run tag @s remove CanUsed - execute if score $5.GunpowderCount Temporary matches 0 run function lib:message/artifact/dont_have_require_items - scoreboard players reset $5.GunpowderCount Temporary \ No newline at end of file +#> prv +# @private + #declare score_holder $5.GunpowderCount + + # 火薬を持ってるかチェック + execute store result score $5.GunpowderCount Temporary run clear @s gunpowder 0 + execute if score $5.GunpowderCount Temporary matches 0 run tag @s remove CanUsed + execute if score $5.GunpowderCount Temporary matches 0 run function lib:message/artifact/dont_have_require_items + scoreboard players reset $5.GunpowderCount Temporary diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.entity_manager.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/.mcfunction similarity index 54% rename from Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.entity_manager.mcfunction rename to Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/.mcfunction index d26f00d6a..458b8de6c 100644 --- a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.entity_manager.mcfunction +++ b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/.mcfunction @@ -1,16 +1,16 @@ -#> asset:artifact/0005.musket_matchlock/click/3.1.entity_manager +#> asset:artifact/0005.musket_matchlock/click/entity/ # # エンダーパールがヒットしたかどうかを確認 # # @within function # asset:artifact/0005.musket_matchlock/click/ -# asset:artifact/0005.musket_matchlock/click/3.1.entity_manager +# asset:artifact/0005.musket_matchlock/click/entity/ -#アーマースタンドがエンダーパールの上に乗っていない状態なら命中処理 - execute as @e[type=marker,tag=5.MatchlockIndicator] unless predicate lib:is_vehicle at @s run function asset:artifact/0005.musket_matchlock/click/3.1.2.damage +# アーマースタンドがエンダーパールの上に乗っていない状態なら命中処理 + execute as @e[type=marker,tag=5.MatchlockIndicator] unless predicate lib:is_vehicle at @s run function asset:artifact/0005.musket_matchlock/click/entity/damage -#アーマースタンドがエンダーパールの上に乗っている状態なら飛翔処理 - execute as @e[type=marker,tag=5.MatchlockIndicator] if predicate lib:is_vehicle at @s run function asset:artifact/0005.musket_matchlock/click/3.1.1.flying +# アーマースタンドがエンダーパールの上に乗っている状態なら飛翔処理 + execute as @e[type=marker,tag=5.MatchlockIndicator] if predicate lib:is_vehicle at @s run function asset:artifact/0005.musket_matchlock/click/entity/flying # 次tickのmanager実行予約 - execute if entity @e[type=marker,tag=5.MatchlockIndicator,predicate=lib:is_vehicle,limit=1] run schedule function asset:artifact/0005.musket_matchlock/click/3.1.entity_manager 1t replace + execute if entity @e[type=marker,tag=5.MatchlockIndicator,predicate=lib:is_vehicle,limit=1] run schedule function asset:artifact/0005.musket_matchlock/click/entity/ 1t replace diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/damage.mcfunction similarity index 96% rename from Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.2.damage.mcfunction rename to Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/damage.mcfunction index cd1255052..41d25e621 100644 --- a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.2.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/damage.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0005.musket_matchlock/click/3.1.2.damage +#> asset:artifact/0005.musket_matchlock/click/entity/damage # # 着弾地点にいるmarkerを起点として、ダメージ処理を行う # -# @within function asset:artifact/0005.musket_matchlock/click/3.1.entity_manager +# @within function asset:artifact/0005.musket_matchlock/click/entity/ #> private # @private diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.1.flying.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/flying.mcfunction similarity index 77% rename from Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.1.flying.mcfunction rename to Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/flying.mcfunction index 81005ddab..73dc0576e 100644 --- a/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/3.1.1.flying.mcfunction +++ b/Asset/data/asset/functions/artifact/0005.musket_matchlock/click/entity/flying.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0005.musket_matchlock/click/3.1.1.flying -# +#> asset:artifact/0005.musket_matchlock/click/entity/flying +# # 銃弾の速度を維持する # -# @within function asset:artifact/0005.musket_matchlock/click/3.1.entity_manager +# @within function asset:artifact/0005.musket_matchlock/click/entity/ # motionセット data modify storage lib: Argument.VectorMagnitude set value 5.0 @@ -16,4 +16,4 @@ execute if score @s 5.FlyingDuration matches 0 run kill @s # reset - data remove storage lib: Argument \ No newline at end of file + data remove storage lib: Argument diff --git a/Asset/data/asset/functions/artifact/0005.musket_matchlock/load.mcfunction b/Asset/data/asset/functions/artifact/0005.musket_matchlock/load.mcfunction index 430f1ffdd..e07c3dc76 100644 --- a/Asset/data/asset/functions/artifact/0005.musket_matchlock/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0005.musket_matchlock/load.mcfunction @@ -5,6 +5,6 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0005.musket_matchlock/click/** +# @within function asset:artifact/0005.musket_matchlock/** scoreboard objectives add 5.OwnerId dummy - scoreboard objectives add 5.FlyingDuration dummy \ No newline at end of file + scoreboard objectives add 5.FlyingDuration dummy diff --git a/Asset/data/asset/functions/artifact/0007.nitrogen_fixater/click/.mcfunction b/Asset/data/asset/functions/artifact/0007.nitrogen_fixater/click/.mcfunction index 5ddc140ed..bacca56e2 100644 --- a/Asset/data/asset/functions/artifact/0007.nitrogen_fixater/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0007.nitrogen_fixater/click/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0007.nitrogen_fixater/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/7/click/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> prv +# @private + #declare score_holder $7.IsPeace # 0: 火薬を入手 1: 骨粉を入手 # 水入り瓶をガラス瓶に置き換え clear @s minecraft:potion{Potion:"minecraft:water"} 1 @@ -25,4 +25,4 @@ execute if score $7.IsPeace Temporary matches 1 run give @s bone_meal 1 # reset - scoreboard players reset $7.IsPeace Temporary \ No newline at end of file + scoreboard players reset $7.IsPeace Temporary diff --git a/Asset/data/asset/functions/artifact/0007.nitrogen_fixater/click/check.mcfunction b/Asset/data/asset/functions/artifact/0007.nitrogen_fixater/click/check.mcfunction index 322f231e1..59972452d 100644 --- a/Asset/data/asset/functions/artifact/0007.nitrogen_fixater/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0007.nitrogen_fixater/click/check.mcfunction @@ -4,13 +4,12 @@ # # @within function asset:artifact/alias/7/click/check -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く - function asset:artifact/common/check_condition/auto - -# 他にアイテム等確認する場合はここに書く - # 水入り瓶を盛っているかチェック - execute store result score $7.Potioncount Temporary run clear @s minecraft:potion{Potion:"minecraft:water"} 0 - execute if score $7.Potioncount Temporary matches 0 run tag @s remove CanUsed - execute if score $7.Potioncount Temporary matches 0 run function lib:message/artifact/dont_have_require_items - scoreboard players reset $7.Potioncount Temporary - \ No newline at end of file +#> prv +# @private + #declare score_holder $7.Potioncount + +# 水入り瓶を持っているかチェック + execute store result score $7.Potioncount Temporary run clear @s minecraft:potion{Potion:"minecraft:water"} 0 + execute if score $7.Potioncount Temporary matches 0 run tag @s remove CanUsed + execute if score $7.Potioncount Temporary matches 0 run function lib:message/artifact/dont_have_require_items + scoreboard players reset $7.Potioncount Temporary diff --git a/Asset/data/asset/functions/artifact/0008.mysterious_tambourine/click/.mcfunction b/Asset/data/asset/functions/artifact/0008.mysterious_tambourine/click/.mcfunction index 3d4ff7899..274f9f4b2 100644 --- a/Asset/data/asset/functions/artifact/0008.mysterious_tambourine/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0008.mysterious_tambourine/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0008.mysterious_tambourine/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/8/click/ @@ -16,4 +16,4 @@ playsound ogg:random.levelup player @a ~ ~ ~ 0.5 1.2 playsound ogg:random.levelup player @a ~ ~ ~ 0.7 1.5 playsound ogg:random.levelup player @a ~ ~ ~ 0.7 2 - particle minecraft:crit ~ ~1 ~ 0.25 0.1 0.25 0.7 20 \ No newline at end of file + particle minecraft:crit ~ ~1 ~ 0.25 0.1 0.25 0.7 20 diff --git a/Asset/data/asset/functions/artifact/0010.attack_order/click/.mcfunction b/Asset/data/asset/functions/artifact/0010.attack_order/click/.mcfunction index 7b101d043..a6bcba174 100644 --- a/Asset/data/asset/functions/artifact/0010.attack_order/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0010.attack_order/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0010.attack_order/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/10/click/ @@ -14,4 +14,4 @@ summon minecraft:snow_golem ~ ~ ~ {Health:100f, Attributes:[{Name:"generic.max_health", Base:100d}],Tags:["Friend"]} summon minecraft:snow_golem ~ ~ ~ {Health:100f, Attributes:[{Name:"generic.max_health", Base:100d}],Tags:["Friend"]} summon minecraft:iron_golem ~ ~ ~ {Tags:["Friend"],Passengers:[{id:"minecraft:snow_golem", Pumpkin:0b, Health:100f, Attributes:[{Name:"generic.max_health", Base:100d}],Tags:["Friend"]}]} - summon minecraft:iron_golem ~ ~ ~ {Tags:["Friend"],Passengers:[{id:"minecraft:snow_golem", Pumpkin:0b, Health:100f, Attributes:[{Name:"generic.max_health", Base:100d}],Tags:["Friend"]}]} \ No newline at end of file + summon minecraft:iron_golem ~ ~ ~ {Tags:["Friend"],Passengers:[{id:"minecraft:snow_golem", Pumpkin:0b, Health:100f, Attributes:[{Name:"generic.max_health", Base:100d}],Tags:["Friend"]}]} diff --git a/Asset/data/asset/functions/artifact/0012.sketchy_herb/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0012.sketchy_herb/use_item/.mcfunction index 86c8bdd7a..a0655d05c 100644 --- a/Asset/data/asset/functions/artifact/0012.sketchy_herb/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0012.sketchy_herb/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0012.sketchy_herb/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/12/use_item/ @@ -14,4 +14,4 @@ # 演出 particle minecraft:smoke ~ ~ ~ 1 1 1 0.1 500 force @s playsound minecraft:block.honey_block.fall player @s ~ ~ ~ 1 0.1 - tellraw @a[distance=..20] [{"text":"気分が不安定になってゆく……","color":"dark_green","italic":true}] \ No newline at end of file + tellraw @a[distance=..20] [{"text":"気分が不安定になってゆく……","color":"dark_green","italic":true}] diff --git a/Asset/data/asset/functions/artifact/0016.golem_core/click/.mcfunction b/Asset/data/asset/functions/artifact/0016.golem_core/click/.mcfunction index 61083602f..15304bb5c 100644 --- a/Asset/data/asset/functions/artifact/0016.golem_core/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0016.golem_core/click/.mcfunction @@ -1,13 +1,13 @@ #> asset:artifact/0016.golem_core/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/16/click/ - # ゴーレム召喚 - summon minecraft:iron_golem ~ ~1 ~ {Health:75f,Attributes:[{Name:"generic.max_health",Base:75d},{Name:"generic.attack_damage",Base:15d}]} - clear @s iron_block 1 +# ゴーレム召喚 + summon minecraft:iron_golem ~ ~1 ~ {Health:75f,Attributes:[{Name:"generic.max_health",Base:75d},{Name:"generic.attack_damage",Base:15d}]} + clear @s iron_block 1 - # 演出 - particle minecraft:enchanted_hit ~ ~ ~ 0.5 1 0.5 0.5 100 force @s - playsound minecraft:block.anvil.destroy player @s ~ ~ ~ 1 0.9 \ No newline at end of file +# 演出 + particle minecraft:enchanted_hit ~ ~ ~ 0.5 1 0.5 0.5 100 force @s + playsound minecraft:block.anvil.destroy player @s ~ ~ ~ 1 0.9 diff --git a/Asset/data/asset/functions/artifact/0016.golem_core/click/check.mcfunction b/Asset/data/asset/functions/artifact/0016.golem_core/click/check.mcfunction index 9a5d6e0ac..2f8517da3 100644 --- a/Asset/data/asset/functions/artifact/0016.golem_core/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0016.golem_core/click/check.mcfunction @@ -4,10 +4,11 @@ # # @within function asset:artifact/alias/16/click/check -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/auto -# 他にアイテム等確認する場合はここに書く - # 鉄ブロックを持ってるかチェック - execute store result score $IronBlockCount Temporary run clear @s iron_block 0 - execute if score $IronBlockCount Temporary matches 0 run tag @s remove CanUsed - execute if score $IronBlockCount Temporary matches 0 run function lib:message/artifact/dont_have_require_items \ No newline at end of file +#> Private +# @private + #declare score_holder $IronBlockCount + +# 鉄ブロックを持ってるかチェック + execute store result score $IronBlockCount Temporary run clear @s iron_block 0 + execute if score $IronBlockCount Temporary matches 0 run tag @s remove CanUsed + execute if score $IronBlockCount Temporary matches 0 run function lib:message/artifact/dont_have_require_items diff --git a/Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/.mcfunction index 592678437..668ee7c6a 100644 --- a/Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/.mcfunction @@ -1,9 +1,9 @@ #> asset:artifact/0017.harmful_books/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/17/attack_melee/ -execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run function asset:artifact/0017.harmful_books/attack_melee/3.1.add_effect +execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run function asset:artifact/0017.harmful_books/attack_melee/add_effect -playsound minecraft:entity.witch.ambient player @a[distance=..10] ~ ~ ~ 1 1.2 \ No newline at end of file +playsound minecraft:entity.witch.ambient player @a[distance=..10] ~ ~ ~ 1 1.2 diff --git a/Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/3.1.add_effect.mcfunction b/Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/add_effect.mcfunction similarity index 100% rename from Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/3.1.add_effect.mcfunction rename to Asset/data/asset/functions/artifact/0017.harmful_books/attack_melee/add_effect.mcfunction diff --git a/Asset/data/asset/functions/artifact/0019.scripture/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0019.scripture/attack_melee/.mcfunction index 219ac7757..c39d70369 100644 --- a/Asset/data/asset/functions/artifact/0019.scripture/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0019.scripture/attack_melee/.mcfunction @@ -1,9 +1,10 @@ #> asset:artifact/0019.scripture/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/19/attack_melee/ +# 攻撃した対象に回復とパーティクル execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run effect give @s minecraft:instant_health 1 1 true execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle end_rod ~ ~ ~ 1 1 1 0.1 100 force @a[distance=..10] diff --git a/Asset/data/asset/functions/artifact/0022.amen_ra_rod/click/.mcfunction b/Asset/data/asset/functions/artifact/0022.amen_ra_rod/click/.mcfunction index fd925f2c3..76844adc5 100644 --- a/Asset/data/asset/functions/artifact/0022.amen_ra_rod/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0022.amen_ra_rod/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0022.amen_ra_rod/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/22/click/ @@ -11,4 +11,4 @@ execute at @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..30] run particle end_rod ~ ~ ~ 1 1 1 0.1 100 force @a[distance=..30] # SE - playsound minecraft:entity.arrow.hit_player player @s ~ ~ ~ 20 1 \ No newline at end of file + playsound minecraft:entity.arrow.hit_player player @s ~ ~ ~ 20 1 diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/click/.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/click/.mcfunction index c532b2c51..525d3ed58 100644 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0033.magic_shield/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0033.magic_shield/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/33/click/ @@ -8,8 +8,6 @@ playsound block.anvil.use player @a ~ ~ ~ 0.5 0.5 0 particle enchanted_hit ~ ~1 ~ 0.2 0.2 0.2 1 30 -# プレイヤーにタグを付与 - tag @s add X.MagicShield - -# 再帰先へ飛ばす - function asset:artifact/0033.magic_shield/click/3.1.loop \ No newline at end of file +# プレイヤーにバフを付与 + data modify storage api: Argument.ID set value 201 + function api:entity/mob/effect/give diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/click/1.1.damage_trigger.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/click/1.1.damage_trigger.mcfunction deleted file mode 100644 index 7825051e7..000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/click/1.1.damage_trigger.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0033.magic_shield/click/1.1.damage_trigger -# -# 殴られたときに発動 -# -# @within tag/function asset:artifact/** - -# 殴られたら発動 - execute if entity @s[tag=X.MagicShield] run function asset:artifact/0033.magic_shield/click/3.2.damage \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/click/3.1.loop.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/click/3.1.loop.mcfunction deleted file mode 100644 index 67402cb3b..000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/click/3.1.loop.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:artifact/0033.magic_shield/click/3.1.loop -# -# ループ -# -# @within function -# asset:artifact/0033.magic_shield/click/ -# asset:artifact/0033.magic_shield/click/rejoin_process -# asset:artifact/0033.magic_shield/click/3.1.loop - -# 効果を与える - 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 \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/click/3.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/click/3.2.damage.mcfunction deleted file mode 100644 index 80f5d4193..000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/click/3.2.damage.mcfunction +++ /dev/null @@ -1,12 +0,0 @@ -#> asset:artifact/0033.magic_shield/click/3.2.damage -# -# -# -# @within function asset:artifact/0033.magic_shield/click/1.1.damage_trigger - -# 演出 - particle block iron_block ~ ~1 ~ 0.5 0.5 0.5 0.2 60 - playsound block.glass.break player @a ~ ~ ~ 1 0.6 0 - -# タグ消し - tag @s remove X.MagicShield \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/click/_index.d.mcfunction deleted file mode 100644 index 14f079eab..000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0033.magic_shield/click/_index.d -# @private - -#> tag -# @within function asset:artifact/0033.magic_shield/click/** - #declare tag X.MagicShield \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/click/check.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/click/check.mcfunction deleted file mode 100644 index 9c3d11f7e..000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/click/check.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:artifact/0033.magic_shield/click/check -# -# 神器の使用条件の確認処理 -# -# @within function asset:artifact/alias/33/click/check - -# 既に発動中の場合発動しない - execute if entity @s[tag=X.MagicShield] run tellraw @s {"text":"既に効果が発動しています","color":"gold"} - execute if entity @s[tag=X.MagicShield] run tag @s remove CanUsed \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0033.magic_shield/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0033.magic_shield/click/rejoin_process.mcfunction deleted file mode 100644 index e87f1698a..000000000 --- a/Asset/data/asset/functions/artifact/0033.magic_shield/click/rejoin_process.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0033.magic_shield/click/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin - -# 発動中のプレイヤーがいる場合再帰先へ飛ばす - execute if entity @a[tag=X.MagicShield] run function asset:artifact/0033.magic_shield/click/3.1.loop \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/_index.d.mcfunction new file mode 100644 index 000000000..ae0c8ff1a --- /dev/null +++ b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0035.malleus_maleficarum/_index.d +# @private + +#> tag +# @within function asset:artifact/0035.malleus_maleficarum/** + #declare tag MalleusMaleficarumIndicator diff --git a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/.mcfunction b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/.mcfunction index aa566ad5f..131d1d262 100644 --- a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/.mcfunction @@ -1,10 +1,13 @@ #> asset:artifact/0035.malleus_maleficarum/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/35/click/ - function asset:artifact/common/use/auto +#> private +# @private + #declare tag MalleusMaleficarumInit + #declare tag MalleusMaleficarumEntity # エンダーパールwithアーマースタンド召喚 execute anchored eyes run summon ender_pearl ^ ^ ^1 {Tags:[MalleusMaleficarumInit,MalleusMaleficarumEntity],Passengers:[{id:"minecraft:armor_stand",Tags:[MalleusMaleficarumIndicator,MalleusMaleficarumInit],NoGravity:1b,Invisible:1b}]} @@ -25,4 +28,4 @@ schedule function asset:artifact/0035.malleus_maleficarum/click/3.1.entity_manager 1t replace # 初期設定用タグ削除 - execute positioned as @s run tag @e[tag=MalleusMaleficarumInit,distance=..3] remove MalleusMaleficarumInit \ No newline at end of file + execute positioned as @s run tag @e[tag=MalleusMaleficarumInit,distance=..3] remove MalleusMaleficarumInit diff --git a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.1.flying.mcfunction b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.1.flying.mcfunction index 9a13f30f3..dfbd4a0c6 100644 --- a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.1.flying.mcfunction +++ b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.1.flying.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0035.malleus_maleficarum/click/3.1.1.flying -# +#> asset:artifact/0035.malleus_maleficarum/click/3.1.1.flying +# # エンダーパール着弾地点にいるアーマースタンドを起点として、魔女化処理を行う # # @within function asset:artifact/0035.malleus_maleficarum/click/3.1.entity_manager # 軌跡表示用パーティクル -particle soul_fire_flame ~ ~ ~ 0 0 0 0 2 force \ No newline at end of file +particle soul_fire_flame ~ ~ ~ 0 0 0 0 2 force diff --git a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.2.witchification.mcfunction b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.2.witchification.mcfunction index ceaf03edb..c388df872 100644 --- a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.2.witchification.mcfunction +++ b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.2.witchification.mcfunction @@ -8,19 +8,19 @@ # @private #declare tag MalleusMaleficarumSacrifice -#対象にタグ付け +# 対象にタグ付け execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=!Uninterferable,tag=!Enemy.Boss,tag=!MalleusMaleficarumIndicator,dx=1,dy=1,dz=1,sort=nearest,limit=1] run tag @s add MalleusMaleficarumSacrifice -#効果音 +# 効果音 execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=MalleusMaleficarumSacrifice,dx=1,dy=1,dz=1,sort=nearest,limit=1] at @s run playsound entity.zombie_villager.converted player @a ~ ~ ~ 1 1 -#particle +# particle execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=MalleusMaleficarumSacrifice,dx=1,dy=1,dz=1,sort=nearest,limit=1] at @s run particle landing_obsidian_tear ~ ~0.1 ~ 0.5 0 0.5 0 200 force -#魔女化 +# 魔女化 execute positioned ~-0.5 ~-0.5 ~-0.5 at @e[type=#lib:living,type=!player,tag=MalleusMaleficarumSacrifice,dx=1,dy=1,dz=1,sort=nearest,limit=1] run summon witch ~ ~ ~ {Fire:1200s} execute positioned ~-0.5 ~-0.5 ~-0.5 as @e[type=#lib:living,type=!player,tag=MalleusMaleficarumSacrifice,dx=1,dy=1,dz=1,sort=nearest,limit=1] at @s run tp @s ~ -100 ~ execute positioned ~-0.5 -100 ~-0.5 as @e[type=#lib:living,type=!player,tag=MalleusMaleficarumSacrifice,dx=1,dy=1,dz=1,sort=nearest,limit=1] run kill @s -#indicator削除 - kill @s \ No newline at end of file +# indicator削除 + kill @s diff --git a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.entity_manager.mcfunction b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.entity_manager.mcfunction index 25da3386a..3fbdb1fe0 100644 --- a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.entity_manager.mcfunction +++ b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/3.1.entity_manager.mcfunction @@ -5,14 +5,13 @@ # @within function # asset:artifact/0035.malleus_maleficarum/click/ # asset:artifact/0035.malleus_maleficarum/click/3.1.entity_manager -# asset:artifact/0035.malleus_maleficarum/click/rejoin_process +# asset:artifact/0035.malleus_maleficarum/rejoin_process - -#アーマースタンドがエンダーパールの上に乗っていない状態なら命中処理 +# アーマースタンドがエンダーパールの上に乗っていない状態なら命中処理 execute as @e[type=armor_stand,tag=MalleusMaleficarumIndicator] unless predicate asset:artifact/0035.malleus_maleficarum/is_ride_on_enderpearl at @s run function asset:artifact/0035.malleus_maleficarum/click/3.1.2.witchification -#アーマースタンドがエンダーパールの上に乗っている状態なら飛翔処理 +# アーマースタンドがエンダーパールの上に乗っている状態なら飛翔処理 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 \ No newline at end of file + 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 diff --git a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/_index.d.mcfunction deleted file mode 100644 index 0f28fa40f..000000000 --- a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0035.malleus_maleficarum/click/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0035.malleus_maleficarum/click/** - #declare tag MalleusMaleficarumIndicator \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/rejoin_process.mcfunction similarity index 75% rename from Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0035.malleus_maleficarum/rejoin_process.mcfunction index 2f984e7ca..084cb2381 100644 --- a/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0035.malleus_maleficarum/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0035.malleus_maleficarum/click/rejoin_process +#> asset:artifact/0035.malleus_maleficarum/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/use_item/.mcfunction index 847a87012..c96e985ec 100644 --- a/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0043.fruit_of_wisdom/use_item/.mcfunction @@ -1,19 +1,20 @@ #> asset:artifact/0043.fruit_of_wisdom/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/43/use_item/ - scoreboard players set $Fluctuation Lib 10000 - function lib:mp/fluctuation +# MP回復 + scoreboard players set $Fluctuation Lib 10000 + function lib:mp/fluctuation - # データ取得 - function api:data_get/health +# データ取得 + function api:data_get/health - # 体力減 - data modify storage lib: Argument set value {AttackType:Physical,FixedDamage:1b} - execute store result storage lib: Argument.Damage float 0.01 run data get storage api: Health 75 - function lib:damage/ - function lib:damage/reset - playsound entity.player.hurt player @a ~ ~ ~ 1 1 - particle enchant ~ ~1 ~ 0.5 0.5 0.5 0 300 force @a \ No newline at end of file +# 体力減 + data modify storage lib: Argument set value {AttackType:Physical,FixedDamage:1b} + execute store result storage lib: Argument.Damage float 0.01 run data get storage api: Health 75 + function lib:damage/ + function lib:damage/reset + playsound entity.player.hurt player @a ~ ~ ~ 1 1 + particle enchant ~ ~1 ~ 0.5 0.5 0.5 0 300 force @a diff --git a/Asset/data/asset/functions/artifact/0046.ritual_wand/click/.mcfunction b/Asset/data/asset/functions/artifact/0046.ritual_wand/click/.mcfunction index f65a6c20f..706f25f15 100644 --- a/Asset/data/asset/functions/artifact/0046.ritual_wand/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0046.ritual_wand/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0046.ritual_wand/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/46/click/ diff --git a/Asset/data/asset/functions/artifact/0057.elemental_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0057.elemental_sword/attack_melee/.mcfunction index 9f2ea443e..309d19d2c 100644 --- a/Asset/data/asset/functions/artifact/0057.elemental_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0057.elemental_sword/attack_melee/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0057.elemental_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/57/attack_melee/ - function asset:artifact/common/use/mainhand - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $ElementalSwordAttack # 攻撃の度に属性を変えるヤツ # 使用回数を取る diff --git a/Asset/data/asset/functions/artifact/0064.kenpo_scroll/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0064.kenpo_scroll/attack_melee/.mcfunction index 4838b9a34..6fc764d72 100644 --- a/Asset/data/asset/functions/artifact/0064.kenpo_scroll/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0064.kenpo_scroll/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0064.kenpo_scroll/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/64/attack_melee/ @@ -22,4 +22,4 @@ # ダメージを与える execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0064.kenpo_scroll/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0064.kenpo_scroll/attack_melee/check.mcfunction index 468ec3915..94d100aaf 100644 --- a/Asset/data/asset/functions/artifact/0064.kenpo_scroll/attack_melee/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0064.kenpo_scroll/attack_melee/check.mcfunction @@ -4,5 +4,6 @@ # # @within function asset:artifact/alias/64/attack_melee/check -# メインハンドにアイテムを所持していない場合のみ実行 - execute if data storage asset:context Items.mainhand.id run tag @s remove CanUsed \ No newline at end of file +# メインハンドにアイテムを所持していない場合のみ実行 + function api:data_get/selected_item + execute if data storage api: SelectedItem run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0071.ariadne_thread/click/.mcfunction b/Asset/data/asset/functions/artifact/0071.ariadne_thread/click/.mcfunction index 15043e741..0b9892969 100644 --- a/Asset/data/asset/functions/artifact/0071.ariadne_thread/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0071.ariadne_thread/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0071.ariadne_thread/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/71/click/ @@ -13,4 +13,4 @@ # 演出 particle portal 23 3 24 0 0 0 2 250 force @a particle effect 23 3 24 0 10 0 0.1 250 force @a - playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 \ No newline at end of file + playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 diff --git a/Asset/data/asset/functions/artifact/0073.suzuran_charm/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0073.suzuran_charm/attack_melee/.mcfunction index 39f007b45..ecc4eb7d5 100644 --- a/Asset/data/asset/functions/artifact/0073.suzuran_charm/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0073.suzuran_charm/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0073.suzuran_charm/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/73/attack_melee/ @@ -21,4 +21,4 @@ playsound minecraft:entity.splash_potion.break player @a[distance=..30] ~ ~ ~ 1 0.5 # スズラン減少 - clear @s lily_of_the_valley 1 \ No newline at end of file + clear @s lily_of_the_valley 1 diff --git a/Asset/data/asset/functions/artifact/0073.suzuran_charm/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0073.suzuran_charm/attack_melee/check.mcfunction index 7e13242a2..78984af7f 100644 --- a/Asset/data/asset/functions/artifact/0073.suzuran_charm/attack_melee/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0073.suzuran_charm/attack_melee/check.mcfunction @@ -4,10 +4,12 @@ # # @within function asset:artifact/alias/73/attack_melee/check -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/mainhand -# 他にアイテム等確認する場合はここに書く - # スズランを持ってるかチェック - execute store result score $SuzuranCount Temporary run clear @s lily_of_the_valley 0 - execute if score $SuzuranCount Temporary matches 0 run tag @s remove CanUsed - execute if score $SuzuranCount Temporary matches 0 run function lib:message/artifact/dont_have_require_items \ No newline at end of file +#> Private +# @private + #declare score_holder $SuzuranCount + +# 他にアイテム等確認する場合はここに書く + # スズランを持ってるかチェック + execute store result score $SuzuranCount Temporary run clear @s lily_of_the_valley 0 + execute if score $SuzuranCount Temporary matches 0 run tag @s remove CanUsed + execute if score $SuzuranCount Temporary matches 0 run function lib:message/artifact/dont_have_require_items diff --git a/Asset/data/asset/functions/artifact/0075.whirlpool_wand/click/.mcfunction b/Asset/data/asset/functions/artifact/0075.whirlpool_wand/click/.mcfunction index 23f0fb245..9c6aba704 100644 --- a/Asset/data/asset/functions/artifact/0075.whirlpool_wand/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0075.whirlpool_wand/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0075.whirlpool_wand/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/75/click/ diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/_index.d.mcfunction similarity index 58% rename from Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/_index.d.mcfunction rename to Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/_index.d.mcfunction index f43dfbb3d..a586f6f91 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/_index.d.mcfunction @@ -1,9 +1,9 @@ -#> asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/_index.d +#> asset:artifact/0077.swords_of_waterfall_climbing/_index.d # @private #> tag # @within function -# asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/** +# asset:artifact/0077.swords_of_waterfall_climbing/** #declare tag 25.EffectClear #declare tag 25.Hit #declare tag 25.Landing diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/.mcfunction index d5a883fea..5cb269bc6 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/77/attack_melee/ diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.1.effectclear.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.1.effectclear.mcfunction index f056b1af4..c3bccb6e1 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.1.effectclear.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.1.effectclear.mcfunction @@ -5,9 +5,7 @@ # @within function # asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/ # asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/3.1.effectclear -# asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/rejoin_process - -# ここから先は神器側の効果の処理を書く +# asset:artifact/0077.swords_of_waterfall_climbing/rejoin_process # OnGround取得 execute as @a[tag=25.EffectClear] run function api:data_get/on_ground @@ -27,4 +25,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 \ No newline at end of file + 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 diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.2.attack.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.2.attack.mcfunction index 77af45078..d4660f410 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.2.attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.2.attack.mcfunction @@ -5,8 +5,6 @@ # @within function # asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/ -# ここから先は神器側の効果の処理を書く - # タグ付与 tag @s add 25.Hit @@ -27,4 +25,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 \ No newline at end of file + playsound minecraft:block.bubble_column.upwards_inside player @a ~ ~ ~ 1 2 0 diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.3.landing_attack.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.3.landing_attack.mcfunction index 3d29f0e9f..784b14e76 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.3.landing_attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/3.3.landing_attack.mcfunction @@ -5,8 +5,6 @@ # @within function # asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/3.1.effectclear -# ここから先は神器側の効果の処理を書く - # タグを消しちゃう tag @s remove 25.Landing @@ -29,4 +27,4 @@ particle minecraft:explosion ~ ~ ~ 0.2 0.2 0.2 1 10 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:entity.generic.explode player @a ~ ~ ~ 1 0 \ No newline at end of file + playsound minecraft:entity.generic.explode player @a ~ ~ ~ 1 0 diff --git a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/rejoin_process.mcfunction similarity index 65% rename from Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/rejoin_process.mcfunction index 9e7e181e1..a4eee35af 100644 --- a/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/attack_melee/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0077.swords_of_waterfall_climbing/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0077.swords_of_waterfall_climbing/attack_melee/rejoin_process +#> asset:artifact/0077.swords_of_waterfall_climbing/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0078.self_destruct_order/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0078.self_destruct_order/_index.d.mcfunction new file mode 100644 index 000000000..6d1e954e2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0078.self_destruct_order/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0078.self_destruct_order/_index.d +# @private + +#> tag +# @within function asset:artifact/0078.self_destruct_order/** + #declare tag 26.GolemBomb + #declare tag 26.Owner \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/.mcfunction b/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/.mcfunction index a667a2f73..176bb60e7 100644 --- a/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0078.self_destruct_order/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/78/click/ @@ -8,7 +8,7 @@ tag @e[type=minecraft:iron_golem,tag=Friend,tag=!Uninterferable,distance=..15] add 26.GolemBomb tag @e[type=minecraft:snow_golem,tag=Friend,tag=!Uninterferable,distance=..15] add 26.GolemBomb -#演出 +# 演出 tellraw @a[distance=..20] [{"text":"爆発まで残り3秒","color":"red","bold":true}] execute at @e[tag=26.GolemBomb] run particle minecraft:squid_ink ~ ~ ~ 0 2 0 0.1 100 force @a[distance=..30] execute at @e[tag=26.GolemBomb] run playsound minecraft:entity.creeper.primed player @a[distance=..30] ~ ~ ~ 1 0.1 @@ -19,4 +19,4 @@ # カウントダウン開始 scoreboard players set @s 26.TickCount 0 - schedule function asset:artifact/0078.self_destruct_order/click/count_down 1t replace \ No newline at end of file + schedule function asset:artifact/0078.self_destruct_order/click/count_down 1t replace diff --git a/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/_index.d.mcfunction deleted file mode 100644 index c335b1d3e..000000000 --- a/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0078.self_destruct_order/click/_index.d -# @private - -#> tag -# @within function asset:artifact/0078.self_destruct_order/click/** - #declare tag 26.GolemBomb - #declare tag 26.Owner \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/count_down.mcfunction b/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/count_down.mcfunction index 181d2bbe6..dc09db5a3 100644 --- a/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/count_down.mcfunction +++ b/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/count_down.mcfunction @@ -5,7 +5,7 @@ # @within function # asset:artifact/0078.self_destruct_order/click/ # asset:artifact/0078.self_destruct_order/click/count_down -# asset:artifact/0078.self_destruct_order/click/rejoin_process +# asset:artifact/0078.self_destruct_order/rejoin_process scoreboard players add @a[tag=26.Owner] 26.TickCount 1 @@ -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 \ No newline at end of file + execute if entity @a[tag=26.Owner, limit=1] run schedule function asset:artifact/0078.self_destruct_order/click/count_down 1t diff --git a/Asset/data/asset/functions/artifact/0078.self_destruct_order/load.mcfunction b/Asset/data/asset/functions/artifact/0078.self_destruct_order/load.mcfunction index f025eb7a1..4df13e1e1 100644 --- a/Asset/data/asset/functions/artifact/0078.self_destruct_order/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0078.self_destruct_order/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0078.self_destruct_order/click/** - scoreboard objectives add 26.TickCount dummy \ No newline at end of file +# @within function asset:artifact/0078.self_destruct_order/** + scoreboard objectives add 26.TickCount dummy diff --git a/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0078.self_destruct_order/rejoin_process.mcfunction similarity index 62% rename from Asset/data/asset/functions/artifact/0078.self_destruct_order/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0078.self_destruct_order/rejoin_process.mcfunction index 55c2a9f9b..a703234a8 100644 --- a/Asset/data/asset/functions/artifact/0078.self_destruct_order/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0078.self_destruct_order/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0078.self_destruct_order/click/rejoin_process +#> asset:artifact/0078.self_destruct_order/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/click/.mcfunction b/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/click/.mcfunction index 112d513c1..f1b0bc846 100644 --- a/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0079.shoot_down_a_flying_dragon/click/.mcfunction @@ -1,16 +1,16 @@ #> asset:artifact/0079.shoot_down_a_flying_dragon/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/79/click/ +#> private +# @private + #declare tag Hit + #declare score_holder $Weather + #declare score_holder $AroundWater #declare score_holder $AttackStrength -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く - # 準備 # 天候を取得 execute if predicate lib:weather/is_sunny run scoreboard players set $Weather Temporary 0 diff --git a/Asset/data/asset/functions/artifact/0087.sheep_blessing/click/.mcfunction b/Asset/data/asset/functions/artifact/0087.sheep_blessing/click/.mcfunction index 6cfdb30a7..60b3b45fd 100644 --- a/Asset/data/asset/functions/artifact/0087.sheep_blessing/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0087.sheep_blessing/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0087.sheep_blessing/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/87/click/ diff --git a/Asset/data/asset/functions/artifact/0088.fertility_hoe/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0088.fertility_hoe/_index.d.mcfunction new file mode 100644 index 000000000..998f6b887 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0088.fertility_hoe/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0088.fertility_hoe/_index.d +# @private + +#> score_holder +# @within function asset:artifact/0088.fertility_hoe/** + #declare score_holder $LayerCrops + #declare score_holder $AroundCrops \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/.mcfunction b/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/.mcfunction index b718cc093..6ec02dfec 100644 --- a/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/.mcfunction @@ -1,19 +1,20 @@ #> asset:artifact/0088.fertility_hoe/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/88/click/ - function asset:artifact/common/use/auto +#> private +# @private + #declare score_holder $PlayerHeight -# ここから先は神器側の効果の処理を書く - # 演出 - particle item bone_block ~ ~ ~ 3 3 3 0 50 normal @a - particle composter ~ ~ ~ 3 3 3 0 100 normal @a - playsound block.pumpkin.carve player @a ~ ~ ~ 1 1 +# 演出 + particle item bone_block ~ ~ ~ 3 3 3 0 50 normal @a + particle composter ~ ~ ~ 3 3 3 0 100 normal @a + playsound block.pumpkin.carve player @a ~ ~ ~ 1 1 - # 処理 - clear @s bone_meal 8 +# 処理 + clear @s bone_meal 8 execute positioned ~ ~-4 ~ run function asset:artifact/0088.fertility_hoe/click/3.1.layer_fill execute positioned ~ ~-3 ~ run function asset:artifact/0088.fertility_hoe/click/3.1.layer_fill @@ -23,4 +24,4 @@ execute positioned ~ ~ ~ run function asset:artifact/0088.fertility_hoe/click/3. execute positioned ~ ~1 ~ run function asset:artifact/0088.fertility_hoe/click/3.1.layer_fill execute positioned ~ ~2 ~ run function asset:artifact/0088.fertility_hoe/click/3.1.layer_fill execute positioned ~ ~3 ~ run function asset:artifact/0088.fertility_hoe/click/3.1.layer_fill -execute positioned ~ ~4 ~ run function asset:artifact/0088.fertility_hoe/click/3.1.layer_fill \ No newline at end of file +execute positioned ~ ~4 ~ run function asset:artifact/0088.fertility_hoe/click/3.1.layer_fill diff --git a/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/2.1.layer_check.mcfunction b/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/2.1.layer_check.mcfunction index cb0edd8a8..184643901 100644 --- a/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/2.1.layer_check.mcfunction +++ b/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/2.1.layer_check.mcfunction @@ -4,7 +4,7 @@ # # @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 - scoreboard players operation $AroundCrops Temporary += $LayerCrops Temporary - scoreboard players reset $LayerCrops Temporary \ No newline at end of file +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 +scoreboard players operation $AroundCrops Temporary += $LayerCrops Temporary +scoreboard players reset $LayerCrops Temporary diff --git a/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/_index.d.mcfunction deleted file mode 100644 index dc1313f5a..000000000 --- a/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0088.fertility_hoe/click/_index.d -# @private - -#> score_holder -# @within function asset:artifact/0088.fertility_hoe/click/** - #declare score_holder $LayerCrops - #declare score_holder $AroundCrops \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/check.mcfunction b/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/check.mcfunction index 10043aa99..f0714c199 100644 --- a/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0088.fertility_hoe/click/check.mcfunction @@ -4,34 +4,35 @@ # # @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/ - \ No newline at end of file +#> private +# @private + #declare score_holder $BoneMeal + +# ゲームモード確認 + 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 + +# リセット + scoreboard players reset $BoneMeal Temporary + scoreboard players reset $AroundCrops Temporary diff --git a/Asset/data/asset/functions/artifact/0090.leather_armor_set/click/.mcfunction b/Asset/data/asset/functions/artifact/0090.leather_armor_set/click/.mcfunction index bc005c9fa..17d70b429 100644 --- a/Asset/data/asset/functions/artifact/0090.leather_armor_set/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0090.leather_armor_set/click/.mcfunction @@ -1,12 +1,9 @@ #> asset:artifact/0090.leather_armor_set/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/90/click/ - - - # 装備変更成功の時 execute as @s[nbt=!{Inventory:[{Slot:100b},{Slot:101b},{Slot:102b},{Slot:103b}]}] at @s run particle minecraft:happy_villager ~ ~1 ~ 0.4 0.4 0.4 0.1 50 execute as @s[nbt=!{Inventory:[{Slot:100b},{Slot:101b},{Slot:102b},{Slot:103b}]}] at @s run playsound minecraft:block.anvil.land player @a ~ ~ ~ 1 2 @@ -25,4 +22,4 @@ item replace entity @s[nbt=!{Inventory:[{Slot:103b}]}] armor.head with minecraft:leather_helmet{display:{Name:'{"text":"簡易革防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 item replace entity @s[nbt=!{Inventory:[{Slot:102b}]}] armor.chest with minecraft:leather_chestplate{display:{Name:'{"text":"簡易革防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 item replace entity @s[nbt=!{Inventory:[{Slot:101b}]}] armor.legs with minecraft:leather_leggings{display:{Name:'{"text":"簡易革防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 - item replace entity @s[nbt=!{Inventory:[{Slot:100b}]}] armor.feet with minecraft:leather_boots{display:{Name:'{"text":"簡易革防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 \ No newline at end of file + item replace entity @s[nbt=!{Inventory:[{Slot:100b}]}] armor.feet with minecraft:leather_boots{display:{Name:'{"text":"簡易革防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 diff --git a/Asset/data/asset/functions/artifact/0091.iron_armor_set/click/.mcfunction b/Asset/data/asset/functions/artifact/0091.iron_armor_set/click/.mcfunction index c41a1ec08..1c1558085 100644 --- a/Asset/data/asset/functions/artifact/0091.iron_armor_set/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0091.iron_armor_set/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0091.iron_armor_set/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/91/click/ @@ -22,4 +22,4 @@ execute unless data storage asset:context {Inventory:[{Slot:103b}]} run item replace entity @s armor.head with minecraft:iron_helmet{display:{Name:'{"text":"簡易鉄防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 execute unless data storage asset:context {Inventory:[{Slot:102b}]} run item replace entity @s armor.chest with minecraft:iron_chestplate{display:{Name:'{"text":"簡易鉄防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 execute unless data storage asset:context {Inventory:[{Slot:101b}]} run item replace entity @s armor.legs with minecraft:iron_leggings{display:{Name:'{"text":"簡易鉄防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 - execute unless data storage asset:context {Inventory:[{Slot:100b}]} run item replace entity @s armor.feet with minecraft:iron_boots{display:{Name:'{"text":"簡易鉄防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 \ No newline at end of file + execute unless data storage asset:context {Inventory:[{Slot:100b}]} run item replace entity @s armor.feet with minecraft:iron_boots{display:{Name:'{"text":"簡易鉄防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 diff --git a/Asset/data/asset/functions/artifact/0092.golden_armor_set/click/.mcfunction b/Asset/data/asset/functions/artifact/0092.golden_armor_set/click/.mcfunction index 73cb4c0a3..8cb4b88d2 100644 --- a/Asset/data/asset/functions/artifact/0092.golden_armor_set/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0092.golden_armor_set/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0092.golden_armor_set/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/92/click/ @@ -22,4 +22,4 @@ execute unless data storage asset:context {Inventory:[{Slot:103b}]} run item replace entity @s armor.head with minecraft:golden_helmet{display:{Name:'{"text":"簡易金防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 execute unless data storage asset:context {Inventory:[{Slot:102b}]} run item replace entity @s armor.chest with minecraft:golden_chestplate{display:{Name:'{"text":"簡易金防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 execute unless data storage asset:context {Inventory:[{Slot:101b}]} run item replace entity @s armor.legs with minecraft:golden_leggings{display:{Name:'{"text":"簡易金防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 - execute unless data storage asset:context {Inventory:[{Slot:100b}]} run item replace entity @s armor.feet with minecraft:golden_boots{display:{Name:'{"text":"簡易金防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 \ No newline at end of file + execute unless data storage asset:context {Inventory:[{Slot:100b}]} run item replace entity @s armor.feet with minecraft:golden_boots{display:{Name:'{"text":"簡易金防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 diff --git a/Asset/data/asset/functions/artifact/0093.diamond_armor_set/click/.mcfunction b/Asset/data/asset/functions/artifact/0093.diamond_armor_set/click/.mcfunction index 585368815..8a3e7ade5 100644 --- a/Asset/data/asset/functions/artifact/0093.diamond_armor_set/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0093.diamond_armor_set/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0093.diamond_armor_set/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/93/click/ @@ -22,4 +22,4 @@ execute unless data storage asset:context {Inventory:[{Slot:103b}]} run item replace entity @s armor.head with minecraft:diamond_helmet{display:{Name:'{"text":"簡易ダイヤ防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 execute unless data storage asset:context {Inventory:[{Slot:102b}]} run item replace entity @s armor.chest with minecraft:diamond_chestplate{display:{Name:'{"text":"簡易ダイヤ防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 execute unless data storage asset:context {Inventory:[{Slot:101b}]} run item replace entity @s armor.legs with minecraft:diamond_leggings{display:{Name:'{"text":"簡易ダイヤ防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 - execute unless data storage asset:context {Inventory:[{Slot:100b}]} run item replace entity @s armor.feet with minecraft:diamond_boots{display:{Name:'{"text":"簡易ダイヤ防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 \ No newline at end of file + execute unless data storage asset:context {Inventory:[{Slot:100b}]} run item replace entity @s armor.feet with minecraft:diamond_boots{display:{Name:'{"text":"簡易ダイヤ防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 diff --git a/Asset/data/asset/functions/artifact/0094.netherite_armor_set/click/.mcfunction b/Asset/data/asset/functions/artifact/0094.netherite_armor_set/click/.mcfunction index e06baaebb..57b221f3a 100644 --- a/Asset/data/asset/functions/artifact/0094.netherite_armor_set/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0094.netherite_armor_set/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0094.netherite_armor_set/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/94/click/ @@ -22,4 +22,4 @@ execute unless data storage asset:context {Inventory:[{Slot:103b}]} run item replace entity @s armor.head with minecraft:netherite_helmet{display:{Name:'{"text":"簡易ネザライト防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 execute unless data storage asset:context {Inventory:[{Slot:102b}]} run item replace entity @s armor.chest with minecraft:netherite_chestplate{display:{Name:'{"text":"簡易ネザライト防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 execute unless data storage asset:context {Inventory:[{Slot:101b}]} run item replace entity @s armor.legs with minecraft:netherite_leggings{display:{Name:'{"text":"簡易ネザライト防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 - execute unless data storage asset:context {Inventory:[{Slot:100b}]} run item replace entity @s armor.feet with minecraft:netherite_boots{display:{Name:'{"text":"簡易ネザライト防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 \ No newline at end of file + execute unless data storage asset:context {Inventory:[{Slot:100b}]} run item replace entity @s armor.feet with minecraft:netherite_boots{display:{Name:'{"text":"簡易ネザライト防具","italic":false}'},RepairCost:9999,Enchantments:[{}]} 1 diff --git a/Asset/data/asset/functions/artifact/0103.necronomicon/click/.mcfunction b/Asset/data/asset/functions/artifact/0103.necronomicon/click/.mcfunction index 890014d38..51c44debe 100644 --- a/Asset/data/asset/functions/artifact/0103.necronomicon/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0103.necronomicon/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0103.necronomicon/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/103/click/ @@ -9,8 +9,8 @@ particle minecraft:enchant ~ ~1 ~ 0.8 0.3 0.8 0.1 100 playsound minecraft:entity.elder_guardian.death player @a ~ ~ ~ 1 2 - # 盲目 - effect give @a[distance=..10] minecraft:blindness 3 1 +# 盲目 + effect give @a[distance=..10] minecraft:blindness 3 1 # ダメージ # 与えるダメージ = 380 @@ -21,4 +21,4 @@ function lib:damage/modifier execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..10] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0105.secret_meat/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0105.secret_meat/use_item/.mcfunction index 2f03da507..ef8618105 100644 --- a/Asset/data/asset/functions/artifact/0105.secret_meat/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0105.secret_meat/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0105.secret_meat/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/105/use_item/ diff --git a/Asset/data/asset/functions/artifact/0106.stone_cutter_blade/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0106.stone_cutter_blade/attack_melee/.mcfunction index 6366053c3..a312a4a72 100644 --- a/Asset/data/asset/functions/artifact/0106.stone_cutter_blade/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0106.stone_cutter_blade/attack_melee/.mcfunction @@ -1,7 +1,8 @@ #> asset:artifact/0106.stone_cutter_blade/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/106/attack_melee/ - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..15] at @s run function asset:artifact/0106.stone_cutter_blade/attack_melee/3.1.entity.main \ No newline at end of file +# 攻撃先のエンティティで実行 + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..15] at @s run function asset:artifact/0106.stone_cutter_blade/attack_melee/3.1.entity.main diff --git a/Asset/data/asset/functions/artifact/0107.dispenser_canon/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0107.dispenser_canon/_index.d.mcfunction new file mode 100644 index 000000000..f5eb97975 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0107.dispenser_canon/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0107.dispenser_canon/_index.d +# @private + +#> tag +# @within +# function asset:artifact/0107.dispenser_canon/** + #declare tag TNTStick diff --git a/Asset/data/asset/functions/artifact/0107.dispenser_canon/click/.mcfunction b/Asset/data/asset/functions/artifact/0107.dispenser_canon/click/.mcfunction index 5ec1def18..12e1366fd 100644 --- a/Asset/data/asset/functions/artifact/0107.dispenser_canon/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0107.dispenser_canon/click/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0107.dispenser_canon/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/107/click/ - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare tag TNTStick # 演出 playsound minecraft:entity.tnt.primed player @a @@ -18,4 +19,4 @@ execute as @e[type=endermite,tag=TNTStick,distance=..2] facing ^ ^ ^10 run function lib:motion/ data remove storage lib: Argument # スケジュール - schedule function asset:artifact/0107.dispenser_canon/click/3.1.sticky 1t \ No newline at end of file + schedule function asset:artifact/0107.dispenser_canon/click/3.1.sticky 1t diff --git a/Asset/data/asset/functions/artifact/0107.dispenser_canon/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0107.dispenser_canon/click/_index.d.mcfunction deleted file mode 100644 index eb37b21be..000000000 --- a/Asset/data/asset/functions/artifact/0107.dispenser_canon/click/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0107.dispenser_canon/click/_index.d -# @private - -#> tag -# @within -# function asset:artifact/0107.dispenser_canon/click/ -# function asset:artifact/0107.dispenser_canon/click/3.1.sticky - #declare tag TNTStick \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0108.vacuum_hopper/click/.mcfunction b/Asset/data/asset/functions/artifact/0108.vacuum_hopper/click/.mcfunction index c29311ba1..77775f2ce 100644 --- a/Asset/data/asset/functions/artifact/0108.vacuum_hopper/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0108.vacuum_hopper/click/.mcfunction @@ -1,11 +1,13 @@ #> asset:artifact/0108.vacuum_hopper/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/108/click/ -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/auto +#> Private +# @private + #declare tag Vacuum + #declare score_holder $Items # ここから先は神器側の効果の処理を書く playsound entity.enderman.teleport player @s ~ ~ ~ 1 2 @@ -23,4 +25,4 @@ tellraw @s [{"text": "ﾀﾞｲｿｿ >> "},{"text": "[ "},{"score": {"name": "$Items","objective": "Temporary"},"color": "gold"},{"text": " ]のアイテムを回収しました"}] execute as @e[type=item,distance=..1] run data modify entity @s PickupDelay set value 0s scoreboard players reset $Items Temporary - tag @e[type=item,tag=Vacuum] remove Vacuum \ No newline at end of file + tag @e[type=item,tag=Vacuum] remove Vacuum diff --git a/Asset/data/asset/functions/artifact/0122.lunatic_lay/click/.mcfunction b/Asset/data/asset/functions/artifact/0122.lunatic_lay/click/.mcfunction index b442818f7..5e8bb6f3c 100644 --- a/Asset/data/asset/functions/artifact/0122.lunatic_lay/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0122.lunatic_lay/click/.mcfunction @@ -1,20 +1,22 @@ #> asset:artifact/0122.lunatic_lay/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/122/click/ +#> private +# @private + #declare tag Hit -# ここから先は神器側の効果の処理を書く - # 対象選択 - tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5,sort=random,limit=1] add Hit - # 演出 - execute at @e[type=#lib:living,type=!player,tag=Hit,distance=..5,limit=1] run particle crit ~ ~3 ~ 0.025 3 0.025 0 100 normal @a - playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 - # ダメージ - data merge storage lib: {Argument:{Damage:165.0f,AttackType:Magic,ElementType:Thunder}} - function lib:damage/modifier - execute as @e[type=#lib:living,type=!player,tag=Hit,distance=..5,limit=1] run function lib:damage/ - # リセット - function lib:damage/reset - tag @e[type=#lib:living,type=!player,tag=Hit,distance=..5,limit=1] remove Hit \ No newline at end of file +# 対象選択 + tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5,sort=random,limit=1] add Hit +# 演出 + execute at @e[type=#lib:living,type=!player,tag=Hit,distance=..5,limit=1] run particle crit ~ ~3 ~ 0.025 3 0.025 0 100 normal @a + playsound entity.lightning_bolt.thunder player @a ~ ~ ~ 1 2 +# ダメージ + data merge storage lib: {Argument:{Damage:165.0f,AttackType:Magic,ElementType:Thunder}} + function lib:damage/modifier + execute as @e[type=#lib:living,type=!player,tag=Hit,distance=..5,limit=1] run function lib:damage/ +# リセット + function lib:damage/reset + tag @e[type=#lib:living,type=!player,tag=Hit,distance=..5,limit=1] remove Hit diff --git a/Asset/data/asset/functions/artifact/0125.storm_bow/click/.mcfunction b/Asset/data/asset/functions/artifact/0125.storm_bow/click/.mcfunction index 0de21f327..1a4d8df5c 100644 --- a/Asset/data/asset/functions/artifact/0125.storm_bow/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0125.storm_bow/click/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0125.storm_bow/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/125/click/ - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare tag ArrowTarget # 不発処理 execute unless entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..15,limit=1] run playsound minecraft:block.dispenser.fail player @a ~ ~ ~ 1 2 @@ -43,4 +44,4 @@ tag @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..15,sort=random,limit=1] add ArrowTarget execute at @e[type=#lib:living,type=!player,tag=ArrowTarget,distance=..15,limit=1] run summon arrow ~0.4 ~7 ~ {pickup:0b,damage:10d,crit:1b,Motion:[-0.2,-1.0,0.0]} execute at @e[type=#lib:living,type=!player,tag=ArrowTarget,distance=..15,limit=1] run particle minecraft:cloud ~0.4 ~7 ~ 0.1 0 0.1 0.01 10 - tag @e[tag=ArrowTarget,limit=1] remove ArrowTarget \ No newline at end of file + tag @e[tag=ArrowTarget,limit=1] remove ArrowTarget diff --git a/Asset/data/asset/functions/artifact/0125.storm_bow/click/check.mcfunction b/Asset/data/asset/functions/artifact/0125.storm_bow/click/check.mcfunction index 1514f1d72..c6848fc10 100644 --- a/Asset/data/asset/functions/artifact/0125.storm_bow/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0125.storm_bow/click/check.mcfunction @@ -4,10 +4,12 @@ # # @within function asset:artifact/alias/125/click/check - function asset:artifact/common/check_condition/auto -# 他にアイテム等確認する場合はここに書く - # 矢を持ってるかチェック - execute store result score $ArrowCount Temporary run clear @s arrow 0 - execute if score $ArrowCount Temporary matches ..0 run tag @s remove CanUsed - execute if score $ArrowCount Temporary matches ..0 run function lib:message/artifact/dont_have_require_items - scoreboard players reset $ArrowCount Temporary \ No newline at end of file +#> Private +# @private + #declare score_holder $ArrowCount + +# 矢を持ってるかチェック + execute store result score $ArrowCount Temporary run clear @s arrow 0 + execute if score $ArrowCount Temporary matches ..0 run tag @s remove CanUsed + execute if score $ArrowCount Temporary matches ..0 run function lib:message/artifact/dont_have_require_items + scoreboard players reset $ArrowCount Temporary diff --git a/Asset/data/asset/functions/artifact/0135.amrita/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0135.amrita/use_item/.mcfunction index a59407e50..adeb3f5eb 100644 --- a/Asset/data/asset/functions/artifact/0135.amrita/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0135.amrita/use_item/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0135.amrita/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/135/use_item/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $Fluctuation # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 20 force @s @@ -14,4 +14,4 @@ # MP回復 scoreboard players set $Fluctuation Lib 40 - function lib:mp/fluctuation \ No newline at end of file + function lib:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0136.hi_amrita/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0136.hi_amrita/use_item/.mcfunction index 9fdc02f41..370052237 100644 --- a/Asset/data/asset/functions/artifact/0136.hi_amrita/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0136.hi_amrita/use_item/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0136.hi_amrita/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/136/use_item/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $Fluctuation # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 20 force @s @@ -14,4 +14,4 @@ # MP回復 scoreboard players set $Fluctuation Lib 100 - function lib:mp/fluctuation \ No newline at end of file + function lib:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0137.aure_amrita/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0137.aure_amrita/use_item/.mcfunction index 550aa0743..88ca924a8 100644 --- a/Asset/data/asset/functions/artifact/0137.aure_amrita/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0137.aure_amrita/use_item/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0137.aure_amrita/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/137/use_item/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $Fluctuation # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 20 force @s @@ -18,4 +18,4 @@ function lib:mp/fluctuation # リセット - data remove storage asset:temp 3T.Temp \ No newline at end of file + data remove storage asset:temp 3T diff --git a/Asset/data/asset/functions/artifact/0138.mystica_amrita/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0138.mystica_amrita/use_item/.mcfunction index 0ec58a9d8..a6373b946 100644 --- a/Asset/data/asset/functions/artifact/0138.mystica_amrita/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0138.mystica_amrita/use_item/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0138.mystica_amrita/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/138/use_item/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $Fluctuation # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 20 force @s @@ -18,4 +18,4 @@ function lib:mp/fluctuation # リセット - data remove storage asset:temp 3U.Temp \ No newline at end of file + data remove storage asset:temp 3U diff --git a/Asset/data/asset/functions/artifact/0139.soma/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0139.soma/use_item/.mcfunction index f837ca124..e6d637eda 100644 --- a/Asset/data/asset/functions/artifact/0139.soma/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0139.soma/use_item/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0139.soma/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/139/use_item/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $Fluctuation # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 20 force @s @@ -23,4 +23,4 @@ function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0140.hi_soma/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0140.hi_soma/use_item/.mcfunction index 126fdb49d..6fa45dca0 100644 --- a/Asset/data/asset/functions/artifact/0140.hi_soma/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0140.hi_soma/use_item/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0140.hi_soma/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/140/use_item/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $Fluctuation # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 20 force @s @@ -23,4 +23,4 @@ function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0141.aure_soma/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0141.aure_soma/use_item/.mcfunction index 3cb714eff..460b8aedd 100644 --- a/Asset/data/asset/functions/artifact/0141.aure_soma/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0141.aure_soma/use_item/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0141.aure_soma/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/141/use_item/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $Fluctuation # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 20 force @s @@ -26,4 +26,4 @@ # リセット function lib:heal/reset - data remove storage asset:temp 3X.Temp + data remove storage asset:temp 3X diff --git a/Asset/data/asset/functions/artifact/0142.mystica_soma/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0142.mystica_soma/use_item/.mcfunction index 3cecfea9b..7891a92e0 100644 --- a/Asset/data/asset/functions/artifact/0142.mystica_soma/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0142.mystica_soma/use_item/.mcfunction @@ -1,9 +1,13 @@ #> asset:artifact/0142.mystica_soma/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/142/use_item/ +#> private +# @private + #declare score_holder $Fluctuation + # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 20 force @s particle minecraft:heart ~ ~0.5 ~ 0.3 0.5 0.3 1 5 force @s @@ -22,4 +26,4 @@ # リセット function lib:heal/reset - data remove storage asset:temp 3Y.Temp + data remove storage asset:temp 3Y diff --git a/Asset/data/asset/functions/artifact/0143.nectar/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0143.nectar/use_item/.mcfunction index ad42b8559..bf68f5b3b 100644 --- a/Asset/data/asset/functions/artifact/0143.nectar/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0143.nectar/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0143.nectar/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/143/use_item/ @@ -14,4 +14,4 @@ function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0144.hi_nectar/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0144.hi_nectar/use_item/.mcfunction index 0e620ca9a..7a5f3423b 100644 --- a/Asset/data/asset/functions/artifact/0144.hi_nectar/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0144.hi_nectar/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0144.hi_nectar/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/144/use_item/ @@ -14,4 +14,4 @@ function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0145.aure_nectar/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0145.aure_nectar/use_item/.mcfunction index 4ebba35ff..4d8c42877 100644 --- a/Asset/data/asset/functions/artifact/0145.aure_nectar/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0145.aure_nectar/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0145.aure_nectar/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/145/use_item/ diff --git a/Asset/data/asset/functions/artifact/0146.mystica_nectar/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0146.mystica_nectar/use_item/.mcfunction index 544ef480f..a15597386 100644 --- a/Asset/data/asset/functions/artifact/0146.mystica_nectar/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0146.mystica_nectar/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0146.mystica_nectar/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/146/use_item/ diff --git a/Asset/data/asset/functions/artifact/0152.call_cat/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0152.call_cat/_index.d.mcfunction similarity index 83% rename from Asset/data/asset/functions/artifact/0152.call_cat/click/_index.d.mcfunction rename to Asset/data/asset/functions/artifact/0152.call_cat/_index.d.mcfunction index 3b396171a..8a7e876c6 100644 --- a/Asset/data/asset/functions/artifact/0152.call_cat/click/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/0152.call_cat/_index.d.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0152.call_cat/click/_index.d +#> asset:artifact/0152.call_cat/_index.d # @private #> tag -# @within function asset:artifact/0152.call_cat/click/* +# @within function asset:artifact/0152.call_cat/click/** #declare tag 48.CalledCat # スコアをどう使ってるかのメモ @@ -17,4 +17,4 @@ # 使用者限定召喚直後回復CD |回復クールダウン(CD) |回復量カウント # # プレーヤーを21まで毎tickカウントアップさせる（クールダウン） - # 一度の回復量を制限するため、回復した場合にネコ1匹につきプレーヤのスコアを1加算（21を引けば回復回数が求められる） \ No newline at end of file + # 一度の回復量を制限するため、回復した場合にネコ1匹につきプレーヤのスコアを1加算（21を引けば回復回数が求められる） diff --git a/Asset/data/asset/functions/artifact/0152.call_cat/click/.mcfunction b/Asset/data/asset/functions/artifact/0152.call_cat/click/.mcfunction index b60b46eec..83c1fca3a 100644 --- a/Asset/data/asset/functions/artifact/0152.call_cat/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0152.call_cat/click/.mcfunction @@ -1,44 +1,43 @@ #> asset:artifact/0152.call_cat/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/152/click/ -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く - - # ネコ召喚 - summon cat ~ ~ ~ {DeathLootTable:"minecraft:empty",PersistenceRequired:1b,CanPickUpLoot:0b,variant:"tabby",Tags:["AbstractCat","48.CalledCat","Friend"]} - particle minecraft:heart ~ ~ ~ 0.5 0.25 0.5 1 10 - playsound minecraft:entity.cat.ambient neutral @a ~ ~ ~ 1 1.25 - - # ネコの種類をランダムに - execute store result score $Random Temporary run function lib:random/ - scoreboard players operation $Random Temporary %= $11 Const - execute if score $Random Temporary matches 0 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "all_black" - execute if score $Random Temporary matches 1 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "black" - execute if score $Random Temporary matches 2 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "british_shorthair" - execute if score $Random Temporary matches 3 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "calico" - execute if score $Random Temporary matches 4 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "jellie" - execute if score $Random Temporary matches 5 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "persian" - execute if score $Random Temporary matches 6 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "ragdoll" - execute if score $Random Temporary matches 7 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "red" - execute if score $Random Temporary matches 8 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "siamese" - execute if score $Random Temporary matches 9 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "tabby" - execute if score $Random Temporary matches 10 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "white" - - # 使用者に懐かせる - function api:data_get/uuid - data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] Owner set from storage api: UUID - - # 回復クールダウンスコア設定 - execute as @a unless score @s 48.CatTime matches -10.. run scoreboard players set @s 48.CatTime -10 - - # ネコがいる間tickさせるfunctionをschedule - schedule function asset:artifact/0152.call_cat/click/3.1.entity_manager 1t replace - - # リセット - scoreboard players reset $Random Temporary - tag @e[type=cat,tag=AbstractCat,distance=..1,limit=1] remove AbstractCat \ No newline at end of file +#> Private +# @private + #declare tag AbstractCat + +# ネコ召喚 + summon cat ~ ~ ~ {DeathLootTable:"minecraft:empty",PersistenceRequired:1b,CanPickUpLoot:0b,variant:"tabby",Tags:["AbstractCat","48.CalledCat","Friend"]} + particle minecraft:heart ~ ~ ~ 0.5 0.25 0.5 1 10 + playsound minecraft:entity.cat.ambient neutral @a ~ ~ ~ 1 1.25 + +# ネコの種類をランダムに + execute store result score $Random Temporary run function lib:random/ + scoreboard players operation $Random Temporary %= $11 Const + execute if score $Random Temporary matches 0 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "all_black" + execute if score $Random Temporary matches 1 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "black" + execute if score $Random Temporary matches 2 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "british_shorthair" + execute if score $Random Temporary matches 3 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "calico" + execute if score $Random Temporary matches 4 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "jellie" + execute if score $Random Temporary matches 5 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "persian" + execute if score $Random Temporary matches 6 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "ragdoll" + execute if score $Random Temporary matches 7 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "red" + execute if score $Random Temporary matches 8 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "siamese" + execute if score $Random Temporary matches 9 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "tabby" + execute if score $Random Temporary matches 10 run data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] variant set value "white" + +# 使用者に懐かせる + function api:data_get/uuid + data modify entity @e[type=cat,tag=AbstractCat,distance=..1,limit=1] Owner set from storage api: UUID + +# 回復クールダウンスコア設定 + execute as @a unless score @s 48.CatTime matches -10.. run scoreboard players set @s 48.CatTime -10 + +# ネコがいる間tickさせるfunctionをschedule + schedule function asset:artifact/0152.call_cat/click/3.1.entity_manager 1t replace + +# リセット + scoreboard players reset $Random Temporary + tag @e[type=cat,tag=AbstractCat,distance=..1,limit=1] remove AbstractCat diff --git a/Asset/data/asset/functions/artifact/0152.call_cat/click/3.1.2.goodbye_cat.mcfunction b/Asset/data/asset/functions/artifact/0152.call_cat/click/3.1.2.goodbye_cat.mcfunction index 1ceeefec1..87fb741e9 100644 --- a/Asset/data/asset/functions/artifact/0152.call_cat/click/3.1.2.goodbye_cat.mcfunction +++ b/Asset/data/asset/functions/artifact/0152.call_cat/click/3.1.2.goodbye_cat.mcfunction @@ -4,10 +4,9 @@ # # @within function asset:artifact/0152.call_cat/click/3.1.entity_manager - # さようなら //killだとログがプレイヤーに出る、死亡音が聞こえるためdataで消す playsound minecraft:item.chorus_fruit.teleport neutral @a ~ ~ ~ 1 0.75 particle minecraft:reverse_portal ~ ~ ~ 0.1 0.1 0.1 0.01 200 effect give @s invisibility 1 0 true tp @s ~ -256 ~ - data modify entity @s Health set value 0 \ No newline at end of file + data modify entity @s Health set value 0 diff --git a/Asset/data/asset/functions/artifact/0152.call_cat/load.mcfunction b/Asset/data/asset/functions/artifact/0152.call_cat/load.mcfunction index 7c0c75e1b..7ba701ffd 100644 --- a/Asset/data/asset/functions/artifact/0152.call_cat/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0152.call_cat/load.mcfunction @@ -5,6 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function -# asset:artifact/0152.call_cat/click/* - scoreboard objectives add 48.CatTime dummy \ No newline at end of file +# @within function asset:artifact/0152.call_cat/** + scoreboard objectives add 48.CatTime dummy diff --git a/Asset/data/asset/functions/artifact/0158.mp_extractor/click/.mcfunction b/Asset/data/asset/functions/artifact/0158.mp_extractor/click/.mcfunction index 79a2228df..90051930e 100644 --- a/Asset/data/asset/functions/artifact/0158.mp_extractor/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0158.mp_extractor/click/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0158.mp_extractor/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/158/click/ +# あげる♡ data modify storage api: Argument.ID set value 159 function api:artifact/give/from_id - # 演出 +# 演出 execute anchored eyes run particle falling_obsidian_tear ^ ^ ^ 0.5 0.5 0.5 0 50 force @s - clear @s glass_bottle 1 \ No newline at end of file + clear @s glass_bottle 1 diff --git a/Asset/data/asset/functions/artifact/0158.mp_extractor/click/check.mcfunction b/Asset/data/asset/functions/artifact/0158.mp_extractor/click/check.mcfunction index 64818c877..9e2653829 100644 --- a/Asset/data/asset/functions/artifact/0158.mp_extractor/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0158.mp_extractor/click/check.mcfunction @@ -4,11 +4,12 @@ # # @within function asset:artifact/alias/158/click/check -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/auto -# 他にアイテム等確認する場合はここに書く - # ガラス瓶持ってるかチェック - execute store result score $BottleCount Temporary run clear @s glass_bottle 0 - execute if score $BottleCount Temporary matches 0 run tag @s remove CanUsed - # ガラス瓶ないよコメント - execute if score $BottleCount Temporary matches 0 run function lib:message/artifact/dont_have_require_items \ No newline at end of file +#> Private +# @private + #declare score_holder $BottleCount + +# ガラス瓶持ってるかチェック + execute store result score $BottleCount Temporary run clear @s glass_bottle 0 + execute if score $BottleCount Temporary matches 0 run tag @s remove CanUsed +# ガラス瓶ないよコメント + execute if score $BottleCount Temporary matches 0 run function lib:message/artifact/dont_have_require_items diff --git a/Asset/data/asset/functions/artifact/0159.extracted_mp_bottle/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0159.extracted_mp_bottle/use_item/.mcfunction index 8225e0681..38edf0104 100644 --- a/Asset/data/asset/functions/artifact/0159.extracted_mp_bottle/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0159.extracted_mp_bottle/use_item/.mcfunction @@ -1,10 +1,12 @@ #> asset:artifact/0159.extracted_mp_bottle/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/159/use_item/ - function asset:artifact/common/use/auto +#> Private +# @private + #declare score_holder $Random # ここから先は神器側の効果の処理を書く execute store result score $Random Temporary run function lib:random/ @@ -14,4 +16,4 @@ tellraw @s ["[ ",{"score": {"name": "$Random","objective": "Temporary"},"color": "light_purple"},{"text": " ] MPが天使の取り分となり、[ ","color": "white"},{"score": {"name": "$Fluctuation","objective": "Lib"},"color": "green"},{"text": " ] MPが回復した！","color": "white"}] function lib:mp/fluctuation scoreboard players reset $Random - execute anchored eyes run particle dust 1 0.31 0.91 0.3 ^ ^ ^ 0.4 0.4 0.4 0 20 normal @s \ No newline at end of file + execute anchored eyes run particle dust 1 0.31 0.91 0.3 ^ ^ ^ 0.4 0.4 0.4 0 20 normal @s diff --git a/Asset/data/asset/functions/artifact/0162.rations/click/.mcfunction b/Asset/data/asset/functions/artifact/0162.rations/click/.mcfunction index ad602fae5..1da705cc3 100644 --- a/Asset/data/asset/functions/artifact/0162.rations/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0162.rations/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0162.rations/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/162/click/ @@ -11,4 +11,4 @@ particle item minecraft:dark_oak_sign ~ ~1.5 ~ 0 0.2 0 0.2 20 force @s # SE - playsound minecraft:entity.player.burp player @s ~ ~ ~ 1 1.3 \ No newline at end of file + playsound minecraft:entity.player.burp player @s ~ ~ ~ 1 1.3 diff --git a/Asset/data/asset/functions/artifact/0164.blessing_boots/tick/.mcfunction b/Asset/data/asset/functions/artifact/0164.blessing_boots/tick/.mcfunction index d4ec7def8..f7b4f747f 100644 --- a/Asset/data/asset/functions/artifact/0164.blessing_boots/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/0164.blessing_boots/tick/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0164.blessing_boots/tick/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/164/tick/ @@ -13,4 +13,4 @@ # 演出 particle portal 23 3 24 0 0 0 2 250 force @a particle effect 23 3 24 0 10 0 0.1 250 force @a - playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 \ No newline at end of file + playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 diff --git a/Asset/data/asset/functions/artifact/0165.blessing_leggings/tick/.mcfunction b/Asset/data/asset/functions/artifact/0165.blessing_leggings/tick/.mcfunction index 1cfd0abd0..b04f9ea1a 100644 --- a/Asset/data/asset/functions/artifact/0165.blessing_leggings/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/0165.blessing_leggings/tick/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0165.blessing_leggings/tick/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/165/tick/ @@ -13,4 +13,4 @@ # 演出 particle portal 23 3 24 0 0 0 2 250 force @a particle effect 23 3 24 0 10 0 0.1 250 force @a - playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 \ No newline at end of file + playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 diff --git a/Asset/data/asset/functions/artifact/0166.blessing_armor/tick/.mcfunction b/Asset/data/asset/functions/artifact/0166.blessing_armor/tick/.mcfunction index b88932e63..1301443e0 100644 --- a/Asset/data/asset/functions/artifact/0166.blessing_armor/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/0166.blessing_armor/tick/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0166.blessing_armor/tick/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/166/tick/ @@ -13,4 +13,4 @@ # 演出 particle portal 23 3 24 0 0 0 2 250 force @a particle effect 23 3 24 0 10 0 0.1 250 force @a - playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 \ No newline at end of file + playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 diff --git a/Asset/data/asset/functions/artifact/0167.blessing_helmet/tick/.mcfunction b/Asset/data/asset/functions/artifact/0167.blessing_helmet/tick/.mcfunction index 7b44e3339..3e9a52148 100644 --- a/Asset/data/asset/functions/artifact/0167.blessing_helmet/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/0167.blessing_helmet/tick/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0167.blessing_helmet/tick/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/167/tick/ @@ -13,4 +13,4 @@ # 演出 particle portal 23 3 24 0 0 0 2 250 force @a particle effect 23 3 24 0 10 0 0.1 250 force @a - playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 \ No newline at end of file + playsound entity.illusioner.prepare_blindness player @s 23 3 24 1 0 1 diff --git a/Asset/data/asset/functions/artifact/0172.icicle/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0172.icicle/_index.d.mcfunction similarity index 55% rename from Asset/data/asset/functions/artifact/0172.icicle/click/_index.d.mcfunction rename to Asset/data/asset/functions/artifact/0172.icicle/_index.d.mcfunction index 2f328d1c2..97f58432f 100644 --- a/Asset/data/asset/functions/artifact/0172.icicle/click/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/0172.icicle/_index.d.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0172.icicle/click/_index.d +#> asset:artifact/0172.icicle/_index.d # @private #> tag -# @within function asset:artifact/0172.icicle/click/** +# @within function asset:artifact/0172.icicle/** #declare tag Landing #declare tag LandingTarget #declare tag 4S.Laser diff --git a/Asset/data/asset/functions/artifact/0172.icicle/click/.mcfunction b/Asset/data/asset/functions/artifact/0172.icicle/click/.mcfunction index 0fd35edcf..75a7a3c0d 100644 --- a/Asset/data/asset/functions/artifact/0172.icicle/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0172.icicle/click/.mcfunction @@ -1,13 +1,12 @@ #> asset:artifact/0172.icicle/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/172/click/ # 演出 playsound minecraft:block.glass.break player @a ~ ~ ~ 1 0 - # 着弾地点にマーカー召喚 execute anchored eyes positioned ^ ^ ^ run function asset:artifact/0172.icicle/click/4.block_check @@ -15,4 +14,4 @@ tag @s remove Landing # スケジュール開始 - schedule function asset:artifact/0172.icicle/click/laser/schedule 1t replace \ No newline at end of file + schedule function asset:artifact/0172.icicle/click/laser/schedule 1t replace diff --git a/Asset/data/asset/functions/artifact/0172.icicle/click/laser/schedule.mcfunction b/Asset/data/asset/functions/artifact/0172.icicle/click/laser/schedule.mcfunction index fbf4f02cb..4ab9d1cba 100644 --- a/Asset/data/asset/functions/artifact/0172.icicle/click/laser/schedule.mcfunction +++ b/Asset/data/asset/functions/artifact/0172.icicle/click/laser/schedule.mcfunction @@ -4,11 +4,11 @@ # # @within function # asset:artifact/0172.icicle/click/ -# asset:artifact/0172.icicle/click/rejoin_process # asset:artifact/0172.icicle/click/laser/schedule +# asset:artifact/0172.icicle/rejoin_process # 実行する 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 \ No newline at end of file + 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 diff --git a/Asset/data/asset/functions/artifact/0172.icicle/load.mcfunction b/Asset/data/asset/functions/artifact/0172.icicle/load.mcfunction index c3a18a939..82d2d26ce 100644 --- a/Asset/data/asset/functions/artifact/0172.icicle/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0172.icicle/load.mcfunction @@ -5,6 +5,6 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0172.icicle/click/** +# @within function asset:artifact/0172.icicle/** scoreboard objectives add 4S.UserID dummy - scoreboard objectives add 4S.Time dummy \ No newline at end of file + scoreboard objectives add 4S.Time dummy diff --git a/Asset/data/asset/functions/artifact/0172.icicle/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0172.icicle/rejoin_process.mcfunction similarity index 69% rename from Asset/data/asset/functions/artifact/0172.icicle/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0172.icicle/rejoin_process.mcfunction index 1a77d7e08..5bac9391d 100644 --- a/Asset/data/asset/functions/artifact/0172.icicle/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0172.icicle/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0172.icicle/click/rejoin_process +#> asset:artifact/0172.icicle/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/click/.mcfunction b/Asset/data/asset/functions/artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/click/.mcfunction index e9bd99a6d..a639dc774 100644 --- a/Asset/data/asset/functions/artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0183.answer_to_the_ultimate_question_of_life_the_universe_and_everything/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/183/click/ diff --git a/Asset/data/asset/functions/artifact/0184.increasable_cookie/click/.mcfunction b/Asset/data/asset/functions/artifact/0184.increasable_cookie/click/.mcfunction index eeede7e91..499164960 100644 --- a/Asset/data/asset/functions/artifact/0184.increasable_cookie/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0184.increasable_cookie/click/.mcfunction @@ -1,7 +1,9 @@ #> asset:artifact/0184.increasable_cookie/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/184/click/ - function api:artifact/give/from_id \ No newline at end of file +# ここから先は神器側の効果の処理を書く + data modify storage api: Argument.ID set value 185 + function api:artifact/give/from_id diff --git a/Asset/data/asset/functions/artifact/0185.increased_cookie/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0185.increased_cookie/use_item/.mcfunction index e5d8af67f..94becd93d 100644 --- a/Asset/data/asset/functions/artifact/0185.increased_cookie/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0185.increased_cookie/use_item/.mcfunction @@ -1,7 +1,9 @@ #> asset:artifact/0185.increased_cookie/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/185/use_item/ - function lib:mp/fluctuation \ No newline at end of file +# ここから先は神器側の効果の処理を書く + scoreboard players set $Fluctuation Lib 1 + function lib:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0187.chloranthy_wand/click/.mcfunction b/Asset/data/asset/functions/artifact/0187.chloranthy_wand/click/.mcfunction index fa2a28770..d16a3e936 100644 --- a/Asset/data/asset/functions/artifact/0187.chloranthy_wand/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0187.chloranthy_wand/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0187.chloranthy_wand/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/187/click/ @@ -9,4 +9,4 @@ playsound minecraft:entity.evoker.prepare_summon player @s ~ ~ ~ 20 2 # 土系ブロックを草ブロックに置換する - fill ~-3 ~-3 ~-3 ~3 ~3 ~3 minecraft:grass_block replace #lib:dirts \ No newline at end of file + fill ~-3 ~-3 ~-3 ~3 ~3 ~3 minecraft:grass_block replace #lib:dirts diff --git a/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/click/.mcfunction b/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/click/.mcfunction index 8385738ab..d0cf50aa5 100644 --- a/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/click/.mcfunction @@ -1,12 +1,13 @@ #> asset:artifact/0188.reverse_transcription_magic/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/188/click/ - execute store result score $Set Lib run data get storage asset:context Items.offhand.tag.TSB.MPCost - tellraw @s [{"text": "MPが ["},{"nbt": "Inventory[{Slot:-106b}].tag.display.Name","storage": "asset:context","interpret": true},{"text": "] の消費MP [ "},{"score": {"name": "$Set","objective": "Lib"}},{"text": " ] になった！"}] - function lib:mp/set - # 演出 - playsound ogg:random.levelup player @s ~ ~ ~ 1 1 1 - particle totem_of_undying ~ ~1.5 ~ 0.5 1 0.5 0 100 force @s +# MPをOffhandItemのMPRequireに設定 + execute store result score $Set Lib run data get storage asset:context Items.offhand.tag.TSB.MPCost + tellraw @s [{"text": "MPが ["},{"nbt": "Inventory[{Slot:-106b}].tag.display.Name","storage": "asset:context","interpret": true},{"text": "] の消費MP [ "},{"score": {"name": "$Set","objective": "Lib"}},{"text": " ] になった！"}] + function lib:mp/set +# 演出 + playsound ogg:random.levelup player @s ~ ~ ~ 1 1 1 + particle totem_of_undying ~ ~1.5 ~ 0.5 1 0.5 0 100 force @s diff --git a/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/click/check.mcfunction b/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/click/check.mcfunction index 248014087..2535096b4 100644 --- a/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0188.reverse_transcription_magic/click/check.mcfunction @@ -4,10 +4,12 @@ # # @within function asset:artifact/alias/188/click/check -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/auto -# 他にアイテム等確認する場合はここに書く - execute store result score $MPRequire Temporary run data get storage asset:context Items.offhand.tag.TSB.MPCost - execute unless score $MPRequire Temporary matches 1.. run tag @s remove CanUsed - execute unless score $MPRequire Temporary matches 1.. run playsound ui.button.click player @s ~ ~ ~ 1 2 - execute unless score $MPRequire Temporary matches 1.. run tellraw @s [{"text": "オフハンドにMPを消費する神器を持っている必要があります","color": "red"}] \ No newline at end of file +#> private +# @private + #declare score_holder $MPRequire + +# 他にアイテム等確認する場合はここに書く + execute store result score $MPRequire Temporary run data get storage asset:context Items.offhand.tag.TSB.MPCost + execute unless score $MPRequire Temporary matches 1.. run tag @s remove CanUsed + execute unless score $MPRequire Temporary matches 1.. run playsound ui.button.click player @s ~ ~ ~ 1 2 + execute unless score $MPRequire Temporary matches 1.. run tellraw @s [{"text": "オフハンドにMPを消費する神器を持っている必要があります","color": "red"}] diff --git a/Asset/data/asset/functions/artifact/0189.crystal_rod/click/.mcfunction b/Asset/data/asset/functions/artifact/0189.crystal_rod/click/.mcfunction index ba1df781b..0e1766470 100644 --- a/Asset/data/asset/functions/artifact/0189.crystal_rod/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0189.crystal_rod/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0189.crystal_rod/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/189/click/ diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/_index.d.mcfunction new file mode 100644 index 000000000..26ab643d0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0190.amor_wand/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0190.amor_wand/_index.d +# @private + +#> Val +# @within function asset:artifact/0190.amor_wand/** + #declare tag 5A.VFX diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/click/.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/click/.mcfunction index 6a8de3930..e5e97b708 100644 --- a/Asset/data/asset/functions/artifact/0190.amor_wand/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0190.amor_wand/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0190.amor_wand/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/190/click/ @@ -15,4 +15,4 @@ execute as @a[distance=..15] run function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/click/_index.d.mcfunction deleted file mode 100644 index 73a7649e8..000000000 --- a/Asset/data/asset/functions/artifact/0190.amor_wand/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0190.amor_wand/click/_index.d -# @private - -#> Val -# @within function asset:artifact/0190.amor_wand/click/** -#declare tag 5A.VFX \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/click/vfx/.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/click/vfx/.mcfunction index ca5a6bc4c..1832f96a5 100644 --- a/Asset/data/asset/functions/artifact/0190.amor_wand/click/vfx/.mcfunction +++ b/Asset/data/asset/functions/artifact/0190.amor_wand/click/vfx/.mcfunction @@ -6,7 +6,7 @@ #> Val # @private -#declare tag Init + #declare tag Init # VFX用Entityの初期化 summon marker ~ ~ ~ {Tags:["5A.VFX","Init","Object","Uninterferable"]} @@ -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 \ No newline at end of file + tag @e[type=marker,tag=Init,distance=..0.01] remove Init diff --git a/Asset/data/asset/functions/artifact/0190.amor_wand/load.mcfunction b/Asset/data/asset/functions/artifact/0190.amor_wand/load.mcfunction index d0586e681..48270d8c3 100644 --- a/Asset/data/asset/functions/artifact/0190.amor_wand/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0190.amor_wand/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0190.amor_wand/click/** +# @within function asset:artifact/0190.amor_wand/** scoreboard objectives add 5A.Age dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/_index.d.mcfunction new file mode 100644 index 000000000..e15f0b47d --- /dev/null +++ b/Asset/data/asset/functions/artifact/0191.horus_wand/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0191.horus_wand/_index.d +# @private + +#> Val +# @within function asset:artifact/0191.horus_wand/** + #declare tag 5B.VFX diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/click/.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/click/.mcfunction index e22756242..20d09f8ae 100644 --- a/Asset/data/asset/functions/artifact/0191.horus_wand/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0191.horus_wand/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0191.horus_wand/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/191/click/ @@ -16,4 +16,4 @@ effect give @a[distance=..15] regeneration 8 1 true # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/click/_index.d.mcfunction deleted file mode 100644 index 77c7cba71..000000000 --- a/Asset/data/asset/functions/artifact/0191.horus_wand/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0191.horus_wand/click/_index.d -# @private - -#> Val -# @within function asset:artifact/0191.horus_wand/click/** -#declare tag 5B.VFX \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/click/vfx/.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/click/vfx/.mcfunction index c031b9f74..e5450d899 100644 --- a/Asset/data/asset/functions/artifact/0191.horus_wand/click/vfx/.mcfunction +++ b/Asset/data/asset/functions/artifact/0191.horus_wand/click/vfx/.mcfunction @@ -6,7 +6,7 @@ #> Val # @private -#declare tag Init + #declare tag Init # VFX用Entityの初期化 summon marker ~ ~ ~ {Tags:["5B.VFX","Init","Object","Uninterferable"]} @@ -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 \ No newline at end of file + tag @e[type=marker,tag=Init,distance=..0.01] remove Init diff --git a/Asset/data/asset/functions/artifact/0191.horus_wand/load.mcfunction b/Asset/data/asset/functions/artifact/0191.horus_wand/load.mcfunction index 3cf62051a..eccecf87c 100644 --- a/Asset/data/asset/functions/artifact/0191.horus_wand/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0191.horus_wand/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0191.horus_wand/click/** +# @within function asset:artifact/0191.horus_wand/** scoreboard objectives add 5B.Age dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/_index.d.mcfunction new file mode 100644 index 000000000..f50e222ef --- /dev/null +++ b/Asset/data/asset/functions/artifact/0192.falcios_wand/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0192.falcios_wand/_index.d +# @private + +#> Val +# @within function asset:artifact/0192.falcios_wand/** + #declare tag 5C.VFX diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/click/.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/click/.mcfunction index 3e8102238..b9bba0149 100644 --- a/Asset/data/asset/functions/artifact/0192.falcios_wand/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0192.falcios_wand/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0192.falcios_wand/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/192/click/ @@ -16,4 +16,4 @@ effect give @a[distance=..15] regeneration 8 2 true # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/click/_index.d.mcfunction deleted file mode 100644 index 645ea5689..000000000 --- a/Asset/data/asset/functions/artifact/0192.falcios_wand/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0192.falcios_wand/click/_index.d -# @private - -#> Val -# @within function asset:artifact/0192.falcios_wand/click/** -#declare tag 5C.VFX \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/click/vfx/.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/click/vfx/.mcfunction index a2257efda..8f961f262 100644 --- a/Asset/data/asset/functions/artifact/0192.falcios_wand/click/vfx/.mcfunction +++ b/Asset/data/asset/functions/artifact/0192.falcios_wand/click/vfx/.mcfunction @@ -6,7 +6,7 @@ #> Val # @private -#declare tag Init + #declare tag Init # VFX用Entityの初期化 summon marker ~ ~ ~ {Tags:["5C.VFX","Init","Object","Uninterferable"]} @@ -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 \ No newline at end of file + tag @e[type=marker,tag=Init,distance=..0.01] remove Init diff --git a/Asset/data/asset/functions/artifact/0192.falcios_wand/load.mcfunction b/Asset/data/asset/functions/artifact/0192.falcios_wand/load.mcfunction index 8e8e222f0..4ca98549e 100644 --- a/Asset/data/asset/functions/artifact/0192.falcios_wand/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0192.falcios_wand/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0192.falcios_wand/click/** +# @within function asset:artifact/0192.falcios_wand/** scoreboard objectives add 5C.Age dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0201.cowardly_soul/damage/.mcfunction b/Asset/data/asset/functions/artifact/0201.cowardly_soul/damage/.mcfunction index 16cc0ea6a..fa2ea0ca7 100644 --- a/Asset/data/asset/functions/artifact/0201.cowardly_soul/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/0201.cowardly_soul/damage/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0201.cowardly_soul/damage/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/201/damage/ @@ -11,4 +11,4 @@ particle minecraft:nautilus ~ ~1.25 ~ 0.0 0.5 0.0 0.5 75 # ワープする - execute in overworld run tp @s 23.5 3.0 24.5 \ No newline at end of file + execute in overworld run tp @s 23.5 3.0 24.5 diff --git a/Asset/data/asset/functions/artifact/0204.spelunker_shoes/tick/.mcfunction b/Asset/data/asset/functions/artifact/0204.spelunker_shoes/tick/.mcfunction index 4306291f0..94dec1565 100644 --- a/Asset/data/asset/functions/artifact/0204.spelunker_shoes/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/0204.spelunker_shoes/tick/.mcfunction @@ -1,8 +1,8 @@ #> asset:artifact/0204.spelunker_shoes/tick/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/204/tick/ # プレイヤーを死亡させる - kill @s \ No newline at end of file + kill @s diff --git a/Asset/data/asset/functions/artifact/0204.spelunker_shoes/tick/check.mcfunction b/Asset/data/asset/functions/artifact/0204.spelunker_shoes/tick/check.mcfunction index d8250978a..1b6680d94 100644 --- a/Asset/data/asset/functions/artifact/0204.spelunker_shoes/tick/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0204.spelunker_shoes/tick/check.mcfunction @@ -4,12 +4,12 @@ # # @within function asset:artifact/alias/204/tick/check -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/feet -# 他にアイテム等確認する場合はここに書く - -# 落下距離が2マス未満の場合は処理しない - function api:data_get/fall_distance - execute store result score $FallDistance Temporary run data get storage api: FallDistance - execute if score $FallDistance Temporary matches ..1 run tag @s remove CanUsed - scoreboard players reset $FallDistance \ No newline at end of file +#> private +# @private + #declare score_holder $FallDistance + +# 落下距離が2マス未満の場合は処理しない + function api:data_get/fall_distance + execute store result score $FallDistance Temporary run data get storage api: FallDistance + execute if score $FallDistance Temporary matches ..1 run tag @s remove CanUsed + scoreboard players reset $FallDistance diff --git a/Asset/data/asset/functions/artifact/0207.life_is_transitory/tick/.mcfunction b/Asset/data/asset/functions/artifact/0207.life_is_transitory/tick/.mcfunction index f24dab839..378f94c03 100644 --- a/Asset/data/asset/functions/artifact/0207.life_is_transitory/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/0207.life_is_transitory/tick/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0207.life_is_transitory/tick/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/207/tick/ @@ -10,4 +10,4 @@ # 効果・演出 effect give @s invisibility 1 1 true - particle minecraft:poof ~ ~ ~ 0 0 0 0.1 1 \ No newline at end of file + particle minecraft:poof ~ ~ ~ 0 0 0 0.1 1 diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/_index.d.mcfunction new file mode 100644 index 000000000..53ff0a254 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/_index.d.mcfunction @@ -0,0 +1,14 @@ +#> asset:artifact/0210.terra_blade/_index.d +# @private +# インデックス +# +# @within function asset:artifact/0210.terra_blade/2.check_condition + +#> tags +# @within function asset:artifact/0210.terra_blade/** + #declare tag 5U.ShotInit + #declare tag 5U.Shot + #declare tag 5U.Spread + #declare tag 5U.This + # + #declare tag 5U.Sword \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/click/.mcfunction index ec959328c..dfe1e3f4c 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/click/.mcfunction @@ -1,10 +1,12 @@ #> asset:artifact/0210.terra_blade/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/210/click/ +# VFX + playsound minecraft:item.trident.throw player @a ~ ~ ~ 1.5 0.75 playsound minecraft:entity.player.attack.sweep player @a ~ ~ ~ 1.5 1.25 # 剣を召喚 - function asset:artifact/0210.terra_blade/click/sword/summon_sword \ No newline at end of file + function asset:artifact/0210.terra_blade/click/sword/summon_sword diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.1.terra_shot_tick.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.1.terra_shot_tick.mcfunction index c796077b1..1512f64f9 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.1.terra_shot_tick.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.1.terra_shot_tick.mcfunction @@ -5,10 +5,10 @@ # @within function # asset:artifact/0210.terra_blade/click/3.1.terra_shot_tick # asset:artifact/0210.terra_blade/click/event/summon_shot -# asset:artifact/0210.terra_blade/click/rejoin_process +# asset:artifact/0210.terra_blade/rejoin_process # テラショットにコマンド実行 execute as @e[type=armor_stand,tag=5U.Shot] at @s run function asset:artifact/0210.terra_blade/click/3.3.terra_shot_main # ビームが存在していれば、このfunctionをループさせるよ - execute if entity @e[type=armor_stand,tag=5U.Shot,limit=1] run schedule function asset:artifact/0210.terra_blade/click/3.1.terra_shot_tick 1t \ No newline at end of file + execute if entity @e[type=armor_stand,tag=5U.Shot,limit=1] run schedule function asset:artifact/0210.terra_blade/click/3.1.terra_shot_tick 1t diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.2.terra_shot_init.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.2.terra_shot_init.mcfunction index 6a28aec06..3066cf35b 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.2.terra_shot_init.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.2.terra_shot_init.mcfunction @@ -6,7 +6,7 @@ #> SpreadLib # @private -#declare tag SpreadMarker + #declare tag SpreadMarker # パーティクル particle minecraft:dust 0 1 0 1 ~ ~ ~ 0.1 0.1 0.1 0 2 diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.3.terra_shot_main.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.3.terra_shot_main.mcfunction index 9fbba286e..19ccdb7f4 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.3.terra_shot_main.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.3.terra_shot_main.mcfunction @@ -2,9 +2,9 @@ # # テラブレードショットに"3.4.terra_shot_main2"を複数回実行させたいだけのfunction 負荷によってはボツにする予定 # -# @within function asset:artifact/0210.terra_blade/click/3.1.terra_shot_tick -# @within function asset:artifact/0210.terra_blade/click/3.3.terra_shot_main - +# @within function +# asset:artifact/0210.terra_blade/click/3.1.terra_shot_tick +# asset:artifact/0210.terra_blade/click/3.3.terra_shot_main # 移動とパーティクル tp @s ^ ^ ^0.5 @@ -32,4 +32,4 @@ execute if entity @s[scores={5U.Recursion=1..,5U.Range=1..}] at @s run function asset:artifact/0210.terra_blade/click/3.3.terra_shot_main # キル - execute if entity @s[scores={5U.Range=0}] run function asset:artifact/0210.terra_blade/click/terra_shot_break \ No newline at end of file + execute if entity @s[scores={5U.Range=0}] run function asset:artifact/0210.terra_blade/click/terra_shot_break diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.5.terra_shot_hit.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.5.terra_shot_hit.mcfunction index 550eabd75..be1a31dd3 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.5.terra_shot_hit.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/click/3.5.terra_shot_hit.mcfunction @@ -4,8 +4,6 @@ # # @within function asset:artifact/0210.terra_blade/click/3.3.terra_shot_main - - # 魔法、無属性のダメージをぶちかます data modify storage lib: Argument.Damage set value 70.0f data modify storage lib: Argument.AttackType set value "Physical" @@ -21,4 +19,4 @@ particle minecraft:sweep_attack ~ ~ ~ 0 0 0 0 1 #ショット削除 - function asset:artifact/0210.terra_blade/click/terra_shot_break \ No newline at end of file + function asset:artifact/0210.terra_blade/click/terra_shot_break diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/click/_index.d.mcfunction deleted file mode 100644 index 99baaf6e6..000000000 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/_index.d.mcfunction +++ /dev/null @@ -1,14 +0,0 @@ -#> asset:artifact/0210.terra_blade/click/_index.d -# -# インデックス -# -# @within function asset:artifact/0210.terra_blade/click/check - -#> tags -# @within function asset:artifact/0210.terra_blade/click/** - #declare tag 5U.ShotInit - #declare tag 5U.Shot - #declare tag 5U.Spread - #declare tag 5U.This - # - #declare tag 5U.Sword \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/event/random_position.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/click/event/random_position.mcfunction index fe75bdb7c..f5e372103 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/event/random_position.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/click/event/random_position.mcfunction @@ -6,10 +6,10 @@ #> SpreadLib # @private -#declare tag SpreadMarker + #declare tag SpreadMarker - summon marker ~ ~ ~ {Tags:["SpreadMarker"]} - data modify storage lib: Argument.Distance set value 0.5f - data modify storage lib: Argument.Spread set value 1.5f - execute as @e[type=marker,tag=SpreadMarker,limit=1] at @p[tag=5U.This] anchored eyes positioned ^ ^ ^ run function lib:forward_spreader/circle - execute at @e[type=marker,tag=SpreadMarker,limit=1] run summon armor_stand ^-0.35 ^-0.25 ^ {Marker:1b,Invisible:1b,Tags:["5U.ShotInit","Projectile","Uninterferable"]} +summon marker ~ ~ ~ {Tags:["SpreadMarker"]} +data modify storage lib: Argument.Distance set value 0.5f +data modify storage lib: Argument.Spread set value 1.5f +execute as @e[type=marker,tag=SpreadMarker,limit=1] at @p[tag=5U.This] anchored eyes positioned ^ ^ ^ run function lib:forward_spreader/circle +execute at @e[type=marker,tag=SpreadMarker,limit=1] run summon armor_stand ^-0.35 ^-0.25 ^ {Marker:1b,Invisible:1b,Tags:["5U.ShotInit","Projectile","Uninterferable"]} diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/sword/sword_schedule.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/click/sword/sword_schedule.mcfunction index 5e6e2526d..1502ae028 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/sword/sword_schedule.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/click/sword/sword_schedule.mcfunction @@ -5,7 +5,7 @@ # @within function # asset:artifact/0210.terra_blade/click/sword/summon_sword # asset:artifact/0210.terra_blade/click/sword/sword_schedule -# asset:artifact/0210.terra_blade/click/rejoin_process +# asset:artifact/0210.terra_blade/rejoin_process # 実行 execute as @e[type=armor_stand,tag=5U.Sword] at @s run function asset:artifact/0210.terra_blade/click/sword/sword diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/load.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/load.mcfunction index 2f51e4ef7..88e4cc729 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/load.mcfunction @@ -5,7 +5,7 @@ # @within tag/function asset:artifact/load #> Objective -# @within asset:artifact/0210.terra_blade/click/** +# @within asset:artifact/0210.terra_blade/** scoreboard objectives add 5U.Tick dummy scoreboard objectives add 5U.ID dummy scoreboard objectives add 5U.Range dummy diff --git a/Asset/data/asset/functions/artifact/0210.terra_blade/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0210.terra_blade/rejoin_process.mcfunction similarity index 79% rename from Asset/data/asset/functions/artifact/0210.terra_blade/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0210.terra_blade/rejoin_process.mcfunction index 3ab838738..f392cfcc4 100644 --- a/Asset/data/asset/functions/artifact/0210.terra_blade/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0210.terra_blade/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0210.terra_blade/click/rejoin_process +#> asset:artifact/0210.terra_blade/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/_index.d.mcfunction new file mode 100644 index 000000000..adabba9d0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/_index.d.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0212.anti_materiel_rifle/_index.d +# @private + +#> tag +# @within function +# asset:artifact/0212.anti_materiel_rifle/** + #declare tag Landing + #declare tag LandingTarget \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/click/.mcfunction b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/click/.mcfunction index dd83dbbc6..aa41914a3 100644 --- a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0212.anti_materiel_rifle/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/212/click/ @@ -12,4 +12,4 @@ playsound minecraft:entity.generic.explode player @a ~ ~ ~ 1 1.5 playsound minecraft:entity.generic.explode player @a ~ ~ ~ 1 2 playsound minecraft:entity.blaze.shoot player @a ~ ~ ~ 1 0.75 - playsound minecraft:entity.wither.hurt player @a ~ ~ ~ 1 1.5 \ No newline at end of file + playsound minecraft:entity.wither.hurt player @a ~ ~ ~ 1 1.5 diff --git a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/click/_index.d.mcfunction deleted file mode 100644 index 4e74d4853..000000000 --- a/Asset/data/asset/functions/artifact/0212.anti_materiel_rifle/click/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0212.anti_materiel_rifle/click/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0212.anti_materiel_rifle/click/** - #declare tag Landing - #declare tag LandingTarget \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0214.web_shooter/click/.mcfunction b/Asset/data/asset/functions/artifact/0214.web_shooter/click/.mcfunction index 9b08a1cf1..cbbdb5899 100644 --- a/Asset/data/asset/functions/artifact/0214.web_shooter/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0214.web_shooter/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0214.web_shooter/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/214/click/ diff --git a/Asset/data/asset/functions/artifact/0214.web_shooter/click/check.mcfunction b/Asset/data/asset/functions/artifact/0214.web_shooter/click/check.mcfunction index 900b74c17..a390c1833 100644 --- a/Asset/data/asset/functions/artifact/0214.web_shooter/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0214.web_shooter/click/check.mcfunction @@ -4,5 +4,6 @@ # # @within function asset:artifact/alias/214/click/check - execute if entity @s[gamemode=adventure] run function lib:message/artifact/can_not_use_here - execute if entity @s[gamemode=adventure] run tag @s remove CanUsed \ No newline at end of file +# アドベンチャーモードのとき利用できないように + execute if entity @s[gamemode=adventure] run function lib:message/artifact/can_not_use_here + execute if entity @s[gamemode=adventure] run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0217.fish/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0217.fish/use_item/.mcfunction index 376eba3ac..8000aa6f8 100644 --- a/Asset/data/asset/functions/artifact/0217.fish/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0217.fish/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0217.fish/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/217/use_item/ diff --git a/Asset/data/asset/functions/artifact/0218.iron_storm/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0218.iron_storm/_index.d.mcfunction new file mode 100644 index 000000000..0c49fab6f --- /dev/null +++ b/Asset/data/asset/functions/artifact/0218.iron_storm/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0218.iron_storm/_index.d +# @private + +#> tag +# @within function asset:artifact/0218.iron_storm/** + #declare tag DA.InAir diff --git a/Asset/data/asset/functions/artifact/0218.iron_storm/click/.mcfunction b/Asset/data/asset/functions/artifact/0218.iron_storm/click/.mcfunction index 362838d09..6ea1f70d2 100644 --- a/Asset/data/asset/functions/artifact/0218.iron_storm/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0218.iron_storm/click/.mcfunction @@ -1,9 +1,13 @@ #> asset:artifact/0218.iron_storm/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/218/click/ +#> private +# @private + #declare tag DA.Number1 + #declare tag DA.Number2 #declare tag DA.Number3 #declare tag DA.Number4 #declare tag DA.Number5 @@ -13,12 +17,6 @@ #declare tag DA.Number9 #declare tag IronStormInit - -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く - # アイアンゴーレム召喚 summon iron_golem 0 0 0 {Tags:["IronStormInit","DA.Number1","DA.InAir","Friend"],OnGround:0b} summon iron_golem 0 0 0 {Tags:["IronStormInit","DA.Number2","DA.InAir","Friend"],OnGround:0b} diff --git a/Asset/data/asset/functions/artifact/0218.iron_storm/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0218.iron_storm/click/_index.d.mcfunction deleted file mode 100644 index e1d0f252c..000000000 --- a/Asset/data/asset/functions/artifact/0218.iron_storm/click/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0218.iron_storm/click/_index.d -# @private -# -#> tag -# @within function -# asset:artifact/0218.iron_storm/click/** - #declare tag DA.InAir \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0218.iron_storm/load.mcfunction b/Asset/data/asset/functions/artifact/0218.iron_storm/load.mcfunction index 8e730d903..88598e531 100644 --- a/Asset/data/asset/functions/artifact/0218.iron_storm/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0218.iron_storm/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0218.iron_storm/click/** +# @within function asset:artifact/0218.iron_storm/** scoreboard objectives add DA.OwnerID dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0219.abyss_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0219.abyss_sword/attack_melee/.mcfunction index 399ca34c2..cf9dfc39a 100644 --- a/Asset/data/asset/functions/artifact/0219.abyss_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0219.abyss_sword/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0219.abyss_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/219/attack_melee/ diff --git a/Asset/data/asset/functions/artifact/0224.onegai_muscle_1/click/.mcfunction b/Asset/data/asset/functions/artifact/0224.onegai_muscle_1/click/.mcfunction index 6515fbcae..bbf48a400 100644 --- a/Asset/data/asset/functions/artifact/0224.onegai_muscle_1/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0224.onegai_muscle_1/click/.mcfunction @@ -1,17 +1,18 @@ #> asset:artifact/0224.onegai_muscle_1/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/224/click/ - scoreboard players set $Set Lib 100 - function lib:score_to_health_wrapper/set - # 効果 - effect give @s strength 10 5 true - execute if predicate player_manager:is_believe/urban run effect give @s strength 10 1 true - # 演出 - playsound entity.player.hurt player @a ~ ~ ~ 1 1 - playsound minecraft:entity.zombie_villager.cure player @s ~ ~ ~ 1 2 - particle angry_villager ~ ~1 ~ 0.5 0.5 0.5 0 30 normal @s - # リセット - scoreboard players reset @s Temporary \ No newline at end of file +# 体力を変更 + scoreboard players set $Set Lib 100 + function lib:score_to_health_wrapper/set +# 効果 + effect give @s strength 10 5 true + execute if predicate player_manager:is_believe/urban run effect give @s strength 10 1 true +# 演出 + playsound entity.player.hurt player @a ~ ~ ~ 1 1 + playsound minecraft:entity.zombie_villager.cure player @s ~ ~ ~ 1 2 + particle angry_villager ~ ~1 ~ 0.5 0.5 0.5 0 30 normal @s +# リセット + scoreboard players reset @s Temporary diff --git a/Asset/data/asset/functions/artifact/0225.onegai_muscle_2/click/.mcfunction b/Asset/data/asset/functions/artifact/0225.onegai_muscle_2/click/.mcfunction index 6ba155d7a..9a293b48b 100644 --- a/Asset/data/asset/functions/artifact/0225.onegai_muscle_2/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0225.onegai_muscle_2/click/.mcfunction @@ -1,16 +1,17 @@ #> asset:artifact/0225.onegai_muscle_2/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/225/click/ - scoreboard players set $Set Lib 100 - function lib:score_to_health_wrapper/set - # 効果 - effect give @s haste 10 10 true - # 演出 - playsound entity.player.hurt player @a ~ ~ ~ 1 1 - playsound minecraft:entity.zombie_villager.cure player @s ~ ~ ~ 1 2 - particle explosion ~ ~1 ~ 0.5 0.5 0.5 0 30 normal @s - #リセット - scoreboard players reset @s Temporary \ No newline at end of file +# 体力を変更 + scoreboard players set $Set Lib 100 + function lib:score_to_health_wrapper/set +# 効果 + effect give @s haste 10 10 true +# 演出 + playsound entity.player.hurt player @a ~ ~ ~ 1 1 + playsound minecraft:entity.zombie_villager.cure player @s ~ ~ ~ 1 2 + particle explosion ~ ~1 ~ 0.5 0.5 0.5 0 30 normal @s +#リセット + scoreboard players reset @s Temporary diff --git a/Asset/data/asset/functions/artifact/0226.onegai_muscle_3/click/.mcfunction b/Asset/data/asset/functions/artifact/0226.onegai_muscle_3/click/.mcfunction index 14120fc1b..1408acce2 100644 --- a/Asset/data/asset/functions/artifact/0226.onegai_muscle_3/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0226.onegai_muscle_3/click/.mcfunction @@ -1,17 +1,18 @@ #> asset:artifact/0226.onegai_muscle_3/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/226/click/ - scoreboard players set $Set Lib 100 - function lib:score_to_health_wrapper/set - # 効果 - effect give @s jump_boost 10 5 true - execute if predicate player_manager:is_believe/nyaptov run effect give @s jump_boost 10 10 true - # 演出 - playsound entity.player.hurt player @a ~ ~ ~ 1 1 - playsound minecraft:entity.zombie_villager.cure player @s ~ ~ ~ 1 2 - particle sweep_attack ~ ~1 ~ 0.5 0.5 0.5 0 30 normal @s - #リセット - scoreboard players reset @s Temporary \ No newline at end of file +# 体力を変更 + scoreboard players set $Set Lib 100 + function lib:score_to_health_wrapper/set +# 効果 + effect give @s jump_boost 10 5 true + execute if predicate player_manager:is_believe/nyaptov run effect give @s jump_boost 10 10 true +# 演出 + playsound entity.player.hurt player @a ~ ~ ~ 1 1 + playsound minecraft:entity.zombie_villager.cure player @s ~ ~ ~ 1 2 + particle sweep_attack ~ ~1 ~ 0.5 0.5 0.5 0 30 normal @s +#リセット + scoreboard players reset @s Temporary diff --git a/Asset/data/asset/functions/artifact/0227.onegai_muscle_4/click/.mcfunction b/Asset/data/asset/functions/artifact/0227.onegai_muscle_4/click/.mcfunction index 20d496c02..2fea23583 100644 --- a/Asset/data/asset/functions/artifact/0227.onegai_muscle_4/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0227.onegai_muscle_4/click/.mcfunction @@ -1,16 +1,17 @@ #> asset:artifact/0227.onegai_muscle_4/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/227/click/ - scoreboard players set $Set Lib 100 - function lib:score_to_health_wrapper/set - # 効果 - effect give @s resistance 30 3 true - # 演出 - playsound entity.player.hurt player @a ~ ~ ~ 1 1 - playsound minecraft:entity.zombie_villager.cure player @s ~ ~ ~ 1 2 - particle end_rod ~ ~1 ~ 0.5 0.5 0.5 0 30 normal @s - #リセット - scoreboard players reset @s Temporary \ No newline at end of file +# 体力を変更 + scoreboard players set $Set Lib 100 + function lib:score_to_health_wrapper/set +# 効果 + effect give @s resistance 30 3 true +# 演出 + playsound entity.player.hurt player @a ~ ~ ~ 1 1 + playsound minecraft:entity.zombie_villager.cure player @s ~ ~ ~ 1 2 + particle end_rod ~ ~1 ~ 0.5 0.5 0.5 0 30 normal @s +#リセット + scoreboard players reset @s Temporary diff --git a/Asset/data/asset/functions/artifact/0233.reversal/click/.mcfunction b/Asset/data/asset/functions/artifact/0233.reversal/click/.mcfunction index d681a39eb..a1fd8bde3 100644 --- a/Asset/data/asset/functions/artifact/0233.reversal/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0233.reversal/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0233.reversal/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/233/click/ diff --git a/Asset/data/asset/functions/artifact/0233.reversal/click/set_mp.mcfunction b/Asset/data/asset/functions/artifact/0233.reversal/click/set_mp.mcfunction index 79e235ef1..e34c4a8bc 100644 --- a/Asset/data/asset/functions/artifact/0233.reversal/click/set_mp.mcfunction +++ b/Asset/data/asset/functions/artifact/0233.reversal/click/set_mp.mcfunction @@ -3,6 +3,7 @@ # # # @within function asset:artifact/0233.reversal/click/ + execute store result score $6H.MP Temporary run function lib:mp/get execute store result score $6H.SetMP Temporary run function lib:mp/get_max scoreboard players operation $6H.SetMP Temporary -= $6H.MP Temporary diff --git a/Asset/data/asset/functions/artifact/0233.reversal/load.mcfunction b/Asset/data/asset/functions/artifact/0233.reversal/load.mcfunction index ed66ff285..ea4e98ece 100644 --- a/Asset/data/asset/functions/artifact/0233.reversal/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0233.reversal/load.mcfunction @@ -5,6 +5,6 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0233.reversal/click/** +# @within function asset:artifact/0233.reversal/** scoreboard objectives add 6H.MP dummy scoreboard objectives add 6H.SetMP dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0236.health_exchanger/click/.mcfunction b/Asset/data/asset/functions/artifact/0236.health_exchanger/click/.mcfunction index 87613339f..271279c57 100644 --- a/Asset/data/asset/functions/artifact/0236.health_exchanger/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0236.health_exchanger/click/.mcfunction @@ -1,55 +1,55 @@ #> asset:artifact/0236.health_exchanger/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/236/click/ +#> private +# @private + #declare tag HasMaxHealth + #declare score_holder $MaxHealth 鯖民の最大体力が代入されています + #declare score_holder $UserHealthDecimal 神器使用者の体力整数部分が代入されています #declare score_holder $UserHealthInt 神器使用者の体力小数部分が代入されています #declare score_holder $TargetHealthDecimal 体力交換先の体力整数部分をが代入されています #declare score_holder $TargetHealthInt 体力交換先の体力小数部分が代入されています #declare score_holder $SCUserHealth -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く - - # //この時点で $SCUserHealthと$MaxHealth,@a のTemporaryに体力が代入済み & hasMaxHealthTag付与済み - # 処理 - # 演算 - # //神器使用者の体力 - scoreboard players operation $UserHealthInt Temporary = $SCUserHealth Temporary - scoreboard players operation $UserHealthDecimal Temporary = $SCUserHealth Temporary - - scoreboard players operation $UserHealthInt Temporary /= $100 Const - scoreboard players operation $UserHealthDecimal Temporary %= $100 Const - - # 神器使用者の体力をMaxHealthに変更 - scoreboard players operation $Set Lib = $MaxHealth Temporary - function lib:score_to_health_wrapper/set - # @a[tag=HasMaxHealth] の体力を変更 - execute as @a[tag=HasMaxHealth] at @s run function asset:artifact/0236.health_exchanger/click/changed_my_health - - # 演出 - # 演算 - # //交換先の体力 - scoreboard players operation $TargetHealthInt Temporary = $MaxHealth Temporary - scoreboard players operation $TargetHealthDecimal Temporary = $MaxHealth Temporary - - scoreboard players operation $TargetHealthInt Temporary /= $100 Const - scoreboard players operation $TargetHealthDecimal Temporary %= $100 Const - # メッセージ「A と体力を交換した！ x.xx => y.yy」 - tellraw @s [{"text":"","color": "yellow"},{"selector":"@a[tag=HasMaxHealth]","color": "yellow"},{"text": " と体力を交換した！ "},{"score":{"name": "$UserHealthInt","objective": "Temporary"}},".",{"score":{"name": "$UserHealthDecimal","objective": "Temporary"}},{"text": " => "},{"score":{"name": "$TargetHealthInt","objective": "Temporary"}},".",{"score":{"name": "$TargetHealthDecimal","objective": "Temporary"}}] - - #パーティクル & 音 - particle totem_of_undying ~ ~ ~ 1 1 1 0 30 force @a - execute as @a[tag=HasMaxHealth] at @s run particle totem_of_undying ~ ~ ~ 1 1 1 0 30 force @a - - playsound ui.button.click player @s ~ ~ ~ 1 1 1 - execute as @a[tag=HasMaxHealth] at @s run playsound ui.button.click player @s ~ ~ ~ 1 1 1 - - # リセット - scoreboard players reset $UserHealthInt Temporary - scoreboard players reset $UserHealthDecimal Temporary - scoreboard players reset $TargetHealthInt Temporary - scoreboard players reset $TargetHealthDecimal Temporary \ No newline at end of file +# //この時点で $SCUserHealthと$MaxHealth,@a のTemporaryに体力が代入済み & hasMaxHealthTag付与済み +# 処理 + # 演算 + # //神器使用者の体力 + scoreboard players operation $UserHealthInt Temporary = $SCUserHealth Temporary + scoreboard players operation $UserHealthDecimal Temporary = $SCUserHealth Temporary + + scoreboard players operation $UserHealthInt Temporary /= $100 Const + scoreboard players operation $UserHealthDecimal Temporary %= $100 Const + + # 神器使用者の体力をMaxHealthに変更 + scoreboard players operation $Set Lib = $MaxHealth Temporary + function lib:score_to_health_wrapper/set + # @a[tag=HasMaxHealth] の体力を変更 + execute as @a[tag=HasMaxHealth] at @s run function asset:artifact/0236.health_exchanger/click/changed_my_health + +# 演出 + # 演算 + # //交換先の体力 + scoreboard players operation $TargetHealthInt Temporary = $MaxHealth Temporary + scoreboard players operation $TargetHealthDecimal Temporary = $MaxHealth Temporary + + scoreboard players operation $TargetHealthInt Temporary /= $100 Const + scoreboard players operation $TargetHealthDecimal Temporary %= $100 Const + # メッセージ「A と体力を交換した！ x.xx => y.yy」 + tellraw @s [{"text":"","color": "yellow"},{"selector":"@a[tag=HasMaxHealth]","color": "yellow"},{"text": " と体力を交換した！ "},{"score":{"name": "$UserHealthInt","objective": "Temporary"}},".",{"score":{"name": "$UserHealthDecimal","objective": "Temporary"}},{"text": " => "},{"score":{"name": "$TargetHealthInt","objective": "Temporary"}},".",{"score":{"name": "$TargetHealthDecimal","objective": "Temporary"}}] + + # パーティクル & 音 + particle totem_of_undying ~ ~ ~ 1 1 1 0 30 force @a + execute as @a[tag=HasMaxHealth] at @s run particle totem_of_undying ~ ~ ~ 1 1 1 0 30 force @a + + playsound ui.button.click player @s ~ ~ ~ 1 1 1 + execute as @a[tag=HasMaxHealth] at @s run playsound ui.button.click player @s ~ ~ ~ 1 1 1 + +# リセット + scoreboard players reset $UserHealthInt Temporary + scoreboard players reset $UserHealthDecimal Temporary + scoreboard players reset $TargetHealthInt Temporary + scoreboard players reset $TargetHealthDecimal Temporary diff --git a/Asset/data/asset/functions/artifact/0236.health_exchanger/click/check.mcfunction b/Asset/data/asset/functions/artifact/0236.health_exchanger/click/check.mcfunction index 398ce086d..20ef7536e 100644 --- a/Asset/data/asset/functions/artifact/0236.health_exchanger/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0236.health_exchanger/click/check.mcfunction @@ -4,29 +4,29 @@ # # @within function asset:artifact/alias/236/click/check - #declare tag HasMaxHealth - -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/auto -# 他にアイテム等確認する場合はここに書く - - # //まず全員の体力をscoreに代入 - execute as @a run function asset:artifact/0236.health_exchanger/click/own_data_put - # //自分の体力も比較用に代入 - function api:data_get/health - execute store result score $SCUserHealth Temporary run data get storage api: Health 100 - # //鯖民の最大体力を求める - execute as @a run scoreboard players operation $MaxHealth Temporary > @s Temporary - execute as @a if score @s Temporary = $MaxHealth Temporary run tag @s add HasMaxHealth - # //Maxが自分と同じだったらTag削除 - execute if entity @s[tag=HasMaxHealth] run tag @s remove CanUsed - execute if entity @s[tag=HasMaxHealth] run tellraw @s [{"text": "-☆既に体力が鯖で一番多いです☆-"}] - # //そもそも他人がいるか - execute unless entity @a[tag=!this] run tag @s remove CanUsed - execute unless entity @a[tag=!this] run tellraw @s [{"text": "なんなら今はボッチです☆","color": "gray"}] - -# CanUsedタグをチェックして.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0236.health_exchanger/click/ - -# リセット //でも使用するため最後に - scoreboard players reset @a Temporary \ No newline at end of file +#> private +# @private + #declare score_holder $SCUserHealth + #declare score_holder $MaxHealth + #declare tag HasMaxHealth + +# //まず全員の体力をscoreに代入 + execute as @a run function asset:artifact/0236.health_exchanger/click/own_data_put +# //自分の体力も比較用に代入 + function api:data_get/health + execute store result score $SCUserHealth Temporary run data get storage api: Health 100 +# //鯖民の最大体力を求める + execute as @a run scoreboard players operation $MaxHealth Temporary > @s Temporary + execute as @a if score @s Temporary = $MaxHealth Temporary run tag @s add HasMaxHealth +# //Maxが自分と同じだったらTag削除 + execute if entity @s[tag=HasMaxHealth] run tag @s remove CanUsed + execute if entity @s[tag=HasMaxHealth] run tellraw @s [{"text": "-☆既に体力が鯖で一番多いです☆-"}] +# //そもそも他人がいるか + execute unless entity @a[tag=!this] run tag @s remove CanUsed + execute unless entity @a[tag=!this] run tellraw @s [{"text": "なんなら今はボッチです☆","color": "gray"}] + +# //リセット //3.mainでも使用するため最後に + scoreboard players reset @a Temporary + scoreboard players reset $SCUserHealth Temporary + scoreboard players reset $MaxHealth Temporary + tag @a[tag=HasMaxHealth] remove HasMaxHealth diff --git a/Asset/data/asset/functions/artifact/0237.schrodingers_cat/click/.mcfunction b/Asset/data/asset/functions/artifact/0237.schrodingers_cat/click/.mcfunction index f1635d26f..d0fb884a5 100644 --- a/Asset/data/asset/functions/artifact/0237.schrodingers_cat/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0237.schrodingers_cat/click/.mcfunction @@ -1,24 +1,25 @@ #> asset:artifact/0237.schrodingers_cat/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/237/click/ - function asset:artifact/common/use/auto +#> Private +# @private + #declare tag CatSpawn -# ここから先は神器側の効果の処理を書く - #ネコか魚か - execute if predicate lib:random_pass_per/50 run tag @s add CatSpawn +# ネコか魚か + execute if predicate lib:random_pass_per/50 run tag @s add CatSpawn - #ネコが出た場合 - execute as @s[tag=CatSpawn] run summon cat ~ ~ ~ - playsound entity.cat.ambient neutral @s[tag=CatSpawn] ~ ~ ~ 3 1 - particle heart ~ ~ ~ 1 1 1 1 100 normal @s[tag=CatSpawn] +# ネコが出た場合 + execute as @s[tag=CatSpawn] run summon cat ~ ~ ~ + playsound entity.cat.ambient neutral @s[tag=CatSpawn] ~ ~ ~ 3 1 + particle heart ~ ~ ~ 1 1 1 1 100 normal @s[tag=CatSpawn] - #ネコが出なかった場合 - execute as @s[tag=!CatSpawn] run summon cod ~ ~ ~ - playsound entity.cod.flop player @s[tag=!CatSpawn] ~ ~ ~ 3 1 - particle falling_water ~ ~ ~ 1 1 1 1 300 normal @s[tag=!CatSpawn] +# ネコが出なかった場合 + execute as @s[tag=!CatSpawn] run summon cod ~ ~ ~ + playsound entity.cod.flop player @s[tag=!CatSpawn] ~ ~ ~ 3 1 + particle falling_water ~ ~ ~ 1 1 1 1 300 normal @s[tag=!CatSpawn] - #タグ消し - tag @s remove CatSpawn \ No newline at end of file +# タグ消し + tag @s remove CatSpawn diff --git a/Asset/data/asset/functions/artifact/0244.skewer/kill_melee/.mcfunction b/Asset/data/asset/functions/artifact/0244.skewer/kill_melee/.mcfunction index e46158655..6320b6a7b 100644 --- a/Asset/data/asset/functions/artifact/0244.skewer/kill_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0244.skewer/kill_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0244.skewer/kill_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/244/kill_melee/ @@ -12,4 +12,4 @@ particle minecraft:crit ~ ~1 ~ 0.25 0.5 0.25 0.1 20 force particle minecraft:smoke ~ ~1 ~ 0.25 0.25 0.25 0.01 50 force playsound minecraft:entity.drowned.shoot player @a ~ ~ ~ 0.7 1.5 - playsound minecraft:entity.generic.eat player @a ~ ~ ~ 2 1 \ No newline at end of file + playsound minecraft:entity.generic.eat player @a ~ ~ ~ 2 1 diff --git a/Asset/data/asset/functions/artifact/0245.skewered_meat/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0245.skewered_meat/use_item/.mcfunction index fa7f3dfcf..78c76f43e 100644 --- a/Asset/data/asset/functions/artifact/0245.skewered_meat/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0245.skewered_meat/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0245.skewered_meat/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/245/use_item/ @@ -12,4 +12,4 @@ # 演出 tellraw @s {"text":"─── んまいっ！","bold":true} - particle minecraft:heart ~ ~1.3 ~ 0.25 0.25 0.25 1 7 \ No newline at end of file + particle minecraft:heart ~ ~1.3 ~ 0.25 0.25 0.25 1 7 diff --git a/Asset/data/asset/functions/artifact/0246.magical_cane/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0246.magical_cane/_index.d.mcfunction new file mode 100644 index 000000000..65c1240a0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0246.magical_cane/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0246.magical_cane/_index.d +# @private + +#> デフォルトのMPスコアなど +# @within function asset:artifact/0246.magical_cane/** + #declare score_holder $MagicalCane \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0246.magical_cane/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0246.magical_cane/attack_melee/.mcfunction index d5c69778f..38b65da92 100644 --- a/Asset/data/asset/functions/artifact/0246.magical_cane/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0246.magical_cane/attack_melee/.mcfunction @@ -1,9 +1,12 @@ #> asset:artifact/0246.magical_cane/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/246/attack_melee/ +# 使用時のMPの数値によって演出がかわるよ + execute store result score $MagicalCane Temporary run function lib:mp/get + execute if score $MagicalCane Temporary matches 0..49 run function asset:artifact/0246.magical_cane/attack_melee/3.1.weak_hit execute if score $MagicalCane Temporary matches 50..249 run function asset:artifact/0246.magical_cane/attack_melee/3.2.strong_hit execute if score $MagicalCane Temporary matches 250.. run function asset:artifact/0246.magical_cane/attack_melee/3.3.hyper_hit @@ -21,9 +24,6 @@ # ダメージを受けろ！ execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function lib:damage/ -# 基本的な使用時の処理(MP消費や使用回数の処理など)を行う auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/use/mainhand - # リセット function lib:damage/reset - scoreboard players reset $MagicalCane Temporary \ No newline at end of file + scoreboard players reset $MagicalCane Temporary diff --git a/Asset/data/asset/functions/artifact/0246.magical_cane/attack_melee/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0246.magical_cane/attack_melee/_index.d.mcfunction deleted file mode 100644 index e4a269731..000000000 --- a/Asset/data/asset/functions/artifact/0246.magical_cane/attack_melee/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0246.magical_cane/attack_melee/_index.d -# @private - -#> デフォルトのMPスコアなど -# @within function asset:artifact/0246.magical_cane/attack_melee/** - #declare score_holder $MagicalCane \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0247.heavenly_herb/damage/.mcfunction b/Asset/data/asset/functions/artifact/0247.heavenly_herb/damage/.mcfunction index 4b774d037..57ae49c59 100644 --- a/Asset/data/asset/functions/artifact/0247.heavenly_herb/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/0247.heavenly_herb/damage/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0247.heavenly_herb/damage/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/247/damage/ @@ -15,4 +15,4 @@ # 演出 particle minecraft:happy_villager ~ ~ ~ 1 1 1 1 100 normal @s - playsound minecraft:entity.arrow.hit_player player @s ~ ~ ~ 1 0.1 \ No newline at end of file + playsound minecraft:entity.arrow.hit_player player @s ~ ~ ~ 1 0.1 diff --git a/Asset/data/asset/functions/artifact/0248.bow_of_vinderre/attack_projectile/.mcfunction b/Asset/data/asset/functions/artifact/0248.bow_of_vinderre/attack_projectile/.mcfunction index 7a2891f8f..1edc35f78 100644 --- a/Asset/data/asset/functions/artifact/0248.bow_of_vinderre/attack_projectile/.mcfunction +++ b/Asset/data/asset/functions/artifact/0248.bow_of_vinderre/attack_projectile/.mcfunction @@ -1,10 +1,12 @@ #> asset:artifact/0248.bow_of_vinderre/attack_projectile/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/248/attack_projectile/ - function asset:artifact/common/use/mainhand +#> private +# @private + #declare tag RandomTP # ここから先は神器側の効果の処理を書く execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..100] run effect give @s poison 20 4 diff --git a/Asset/data/asset/functions/artifact/0249.wakinyan/attack_projectile/.mcfunction b/Asset/data/asset/functions/artifact/0249.wakinyan/attack_projectile/.mcfunction index 64d7e5c39..3ab6e7700 100644 --- a/Asset/data/asset/functions/artifact/0249.wakinyan/attack_projectile/.mcfunction +++ b/Asset/data/asset/functions/artifact/0249.wakinyan/attack_projectile/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0249.wakinyan/attack_projectile/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/249/attack_projectile/ diff --git a/Asset/data/asset/functions/artifact/0250.phoenix/attack_projectile/.mcfunction b/Asset/data/asset/functions/artifact/0250.phoenix/attack_projectile/.mcfunction index 24e22b32e..fd173e972 100644 --- a/Asset/data/asset/functions/artifact/0250.phoenix/attack_projectile/.mcfunction +++ b/Asset/data/asset/functions/artifact/0250.phoenix/attack_projectile/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0250.phoenix/attack_projectile/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/250/attack_projectile/ diff --git a/Asset/data/asset/functions/artifact/0252.void_transaction/click/.mcfunction b/Asset/data/asset/functions/artifact/0252.void_transaction/click/.mcfunction index 55e3ace82..c1f5c7d07 100644 --- a/Asset/data/asset/functions/artifact/0252.void_transaction/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0252.void_transaction/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0252.void_transaction/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/252/click/ diff --git a/Asset/data/asset/functions/artifact/0253.holy_barrier/damage_entity/.mcfunction b/Asset/data/asset/functions/artifact/0253.holy_barrier/damage_entity/.mcfunction index fc902d6a2..8aa0929fe 100644 --- a/Asset/data/asset/functions/artifact/0253.holy_barrier/damage_entity/.mcfunction +++ b/Asset/data/asset/functions/artifact/0253.holy_barrier/damage_entity/.mcfunction @@ -1,16 +1,17 @@ #> asset:artifact/0253.holy_barrier/damage_entity/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/253/damage_entity/ - function asset:artifact/common/use/hotbar +#> prv +# @private + #declare tag 71.Target -# ここから先は神器側の効果の処理を書く # 攻撃対象にタグ付け tag @e[type=#lib:living,tag=!Enemy.Boss,tag=!Uninterferable,predicate=asset:artifact/0253.holy_barrier/is_angry] add 71.Target -#音 +# 音 playsound minecraft:block.respawn_anchor.deplete player @a[distance=..16] ~ ~ ~ 1 1 1 playsound entity.experience_orb.pickup player @a[distance=..16] ~ ~ ~ 1 1.2 1 diff --git a/Asset/data/asset/functions/artifact/0253.holy_barrier/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/0253.holy_barrier/damage_entity/check.mcfunction deleted file mode 100644 index 33229ac98..000000000 --- a/Asset/data/asset/functions/artifact/0253.holy_barrier/damage_entity/check.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0253.holy_barrier/damage_entity/check -# -# 神器の使用条件の確認処理 -# -# @within function asset:artifact/alias/253/damage_entity/check - -# 他にアイテム等確認する場合はここに書く \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/click/.mcfunction b/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/click/.mcfunction index dae255da4..a7770a17f 100644 --- a/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0258.chen_dream_pillow/click/.mcfunction @@ -1,13 +1,9 @@ #> asset:artifact/0258.chen_dream_pillow/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/258/click/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く - # 演出 particle minecraft:composter ~ ~1 ~ 0.5 0.5 0.5 1 100 force @s playsound minecraft:ui.toast.challenge_complete player @a ~ ~ ~ 1 1 @@ -18,4 +14,4 @@ # MP回復 scoreboard players set $Fluctuation Lib 1231 - function lib:mp/fluctuation \ No newline at end of file + function lib:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0260.heal_lv.1/click/.mcfunction b/Asset/data/asset/functions/artifact/0260.heal_lv.1/click/.mcfunction index 81db6f984..1561967e7 100644 --- a/Asset/data/asset/functions/artifact/0260.heal_lv.1/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0260.heal_lv.1/click/.mcfunction @@ -1,9 +1,10 @@ #> asset:artifact/0260.heal_lv.1/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/260/click/ +# 演出 playsound minecraft:entity.evoker.cast_spell player @a ~ ~ ~ 0.6 0.8 playsound minecraft:entity.evoker.cast_spell player @a ~ ~ ~ 0.8 1.8 playsound minecraft:entity.evoker.prepare_summon player @a ~ ~ ~ 0.6 1.17 @@ -16,4 +17,4 @@ function lib:heal/modifier execute as @a[distance=..3,sort=nearest,limit=6] run function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/_index.d.mcfunction new file mode 100644 index 000000000..43d923609 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0261.holy_symbol_lv.1/_index.d +# @private + +#> 定義類はここに +# @within function asset:artifact/0261.holy_symbol_lv.1/** + #declare tag 79.HolySymbol diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/.mcfunction index e54fd473f..47bf0a8ac 100644 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/.mcfunction @@ -1,7 +1,9 @@ #> asset:artifact/0261.holy_symbol_lv.1/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/261/click/ - function asset:artifact/0261.holy_symbol_lv.1/click/recursive \ No newline at end of file +# ここから先は神器側の効果の処理を書く + summon minecraft:area_effect_cloud ~ ~ ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["79.HolySymbol","Object","Uninterferable"]} + function asset:artifact/0261.holy_symbol_lv.1/click/recursive diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/_index.d.mcfunction deleted file mode 100644 index ff4366be3..000000000 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0261.holy_symbol_lv.1/click/_index.d -# @private - -#> 定義類はここに -# @within function asset:artifact/0261.holy_symbol_lv.1/click/** -#declare tag 79.HolySymbol \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/recursive.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/recursive.mcfunction index 7750cd77e..f704f9fe8 100644 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/recursive.mcfunction @@ -4,8 +4,8 @@ # # @within function # asset:artifact/0261.holy_symbol_lv.1/click/ -# asset:artifact/0261.holy_symbol_lv.1/click/rejoin_process # asset:artifact/0261.holy_symbol_lv.1/click/symbol/ # asset:artifact/0261.holy_symbol_lv.1/click/effect/ +# asset:artifact/0261.holy_symbol_lv.1/rejoin_process execute as @e[type=area_effect_cloud,tag=79.HolySymbol] at @s run function asset:artifact/0261.holy_symbol_lv.1/click/symbol/ diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/load.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/load.mcfunction index bd649a2b8..b69a46d46 100644 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0261.holy_symbol_lv.1/click/** +# @within function asset:artifact/0261.holy_symbol_lv.1/** scoreboard objectives add 79.HolySymbol dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/rejoin_process.mcfunction similarity index 67% rename from Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/rejoin_process.mcfunction index 5f78d8b91..10997f0fb 100644 --- a/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0261.holy_symbol_lv.1/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0261.holy_symbol_lv.1/click/rejoin_process +#> asset:artifact/0261.holy_symbol_lv.1/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/_index.d.mcfunction similarity index 50% rename from Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/_index.d.mcfunction rename to Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/_index.d.mcfunction index bca2a60b9..f694be6df 100644 --- a/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/_index.d.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0262.angel_ray_lv.1/click/_index.d +#> asset:artifact/0262.angel_ray_lv.1/_index.d # @private #> 定義類はここに -# @within function asset:artifact/0262.angel_ray_lv.1/click/** +# @within function asset:artifact/0262.angel_ray_lv.1/** #declare tag 7A.AngelRay #declare tag Init #declare tag TargetCandidate \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/.mcfunction b/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/.mcfunction index 486ad9a3b..72876c260 100644 --- a/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/.mcfunction @@ -1,9 +1,10 @@ #> asset:artifact/0262.angel_ray_lv.1/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/262/click/ +# レイ用Entityの初期化 summon minecraft:area_effect_cloud ~ ~1.4 ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["7A.AngelRay","Init","Object","Uninterferable"]} execute positioned ~ ~1.4 ~ run tp @e[type=area_effect_cloud,tag=Init,distance=..0.01] ~ ~ ~ ~ ~ # 初回演出 @@ -17,4 +18,4 @@ # 効果処理 execute positioned ~ ~1.4 ~ run function asset:artifact/0262.angel_ray_lv.1/click/effect/ # リセット - execute positioned ~ ~1.4 ~ run tag @e[type=area_effect_cloud,tag=Init,distance=..0.01] remove Init \ No newline at end of file + execute positioned ~ ~1.4 ~ run tag @e[type=area_effect_cloud,tag=Init,distance=..0.01] remove Init diff --git a/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/effect/.mcfunction b/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/effect/.mcfunction index 57ff84768..bd01586a7 100644 --- a/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/effect/.mcfunction +++ b/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/click/effect/.mcfunction @@ -6,7 +6,7 @@ #> Target # @private -#declare tag Target + #declare tag Target # それぞれでmodifierを実行するのは面倒なので先に処理してしまう data modify storage lib: Argument.Damage set value 146.4d @@ -28,4 +28,4 @@ tag @e[type=#lib:living,tag=TargetCandidate,distance=..13] remove TargetCandidate tag @e[type=#lib:living,tag=Target,distance=..13] remove Target function lib:damage/reset - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/load.mcfunction b/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/load.mcfunction index d133c02bb..ff9e6bee0 100644 --- a/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0262.angel_ray_lv.1/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0262.angel_ray_lv.1/click/** +# @within function asset:artifact/0262.angel_ray_lv.1/** scoreboard objectives add 7A.AngelRay dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0264.heal_lv.5/click/.mcfunction b/Asset/data/asset/functions/artifact/0264.heal_lv.5/click/.mcfunction index 1b00c830d..68a16d0b2 100644 --- a/Asset/data/asset/functions/artifact/0264.heal_lv.5/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0264.heal_lv.5/click/.mcfunction @@ -1,9 +1,10 @@ #> asset:artifact/0264.heal_lv.5/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/264/click/ +# 演出 playsound minecraft:entity.evoker.cast_spell player @a ~ ~ ~ 0.6 0.8 playsound minecraft:entity.evoker.cast_spell player @a ~ ~ ~ 0.8 1.8 playsound minecraft:entity.evoker.prepare_summon player @a ~ ~ ~ 0.6 1.17 @@ -16,4 +17,4 @@ function lib:heal/modifier execute as @a[distance=..3,sort=nearest,limit=6] run function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/_index.d.mcfunction new file mode 100644 index 000000000..dad3a2994 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0265.holy_symbol_lv.5/_index.d +# @private + +#> 定義類はここに +# @within function asset:artifact/0265.holy_symbol_lv.5/** + #declare tag 7D.HolySymbol diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/.mcfunction index 4c26230f2..103344f81 100644 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/.mcfunction @@ -1,7 +1,9 @@ #> asset:artifact/0265.holy_symbol_lv.5/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/265/click/ - function asset:artifact/0265.holy_symbol_lv.5/click/recursive \ No newline at end of file +# ここから先は神器側の効果の処理を書く + summon minecraft:area_effect_cloud ~ ~ ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["7D.HolySymbol","Object","Uninterferable"]} + function asset:artifact/0265.holy_symbol_lv.5/click/recursive diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/_index.d.mcfunction deleted file mode 100644 index 64b2a6862..000000000 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0265.holy_symbol_lv.5/click/_index.d -# @private - -#> 定義類はここに -# @within function asset:artifact/0265.holy_symbol_lv.5/click/** -#declare tag 7D.HolySymbol \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/recursive.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/recursive.mcfunction index f0638ba1c..ac0696a6c 100644 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/recursive.mcfunction @@ -4,8 +4,8 @@ # # @within function # asset:artifact/0265.holy_symbol_lv.5/click/ -# asset:artifact/0265.holy_symbol_lv.5/click/rejoin_process # asset:artifact/0265.holy_symbol_lv.5/click/symbol/ # asset:artifact/0265.holy_symbol_lv.5/click/effect/ +# asset:artifact/0265.holy_symbol_lv.5/rejoin_process execute as @e[type=area_effect_cloud,tag=7D.HolySymbol] at @s run function asset:artifact/0265.holy_symbol_lv.5/click/symbol/ diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/load.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/load.mcfunction index f8858f641..d44a13f52 100644 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0265.holy_symbol_lv.5/click/** +# @within function asset:artifact/0265.holy_symbol_lv.5/** scoreboard objectives add 7D.HolySymbol dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/rejoin_process.mcfunction similarity index 67% rename from Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/rejoin_process.mcfunction index 84f323ec8..d7fbfaa0e 100644 --- a/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0265.holy_symbol_lv.5/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0265.holy_symbol_lv.5/click/rejoin_process +#> asset:artifact/0265.holy_symbol_lv.5/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/_index.d.mcfunction similarity index 51% rename from Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/_index.d.mcfunction rename to Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/_index.d.mcfunction index f689f5ea3..cc0363d04 100644 --- a/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/_index.d.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0266.angel_ray_lv.5/click/_index.d +#> asset:artifact/0266.angel_ray_lv.5/_index.d # @private #> 定義類はここに -# @within function asset:artifact/0266.angel_ray_lv.5/click/** +# @within function asset:artifact/0266.angel_ray_lv.5/** #declare tag 7E.HolySymbol #declare tag Init #declare tag TargetCandidate \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/.mcfunction b/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/.mcfunction index 1a062f888..2ae63c432 100644 --- a/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/.mcfunction @@ -1,9 +1,10 @@ #> asset:artifact/0266.angel_ray_lv.5/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/266/click/ +# レイ用Entityの初期化 summon minecraft:area_effect_cloud ~ ~1.4 ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["7E.HolySymbol","Init","Object","Uninterferable"]} execute positioned ~ ~1.4 ~ run tp @e[type=area_effect_cloud,tag=Init,distance=..0.01] ~ ~ ~ ~ ~ # 初回演出 @@ -17,4 +18,4 @@ # 効果処理 execute positioned ~ ~1.4 ~ run function asset:artifact/0266.angel_ray_lv.5/click/effect/ # リセット - execute positioned ~ ~1.4 ~ run tag @e[type=area_effect_cloud,tag=Init,distance=..0.01] remove Init \ No newline at end of file + execute positioned ~ ~1.4 ~ run tag @e[type=area_effect_cloud,tag=Init,distance=..0.01] remove Init diff --git a/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/effect/.mcfunction b/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/effect/.mcfunction index 52506f94b..30eeb6349 100644 --- a/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/effect/.mcfunction +++ b/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/click/effect/.mcfunction @@ -6,7 +6,7 @@ #> Target # @private -#declare tag Target + #declare tag Target # それぞれでmodifierを実行するのは面倒なので先に処理してしまう data modify storage lib: Argument.Damage set value 439.2d @@ -28,4 +28,4 @@ tag @e[type=#lib:living,tag=TargetCandidate] remove TargetCandidate tag @e[type=#lib:living,tag=Target] remove Target function lib:damage/reset - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/load.mcfunction b/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/load.mcfunction index d03db2b8e..3acfbb611 100644 --- a/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0266.angel_ray_lv.5/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0266.angel_ray_lv.5/click/** +# @within function asset:artifact/0266.angel_ray_lv.5/** scoreboard objectives add 7E.HolySymbol dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0268.heal_lv.10/click/.mcfunction b/Asset/data/asset/functions/artifact/0268.heal_lv.10/click/.mcfunction index 67d1c2647..be0212e35 100644 --- a/Asset/data/asset/functions/artifact/0268.heal_lv.10/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0268.heal_lv.10/click/.mcfunction @@ -1,9 +1,10 @@ #> asset:artifact/0268.heal_lv.10/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/268/click/ +# 演出 playsound minecraft:entity.evoker.cast_spell player @a ~ ~ ~ 0.6 0.8 playsound minecraft:entity.evoker.cast_spell player @a ~ ~ ~ 0.8 1.8 playsound minecraft:entity.evoker.prepare_summon player @a ~ ~ ~ 0.6 1.17 @@ -16,4 +17,4 @@ function lib:heal/modifier execute as @a[distance=..3,sort=nearest,limit=6] run function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/_index.d.mcfunction new file mode 100644 index 000000000..fe2667c87 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0269.holy_symbol_lv.10/_index.d +# @private + +#> 定義類はここに +# @within function asset:artifact/0269.holy_symbol_lv.10/** + #declare tag 7H.HolySymbol diff --git a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/.mcfunction b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/.mcfunction index 28df65330..ecee2670a 100644 --- a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/.mcfunction @@ -1,7 +1,9 @@ #> asset:artifact/0269.holy_symbol_lv.10/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/269/click/ - function asset:artifact/0269.holy_symbol_lv.10/click/recursive \ No newline at end of file +# ここから先は神器側の効果の処理を書く + summon minecraft:area_effect_cloud ~ ~ ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["7H.HolySymbol","Object","Uninterferable"]} + function asset:artifact/0269.holy_symbol_lv.10/click/recursive diff --git a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/_index.d.mcfunction deleted file mode 100644 index 5f62fdce6..000000000 --- a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/_index.d.mcfunction +++ /dev/null @@ -1,6 +0,0 @@ -#> asset:artifact/0269.holy_symbol_lv.10/click/_index.d -# @private - -#> 定義類はここに -# @within function asset:artifact/0269.holy_symbol_lv.10/click/** -#declare tag 7H.HolySymbol \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/recursive.mcfunction b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/recursive.mcfunction index e92d3c13e..25494c90a 100644 --- a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/recursive.mcfunction +++ b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/recursive.mcfunction @@ -4,8 +4,8 @@ # # @within function # asset:artifact/0269.holy_symbol_lv.10/click/ -# asset:artifact/0269.holy_symbol_lv.10/click/rejoin_process # asset:artifact/0269.holy_symbol_lv.10/click/symbol/ # asset:artifact/0269.holy_symbol_lv.10/click/effect/ +# asset:artifact/0269.holy_symbol_lv.10/rejoin_process execute as @e[type=area_effect_cloud,tag=7H.HolySymbol] at @s run function asset:artifact/0269.holy_symbol_lv.10/click/symbol/ diff --git a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/load.mcfunction b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/load.mcfunction index b0f9363bf..fd38056fa 100644 --- a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0269.holy_symbol_lv.10/click/** +# @within function asset:artifact/0269.holy_symbol_lv.10/** scoreboard objectives add 7H.HolySymbol dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/rejoin_process.mcfunction similarity index 67% rename from Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/rejoin_process.mcfunction index 7e275fc85..79d93c9c5 100644 --- a/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0269.holy_symbol_lv.10/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0269.holy_symbol_lv.10/click/rejoin_process +#> asset:artifact/0269.holy_symbol_lv.10/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/_index.d.mcfunction similarity index 50% rename from Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/_index.d.mcfunction rename to Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/_index.d.mcfunction index 5a6af5e61..3df66ff52 100644 --- a/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/_index.d.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0270.angel_ray_lv.10/click/_index.d +#> asset:artifact/0270.angel_ray_lv.10/_index.d # @private #> 定義類はここに -# @within function asset:artifact/0270.angel_ray_lv.10/click/** +# @within function asset:artifact/0270.angel_ray_lv.10/** #declare tag 7I.AngelRay #declare tag Init #declare tag TargetCandidate \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/.mcfunction b/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/.mcfunction index dd7347405..075e1f69a 100644 --- a/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/.mcfunction @@ -1,9 +1,10 @@ #> asset:artifact/0270.angel_ray_lv.10/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/270/click/ +# レイ用Entityの初期化 summon minecraft:area_effect_cloud ~ ~1.4 ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["7I.AngelRay","Init","Object","Uninterferable"]} execute positioned ~ ~1.4 ~ run tp @e[type=area_effect_cloud,tag=Init,distance=..0.01] ~ ~ ~ ~ ~ # 初回演出 @@ -17,4 +18,4 @@ # 効果処理 execute positioned ~ ~1.4 ~ run function asset:artifact/0270.angel_ray_lv.10/click/effect/ # リセット - execute positioned ~ ~1.4 ~ run tag @e[type=area_effect_cloud,tag=Init,distance=..0.01] remove Init \ No newline at end of file + execute positioned ~ ~1.4 ~ run tag @e[type=area_effect_cloud,tag=Init,distance=..0.01] remove Init diff --git a/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/effect/.mcfunction b/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/effect/.mcfunction index 676ef27e7..949e9c4e9 100644 --- a/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/effect/.mcfunction +++ b/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/click/effect/.mcfunction @@ -6,7 +6,7 @@ #> Target # @private -#declare tag Target + #declare tag Target # それぞれでmodifierを実行するのは面倒なので先に処理してしまう data modify storage lib: Argument.Damage set value 1171.3d @@ -28,4 +28,4 @@ tag @e[type=#lib:living,tag=TargetCandidate] remove TargetCandidate tag @e[type=#lib:living,tag=Target] remove Target function lib:damage/reset - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/load.mcfunction b/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/load.mcfunction index 4366c605d..f03a9c8f1 100644 --- a/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0270.angel_ray_lv.10/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0270.angel_ray_lv.10/click/** +# @within function asset:artifact/0270.angel_ray_lv.10/** scoreboard objectives add 7I.AngelRay dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0272.infinity_food/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0272.infinity_food/use_item/.mcfunction index f33dbb60b..b1cd9191c 100644 --- a/Asset/data/asset/functions/artifact/0272.infinity_food/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0272.infinity_food/use_item/.mcfunction @@ -1,7 +1,9 @@ #> asset:artifact/0272.infinity_food/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/272/use_item/ - function api:artifact/give/from_id \ No newline at end of file +# ここから先は神器側の効果の処理を書く + data modify storage api: Argument.ID set value 272 + function api:artifact/give/from_id diff --git a/Asset/data/asset/functions/artifact/0273.tonbo_gaeri/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0273.tonbo_gaeri/attack_melee/.mcfunction index 3ddadb93a..d32e1f21a 100644 --- a/Asset/data/asset/functions/artifact/0273.tonbo_gaeri/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0273.tonbo_gaeri/attack_melee/.mcfunction @@ -1,10 +1,9 @@ #> asset:artifact/0273.tonbo_gaeri/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/273/attack_melee/ - # 移動前の地点にパーティクルと音を残す function asset:artifact/0273.tonbo_gaeri/attack_melee/3.1.warp_effect @@ -24,4 +23,4 @@ execute in minecraft:overworld run tp @s 23 3 24 # 移動前の地点にパーティクルと音を残す - execute at @s run function asset:artifact/0273.tonbo_gaeri/attack_melee/3.1.warp_effect \ No newline at end of file + execute at @s run function asset:artifact/0273.tonbo_gaeri/attack_melee/3.1.warp_effect diff --git a/Asset/data/asset/functions/artifact/0277.nudist_carnival/damage/.mcfunction b/Asset/data/asset/functions/artifact/0277.nudist_carnival/damage/.mcfunction index 4f6753961..e01a81b97 100644 --- a/Asset/data/asset/functions/artifact/0277.nudist_carnival/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/0277.nudist_carnival/damage/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0277.nudist_carnival/damage/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/277/damage/ @@ -12,4 +12,4 @@ # プレイヤーを回復 function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0277.nudist_carnival/damage/check.mcfunction b/Asset/data/asset/functions/artifact/0277.nudist_carnival/damage/check.mcfunction index c7a7c4515..7c25a012b 100644 --- a/Asset/data/asset/functions/artifact/0277.nudist_carnival/damage/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0277.nudist_carnival/damage/check.mcfunction @@ -4,9 +4,9 @@ # # @within function asset:artifact/alias/277/damage/check - # このアイテム以外のアイテムを何も持っていないか確認 - execute store result score @s Temporary run clear @s #lib:all 0 - tag @s[scores={Temporary=2..}] remove CanUsed - - # リセット - scoreboard players reset @s Temporary \ No newline at end of file +# このアイテム以外のアイテムを何も持っていないか確認 + execute store result score @s Temporary run clear @s #lib:all 0 + tag @s[scores={Temporary=2..}] remove CanUsed + +# リセット + scoreboard players reset @s Temporary diff --git a/Asset/data/asset/functions/artifact/0278.reveille/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0278.reveille/_index.d.mcfunction new file mode 100644 index 000000000..47004c1f0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0278.reveille/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0278.reveille/_index.d +# @private +# +#> tag +# @within function asset:artifact/0278.reveille/** + #declare score_holder $Timeline diff --git a/Asset/data/asset/functions/artifact/0278.reveille/click/.mcfunction b/Asset/data/asset/functions/artifact/0278.reveille/click/.mcfunction index 2a615c4a8..f8dc85dfb 100644 --- a/Asset/data/asset/functions/artifact/0278.reveille/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0278.reveille/click/.mcfunction @@ -1,7 +1,9 @@ #> asset:artifact/0278.reveille/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/278/click/ - schedule function asset:artifact/0278.reveille/click/3.1.play_manager 1t \ No newline at end of file +# ここから先は神器側の効果の処理を書く + scoreboard players set $Timeline 7Q.Timeline 0 + schedule function asset:artifact/0278.reveille/click/3.1.play_manager 1t diff --git a/Asset/data/asset/functions/artifact/0278.reveille/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0278.reveille/click/_index.d.mcfunction deleted file mode 100644 index 3d9ee501b..000000000 --- a/Asset/data/asset/functions/artifact/0278.reveille/click/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0278.reveille/click/_index.d -# @private -# -#> tag -# @within function -# asset:artifact/0278.reveille/click/** - #declare score_holder $Timeline \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0278.reveille/click/check.mcfunction b/Asset/data/asset/functions/artifact/0278.reveille/click/check.mcfunction index 8608550fa..cf3299408 100644 --- a/Asset/data/asset/functions/artifact/0278.reveille/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0278.reveille/click/check.mcfunction @@ -4,11 +4,10 @@ # # @within function asset:artifact/alias/278/click/check -# オーバーワールドでなければCanUsedを削除 - execute if entity @s[tag=CanUsed] unless predicate lib:dimension/is_overworld run function lib:message/artifact/can_not_use_here - execute unless predicate lib:dimension/is_overworld run tag @s remove CanUsed - -# 昼ならCanUsedを削除する - execute if entity @s[tag=CanUsed] if predicate lib:is_day run tellraw @s {"text":"発動条件を満たしていません。","color":"red"} - execute if predicate lib:is_day run tag @s remove CanUsed - \ No newline at end of file +# オーバーワールドでなければCanUsedを削除 + execute if entity @s[tag=CanUsed] unless predicate lib:dimension/is_overworld run function lib:message/artifact/can_not_use_here + execute unless predicate lib:dimension/is_overworld run tag @s remove CanUsed + +# 昼ならCanUsedを削除する + execute if entity @s[tag=CanUsed] if predicate lib:is_day run tellraw @s {"text":"発動条件を満たしていません。","color":"red"} + execute if predicate lib:is_day run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0278.reveille/load.mcfunction b/Asset/data/asset/functions/artifact/0278.reveille/load.mcfunction index d0d7ef8b6..53b9790fa 100644 --- a/Asset/data/asset/functions/artifact/0278.reveille/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0278.reveille/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0278.reveille/click/** +# @within function asset:artifact/0278.reveille/** scoreboard objectives add 7Q.Timeline dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0288.lamentation_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0288.lamentation_sword/attack_melee/.mcfunction index 1cdae1965..e05f1ca47 100644 --- a/Asset/data/asset/functions/artifact/0288.lamentation_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0288.lamentation_sword/attack_melee/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0288.lamentation_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/288/attack_melee/ - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare tag Hit # 演出 playsound minecraft:entity.ghast.hurt player @a ~ ~ ~ 0.3 1.6 @@ -23,4 +24,4 @@ function lib:damage/modifier execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0290.carefully_collector/click/.mcfunction b/Asset/data/asset/functions/artifact/0290.carefully_collector/click/.mcfunction index eb4181991..ceabee400 100644 --- a/Asset/data/asset/functions/artifact/0290.carefully_collector/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0290.carefully_collector/click/.mcfunction @@ -1,35 +1,37 @@ #> asset:artifact/0290.carefully_collector/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/290/click/ +#> private +# @private + #declare tag CarefullyCollect -# ここから先は神器側の効果の処理を書く - # 判定 - execute if block ~ ~ ~ chest run scoreboard players set @s Temporary 1 - execute if block ~ ~ ~ trapped_chest run scoreboard players set @s Temporary 2 - # summon - summon item ~ ~ ~ {Tags:[CarefullyCollect],Item:{id:"minecraft:barrier",Count:1b}} +# 判定 + execute if block ~ ~ ~ chest run scoreboard players set @s Temporary 1 + execute if block ~ ~ ~ trapped_chest run scoreboard players set @s Temporary 2 +# summon + summon item ~ ~ ~ {Tags:[CarefullyCollect],Item:{id:"minecraft:barrier",Count:1b}} - # データ処理 - data modify storage asset:temp block set from block ~ ~ ~ +# データ処理 + data modify storage asset:temp block set from block ~ ~ ~ - data modify storage asset:temp chest.Count set value 1b - data modify storage asset:temp chest.id set from storage asset:temp block.id - data modify storage asset:temp chest.tag.BlockEntityTag.Items set from storage asset:temp block.Items - data modify storage asset:temp chest.tag.BlockEntityTag.Lock set from storage asset:temp block.Lock - data modify storage asset:temp chest.tag.display.Name set from storage asset:temp block.CustomName - # //反映 - data modify entity @e[type=item,tag=CarefullyCollect,distance=..0,limit=1] Item set from storage asset:temp chest + data modify storage asset:temp chest.Count set value 1b + data modify storage asset:temp chest.id set from storage asset:temp block.id + data modify storage asset:temp chest.tag.BlockEntityTag.Items set from storage asset:temp block.Items + data modify storage asset:temp chest.tag.BlockEntityTag.Lock set from storage asset:temp block.Lock + data modify storage asset:temp chest.tag.display.Name set from storage asset:temp block.CustomName + # //反映 + data modify entity @e[type=item,tag=CarefullyCollect,distance=..0,limit=1] Item set from storage asset:temp chest - # 演出 - execute align xyz positioned ~0.5 ~0.5 ~0.5 run particle dust 0.408 0.894 0.29 0.5 ~ ~ ~ 0.4 0.4 0.4 0 250 normal @a - playsound entity.arrow.hit_player player @a ~ ~ ~ 1 1.5 1 +# 演出 + execute align xyz positioned ~0.5 ~0.5 ~0.5 run particle dust 0.408 0.894 0.29 0.5 ~ ~ ~ 0.4 0.4 0.4 0 250 normal @a + playsound entity.arrow.hit_player player @a ~ ~ ~ 1 1.5 1 - # リセット - setblock ~ ~ ~ air - scoreboard players reset @s Temporary - data remove storage asset:temp block - data remove storage asset:temp chest - tag @e[type=item,tag=CarefullyCollect,distance=..0] remove CarefullyCollect \ No newline at end of file +# リセット + setblock ~ ~ ~ air + scoreboard players reset @s Temporary + data remove storage asset:temp block + data remove storage asset:temp chest + tag @e[type=item,tag=CarefullyCollect,distance=..0] remove CarefullyCollect diff --git a/Asset/data/asset/functions/artifact/0290.carefully_collector/click/check.mcfunction b/Asset/data/asset/functions/artifact/0290.carefully_collector/click/check.mcfunction index 9ad8d5633..0e4674434 100644 --- a/Asset/data/asset/functions/artifact/0290.carefully_collector/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0290.carefully_collector/click/check.mcfunction @@ -4,9 +4,11 @@ # # @within function asset:artifact/alias/290/click/check - tag @s[gamemode=!survival,gamemode=!creative] remove CanUsed - - execute if block ~ ~ ~ chest run scoreboard players set @s Temporary 1 - execute if block ~ ~ ~ trapped_chest run scoreboard players set @s Temporary 1 - execute unless score @s Temporary matches 1 run tellraw @s ["足元が[",{"translate":"block.minecraft.chest"},"/",{"translate":"block.minecraft.trapped_chest"},"]である必要があります"] - execute unless score @s Temporary matches 1 run tag @s remove CanUsed \ No newline at end of file +tellraw @s[gamemode=!survival,gamemode=!creative] [{"text": "サバイバルエリアでのみ使用可能です"}] +tag @s[gamemode=!survival,gamemode=!creative] remove CanUsed + +execute if block ~ ~ ~ chest run scoreboard players set @s Temporary 1 +execute if block ~ ~ ~ trapped_chest run scoreboard players set @s Temporary 1 +execute unless score @s Temporary matches 1 run tellraw @s ["足元が[",{"translate":"block.minecraft.chest"},"/",{"translate":"block.minecraft.trapped_chest"},"]である必要があります"] +execute unless score @s Temporary matches 1 run tag @s remove CanUsed +scoreboard players reset @s Temporary diff --git a/Asset/data/asset/functions/artifact/0292.craving_sword/kill_melee/.mcfunction b/Asset/data/asset/functions/artifact/0292.craving_sword/kill_melee/.mcfunction index c7829a439..f95bd22ae 100644 --- a/Asset/data/asset/functions/artifact/0292.craving_sword/kill_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0292.craving_sword/kill_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0292.craving_sword/kill_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/292/kill_melee/ @@ -14,4 +14,4 @@ function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/_index.d.mcfunction.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/_index.d.mcfunction similarity index 67% rename from Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/_index.d.mcfunction.mcfunction rename to Asset/data/asset/functions/artifact/0295.call_elemental_familiar/_index.d.mcfunction index 6404c7e6b..bed71d064 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/_index.d.mcfunction.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/_index.d.mcfunction @@ -1,8 +1,8 @@ -#> asset:artifact/0295.call_elemental_familiar/click/_index.d.mcfunction +#> asset:artifact/0295.call_elemental_familiar/_index.d # @private #> tags -# @within function asset:artifact/0295.call_elemental_familiar/click/** +# @within function asset:artifact/0295.call_elemental_familiar/** #declare tag 87.Familiar #declare tag 87.FamiliarInit #declare tag 87.FamiliarFire @@ -14,4 +14,4 @@ #declare tag 87.ShotWater #declare tag 87.ShotThunder #declare tag 87.IDCopyBase - #declare tag 87.CannotUse \ No newline at end of file + #declare tag 87.CannotUse diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/.mcfunction index 33f700f7b..0a0c30246 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0295.call_elemental_familiar/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/295/click/ @@ -20,4 +20,4 @@ playsound minecraft:entity.vex.ambient neutral @a ~ ~ ~ 1 2 # 精霊さんを動かす - schedule function asset:artifact/0295.call_elemental_familiar/click/fairy/2.tick 1t replace \ No newline at end of file + schedule function asset:artifact/0295.call_elemental_familiar/click/fairy/2.tick 1t replace diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/check.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/check.mcfunction index d28c37b84..7c57d6e3c 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/check.mcfunction @@ -4,6 +4,7 @@ # # @within function asset:artifact/alias/295/click/check - execute at @e[type=armor_stand,tag=87.Familiar] if score @s UserID = @e[type=armor_stand,tag=87.Familiar,distance=..0.01,sort=nearest,limit=1] 87.UserID run tag @s add 87.CannotUse - execute if entity @s[tag=87.CannotUse] run tag @s remove CanUsed - execute if entity @s[tag=87.CannotUse] run function asset:artifact/0295.call_elemental_familiar/click/3.cannot_use \ No newline at end of file +# 既に召喚済みなら使えない。タグ付与じゃないと残ってるファミリアの数だけコマンドが実行されてしまう。つまりめっちゃうるさい。 + execute at @e[type=armor_stand,tag=87.Familiar] if score @s UserID = @e[type=armor_stand,tag=87.Familiar,distance=..0.01,sort=nearest,limit=1] 87.UserID run tag @s add 87.CannotUse + execute if entity @s[tag=87.CannotUse] run tag @s remove CanUsed + execute if entity @s[tag=87.CannotUse] run function asset:artifact/0295.call_elemental_familiar/click/3.cannot_use diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/2.tick.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/2.tick.mcfunction index 6a6ed2f6b..c04d8f85b 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/2.tick.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/2.tick.mcfunction @@ -5,10 +5,10 @@ # @within function # asset:artifact/0295.call_elemental_familiar/click/fairy/2.tick # asset:artifact/0295.call_elemental_familiar/click/ -# asset:artifact/0295.call_elemental_familiar/click/rejoin_process +# asset:artifact/0295.call_elemental_familiar/rejoin_process # エンティティに実行させる - execute as @e[type=armor_stand,tag=87.Familiar] at @s run function asset:artifact/0295.call_elemental_familiar/click/fairy/ + execute as @e[type=armor_stand,tag=87.Familiar] at @s run function asset:artifact/0295.call_elemental_familiar/click/fairy/3.main # エンティティがいればループ - execute if entity @e[type=armor_stand,tag=87.Familiar,limit=1] run schedule function asset:artifact/0295.call_elemental_familiar/click/fairy/2.tick 1t \ No newline at end of file + execute if entity @e[type=armor_stand,tag=87.Familiar,limit=1] run schedule function asset:artifact/0295.call_elemental_familiar/click/fairy/2.tick 1t diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/4.shoot.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/4.shoot.mcfunction index 1d46dca37..40dcf2743 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/4.shoot.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/4.shoot.mcfunction @@ -2,8 +2,7 @@ # # ショット発射！ # -# @within asset:artifact/0295.call_elemental_familiar/click/fairy/ - +# @within asset:artifact/0295.call_elemental_familiar/click/fairy/3.main # タグ付与 tag @s add 87.IDCopyBase @@ -26,4 +25,4 @@ # リセット scoreboard players reset @s 87.Tick - tag @s remove 87.IDCopyBase \ No newline at end of file + tag @s remove 87.IDCopyBase diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/5.disapper.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/5.disapper.mcfunction index 992ae4240..247c333ed 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/5.disapper.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/fairy/5.disapper.mcfunction @@ -2,7 +2,7 @@ # # 消滅処理 # -# @within function asset:artifact/0295.call_elemental_familiar/click/fairy/ +# @within function asset:artifact/0295.call_elemental_familiar/click/fairy/3.main # 演出 playsound minecraft:entity.vex.ambient neutral @a ~ ~ ~ 1.5 1.5 @@ -10,4 +10,4 @@ particle minecraft:end_rod ~ ~0.5 ~ 0 0 0 0.02 10 # キル - kill @s \ No newline at end of file + kill @s diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/shot/2.tick.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/shot/2.tick.mcfunction index d0ea3d809..8b25aacb9 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/shot/2.tick.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/shot/2.tick.mcfunction @@ -5,10 +5,10 @@ # @within function # asset:artifact/0295.call_elemental_familiar/click/fairy/4.shoot # asset:artifact/0295.call_elemental_familiar/click/shot/2.tick -# asset:artifact/0295.call_elemental_familiar/click/rejoin_process +# asset:artifact/0295.call_elemental_familiar/rejoin_process # エンティティに実行させる - execute as @e[type=armor_stand,tag=87.Shot] at @s run function asset:artifact/0295.call_elemental_familiar/click/shot/ + execute as @e[type=armor_stand,tag=87.Shot] at @s run function asset:artifact/0295.call_elemental_familiar/click/shot/3.main # エンティティがいればループ - execute if entity @e[type=armor_stand,tag=87.Shot,limit=1] run schedule function asset:artifact/0295.call_elemental_familiar/click/shot/2.tick 1t \ No newline at end of file + execute if entity @e[type=armor_stand,tag=87.Shot,limit=1] run schedule function asset:artifact/0295.call_elemental_familiar/click/shot/2.tick 1t diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/shot/4.hit.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/shot/4.hit.mcfunction index 0228ad471..09150a99b 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/shot/4.hit.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/shot/4.hit.mcfunction @@ -2,7 +2,7 @@ # # # -# @within function asset:artifact/0295.call_elemental_familiar/click/shot/ +# @within function asset:artifact/0295.call_elemental_familiar/click/shot/3.main # 魔法、火属性のダメージをぶちかます data modify storage lib: Argument.Damage set value 40.0f @@ -25,4 +25,4 @@ function lib:damage/reset # ショットを消す - kill @s \ No newline at end of file + kill @s diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/load.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/load.mcfunction index f3bc076e3..ac6b3b155 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/load.mcfunction @@ -5,7 +5,7 @@ # @within tag/function asset:artifact/load #> Objective -# @within asset:artifact/0295.call_elemental_familiar/click/** +# @within asset:artifact/0295.call_elemental_familiar/** scoreboard objectives add 87.Tick dummy scoreboard objectives add 87.LifeTime dummy scoreboard objectives add 87.UserID dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/rejoin_process.mcfunction similarity index 78% rename from Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0295.call_elemental_familiar/rejoin_process.mcfunction index e4c8ff0da..b04a2c534 100644 --- a/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0295.call_elemental_familiar/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0295.call_elemental_familiar/click/rejoin_process +#> asset:artifact/0295.call_elemental_familiar/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0297.spirit_world_trance/click/.mcfunction b/Asset/data/asset/functions/artifact/0297.spirit_world_trance/click/.mcfunction index c31a79d3f..5116725d0 100644 --- a/Asset/data/asset/functions/artifact/0297.spirit_world_trance/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0297.spirit_world_trance/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0297.spirit_world_trance/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/297/click/ diff --git a/Asset/data/asset/functions/artifact/0297.spirit_world_trance/click/check.mcfunction b/Asset/data/asset/functions/artifact/0297.spirit_world_trance/click/check.mcfunction index ee926a6bb..f89b719ef 100644 --- a/Asset/data/asset/functions/artifact/0297.spirit_world_trance/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0297.spirit_world_trance/click/check.mcfunction @@ -4,10 +4,9 @@ # # @within function asset:artifact/alias/297/click/check -# 戦闘中に使うべからず - execute if predicate lib:in_battle run tellraw @a {"text":"戦闘中は使用できません。","color":"red"} - execute if predicate lib:in_battle run tag @s remove CanUsed - -# 愚か者を弾く機構 - execute if entity @s[gamemode=spectator,tag=CanUsed] run tag @s remove CanUsed - \ No newline at end of file +# 戦闘中に使うべからず + execute if predicate lib:in_battle run tellraw @a {"text":"戦闘中は使用できません。","color":"red"} + execute if predicate lib:in_battle run tag @s remove CanUsed + +# 愚か者を弾く機構 + execute if entity @s[gamemode=spectator,tag=CanUsed] run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0312.fire_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0312.fire_sword/attack_melee/.mcfunction index 34c1d109d..e500b763d 100644 --- a/Asset/data/asset/functions/artifact/0312.fire_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0312.fire_sword/attack_melee/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0312.fire_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/312/attack_melee/ - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $RandomDamage # 演出 execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:flame ~ ~1 ~ 0 0 0 0.05 10 @@ -15,14 +16,14 @@ playsound minecraft:block.fire.ambient player @a ~ ~ ~ 1 1.5 # ダメージ - #ダメージブレのための処理 + # ダメージブレのための処理 # 疑似乱数取得 execute store result score $RandomDamage Temporary run function lib:random/ # 剰余算する。0~10の追加ダメージ scoreboard players operation $RandomDamage Temporary %= $11 Const # 最低ダメージ設定 scoreboard players add $RandomDamage Temporary 40 - #ダメージセット + # ダメージセット execute store result storage lib: Argument.Damage float 1 run scoreboard players get $RandomDamage Temporary # 第一属性 data modify storage lib: Argument.AttackType set value "Physical" @@ -35,4 +36,4 @@ # リセット function lib:damage/reset - scoreboard players reset $RandomDamage Temporary \ No newline at end of file + scoreboard players reset $RandomDamage Temporary diff --git a/Asset/data/asset/functions/artifact/0313.raging_fire_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0313.raging_fire_sword/attack_melee/.mcfunction index 56d81cc3c..9226491f3 100644 --- a/Asset/data/asset/functions/artifact/0313.raging_fire_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0313.raging_fire_sword/attack_melee/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0313.raging_fire_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/313/attack_melee/ - function asset:artifact/common/use/mainhand - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare score_holder $RandomDamage # 演出 execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:lava ~ ~0.5 ~ 0 0.5 0 0.1 20 @@ -14,14 +14,14 @@ playsound minecraft:block.fire.ambient player @a ~ ~ ~ 1 1.3 # ダメージ - #ダメージブレのための処理 + # ダメージブレのための処理 # 疑似乱数取得 execute store result score $RandomDamage Temporary run function lib:random/ # 剰余算する。0~30の追加ダメージ scoreboard players operation $RandomDamage Temporary %= $31 Const # 最低ダメージ設定 scoreboard players add $RandomDamage Temporary 90 - #ダメージセット + # ダメージセット execute store result storage lib: Argument.Damage float 1 run scoreboard players get $RandomDamage Temporary # 第一属性 data modify storage lib: Argument.AttackType set value "Physical" @@ -34,4 +34,4 @@ # リセット function lib:damage/reset - scoreboard players reset $RandomDamage Temporary \ No newline at end of file + scoreboard players reset $RandomDamage Temporary diff --git a/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/_index.d.mcfunction new file mode 100644 index 000000000..2df3fd7f4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0314.blasting_fire_sword/_index.d +# @private + +#> tag +# @within function +# asset:artifact/0314.blasting_fire_sword/** + #declare score_holder $Rotate \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/attack_melee/.mcfunction index a25537984..eeebe206f 100644 --- a/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/attack_melee/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0314.blasting_fire_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/314/attack_melee/ - function asset:artifact/common/use/mainhand - -# ここから先は神器側の効果の処理を書く +#> Private +# @private + #declare score_holder $RandomDamage # 演出 execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle minecraft:lava ~ ~ ~ 0 0 0 1 20 @@ -15,14 +15,14 @@ playsound minecraft:item.trident.throw player @a ~ ~ ~ 1 0.5 # ダメージ - #ダメージブレのための処理 + # ダメージブレのための処理 # 疑似乱数取得 execute store result score $RandomDamage Temporary run function lib:random/ # 剰余算する。0~40の追加ダメージ scoreboard players operation $RandomDamage Temporary %= $41 Const # 最低ダメージ設定 scoreboard players add $RandomDamage Temporary 280 - #ダメージセット + # ダメージセット execute store result storage lib: Argument.Damage float 1 run scoreboard players get $RandomDamage Temporary # 第一属性 data modify storage lib: Argument.AttackType set value "Physical" @@ -36,4 +36,4 @@ # リセット function lib:damage/reset scoreboard players reset $RandomDamage Temporary - scoreboard players reset $Rotate Temporary \ No newline at end of file + scoreboard players reset $Rotate Temporary diff --git a/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/attack_melee/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/attack_melee/_index.d.mcfunction deleted file mode 100644 index 9c327380e..000000000 --- a/Asset/data/asset/functions/artifact/0314.blasting_fire_sword/attack_melee/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0314.blasting_fire_sword/attack_melee/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0314.blasting_fire_sword/attack_melee/** - #declare score_holder $Rotate \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0315.water_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0315.water_sword/attack_melee/.mcfunction index bb24373c7..fd202b499 100644 --- a/Asset/data/asset/functions/artifact/0315.water_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0315.water_sword/attack_melee/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0315.water_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/315/attack_melee/ - -# ここから先は神器側の効果の処理を書く +#> Private +# @private + #declare score_holder $RandomDamage # 演出 execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:rain ~ ~1 ~ 0.2 0.2 0.2 0 200 @@ -13,7 +14,7 @@ playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 1 1 # ダメージ - #ダメージブレのための処理 + # ダメージブレのための処理 # 疑似乱数取得 execute store result score $RandomDamage Temporary run function lib:random/ # 剰余算する。0~10の追加ダメージ @@ -33,4 +34,4 @@ # リセット function lib:damage/reset - scoreboard players reset $RandomDamage Temporary \ No newline at end of file + scoreboard players reset $RandomDamage Temporary diff --git a/Asset/data/asset/functions/artifact/0316.rapids_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0316.rapids_sword/attack_melee/.mcfunction index 9d46a2539..320d77fb6 100644 --- a/Asset/data/asset/functions/artifact/0316.rapids_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0316.rapids_sword/attack_melee/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0316.rapids_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/316/attack_melee/ - -# ここから先は神器側の効果の処理を書く +#> Private +# @private + #declare score_holder $RandomDamage # 演出 execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] at @s run particle minecraft:block blue_ice ~ ~1 ~ 0.5 0.5 0.5 2 50 @@ -14,14 +15,14 @@ playsound minecraft:entity.dolphin.splash player @a ~ ~ ~ 1 1 # ダメージ - #ダメージブレのための処理 + # ダメージブレのための処理 # 疑似乱数取得 execute store result score $RandomDamage Temporary run function lib:random/ # 剰余算する。0~30の追加ダメージ scoreboard players operation $RandomDamage Temporary %= $31 Const # 最低ダメージ設定 scoreboard players add $RandomDamage Temporary 90 - #ダメージセット + # ダメージセット execute store result storage lib: Argument.Damage float 1 run scoreboard players get $RandomDamage Temporary # 第一属性 data modify storage lib: Argument.AttackType set value "Physical" @@ -34,4 +35,4 @@ # リセット function lib:damage/reset - scoreboard players reset $RandomDamage Temporary \ No newline at end of file + scoreboard players reset $RandomDamage Temporary diff --git a/Asset/data/asset/functions/artifact/0317.sea_storm_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0317.sea_storm_sword/attack_melee/.mcfunction index b17160793..5d03b292e 100644 --- a/Asset/data/asset/functions/artifact/0317.sea_storm_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0317.sea_storm_sword/attack_melee/.mcfunction @@ -1,26 +1,26 @@ #> asset:artifact/0317.sea_storm_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/317/attack_melee/ - function asset:artifact/common/use/mainhand - -# ここから先は神器側の効果の処理を書く +#> Private +# @private + #declare score_holder $RandomDamage # 演出 execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function asset:artifact/0317.sea_storm_sword/attack_melee/vfx playsound item.trident.throw player @a ~ ~ ~ 0.8 0.7 # ダメージ - #ダメージブレのための処理 + # ダメージブレのための処理 # 疑似乱数取得 execute store result score $RandomDamage Temporary run function lib:random/ # 剰余算する。0~40の追加ダメージ scoreboard players operation $RandomDamage Temporary %= $41 Const # 最低ダメージ設定 scoreboard players add $RandomDamage Temporary 280 - #ダメージセット + # ダメージセット execute store result storage lib: Argument.Damage float 1 run scoreboard players get $RandomDamage Temporary # 第一属性 data modify storage lib: Argument.AttackType set value "Physical" @@ -34,4 +34,3 @@ # リセット function lib:damage/reset scoreboard players reset $RandomDamage Temporary - scoreboard players reset $Rotate Temporary \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0317.sea_storm_sword/attack_melee/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0317.sea_storm_sword/attack_melee/_index.d.mcfunction deleted file mode 100644 index ff1f1bb0d..000000000 --- a/Asset/data/asset/functions/artifact/0317.sea_storm_sword/attack_melee/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0317.sea_storm_sword/attack_melee/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0317.sea_storm_sword/attack_melee/** - #declare score_holder $Rotate \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0318.thunder_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0318.thunder_sword/attack_melee/.mcfunction index 40574dc29..ddf1269b8 100644 --- a/Asset/data/asset/functions/artifact/0318.thunder_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0318.thunder_sword/attack_melee/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0318.thunder_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/318/attack_melee/ - -# ここから先は神器側の効果の処理を書く +#> Private +# @private + #declare score_holder $RandomDamage # 演出 execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle dust 1 1 0 1 ~ ~2 ~ 0 2.5 0 0 100 @@ -32,4 +33,4 @@ # リセット function lib:damage/reset - scoreboard players reset $RandomDamage Temporary \ No newline at end of file + scoreboard players reset $RandomDamage Temporary diff --git a/Asset/data/asset/functions/artifact/0319.thunderbolt_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0319.thunderbolt_sword/attack_melee/.mcfunction index 8abf82cf9..4f04259e3 100644 --- a/Asset/data/asset/functions/artifact/0319.thunderbolt_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0319.thunderbolt_sword/attack_melee/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0319.thunderbolt_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/319/attack_melee/ - -# ここから先は神器側の効果の処理を書く - +#> Private +# @private + #declare score_holder $RandomDamage # 演出 execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle dust 0.867 0.667 0.161 1 ~ ~2 ~ 0 2.5 0 0 100 @@ -35,4 +35,4 @@ # リセット function lib:damage/reset - scoreboard players reset $RandomDamage Temporary \ No newline at end of file + scoreboard players reset $RandomDamage Temporary diff --git a/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/_index.d.mcfunction new file mode 100644 index 000000000..d19eb3bdb --- /dev/null +++ b/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/_index.d.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0320.divine_thunder_sword/_index.d +# @private + +#> tag +# @within function +# asset:artifact/0320.divine_thunder_sword/** + #declare score_holder $Line + #declare score_holder $RandomDamage \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/attack_melee/.mcfunction index 000dddc2b..0a4f209e3 100644 --- a/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0320.divine_thunder_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/320/attack_melee/ @@ -29,4 +29,4 @@ # リセット function lib:damage/reset - scoreboard players reset $RandomDamage Temporary \ No newline at end of file + scoreboard players reset $RandomDamage Temporary diff --git a/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/attack_melee/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/attack_melee/_index.d.mcfunction deleted file mode 100644 index ae7a82bcb..000000000 --- a/Asset/data/asset/functions/artifact/0320.divine_thunder_sword/attack_melee/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0320.divine_thunder_sword/attack_melee/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0320.divine_thunder_sword/attack_melee/** - #declare score_holder $Line - #declare score_holder $RandomDamage \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0322.ice_cane/click/.mcfunction b/Asset/data/asset/functions/artifact/0322.ice_cane/click/.mcfunction index 4230b64e4..d52611391 100644 --- a/Asset/data/asset/functions/artifact/0322.ice_cane/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0322.ice_cane/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0322.ice_cane/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/322/click/ @@ -11,4 +11,4 @@ # 演出 particle minecraft:spit ~ ~ ~ 2 0.5 2 0.05 100 - playsound minecraft:block.glass.break player @a ~ ~ ~ 0.8 1 \ No newline at end of file + playsound minecraft:block.glass.break player @a ~ ~ ~ 0.8 1 diff --git a/Asset/data/asset/functions/artifact/0322.ice_cane/click/check.mcfunction b/Asset/data/asset/functions/artifact/0322.ice_cane/click/check.mcfunction index 254dcfa8b..906571701 100644 --- a/Asset/data/asset/functions/artifact/0322.ice_cane/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0322.ice_cane/click/check.mcfunction @@ -4,6 +4,6 @@ # # @within function asset:artifact/alias/322/click/check -# プレイヤーのゲームモードがサバイバル・クリエイティブの時にのみ使用可能 - 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 \ No newline at end of file +# プレイヤーのゲームモードがサバイバル・クリエイティブの時にのみ使用可能 + 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 diff --git a/Asset/data/asset/functions/artifact/0328.attract_hook_shot/attack_projectile/.mcfunction b/Asset/data/asset/functions/artifact/0328.attract_hook_shot/attack_projectile/.mcfunction index 5a3920d38..6bcb0cdb1 100644 --- a/Asset/data/asset/functions/artifact/0328.attract_hook_shot/attack_projectile/.mcfunction +++ b/Asset/data/asset/functions/artifact/0328.attract_hook_shot/attack_projectile/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0328.attract_hook_shot/attack_projectile/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/328/attack_projectile/ diff --git a/Asset/data/asset/functions/artifact/0329.approaching_hook_shot/attack_projectile/.mcfunction b/Asset/data/asset/functions/artifact/0329.approaching_hook_shot/attack_projectile/.mcfunction index a55fa90c1..b2e14e7f2 100644 --- a/Asset/data/asset/functions/artifact/0329.approaching_hook_shot/attack_projectile/.mcfunction +++ b/Asset/data/asset/functions/artifact/0329.approaching_hook_shot/attack_projectile/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0329.approaching_hook_shot/attack_projectile/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/329/attack_projectile/ - # 矢が当たったエンティティに視線方向維持でテレポート +# 矢が当たったエンティティに視線方向維持でテレポート execute positioned as @e[type=#lib:living,type=!player,tag=Victim,distance=..150] run tp @a[tag=this] ~ ~ ~ execute at @s run particle minecraft:portal ~ ~ ~ 0.3 0.3 0.3 1 200 - execute at @s run playsound minecraft:entity.shulker.teleport player @a ~ ~ ~ 2 1.5 \ No newline at end of file + execute at @s run playsound minecraft:entity.shulker.teleport player @a ~ ~ ~ 2 1.5 diff --git a/Asset/data/asset/functions/artifact/0329.approaching_hook_shot/attack_projectile/check.mcfunction b/Asset/data/asset/functions/artifact/0329.approaching_hook_shot/attack_projectile/check.mcfunction index 0c5fd31eb..3b457b5e1 100644 --- a/Asset/data/asset/functions/artifact/0329.approaching_hook_shot/attack_projectile/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0329.approaching_hook_shot/attack_projectile/check.mcfunction @@ -4,10 +4,12 @@ # # @within function asset:artifact/alias/329/attack_projectile/check -# 神器の基本的な条件の確認を行うfunction、成功している場合CanUsedタグが付く auto/feet/legs/chest/head/mainhand/offhandを記載してね - function asset:artifact/common/check_condition/mainhand -# 他にアイテム等確認する場合はここに書く - execute if entity @s[tag=CanUsed] as @e[type=#lib:living,type=!player,tag=Victim,distance=..150] at @s store result score $isBanTPArea Temporary if predicate lib:is_ban_tp_area - execute if score $isBanTPArea Temporary matches 1 run tag @s remove CanUsed - execute if score $isBanTPArea Temporary matches 1 run function lib:message/artifact/can_not_use_here - scoreboard players reset $isBanTPArea Temporary \ No newline at end of file +#> private +# @private + #declare score_holder $isBanTPArea + +# 他にアイテム等確認する場合はここに書く + execute if entity @s[tag=CanUsed] as @e[type=#lib:living,type=!player,tag=Victim,distance=..150] at @s store result score $isBanTPArea Temporary if predicate lib:is_ban_tp_area + execute if score $isBanTPArea Temporary matches 1 run tag @s remove CanUsed + execute if score $isBanTPArea Temporary matches 1 run function lib:message/artifact/can_not_use_here + scoreboard players reset $isBanTPArea Temporary diff --git a/Asset/data/asset/functions/artifact/0333.koukisin/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0333.koukisin/attack_melee/.mcfunction index 8e5082eb9..cb360f3b9 100644 --- a/Asset/data/asset/functions/artifact/0333.koukisin/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0333.koukisin/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0333.koukisin/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/333/attack_melee/ @@ -18,4 +18,4 @@ # 攻撃した対象に実行 execute as @e[type=#lib:living,type=!player,tag=Victim,tag=!Uninterferable,distance=..10,limit=1] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0342.super_dragon_bell/click/.mcfunction b/Asset/data/asset/functions/artifact/0342.super_dragon_bell/click/.mcfunction index 10199ccc1..5cae2c809 100644 --- a/Asset/data/asset/functions/artifact/0342.super_dragon_bell/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0342.super_dragon_bell/click/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0342.super_dragon_bell/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/342/click/ - playsound entity.horse.gallop player @a ~ ~ ~ 1.0 0.5 - playsound block.bell.use player @a ~ ~ ~ 1.0 1.5 - particle cloud ~ ~1 ~ 0.5 0.5 0.5 0.1 30 - # スーパードラゴン召喚 - summon horse ~ ~0.1 ~ {Health:0.1f,CustomName:'[{"text":"スーパードラゴン","color":"aqua"}]',CustomNameVisible:1b,Tame:1b,Variant:0,SaddleItem:{id:"minecraft:saddle",Count:1b,tag:{TSB:{ItemMetaData:["BanEntityConditionItem","BanPossession"]}}},DeathLootTable:"minecraft:empty",active_effects:[{id:"jump_boost",amplifier:18b,duration:999999,show_particles:0b}],Attributes:[{Name:"generic.max_health",Base:0.1d},{Name:"horse.jump_strength",Base:2.0d},{Name:"generic.movement_speed",Base:0.6d}],Tags:["Friend"]} \ No newline at end of file +# 演出 + playsound entity.horse.gallop player @a ~ ~ ~ 1.0 0.5 + playsound block.bell.use player @a ~ ~ ~ 1.0 1.5 + particle cloud ~ ~1 ~ 0.5 0.5 0.5 0.1 30 +# スーパードラゴン召喚 + summon horse ~ ~0.1 ~ {Health:0.1f,CustomName:'[{"text":"スーパードラゴン","color":"aqua"}]',CustomNameVisible:1b,Tame:1b,Variant:0,SaddleItem:{id:"minecraft:saddle",Count:1b,tag:{TSB:{ItemMetaData:["BanEntityConditionItem","BanPossession"]}}},DeathLootTable:"minecraft:empty",active_effects:[{id:"jump_boost",amplifier:18b,duration:999999,show_particles:0b}],Attributes:[{Name:"generic.max_health",Base:0.1d},{Name:"horse.jump_strength",Base:2.0d},{Name:"generic.movement_speed",Base:0.6d}],Tags:["Friend"]} diff --git a/Asset/data/asset/functions/artifact/0346.gather_around/click/.mcfunction b/Asset/data/asset/functions/artifact/0346.gather_around/click/.mcfunction index 4c5e42872..913d0f903 100644 --- a/Asset/data/asset/functions/artifact/0346.gather_around/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0346.gather_around/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0346.gather_around/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/346/click/ diff --git a/Asset/data/asset/functions/artifact/0349.passion_pickaxe/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0349.passion_pickaxe/attack_melee/.mcfunction index 600b9d79d..0d017528c 100644 --- a/Asset/data/asset/functions/artifact/0349.passion_pickaxe/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0349.passion_pickaxe/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0349.passion_pickaxe/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/349/attack_melee/ @@ -25,4 +25,4 @@ # 演出 particle minecraft:lava ~ ~ ~ 0.5 1 0.5 1 100 force @a[distance=..20] - playsound minecraft:entity.ghast.shoot player @s ~ ~ ~ 1 0.7 \ No newline at end of file + playsound minecraft:entity.ghast.shoot player @s ~ ~ ~ 1 0.7 diff --git a/Asset/data/asset/functions/artifact/0355.barrel/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0355.barrel/_index.d.mcfunction new file mode 100644 index 000000000..dd6e1b8ff --- /dev/null +++ b/Asset/data/asset/functions/artifact/0355.barrel/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0355.barrel/_index.d +# @private + +#> Temp +# @within function asset:artifact/0355.barrel/** + #declare tag 9V.Barrel diff --git a/Asset/data/asset/functions/artifact/0355.barrel/click/.mcfunction b/Asset/data/asset/functions/artifact/0355.barrel/click/.mcfunction index baaf8eb12..32e0376d3 100644 --- a/Asset/data/asset/functions/artifact/0355.barrel/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0355.barrel/click/.mcfunction @@ -1,12 +1,13 @@ #> asset:artifact/0355.barrel/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/355/click/ - execute at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..8] run summon armor_stand ~ ~1.8 ~ {Tags:["9V.Barrel","Projectile","Uninterferable"],Marker:1b,Invisible:1b,ArmorItems:[{},{},{},{id:"minecraft:barrel",Count:1b}]} - # tick予約 - schedule function asset:artifact/0355.barrel/click/3.1.tick_base 1t replace - # 演出 - particle happy_villager ~ ~ ~ 0.5 0.5 0.5 1 30 - playsound entity.experience_orb.pickup player @a ~ ~ ~ 1.0 1.5 \ No newline at end of file +# 樽召喚 + execute at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..8] run summon armor_stand ~ ~1.8 ~ {Tags:["9V.Barrel","Projectile","Uninterferable"],Marker:1b,Invisible:1b,ArmorItems:[{},{},{},{id:"minecraft:barrel",Count:1b}]} +# tick予約 + schedule function asset:artifact/0355.barrel/click/3.1.tick_base 1t replace +# 演出 + particle happy_villager ~ ~ ~ 0.5 0.5 0.5 1 30 + playsound entity.experience_orb.pickup player @a ~ ~ ~ 1.0 1.5 diff --git a/Asset/data/asset/functions/artifact/0355.barrel/click/3.1.tick_base.mcfunction b/Asset/data/asset/functions/artifact/0355.barrel/click/3.1.tick_base.mcfunction index cdf3a36f2..e3f51ceb2 100644 --- a/Asset/data/asset/functions/artifact/0355.barrel/click/3.1.tick_base.mcfunction +++ b/Asset/data/asset/functions/artifact/0355.barrel/click/3.1.tick_base.mcfunction @@ -2,10 +2,10 @@ # # 全体のtick # -# @within function asset:artifact/0355.barrel/click/3.* +# @within function asset:artifact/0355.barrel/click/** # 樽ごとに実行 execute as @e[type=armor_stand,tag=9V.Barrel] at @s run function asset:artifact/0355.barrel/click/barrel/tick # 樽が存在するとき次のtickを予約 - execute if entity @e[type=armor_stand,tag=9V.Barrel,limit=1] run schedule function asset:artifact/0355.barrel/click/3.1.tick_base 1t replace \ No newline at end of file + execute if entity @e[type=armor_stand,tag=9V.Barrel,limit=1] run schedule function asset:artifact/0355.barrel/click/3.1.tick_base 1t replace diff --git a/Asset/data/asset/functions/artifact/0355.barrel/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0355.barrel/click/_index.d.mcfunction deleted file mode 100644 index 25cfb0e9a..000000000 --- a/Asset/data/asset/functions/artifact/0355.barrel/click/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0355.barrel/click/_index.d -# -# @private - -#> Temp -# -# @within function asset:artifact/0355.barrel/click/** - #declare tag 9V.Barrel \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0358.cyfosio/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0358.cyfosio/attack_melee/.mcfunction index aa6e1ad65..b809e7766 100644 --- a/Asset/data/asset/functions/artifact/0358.cyfosio/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0358.cyfosio/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0358.cyfosio/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/358/attack_melee/ @@ -13,4 +13,4 @@ execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0361.rainbow_crystal/click/.mcfunction b/Asset/data/asset/functions/artifact/0361.rainbow_crystal/click/.mcfunction index 545ede9eb..52d356bc4 100644 --- a/Asset/data/asset/functions/artifact/0361.rainbow_crystal/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0361.rainbow_crystal/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0361.rainbow_crystal/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/361/click/ @@ -64,4 +64,4 @@ execute as @e[type=#lib:living,tag=Enemy,distance=..30] run function api:damage/ # リセット - function api:damage/reset \ No newline at end of file + function api:damage/reset diff --git a/Asset/data/asset/functions/artifact/0364.red_knights_sword/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0364.red_knights_sword/attack_melee/.mcfunction index c490dc535..910ba2868 100644 --- a/Asset/data/asset/functions/artifact/0364.red_knights_sword/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0364.red_knights_sword/attack_melee/.mcfunction @@ -1,22 +1,22 @@ #> asset:artifact/0364.red_knights_sword/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/364/attack_melee/ - function asset:artifact/common/use/mainhand - -# ここから先は神器側の効果の処理を書く +#> Private +# @private + #declare score_holder $UseCount # 残り回数が1回の時発動した場合 - execute unless data storage asset:context Items.mainhand.id run data modify storage api: Argument.ID set value 365 - execute unless data storage asset:context Items.mainhand.id run function api:artifact/give/from_id - execute unless data storage asset:context Items.mainhand.id run tellraw @s {"text":"赤い騎士の剣は血を欲している","color":"dark_red","bold":true} + execute if data storage asset:context {BrokeItem: true} run data modify storage api: Argument.ID set value 365 + execute if data storage asset:context {BrokeItem: true} run function api:artifact/give/from_id + execute if data storage asset:context {BrokeItem: true} run tellraw @s {"text":"赤い騎士の剣は血を欲している","color":"dark_red","bold":true} + # 演出 playsound minecraft:item.trident.return player @a ~ ~ ~ 1 2 - # ほしい範囲に剰余算 execute store result score $Random Temporary run function lib:random/ # 疑似乱数取得 @@ -51,4 +51,4 @@ function lib:damage/modifier_continuation execute as @s[tag=!PlayerShouldInvulnerable] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0365.bloodthirsty_sword/click/.mcfunction b/Asset/data/asset/functions/artifact/0365.bloodthirsty_sword/click/.mcfunction index af6fdd9a0..05abcd76e 100644 --- a/Asset/data/asset/functions/artifact/0365.bloodthirsty_sword/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0365.bloodthirsty_sword/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0365.bloodthirsty_sword/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/365/click/ @@ -28,4 +28,4 @@ function lib:damage/modifier function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0368.fire_spell/click/.mcfunction b/Asset/data/asset/functions/artifact/0368.fire_spell/click/.mcfunction index 6f0271412..dca273d18 100644 --- a/Asset/data/asset/functions/artifact/0368.fire_spell/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0368.fire_spell/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0368.fire_spell/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/368/click/ @@ -8,4 +8,4 @@ execute positioned ^ ^ ^5 unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] run function asset:artifact/0368.fire_spell/click/4.attack # 前方に敵が居た場合 - execute positioned ^ ^ ^5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] run function asset:artifact/0368.fire_spell/click/4.attack \ No newline at end of file + execute positioned ^ ^ ^5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] run function asset:artifact/0368.fire_spell/click/4.attack diff --git a/Asset/data/asset/functions/artifact/0369.fire_magic/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0369.fire_magic/_index.d.mcfunction new file mode 100644 index 000000000..58e74cbd0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0369.fire_magic/_index.d.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/0369.fire_magic/_index.d +# @private + +#> tag +# @within function asset:artifact/0369.fire_magic/** + #declare tag A9.First + #declare tag A9.This + #declare tag A9.Fire + #declare tag A9.Landing + #declare tag A9.Target diff --git a/Asset/data/asset/functions/artifact/0369.fire_magic/click/.mcfunction b/Asset/data/asset/functions/artifact/0369.fire_magic/click/.mcfunction index dc931f8e4..cb0bfde37 100644 --- a/Asset/data/asset/functions/artifact/0369.fire_magic/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0369.fire_magic/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0369.fire_magic/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/369/click/ @@ -17,4 +17,4 @@ tag @e[tag=A9.First] remove A9.First # Scheduleループ - schedule function asset:artifact/0369.fire_magic/click/3.1.tick 1t replace \ No newline at end of file + schedule function asset:artifact/0369.fire_magic/click/3.1.tick 1t replace diff --git a/Asset/data/asset/functions/artifact/0369.fire_magic/click/3.1.tick.mcfunction b/Asset/data/asset/functions/artifact/0369.fire_magic/click/3.1.tick.mcfunction index d84ef3418..10d418825 100644 --- a/Asset/data/asset/functions/artifact/0369.fire_magic/click/3.1.tick.mcfunction +++ b/Asset/data/asset/functions/artifact/0369.fire_magic/click/3.1.tick.mcfunction @@ -5,10 +5,10 @@ # @within function # asset:artifact/0369.fire_magic/click/ # asset:artifact/0369.fire_magic/click/3.1.tick -# asset:artifact/0369.fire_magic/click/rejoin_process +# asset:artifact/0369.fire_magic/rejoin_process # 火の玉が実行する処理 execute as @e[tag=A9.Fire] at @s run function asset:artifact/0369.fire_magic/click/3.2.fireball # Scheduleループ - execute if entity @e[tag=A9.Fire] run schedule function asset:artifact/0369.fire_magic/click/3.1.tick 1t replace \ No newline at end of file + execute if entity @e[tag=A9.Fire] run schedule function asset:artifact/0369.fire_magic/click/3.1.tick 1t replace diff --git a/Asset/data/asset/functions/artifact/0369.fire_magic/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0369.fire_magic/click/_index.d.mcfunction deleted file mode 100644 index 6e3d99e02..000000000 --- a/Asset/data/asset/functions/artifact/0369.fire_magic/click/_index.d.mcfunction +++ /dev/null @@ -1,11 +0,0 @@ -#> asset:artifact/0369.fire_magic/click/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0369.fire_magic/click/** - #declare tag A9.First - #declare tag A9.This - #declare tag A9.Fire - #declare tag A9.Landing - #declare tag A9.Target \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0369.fire_magic/load.mcfunction b/Asset/data/asset/functions/artifact/0369.fire_magic/load.mcfunction index 66ac6999e..256257fd3 100644 --- a/Asset/data/asset/functions/artifact/0369.fire_magic/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0369.fire_magic/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0369.fire_magic/click/** +# @within function asset:artifact/0369.fire_magic/** scoreboard objectives add A9.UserID dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0369.fire_magic/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0369.fire_magic/rejoin_process.mcfunction similarity index 63% rename from Asset/data/asset/functions/artifact/0369.fire_magic/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0369.fire_magic/rejoin_process.mcfunction index 0844c7380..f8bd0606c 100644 --- a/Asset/data/asset/functions/artifact/0369.fire_magic/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0369.fire_magic/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0369.fire_magic/click/rejoin_process +#> asset:artifact/0369.fire_magic/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0370.burn_sorcery/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0370.burn_sorcery/_index.d.mcfunction new file mode 100644 index 000000000..1b34747de --- /dev/null +++ b/Asset/data/asset/functions/artifact/0370.burn_sorcery/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0370.burn_sorcery/_index.d +# @private + +#> tag +# @within function asset:artifact/0370.burn_sorcery/** + #declare tag Landing + #declare tag LandingTarget diff --git a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/.mcfunction b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/.mcfunction index 22c2db36f..72618fb7c 100644 --- a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0370.burn_sorcery/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/370/click/ @@ -14,4 +14,4 @@ execute anchored eyes positioned ^ ^ ^1.5 rotated ~ ~90 run function asset:artifact/0370.burn_sorcery/click/particle.1 # タグを消す - tag @s remove Landing \ No newline at end of file + tag @s remove Landing diff --git a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/3.1.shoot.mcfunction b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/3.1.shoot.mcfunction index 7fb431066..5acfa4d3e 100644 --- a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/3.1.shoot.mcfunction +++ b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/3.1.shoot.mcfunction @@ -6,7 +6,6 @@ # asset:artifact/0370.burn_sorcery/click/ # asset:artifact/0370.burn_sorcery/click/3.1.shoot -# ここから先は神器側の効果の処理を書く # 着弾検知 execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing @@ -22,4 +21,4 @@ execute if entity @s[tag=Landing] run function asset:artifact/0370.burn_sorcery/click/3.2.damage # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0370.burn_sorcery/click/3.1.shoot \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0370.burn_sorcery/click/3.1.shoot diff --git a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/3.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/3.2.damage.mcfunction index 32ef60551..80dac6ca3 100644 --- a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/3.2.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/3.2.damage.mcfunction @@ -5,8 +5,6 @@ # @within function # asset:artifact/0370.burn_sorcery/click/3.1.shoot -# ここから先は神器側の効果の処理を書く - # 演出 particle minecraft:lava ~ ~ ~ 0 2 0 1 100 execute rotated 0 0 run function asset:artifact/0370.burn_sorcery/click/particle.2 @@ -28,4 +26,4 @@ function lib:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget \ No newline at end of file + tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget diff --git a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/_index.d.mcfunction deleted file mode 100644 index dd6c6b618..000000000 --- a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0370.burn_sorcery/click/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0370.burn_sorcery/click/** - #declare tag Landing - #declare tag LandingTarget \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/particle.1.mcfunction b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/particle.1.mcfunction index 8e5a353a4..9adff52b0 100644 --- a/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/particle.1.mcfunction +++ b/Asset/data/asset/functions/artifact/0370.burn_sorcery/click/particle.1.mcfunction @@ -3,6 +3,7 @@ # # # @within function asset:artifact/0370.burn_sorcery/click/ + # [ImportKey]: NobwRALgngDgpmAXGAxgSwE4oDYIDRgB2AhgLYLKBhigAQBMYBMxGZAzkuCgPYCuhESWgAYCKOPzgYOYAB5IRYKPIC+BFgBM0PdoiEA6AGwFWEZgN0E42bGhisKARiEKMXUxApDlq8NHhIwGC5sKABzLkIGIjIKMEAsTUAlyMAjfWoHKKYWUh1OXn4kAHZRcQ8pRHA5C0UVNWJNbSQHPQAOY1MMcwUrGztHZzU3Yg95US4MQkkkIzAAKx5SGEECADc4AC80Cd1vAF0gA # 多角形 1 particle flame ^0 ^ ^-1.8 0 0 0 0 1 @@ -67,4 +68,4 @@ particle flame ^-0.6 ^ ^0 0 0 0 0 1 particle flame ^-0.57063 ^ ^-0.18541 0 0 0 0 1 particle flame ^-0.48541 ^ ^-0.35267 0 0 0 0 1 particle flame ^-0.35267 ^ ^-0.48541 0 0 0 0 1 -particle flame ^-0.18541 ^ ^-0.57063 0 0 0 0 1 \ No newline at end of file +particle flame ^-0.18541 ^ ^-0.57063 0 0 0 0 1 diff --git a/Asset/data/asset/functions/artifact/0371.water_spell/click/.mcfunction b/Asset/data/asset/functions/artifact/0371.water_spell/click/.mcfunction index 937e047e5..37c1aa0ef 100644 --- a/Asset/data/asset/functions/artifact/0371.water_spell/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0371.water_spell/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0371.water_spell/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/371/click/ @@ -8,4 +8,4 @@ execute positioned ^ ^ ^5 unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] run function asset:artifact/0371.water_spell/click/3.1.attack # 前方に敵が居た場合 - execute positioned ^ ^ ^5 as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] at @s run function asset:artifact/0371.water_spell/click/3.1.attack \ No newline at end of file + execute positioned ^ ^ ^5 as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] at @s run function asset:artifact/0371.water_spell/click/3.1.attack diff --git a/Asset/data/asset/functions/artifact/0371.water_spell/click/3.1.attack.mcfunction b/Asset/data/asset/functions/artifact/0371.water_spell/click/3.1.attack.mcfunction index 0394d4b68..fd15eaf05 100644 --- a/Asset/data/asset/functions/artifact/0371.water_spell/click/3.1.attack.mcfunction +++ b/Asset/data/asset/functions/artifact/0371.water_spell/click/3.1.attack.mcfunction @@ -4,8 +4,6 @@ # # @within function asset:artifact/0371.water_spell/click/ -# ここから先は神器側の効果の処理を書く - # 演出 particle minecraft:rain ~ ~1 ~ 0.2 0.2 0.2 0 200 playsound minecraft:entity.squid.death player @a ~ ~ ~ 1 2 @@ -24,4 +22,4 @@ # 攻撃した対象に実行 execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0372.water_magic/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0372.water_magic/_index.d.mcfunction new file mode 100644 index 000000000..f91fd2c94 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0372.water_magic/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0372.water_magic/_index.d +# @private + +#> Temp +# @within function asset:artifact/0372.water_magic/** + #declare tag AC.Water + #declare tag AC.First diff --git a/Asset/data/asset/functions/artifact/0372.water_magic/click/.mcfunction b/Asset/data/asset/functions/artifact/0372.water_magic/click/.mcfunction index 4ffd8eb4f..bb4484308 100644 --- a/Asset/data/asset/functions/artifact/0372.water_magic/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0372.water_magic/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0372.water_magic/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/372/click/ @@ -17,4 +17,4 @@ tag @e[type=area_effect_cloud,tag=AC.First] remove AC.First # Scheduleセット - schedule function asset:artifact/0372.water_magic/click/3.1.loop 1t replace \ No newline at end of file + schedule function asset:artifact/0372.water_magic/click/3.1.loop 1t replace diff --git a/Asset/data/asset/functions/artifact/0372.water_magic/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0372.water_magic/click/_index.d.mcfunction deleted file mode 100644 index 182799c0e..000000000 --- a/Asset/data/asset/functions/artifact/0372.water_magic/click/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0372.water_magic/click/_index.d -# -# @private -#> Temp -# -# @within function asset:artifact/0372.water_magic/click/** - #declare tag AC.Water - #declare tag AC.First \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0372.water_magic/load.mcfunction b/Asset/data/asset/functions/artifact/0372.water_magic/load.mcfunction index c26867af5..0b3308516 100644 --- a/Asset/data/asset/functions/artifact/0372.water_magic/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0372.water_magic/load.mcfunction @@ -5,6 +5,6 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0372.water_magic/click/** +# @within function asset:artifact/0372.water_magic/** scoreboard objectives add AC.Time dummy scoreboard objectives add AC.UserID dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/_index.d.mcfunction new file mode 100644 index 000000000..e4905f9ca --- /dev/null +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0373.ice_sorcery/_index.d +# @private + +#> Temp +# @within function asset:artifact/0373.ice_sorcery/** + #declare tag AD.Hit + #declare tag AD.HitTarget diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/.mcfunction index 1ca0a7d98..15129cb6c 100644 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0373.ice_sorcery/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/373/click/ @@ -12,4 +12,4 @@ scoreboard players add @s AD.BeamTime 5 # ビーム発射 - schedule function asset:artifact/0373.ice_sorcery/click/3.1.beamshot 1t replace \ No newline at end of file + schedule function asset:artifact/0373.ice_sorcery/click/3.1.beamshot 1t replace diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.1.beamshot.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.1.beamshot.mcfunction index f282b163e..fc621d960 100644 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.1.beamshot.mcfunction +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.1.beamshot.mcfunction @@ -5,7 +5,7 @@ # @within function # asset:artifact/0373.ice_sorcery/click/ # asset:artifact/0373.ice_sorcery/click/3.1.beamshot -# asset:artifact/0373.ice_sorcery/click/rejoin_process +# asset:artifact/0373.ice_sorcery/rejoin_process # またファンクション分岐 execute as @a[scores={AD.BeamTime=1..}] at @s run function asset:artifact/0373.ice_sorcery/click/3.2.beamshot2 @@ -15,4 +15,4 @@ scoreboard players reset @a[scores={AD.BeamTime=0}] AD.BeamTime # 次tickも実行 - execute as @p[scores={AD.BeamTime=1..}] run schedule function asset:artifact/0373.ice_sorcery/click/3.1.beamshot 1t replace \ No newline at end of file + execute as @p[scores={AD.BeamTime=1..}] run schedule function asset:artifact/0373.ice_sorcery/click/3.1.beamshot 1t replace diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.2.beamshot2.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.2.beamshot2.mcfunction index cce53f69b..6f8c142ae 100644 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.2.beamshot2.mcfunction +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.2.beamshot2.mcfunction @@ -8,7 +8,7 @@ #> SpreadLib # @private -#declare tag SpreadMarker + #declare tag SpreadMarker # 前方拡散事前準備 summon marker ~ ~ ~ {Tags:["SpreadMarker"]} @@ -23,4 +23,4 @@ tag @s remove AD.Hit # リセット - kill @e[type=marker,tag=SpreadMarker] \ No newline at end of file + kill @e[type=marker,tag=SpreadMarker] diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.3.beam.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.3.beam.mcfunction index 949bd6e9a..feab74b3e 100644 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.3.beam.mcfunction +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/3.3.beam.mcfunction @@ -4,9 +4,6 @@ # # @within function asset:artifact/0373.ice_sorcery/click/** - -# ここから先は神器側の効果の処理を書く - # 着弾検知 execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add AD.Hit execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add AD.Hit @@ -23,4 +20,4 @@ execute if entity @s[tag=AD.Hit] run function asset:artifact/0373.ice_sorcery/click/3.4.hit # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!AD.Hit,distance=..30] run function asset:artifact/0373.ice_sorcery/click/3.3.beam \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!AD.Hit,distance=..30] run function asset:artifact/0373.ice_sorcery/click/3.3.beam diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/_index.d.mcfunction deleted file mode 100644 index 55667a91b..000000000 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/_index.d.mcfunction +++ /dev/null @@ -1,9 +0,0 @@ -#> asset:artifact/0373.ice_sorcery/click/_index.d -# -# @private - -#> Temp -# -# @within function asset:artifact/0373.ice_sorcery/click/** - #declare tag AD.Hit - #declare tag AD.HitTarget \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/rejoin_process.mcfunction deleted file mode 100644 index 690b84cc2..000000000 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/click/rejoin_process.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0373.ice_sorcery/click/rejoin_process -# -# 使い方は必ずwikiを見ること -# -# @within tag/function asset:rejoin -# リログ処理 - execute as @p[scores={AD.BeamTime=1..}] run schedule function asset:artifact/0373.ice_sorcery/click/3.1.beamshot 1t replace \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/load.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/load.mcfunction index 5449ab93f..022b238e8 100644 --- a/Asset/data/asset/functions/artifact/0373.ice_sorcery/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0373.ice_sorcery/click/** +# @within function asset:artifact/0373.ice_sorcery/** scoreboard objectives add AD.BeamTime dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0373.ice_sorcery/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0373.ice_sorcery/rejoin_process.mcfunction new file mode 100644 index 000000000..041a54fe2 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0373.ice_sorcery/rejoin_process.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0373.ice_sorcery/rejoin_process +# +# プレイヤー再参加時の処理 +# +# @within tag/function asset:rejoin + +execute as @p[scores={AD.BeamTime=1..}] run schedule function asset:artifact/0373.ice_sorcery/click/3.1.beamshot 1t replace diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/_index.d.mcfunction new file mode 100644 index 000000000..b4a8c5f8f --- /dev/null +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0374.thunder_spell/_index.d +# @private + +#> Temp +# @within function asset:artifact/0374.thunder_spell/** + #declare tag AE.Check diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/click/.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/click/.mcfunction index 0bb273474..9d2c668d6 100644 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0374.thunder_spell/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/374/click/ @@ -21,4 +21,4 @@ execute positioned ~ ~1 ~ positioned ^ ^ ^5 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] facing entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5,sort=nearest,limit=1] feet run function asset:artifact/0374.thunder_spell/click/3.1.line # タグ消し - tag @s remove AE.Check \ No newline at end of file + tag @s remove AE.Check diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/click/3.1.line.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/click/3.1.line.mcfunction index 22205dbc5..450bbb306 100644 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/click/3.1.line.mcfunction +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/click/3.1.line.mcfunction @@ -5,7 +5,6 @@ # @within function # asset:artifact/0374.thunder_spell/click/ # asset:artifact/0374.thunder_spell/click/3.1.line -# ここから先は神器側の効果の処理を書く # 演出 particle dust 1 1 0 1 ~ ~ ~ 0.1 0 0.1 0 5 @@ -14,4 +13,4 @@ execute if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function asset:artifact/0374.thunder_spell/click/3.2.damage # 再起 - execute if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..1] unless entity @s[tag=AE.Check] positioned ^ ^ ^0.5 run function asset:artifact/0374.thunder_spell/click/3.1.line \ No newline at end of file + execute if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..5] unless entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..1] unless entity @s[tag=AE.Check] positioned ^ ^ ^0.5 run function asset:artifact/0374.thunder_spell/click/3.1.line diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/click/3.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/click/3.2.damage.mcfunction index 0068675a2..4540fd452 100644 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/click/3.2.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0374.thunder_spell/click/3.2.damage.mcfunction @@ -5,8 +5,6 @@ # @within function # asset:artifact/0374.thunder_spell/click/3.1.line -# ここから先は神器側の効果の処理を書く - # タグチェック用 tag @s add AE.Check # 演出 @@ -25,4 +23,4 @@ # 攻撃した対象に実行 execute as @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..1,sort=nearest,limit=1] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0374.thunder_spell/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0374.thunder_spell/click/_index.d.mcfunction deleted file mode 100644 index e02b0f6fe..000000000 --- a/Asset/data/asset/functions/artifact/0374.thunder_spell/click/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0374.thunder_spell/click/_index.d -# -# @private - -#> Temp -# -# @within function asset:artifact/0374.thunder_spell/click/** - #declare tag AE.Check \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0375.thunder_magic/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0375.thunder_magic/_index.d.mcfunction new file mode 100644 index 000000000..7ddae0bbe --- /dev/null +++ b/Asset/data/asset/functions/artifact/0375.thunder_magic/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0375.thunder_magic/_index.d +# @private + +#> Temp +# @within function asset:artifact/0375.thunder_magic/** + #declare score_holder $Rotate diff --git a/Asset/data/asset/functions/artifact/0375.thunder_magic/click/.mcfunction b/Asset/data/asset/functions/artifact/0375.thunder_magic/click/.mcfunction index 0c8b33d60..8517938fd 100644 --- a/Asset/data/asset/functions/artifact/0375.thunder_magic/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0375.thunder_magic/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0375.thunder_magic/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/375/click/ @@ -13,4 +13,4 @@ execute positioned ^ ^ ^7 if entity @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..7] at @e[type=#lib:living,type=!player,tag=Enemy,tag=!Uninterferable,distance=..7,sort=nearest,limit=1] run function asset:artifact/0375.thunder_magic/click/3.2.damage # リセット - scoreboard players reset $Rotate Temporary \ No newline at end of file + scoreboard players reset $Rotate Temporary diff --git a/Asset/data/asset/functions/artifact/0375.thunder_magic/click/3.1.circle_particle.mcfunction b/Asset/data/asset/functions/artifact/0375.thunder_magic/click/3.1.circle_particle.mcfunction index 64a37b0f6..6120c065e 100644 --- a/Asset/data/asset/functions/artifact/0375.thunder_magic/click/3.1.circle_particle.mcfunction +++ b/Asset/data/asset/functions/artifact/0375.thunder_magic/click/3.1.circle_particle.mcfunction @@ -5,11 +5,10 @@ # @within function # asset:artifact/0375.thunder_magic/click/ # asset:artifact/0375.thunder_magic/click/3.1.circle_particle -# ここから先は神器側の効果の処理を書く # 演出 execute positioned ^ ^ ^1 run particle dust 1 1 0 1 ~ ~ ~ 0.1 0 0.1 0 5 # 回す scoreboard players add $Rotate Temporary 1 - execute if score $Rotate Temporary matches ..35 rotated ~10 0 run function asset:artifact/0375.thunder_magic/click/3.1.circle_particle \ No newline at end of file + execute if score $Rotate Temporary matches ..35 rotated ~10 0 run function asset:artifact/0375.thunder_magic/click/3.1.circle_particle diff --git a/Asset/data/asset/functions/artifact/0375.thunder_magic/click/3.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0375.thunder_magic/click/3.2.damage.mcfunction index c5a5058ee..041c7c81e 100644 --- a/Asset/data/asset/functions/artifact/0375.thunder_magic/click/3.2.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0375.thunder_magic/click/3.2.damage.mcfunction @@ -5,7 +5,6 @@ # @within function # asset:artifact/0375.thunder_magic/click/ # asset:artifact/0375.thunder_magic/click/3.1.line -# ここから先は神器側の効果の処理を書く # 演出 particle dust 0.867 0.667 0.161 1 ~ ~2 ~ 0 2.5 0 0 100 @@ -25,4 +24,4 @@ # 攻撃した対象に実行 execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..1.5,sort=nearest] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0375.thunder_magic/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0375.thunder_magic/click/_index.d.mcfunction deleted file mode 100644 index 46e7ced8e..000000000 --- a/Asset/data/asset/functions/artifact/0375.thunder_magic/click/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0375.thunder_magic/click/_index.d -# -# @private - -#> Temp -# -# @within function asset:artifact/0375.thunder_magic/click/** - #declare score_holder $Rotate \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0376.ray_sorcery/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0376.ray_sorcery/_index.d.mcfunction new file mode 100644 index 000000000..3109dc963 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0376.ray_sorcery/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0376.ray_sorcery/_index.d +# @private + +#> tag +# @within function asset:artifact/0376.ray_sorcery/** + #declare tag Landing + #declare tag LandingTarget diff --git a/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/.mcfunction b/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/.mcfunction index d6fafdb23..251c8c3ee 100644 --- a/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0376.ray_sorcery/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/376/click/ @@ -12,4 +12,4 @@ playsound minecraft:entity.wither.hurt player @a ~ ~ ~ 1 1.5 # タグを消す - tag @s remove Landing \ No newline at end of file + tag @s remove Landing diff --git a/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/3.1.shoot.mcfunction b/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/3.1.shoot.mcfunction index 13eb936bc..93a9846be 100644 --- a/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/3.1.shoot.mcfunction +++ b/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/3.1.shoot.mcfunction @@ -6,7 +6,6 @@ # asset:artifact/0376.ray_sorcery/click/ # asset:artifact/0376.ray_sorcery/click/3.1.shoot -# ここから先は神器側の効果の処理を書く # 着弾検知 execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing @@ -21,4 +20,4 @@ execute if entity @s[tag=Landing] run function asset:artifact/0376.ray_sorcery/click/3.2.damage # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0376.ray_sorcery/click/3.1.shoot \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0376.ray_sorcery/click/3.1.shoot diff --git a/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/3.2.damage.mcfunction b/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/3.2.damage.mcfunction index e504be2d8..952f773c1 100644 --- a/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/3.2.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/3.2.damage.mcfunction @@ -5,8 +5,6 @@ # @within function # asset:artifact/0376.ray_sorcery/click/3.1.shoot -# ここから先は神器側の効果の処理を書く - # 演出 particle dust 1 1 0 1 ~ ~3 ~ 0.7 3 0.7 0 300 particle dust 1 1 0 1 ~ ~5 ~ 0.1 5 0.1 0 300 @@ -31,4 +29,4 @@ function lib:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget \ No newline at end of file + tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget diff --git a/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/_index.d.mcfunction deleted file mode 100644 index dc5aacd30..000000000 --- a/Asset/data/asset/functions/artifact/0376.ray_sorcery/click/_index.d.mcfunction +++ /dev/null @@ -1,8 +0,0 @@ -#> asset:artifact/0376.ray_sorcery/click/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0376.ray_sorcery/click/** - #declare tag Landing - #declare tag LandingTarget \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0379.miracle_rod/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0379.miracle_rod/_index.d.mcfunction new file mode 100644 index 000000000..07a85b3ef --- /dev/null +++ b/Asset/data/asset/functions/artifact/0379.miracle_rod/_index.d.mcfunction @@ -0,0 +1,9 @@ +#> asset:artifact/0379.miracle_rod/_index.d +# @private + +#> tag +# @within function asset:artifact/0379.miracle_rod/** + #declare tag AJ.Magic + #declare tag AJ.MagicSet + #declare tag Landing + #declare tag LandingTarget diff --git a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/.mcfunction b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/.mcfunction index 92e9319a3..48af9597e 100644 --- a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0379.miracle_rod/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/379/click/ @@ -15,4 +15,4 @@ tag @e[type=area_effect_cloud,tag=AJ.MagicSet,sort=nearest,limit=1] remove AJ.MagicSet # 魔法陣実行 - function asset:artifact/0379.miracle_rod/click/3.2.magic_circle \ No newline at end of file + function asset:artifact/0379.miracle_rod/click/3.2.magic_circle diff --git a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.2.magic_circle.mcfunction b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.2.magic_circle.mcfunction index 1cad990ce..ff2e53aa5 100644 --- a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.2.magic_circle.mcfunction +++ b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.2.magic_circle.mcfunction @@ -6,8 +6,6 @@ # asset:artifact/0379.miracle_rod/click/ # asset:artifact/0379.miracle_rod/click/3.2.magic_circle -# ここから先は神器側の効果の処理を書く - # 演出 execute as @e[type=area_effect_cloud,tag=AJ.Magic] at @s positioned ~ ~1.5 ~ positioned ^ ^ ^2 rotated ~ ~90 run function asset:artifact/0379.miracle_rod/click/3.1.particle @@ -20,4 +18,4 @@ scoreboard players remove @e[type=area_effect_cloud,tag=AJ.Magic] AJ.CoolTime 1 # ループ - execute if entity @e[type=area_effect_cloud,tag=AJ.Magic,limit=1] run schedule function asset:artifact/0379.miracle_rod/click/3.2.magic_circle 1t replace \ No newline at end of file + execute if entity @e[type=area_effect_cloud,tag=AJ.Magic,limit=1] run schedule function asset:artifact/0379.miracle_rod/click/3.2.magic_circle 1t replace diff --git a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.3.shoot.mcfunction b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.3.shoot.mcfunction index 8ef51ac7e..203b20017 100644 --- a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.3.shoot.mcfunction +++ b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.3.shoot.mcfunction @@ -6,7 +6,6 @@ # asset:artifact/0379.miracle_rod/click/3.2.magic_circle # asset:artifact/0379.miracle_rod/click/3.3.shoot -# ここから先は神器側の効果の処理を書く # 着弾検知 execute if entity @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] run tag @s add Landing execute unless block ^ ^ ^0.5 #lib:no_collision run tag @s add Landing @@ -22,4 +21,4 @@ execute if entity @s[tag=Landing] run function asset:artifact/0379.miracle_rod/click/3.4.damage # 再起 - execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0379.miracle_rod/click/3.3.shoot \ No newline at end of file + execute positioned ^ ^ ^0.5 if entity @s[tag=!Landing,distance=..30] run function asset:artifact/0379.miracle_rod/click/3.3.shoot diff --git a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.4.damage.mcfunction b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.4.damage.mcfunction index d32d729f9..5c01424ca 100644 --- a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.4.damage.mcfunction +++ b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/3.4.damage.mcfunction @@ -5,8 +5,6 @@ # @within function # asset:artifact/0379.miracle_rod/click/3.3.shoot -# ここから先は神器側の効果の処理を書く - # 演出 particle end_rod ~ ~ ~ 0 0 0 0.4 200 particle minecraft:large_smoke ~ ~ ~ 0 0 0 0.4 10 @@ -29,4 +27,4 @@ function lib:damage/reset # 着弾タグを消す - tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget \ No newline at end of file + tag @e[type=#lib:living,type=!player,tag=LandingTarget,tag=!Uninterferable,distance=..50,limit=1] remove LandingTarget diff --git a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0379.miracle_rod/click/_index.d.mcfunction deleted file mode 100644 index 4711d2446..000000000 --- a/Asset/data/asset/functions/artifact/0379.miracle_rod/click/_index.d.mcfunction +++ /dev/null @@ -1,10 +0,0 @@ -#> asset:artifact/0379.miracle_rod/click/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0379.miracle_rod/click/** - #declare tag AJ.Magic - #declare tag AJ.MagicSet - #declare tag Landing - #declare tag LandingTarget \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0379.miracle_rod/load.mcfunction b/Asset/data/asset/functions/artifact/0379.miracle_rod/load.mcfunction index b1ee107fe..a44164edb 100644 --- a/Asset/data/asset/functions/artifact/0379.miracle_rod/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0379.miracle_rod/load.mcfunction @@ -5,6 +5,6 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0379.miracle_rod/click/** +# @within function asset:artifact/0379.miracle_rod/** scoreboard objectives add AJ.CoolTime dummy scoreboard objectives add AJ.UserID dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0382.haru_urara/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0382.haru_urara/attack_melee/.mcfunction index fdf189203..f23f60abd 100644 --- a/Asset/data/asset/functions/artifact/0382.haru_urara/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0382.haru_urara/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0382.haru_urara/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/382/attack_melee/ @@ -25,4 +25,4 @@ function lib:damage/reset # 吹っ飛び効果 - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run effect give @s minecraft:levitation 1 30 true \ No newline at end of file + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run effect give @s minecraft:levitation 1 30 true diff --git a/Asset/data/asset/functions/artifact/0383.i_scream_ice_cream/click/.mcfunction b/Asset/data/asset/functions/artifact/0383.i_scream_ice_cream/click/.mcfunction index 350c31938..885a19c36 100644 --- a/Asset/data/asset/functions/artifact/0383.i_scream_ice_cream/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0383.i_scream_ice_cream/click/.mcfunction @@ -1,11 +1,12 @@ #> asset:artifact/0383.i_scream_ice_cream/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/383/click/ - -# ここから先は神器側の効果の処理を書く +#> Private +# @private + #declare score_holder $Random # ランダムで変なこと言うやつ # 引数 @@ -82,4 +83,4 @@ # 範囲5m以内のエンティティを対象に execute as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..5] run function lib:damage/ # リセット - function lib:damage/reset \ No newline at end of file + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/_index.d.mcfunction similarity index 63% rename from Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/_index.d.mcfunction rename to Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/_index.d.mcfunction index c85f5dcf7..750ffb17a 100644 --- a/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/_index.d.mcfunction +++ b/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/_index.d.mcfunction @@ -1,6 +1,4 @@ -#> asset:artifact/0397.floor_sublimation_wing/click/_index.d -# -# +#> asset:artifact/0397.floor_sublimation_wing/_index.d # @private #> Temp @@ -12,9 +10,7 @@ # 397.Marker: TPに使用 # # @within function -# asset:artifact/0397.floor_sublimation_wing/click/2.* -# asset:artifact/0397.floor_sublimation_wing/click/ -# +# asset:artifact/0397.floor_sublimation_wing/** #declare score_holder $397_Count #declare score_holder $397_Stat - #declare tag B1.Marker \ No newline at end of file + #declare tag B1.Marker diff --git a/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/.mcfunction b/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/.mcfunction index ac56d7704..feac6e455 100644 --- a/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/.mcfunction @@ -1,19 +1,20 @@ #> asset:artifact/0397.floor_sublimation_wing/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/397/click/ - playsound minecraft:entity.enderman.teleport player @a ~ ~ ~ 1 1.3 - playsound minecraft:entity.player.attack.weak player @a ~ ~ ~ 1 0.2 - particle minecraft:reverse_portal ~ ~ ~ 0.1 0.1 0.1 1 150 - particle minecraft:witch ~ ~ ~ 0.1 0.1 0.1 5 30 +# 演出(テレポート元) + playsound minecraft:entity.enderman.teleport player @a ~ ~ ~ 1 1.3 + playsound minecraft:entity.player.attack.weak player @a ~ ~ ~ 1 0.2 + particle minecraft:reverse_portal ~ ~ ~ 0.1 0.1 0.1 1 150 + particle minecraft:witch ~ ~ ~ 0.1 0.1 0.1 5 30 - # テレポート - execute at @e[type=area_effect_cloud,tag=B1.Marker,distance=..32,limit=1] rotated as @s run tp @s ~ ~ ~ +# テレポート + execute at @e[type=area_effect_cloud,tag=B1.Marker,distance=..32,limit=1] rotated as @s run tp @s ~ ~ ~ - # 演出(テレポート後) - execute at @s run particle minecraft:reverse_portal ~ ~ ~ 0.1 0.1 0.1 1 150 - execute at @s run particle minecraft:witch ~ ~ ~ 0.1 0.1 0.1 5 30 - execute at @s run playsound minecraft:entity.enderman.teleport player @a ~ ~ ~ 1 1.3 - execute at @s run playsound minecraft:entity.player.attack.weak player @a ~ ~ ~ 1 0.2 \ No newline at end of file +# 演出(テレポート後) + execute at @s run particle minecraft:reverse_portal ~ ~ ~ 0.1 0.1 0.1 1 150 + execute at @s run particle minecraft:witch ~ ~ ~ 0.1 0.1 0.1 5 30 + execute at @s run playsound minecraft:entity.enderman.teleport player @a ~ ~ ~ 1 1.3 + execute at @s run playsound minecraft:entity.player.attack.weak player @a ~ ~ ~ 1 0.2 diff --git a/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/check.mcfunction b/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/check.mcfunction index 3c05e2a3b..f7d57c66b 100644 --- a/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0397.floor_sublimation_wing/click/check.mcfunction @@ -4,17 +4,16 @@ # # @within function asset:artifact/alias/397/click/check -# 他にアイテム等確認する場合はここに書く - # 条件チェックに必要なオブジェクトの初期化 - scoreboard players set $397_Count Temporary 0 - scoreboard players set $397_Stat Temporary 0 - # Y <= 32ブロック に埋まることなくTPできるブロックが存在するか - execute positioned ~ ~1 ~ run function asset:artifact/0397.floor_sublimation_wing/click/2.1.check_block - execute if score $397_Stat Temporary matches 1 as @e[type=area_effect_cloud,tag=B1.Marker,distance=..32,limit=1] at @s if predicate lib:is_ban_tp_area run scoreboard players set $397_Stat Temporary 0 - execute if score $397_Stat Temporary matches 0 if entity @s[tag=CanUsed] run function lib:message/artifact/can_not_use_here - execute if score $397_Stat Temporary matches 0 run tag @s remove CanUsed - -# CanUsedタグをチェックして.mcfunctionを実行する - execute if entity @s[tag=CanUsed] run function asset:artifact/0397.floor_sublimation_wing/click/ - -# オブジェクトの開放 \ No newline at end of file +# 条件チェックに必要なオブジェクトの初期化 + scoreboard players set $397_Count Temporary 0 + scoreboard players set $397_Stat Temporary 0 +# Y <= 32ブロック に埋まることなくTPできるブロックが存在するか + execute positioned ~ ~1 ~ run function asset:artifact/0397.floor_sublimation_wing/click/2.1.check_block + execute if score $397_Stat Temporary matches 1 as @e[type=area_effect_cloud,tag=B1.Marker,distance=..32,limit=1] at @s if predicate lib:is_ban_tp_area run scoreboard players set $397_Stat Temporary 0 + execute if score $397_Stat Temporary matches 0 if entity @s[tag=CanUsed] run function lib:message/artifact/can_not_use_here + execute if score $397_Stat Temporary matches 0 run tag @s remove CanUsed + +# オブジェクトの開放 + kill @e[type=area_effect_cloud,tag=B1.Marker,distance=..32,limit=1] + scoreboard players reset $397_Count Temporary + scoreboard players reset $397_Stat Temporary diff --git a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/.mcfunction b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/.mcfunction index 7a81f5b6f..1fe104d1a 100644 --- a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0431.weather_lock_cane/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/431/click/ diff --git a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/vfx/thunder2.mcfunction b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/vfx/thunder2.mcfunction index 9fe327d2d..8dd386a32 100644 --- a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/vfx/thunder2.mcfunction +++ b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/vfx/thunder2.mcfunction @@ -4,9 +4,8 @@ # # @within function asset:artifact/0431.weather_lock_cane/click/vfx/thunder - # 演出 particle dust 1 1 0 1 ~ ~3 ~ 0.7 3 0.7 0 200 particle dust 1 1 0 1 ~ ~5 ~ 0.1 5 0.1 0 200 particle minecraft:explosion ~ ~ ~ 0.3 0 0.3 0 5 - particle minecraft:large_smoke ~ ~ ~ 0 0 0 0.4 75 \ No newline at end of file + particle minecraft:large_smoke ~ ~ ~ 0 0 0 0.4 75 diff --git a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/weather/.mcfunction b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/weather/.mcfunction index 829fc3296..eb0e63dcb 100644 --- a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/weather/.mcfunction +++ b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/weather/.mcfunction @@ -5,7 +5,7 @@ # @within function # asset:artifact/0431.weather_lock_cane/click/ # asset:artifact/0431.weather_lock_cane/click/weather/lock -# asset:artifact/0431.weather_lock_cane/click/rejoin_process +# asset:artifact/0431.weather_lock_cane/rejoin_process # ディメンションチェック execute if predicate lib:dimension/is_overworld unless score @s BZ.Dimension matches 0 run function asset:artifact/0431.weather_lock_cane/click/weather/overworld diff --git a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/weather/clear.mcfunction b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/weather/clear.mcfunction index 9ef2f0132..6b7fc85ed 100644 --- a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/weather/clear.mcfunction +++ b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/weather/clear.mcfunction @@ -4,7 +4,7 @@ # # @within function # asset:artifact/0431.weather_lock_cane/click/end -# asset:artifact/0431.weather_lock_cane/click/rejoin_process +# asset:artifact/0431.weather_lock_cane/rejoin_process # 演出 # chat diff --git a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/load.mcfunction b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/load.mcfunction index 1aea573bb..06df8b4d6 100644 --- a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0431.weather_lock_cane/click/** +# @within function asset:artifact/0431.weather_lock_cane/** scoreboard objectives add BZ.Dimension dummy diff --git a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/rejoin_process.mcfunction similarity index 81% rename from Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0431.weather_lock_cane/rejoin_process.mcfunction index c11e2addb..e3df5feef 100644 --- a/Asset/data/asset/functions/artifact/0431.weather_lock_cane/click/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0431.weather_lock_cane/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0431.weather_lock_cane/click/rejoin_process +#> asset:artifact/0431.weather_lock_cane/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/use_item/.mcfunction index f676516d0..161406eb0 100644 --- a/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0437.only_the_crabs_know/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0437.only_the_crabs_know/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/437/use_item/ @@ -21,4 +21,4 @@ # 天国 execute if score $Random Temporary matches 80..99 run function asset:artifact/0437.only_the_crabs_know/use_item/3.5.heavenly_feeling # リセット - scoreboard players reset $Random Temporary \ No newline at end of file + scoreboard players reset $Random Temporary diff --git a/Asset/data/asset/functions/artifact/0441.awaited_opportunity/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0441.awaited_opportunity/attack_melee/.mcfunction index eb0d6bc24..5ccaef6eb 100644 --- a/Asset/data/asset/functions/artifact/0441.awaited_opportunity/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0441.awaited_opportunity/attack_melee/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0441.awaited_opportunity/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/441/attack_melee/ @@ -11,4 +11,4 @@ execute if predicate lib:random_pass_per/30 run function asset:artifact/0441.awaited_opportunity/attack_melee/3.1.message # 攻撃対象にダメージ - execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..150] at @s run function asset:artifact/0441.awaited_opportunity/attack_melee/3.3.attack \ No newline at end of file + execute as @e[type=#lib:living,type=!player,tag=Victim,distance=..150] at @s run function asset:artifact/0441.awaited_opportunity/attack_melee/3.3.attack diff --git a/Asset/data/asset/functions/artifact/0441.awaited_opportunity/attack_melee/3.1.message.mcfunction b/Asset/data/asset/functions/artifact/0441.awaited_opportunity/attack_melee/3.1.message.mcfunction index 9d1d58923..f523eb25f 100644 --- a/Asset/data/asset/functions/artifact/0441.awaited_opportunity/attack_melee/3.1.message.mcfunction +++ b/Asset/data/asset/functions/artifact/0441.awaited_opportunity/attack_melee/3.1.message.mcfunction @@ -3,6 +3,7 @@ # メッセージを流す # # @within function asset:artifact/0441.awaited_opportunity/attack_melee/ + #> Private # @private #declare score_holder $Random @@ -45,4 +46,4 @@ execute if score $Random Temporary matches 65..69 run effect give @s speed 30 10 true # リセット - scoreboard players reset $Random Temporary \ No newline at end of file + scoreboard players reset $Random Temporary diff --git a/Asset/data/asset/functions/artifact/0454.kinoko/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0454.kinoko/use_item/.mcfunction index 62c1bed82..d4ccf7242 100644 --- a/Asset/data/asset/functions/artifact/0454.kinoko/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0454.kinoko/use_item/.mcfunction @@ -1,13 +1,14 @@ #> asset:artifact/0454.kinoko/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/454/use_item/ - tellraw @s [{"text": "<"},{"selector":"@s"},{"text": "> き の こ 万 歳 ！"}] - # 処理 - function api:modifier/max_health/get - execute store result storage lib: Argument.Heal double 0.01 run data get storage api: Return.MaxHealth 50 - function lib:heal/modifier - function lib:heal/ - function lib:heal/reset +# 演出 + tellraw @s [{"text": "<"},{"selector":"@s"},{"text": "> き の こ 万 歳 ！"}] +# 処理 + function api:modifier/max_health/get + execute store result storage lib: Argument.Heal double 0.01 run data get storage api: Return.MaxHealth 50 + function lib:heal/modifier + function lib:heal/ + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0455.takenoko/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0455.takenoko/use_item/.mcfunction index fede1ec4f..354b696a9 100644 --- a/Asset/data/asset/functions/artifact/0455.takenoko/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0455.takenoko/use_item/.mcfunction @@ -1,13 +1,14 @@ #> asset:artifact/0455.takenoko/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/455/use_item/ - tellraw @s [{"text": "<"},{"selector":"@s"},{"text": "> た け の こ 万 歳 ！"}] - # 処理 - function api:data_get/health - execute store result storage lib: Argument.Heal double 0.01 run data get storage api: Health 50 - function lib:heal/modifier - function lib:heal/ - function lib:heal/reset +# 演出 + tellraw @s [{"text": "<"},{"selector":"@s"},{"text": "> た け の こ 万 歳 ！"}] +# 処理 + function api:data_get/health + execute store result storage lib: Argument.Heal double 0.01 run data get storage api: Health 50 + function lib:heal/modifier + function lib:heal/ + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/use_item/.mcfunction index 63ac43733..ca68e52f4 100644 --- a/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0456.potion_of_stalling_power/use_item/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0456.potion_of_stalling_power/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/456/use_item/ diff --git a/Asset/data/asset/functions/artifact/0462.456_dice/click/.mcfunction b/Asset/data/asset/functions/artifact/0462.456_dice/click/.mcfunction index 78066f608..11582c189 100644 --- a/Asset/data/asset/functions/artifact/0462.456_dice/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0462.456_dice/click/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0462.456_dice/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/462/click/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> Private +# @private + #declare tag CU.Target # サイコロを振る # 疑似乱数取得 @@ -28,4 +28,4 @@ # リセット scoreboard players reset @s Temporary - tag @e[tag=CU.Target] remove CU.Target \ No newline at end of file + tag @e[tag=CU.Target] remove CU.Target diff --git a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/_index.d.mcfunction new file mode 100644 index 000000000..d191eb784 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/_index.d.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/0467.cosmo_blue_flash/_index.d +# @private + +#> Private +# @within asset:artifact/0467.cosmo_blue_flash/** + #declare tag CZ.HitEntity + #declare tag CZ.HitFlag diff --git a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/.mcfunction b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/.mcfunction index b3d89ec34..819e29cb3 100644 --- a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0467.cosmo_blue_flash/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/467/click/ @@ -14,4 +14,4 @@ # リセット tag @e[tag=CZ.HitEntity] remove CZ.HitEntity - tag @s remove CZ.HitFlag \ No newline at end of file + tag @s remove CZ.HitFlag diff --git a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/_index.d.mcfunction deleted file mode 100644 index fb59b17db..000000000 --- a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0467.cosmo_blue_flash/click/_index.d -# @private - -#> Private -# @within asset:artifact/0467.cosmo_blue_flash/click/* - #declare tag CZ.HitEntity - #declare tag CZ.HitFlag \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/shot.mcfunction b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/shot.mcfunction index d5e884fd0..2d3488f85 100644 --- a/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/shot.mcfunction +++ b/Asset/data/asset/functions/artifact/0467.cosmo_blue_flash/click/shot.mcfunction @@ -6,8 +6,6 @@ # asset:artifact/0467.cosmo_blue_flash/click/ # asset:artifact/0467.cosmo_blue_flash/click/shot -# ここから先は神器側の効果の処理を書く - # 演出 particle minecraft:dolphin ~ ~ ~ 0.1 0.1 0.1 1 30 force @@ -16,4 +14,4 @@ execute if entity @e[tag=CZ.HitEntity,distance=..40] run tag @s add CZ.HitFlag # 再帰 - execute positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision if entity @s[tag=!CZ.HitFlag,distance=..30] run function asset:artifact/0467.cosmo_blue_flash/click/shot \ No newline at end of file + execute positioned ^ ^ ^0.5 if block ~ ~ ~ #lib:no_collision if entity @s[tag=!CZ.HitFlag,distance=..30] run function asset:artifact/0467.cosmo_blue_flash/click/shot diff --git a/Asset/data/asset/functions/artifact/0468.raging_demon/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0468.raging_demon/_index.d.mcfunction new file mode 100644 index 000000000..c61f31e4f --- /dev/null +++ b/Asset/data/asset/functions/artifact/0468.raging_demon/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0468.raging_demon/_index.d +# @private + +#> tag +# @within function asset:artifact/0468.raging_demon/** + #declare tag D0.Target diff --git a/Asset/data/asset/functions/artifact/0468.raging_demon/tick/.mcfunction b/Asset/data/asset/functions/artifact/0468.raging_demon/tick/.mcfunction index 9341135cb..f95f1f307 100644 --- a/Asset/data/asset/functions/artifact/0468.raging_demon/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/0468.raging_demon/tick/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0468.raging_demon/tick/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/468/tick/ @@ -13,4 +13,4 @@ # リセット function lib:damage/reset - tag @e[tag=D0.Target] remove D0.Target \ No newline at end of file + tag @e[tag=D0.Target] remove D0.Target diff --git a/Asset/data/asset/functions/artifact/0468.raging_demon/tick/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0468.raging_demon/tick/_index.d.mcfunction deleted file mode 100644 index aad84bc8b..000000000 --- a/Asset/data/asset/functions/artifact/0468.raging_demon/tick/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0468.raging_demon/tick/_index.d -# @private - -#> tag -# @within function -# asset:artifact/0468.raging_demon/tick/** - #declare tag D0.Target \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0468.raging_demon/tick/check.mcfunction b/Asset/data/asset/functions/artifact/0468.raging_demon/tick/check.mcfunction index b0037a28a..071f274b1 100644 --- a/Asset/data/asset/functions/artifact/0468.raging_demon/tick/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0468.raging_demon/tick/check.mcfunction @@ -4,5 +4,5 @@ # # @within function asset:artifact/alias/468/tick/check -# 周囲10M以内に体力が20以下の敵がいるか確認 - execute if entity @s[tag=CanUsed] run function asset:artifact/0468.raging_demon/tick/check_target \ No newline at end of file +# 周囲10M以内に体力が20以下の敵がいるか確認 + execute if entity @s[tag=CanUsed] run function asset:artifact/0468.raging_demon/tick/check_target diff --git a/Asset/data/asset/functions/artifact/0468.raging_demon/tick/check_target.mcfunction b/Asset/data/asset/functions/artifact/0468.raging_demon/tick/check_target.mcfunction index 72805e1c1..c0eadf00f 100644 --- a/Asset/data/asset/functions/artifact/0468.raging_demon/tick/check_target.mcfunction +++ b/Asset/data/asset/functions/artifact/0468.raging_demon/tick/check_target.mcfunction @@ -4,6 +4,7 @@ # 対象の敵がいないときはCanUsedを削除 # # @within function asset:artifact/0468.raging_demon/tick/check + #> Private # @private #declare tag CanUsed diff --git a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/_index.d.mcfunction new file mode 100644 index 000000000..62a0beae0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/_index.d.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/0471.stone_cutter_chainsaw/_index.d +# @private + +#> Temp +# +# クリティカルヒットの判定用のスコアホルダー、タグ +# +# @within function asset:artifact/0471.stone_cutter_chainsaw/click/** + #declare score_holder $7N.Count + #declare tag D3.Critical diff --git a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/.mcfunction b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/.mcfunction index bdca80f3d..15a1bc74e 100644 --- a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/.mcfunction @@ -1,23 +1,23 @@ #> asset:artifact/0471.stone_cutter_chainsaw/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/471/click/ - # 初期化 - scoreboard players set $7n.Count Temporary 0 +# 初期化 + scoreboard players set $7N.Count Temporary 0 - # 演出 - execute positioned ~ ~1 ~ run particle block stone ^ ^ ^0.8 0.1 0.1 0.1 1.0 20 - playsound entity.wandering_trader.drink_potion player @p ~ ~ ~ 0.8 0.3 - playsound block.soul_sand.place player @p ~ ~ ~ 1.0 0.8 - playsound item.totem.use player @a ~ ~ ~ 0.1 2.0 +# 演出 + execute positioned ~ ~1 ~ run particle block stone ^ ^ ^0.8 0.1 0.1 0.1 1.0 20 + playsound entity.wandering_trader.drink_potion player @p ~ ~ ~ 0.8 0.3 + playsound block.soul_sand.place player @p ~ ~ ~ 1.0 0.8 + playsound item.totem.use player @a ~ ~ ~ 0.1 2.0 - # クリティカルヒット判定 - execute anchored eyes positioned ^ ^ ^0.1 run function asset:artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical +# クリティカルヒット判定 + execute anchored eyes positioned ^ ^ ^0.1 run function asset:artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical - # ヒット - execute positioned ^ ^ ^2 as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] at @s if entity @p[tag=this, distance=..4] run function asset:artifact/0471.stone_cutter_chainsaw/click/3.2.entity +# ヒット + execute positioned ^ ^ ^2 as @e[type=#lib:living,type=!player,tag=!Uninterferable,distance=..2] at @s if entity @p[tag=this, distance=..4] run function asset:artifact/0471.stone_cutter_chainsaw/click/3.2.entity - # 開放 - scoreboard players reset $7n.Count Temporary \ No newline at end of file +# 開放 + scoreboard players reset $7N.Count Temporary diff --git a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical.mcfunction b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical.mcfunction index 302d70bd4..5f1f06cc2 100644 --- a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical.mcfunction +++ b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical.mcfunction @@ -11,7 +11,7 @@ tag @e[type=#lib:living,type=!player,tag=!Uninterferable,dx=0,limit=1] add D3.Critical # 加算 - scoreboard players add $7n.Count Temporary 1 + scoreboard players add $7N.Count Temporary 1 # 3.5マスまで再帰 - execute unless entity @e[type=#lib:living,type=!player,tag=D3.Critical,tag=!Uninterferable,dx=0] if score $7n.Count Temporary matches ..35 positioned ^ ^ ^0.1 run function asset:artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical \ No newline at end of file + execute unless entity @e[type=#lib:living,type=!player,tag=D3.Critical,tag=!Uninterferable,dx=0] if score $7N.Count Temporary matches ..35 positioned ^ ^ ^0.1 run function asset:artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical diff --git a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/_index.d.mcfunction deleted file mode 100644 index d91456003..000000000 --- a/Asset/data/asset/functions/artifact/0471.stone_cutter_chainsaw/click/_index.d.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/0471.stone_cutter_chainsaw/click/_index.d -# -# @private - -#> Temp -# -# クリティカルヒットの判定用のスコアホルダー、タグ -# -# @within function -# asset:artifact/0471.stone_cutter_chainsaw/click/ -# asset:artifact/0471.stone_cutter_chainsaw/click/3.1.check_critical -# asset:artifact/0471.stone_cutter_chainsaw/click/3.2.entity -# - #declare score_holder $7n.Count - #declare tag D3.Critical \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0501.infinity/click/.mcfunction b/Asset/data/asset/functions/artifact/0501.infinity/click/.mcfunction index ab720aa51..3693f79a4 100644 --- a/Asset/data/asset/functions/artifact/0501.infinity/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0501.infinity/click/.mcfunction @@ -1,7 +1,9 @@ #> asset:artifact/0501.infinity/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/501/click/ - function api:artifact/give/from_id \ No newline at end of file +# ここから先は神器側の効果の処理を書く + data modify storage api: Argument.ID set value 501 + function api:artifact/give/from_id diff --git a/Asset/data/asset/functions/artifact/0515.time_medicine/use_item/.mcfunction b/Asset/data/asset/functions/artifact/0515.time_medicine/use_item/.mcfunction index 02e627c82..cceecef91 100644 --- a/Asset/data/asset/functions/artifact/0515.time_medicine/use_item/.mcfunction +++ b/Asset/data/asset/functions/artifact/0515.time_medicine/use_item/.mcfunction @@ -1,9 +1,10 @@ #> asset:artifact/0515.time_medicine/use_item/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/515/use_item/ +# 朝 execute if predicate lib:is_day run function asset:artifact/0515.time_medicine/use_item/day # 夜 execute if predicate lib:is_night run function asset:artifact/0515.time_medicine/use_item/night diff --git a/Asset/data/asset/functions/artifact/0522.humanism/click/.mcfunction b/Asset/data/asset/functions/artifact/0522.humanism/click/.mcfunction index b0b1a38d0..71cc184a6 100644 --- a/Asset/data/asset/functions/artifact/0522.humanism/click/.mcfunction +++ b/Asset/data/asset/functions/artifact/0522.humanism/click/.mcfunction @@ -1,12 +1,12 @@ #> asset:artifact/0522.humanism/click/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/522/click/ - function asset:artifact/common/use/auto - -# ここから先は神器側の効果の処理を書く +#> private +# @private + #declare tag EI.Target # 演出 playsound block.enchantment_table.use player @a ~ ~ ~ 1 0 1 @@ -29,4 +29,4 @@ function lib:damage/reset # タグリセット - execute at @a run tag @e[tag=EI.Target,tag=!Uninterferable,distance=..50] remove EI.Target \ No newline at end of file + execute at @a run tag @e[tag=EI.Target,tag=!Uninterferable,distance=..50] remove EI.Target diff --git a/Asset/data/asset/functions/artifact/0522.humanism/click/mp_heal.mcfunction b/Asset/data/asset/functions/artifact/0522.humanism/click/mp_heal.mcfunction index c8f16adc4..9900de9ed 100644 --- a/Asset/data/asset/functions/artifact/0522.humanism/click/mp_heal.mcfunction +++ b/Asset/data/asset/functions/artifact/0522.humanism/click/mp_heal.mcfunction @@ -4,6 +4,6 @@ # # @within function asset:artifact/0522.humanism/click/ - # 自身以外のプレイヤー全回復 - scoreboard players set $Fluctuation Lib 150 - function lib:mp/fluctuation +# 自身以外のプレイヤー全回復 + scoreboard players set $Fluctuation Lib 150 + function lib:mp/fluctuation diff --git a/Asset/data/asset/functions/artifact/0529.safety_helmet/damage/.mcfunction b/Asset/data/asset/functions/artifact/0529.safety_helmet/damage/.mcfunction index 978943273..acf14e260 100644 --- a/Asset/data/asset/functions/artifact/0529.safety_helmet/damage/.mcfunction +++ b/Asset/data/asset/functions/artifact/0529.safety_helmet/damage/.mcfunction @@ -1,6 +1,6 @@ #> asset:artifact/0529.safety_helmet/damage/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/529/damage/ @@ -8,4 +8,4 @@ playsound entity.ender_eye.death player @p ~ ~ ~ 1.0 1.0 # 耐性付与 - effect give @s resistance 3 1 \ No newline at end of file + effect give @s resistance 3 1 diff --git a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0534.all_night_helmet/attack_melee/.mcfunction similarity index 78% rename from Asset/data/asset/functions/artifact/0535.all_night_chestplate/attack_melee/.mcfunction rename to Asset/data/asset/functions/artifact/0534.all_night_helmet/attack_melee/.mcfunction index 34cb9edfe..8e005ce74 100644 --- a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0534.all_night_helmet/attack_melee/.mcfunction @@ -1,16 +1,15 @@ -#> asset:artifact/0535.all_night_chestplate/attack_melee/ +#> asset:artifact/0534.all_night_helmet/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # -# @within function asset:artifact/alias/535/attack_melee/ - +# @within function asset:artifact/alias/534/attack_melee/ # 演出 playsound minecraft:entity.drowned.death_water player @a ~ ~ ~ 1 0.8 execute at @e[type=#lib:living,type=!player,tag=Victim,distance=..10] run particle minecraft:squid_ink ~ ~1 ~ 0.4 0.4 0.4 0.03 30 # ダメージ設定 - # 与えるダメージ = 90 + # 与えるダメージ = 15 data modify storage lib: Argument.Damage set value 15.0f # 第一属性 data modify storage lib: Argument.AttackType set value "Magic" @@ -28,4 +27,4 @@ # 自分を対象に function lib:heal/ # リセット - function lib:heal/reset \ No newline at end of file + function lib:heal/reset diff --git a/Asset/data/asset/functions/artifact/0534.all_night_helmet/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0534.all_night_helmet/attack_melee/check.mcfunction new file mode 100644 index 000000000..a390efba9 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0534.all_night_helmet/attack_melee/check.mcfunction @@ -0,0 +1,27 @@ +#> asset:artifact/0534.all_night_helmet/attack_melee/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/534/attack_melee/check + +#> score +# @private + #declare score_holder $Daytime + +# 今が夜かどうか確認 + execute store result score $Daytime Temporary run time query daytime + +# 装備をすべて着ているが、夜じゃない場合 + data modify storage api: Argument.ID set value 241 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect{Stack:4} if score $Daytime Temporary matches 0..12000 run tag @s remove CanUsed + +# 演出（使用できないときのメッセージだすとうるさいのでなし） + execute unless entity @s[tag=CanUsed] run particle minecraft:smoke ~ ~1 ~ 0.3 0.3 0.3 0 20 normal @s + execute unless entity @s[tag=CanUsed] run playsound minecraft:block.stone_button.click_off player @s ~ ~ ~ 1 2 + +# 装備が足りない場合 + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed + +# リセット + scoreboard players reset $Daytime Temporary diff --git a/Asset/data/asset/functions/artifact/0534.all_night_hellmet/enroll_pool.mcfunction b/Asset/data/asset/functions/artifact/0534.all_night_helmet/enroll_pool.mcfunction similarity index 76% rename from Asset/data/asset/functions/artifact/0534.all_night_hellmet/enroll_pool.mcfunction rename to Asset/data/asset/functions/artifact/0534.all_night_helmet/enroll_pool.mcfunction index 107a78e90..28e51b3af 100644 --- a/Asset/data/asset/functions/artifact/0534.all_night_hellmet/enroll_pool.mcfunction +++ b/Asset/data/asset/functions/artifact/0534.all_night_helmet/enroll_pool.mcfunction @@ -1,4 +1,4 @@ -#> asset:artifact/0534.all_night_hellmet/enroll_pool +#> asset:artifact/0534.all_night_helmet/enroll_pool # # 神器プールへの登録処理 # diff --git a/Asset/data/asset/functions/artifact/0534.all_night_hellmet/register.mcfunction b/Asset/data/asset/functions/artifact/0534.all_night_helmet/register.mcfunction similarity index 92% rename from Asset/data/asset/functions/artifact/0534.all_night_hellmet/register.mcfunction rename to Asset/data/asset/functions/artifact/0534.all_night_helmet/register.mcfunction index 7f8264bc3..1ab09eefd 100644 --- a/Asset/data/asset/functions/artifact/0534.all_night_hellmet/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0534.all_night_helmet/register.mcfunction @@ -1,52 +1,56 @@ -#> asset:artifact/0534.all_night_hellmet/register +#> asset:artifact/0534.all_night_helmet/register # # 神器の生成処理 # # @within function asset:artifact/alias/534/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 534 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_helmet" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"夜を崇拝する者達の正装だ。","color":"dark_purple"}'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "head" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "attack_melee" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [15] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:2s},{id:"minecraft:projectile_protection",lvl:3s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:1,Operation:0,UUID:[I;1,1,534,6],Slot:"head"}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 534 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_helmet" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"夜を崇拝する者達の正装だ。","color":"dark_purple"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "head" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "attack_melee" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [15] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 241 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:2s},{id:"minecraft:projectile_protection",lvl:3s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:1,Operation:0,UUID:[I;1,1,534,6],Slot:"head"}]} diff --git a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/attack_melee/check.mcfunction index 1e14f2686..47dde53d0 100644 --- a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/attack_melee/check.mcfunction +++ b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/attack_melee/check.mcfunction @@ -4,20 +4,5 @@ # # @within function asset:artifact/alias/535/attack_melee/check -# 他にアイテム等確認する場合はここに書く - -# 今が夜かどうか確認 - execute store result score $Daytime Temporary run time query daytime - -# 装備をすべて着ているが、夜じゃない場合 - execute if data storage asset:context {Inventory:[{Slot:103b,tag:{TSB:{ID:534}}},{Slot:101b,tag:{TSB:{ID:536}}},{Slot:100b,tag:{TSB:{ID:537}}}]} if score $Daytime Temporary matches 0..12000 run tag @s remove CanUsed - -# 演出（使用できないときのメッセージだすとうるさいのでなし） - execute unless entity @s[tag=CanUsed] run particle minecraft:smoke ~ ~1 ~ 0.3 0.3 0.3 0 20 normal @s - execute unless entity @s[tag=CanUsed] run playsound minecraft:block.stone_button.click_off player @s ~ ~ ~ 1 2 - -# 装備が足りない場合 - execute unless data storage asset:context {Inventory:[{Slot:103b,tag:{TSB:{ID:534}}},{Slot:101b,tag:{TSB:{ID:536}}},{Slot:100b,tag:{TSB:{ID:537}}}]} run tag @s remove CanUsed - -# リセット - scoreboard players reset $Daytime Temporary \ No newline at end of file +# 効果は発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/register.mcfunction b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/register.mcfunction index cb0532d3b..6c2733954 100644 --- a/Asset/data/asset/functions/artifact/0535.all_night_chestplate/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0535.all_night_chestplate/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/535/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 535 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_chestplate" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"夜を崇拝する者達の正装だ。","color":"dark_purple"}'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "chest" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "attack_melee" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [15] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:5s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3,Operation:0,UUID:[I;1,1,535,5],Slot:"chest"}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 535 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_chestplate" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"夜を崇拝する者達の正装だ。","color":"dark_purple"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "chest" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "attack_melee" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [15] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 241 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:5s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3,Operation:0,UUID:[I;1,1,535,5],Slot:"chest"}]} diff --git a/Asset/data/asset/functions/artifact/0536.all_night_leggings/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0536.all_night_leggings/attack_melee/check.mcfunction new file mode 100644 index 000000000..91c3f1620 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0536.all_night_leggings/attack_melee/check.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0536.all_night_leggings/attack_melee/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/536/attack_melee/check + +# 効果は発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0536.all_night_leggings/register.mcfunction b/Asset/data/asset/functions/artifact/0536.all_night_leggings/register.mcfunction index b5f8f6ab8..eae564a71 100644 --- a/Asset/data/asset/functions/artifact/0536.all_night_leggings/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0536.all_night_leggings/register.mcfunction @@ -4,50 +4,53 @@ # # @within function asset:artifact/alias/536/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 536 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_leggings" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"夜を崇拝する者達の正装だ。","color":"dark_purple"}'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "legs" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "attack_melee" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [15] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3,Operation:0,UUID:[I;1,1,536,4],Slot:"legs"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.2,Operation:1,UUID:[I;1,1,536,4],Slot:"legs"}]} - \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 536 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_leggings" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"夜を崇拝する者達の正装だ。","color":"dark_purple"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "legs" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "attack_melee" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [15] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 241 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:3,Operation:0,UUID:[I;1,1,536,4],Slot:"legs"},{AttributeName:"generic.movement_speed",Name:"generic.movement_speed",Amount:0.2,Operation:1,UUID:[I;1,1,536,4],Slot:"legs"}]} diff --git a/Asset/data/asset/functions/artifact/0537.all_night_boots/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0537.all_night_boots/attack_melee/check.mcfunction new file mode 100644 index 000000000..94a97d9c7 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0537.all_night_boots/attack_melee/check.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0537.all_night_boots/attack_melee/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/537/attack_melee/check + +# 効果は発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0537.all_night_boots/register.mcfunction b/Asset/data/asset/functions/artifact/0537.all_night_boots/register.mcfunction index ad1d53d24..a8b2571b4 100644 --- a/Asset/data/asset/functions/artifact/0537.all_night_boots/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0537.all_night_boots/register.mcfunction @@ -4,50 +4,53 @@ # # @within function asset:artifact/alias/537/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 537 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_boots" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['{"text":"夜を崇拝する者達の正装だ。","color":"dark_purple"}'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "feet" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "attack_melee" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value [15] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,537,3],Slot:"feet"}]} - \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 537 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_boots" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '{"text":"終夜","color":"dark_purple","bold":true,"underlined":true}' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['{"text":"夜を崇拝する者達の正装だ。","color":"dark_purple"}'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "feet" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "attack_melee" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"夜の間、終夜をすべて着ている状態"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value [15] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.IsRangeAttack set value "never" +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 0 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 241 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Nyaptov", "Wi-ki", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,display:{color:1050959},HideFlags:64,Enchantments:[{id:"minecraft:protection",lvl:1s}],AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:2,Operation:0,UUID:[I;1,1,537,3],Slot:"feet"}]} diff --git a/Asset/data/asset/functions/artifact/0554.catastrophe/damage_entity/.mcfunction b/Asset/data/asset/functions/artifact/0554.catastrophe/damage_entity/.mcfunction new file mode 100644 index 000000000..e42ad6c2a --- /dev/null +++ b/Asset/data/asset/functions/artifact/0554.catastrophe/damage_entity/.mcfunction @@ -0,0 +1,16 @@ +#> asset:artifact/0554.catastrophe/damage_entity/ +# +# 神器のトリガー処理 +# +# @within function asset:artifact/alias/554/damage_entity/ + +# 演出 + execute at @e[type=#lib:living,tag=Attacker,limit=1] run particle soul_fire_flame ~ ~0.5 ~ 0.4 0.6 0.4 0 100 force @a + +# ダメージ + data modify storage lib: Argument set value {Damage:600,AttackType:Magic,ElementType:None,FixedDamage:false} + function lib:damage/modifier + execute as @e[type=#lib:living,tag=Attacker,limit=1] run function lib:damage/ + +# リセット + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0554.catastrophe/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/0554.catastrophe/damage_entity/check.mcfunction new file mode 100644 index 000000000..fa3b53595 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0554.catastrophe/damage_entity/check.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/0554.catastrophe/damage_entity/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/554/damage_entity/check + +# 装備をすべて身に着けているかチェックする + data modify storage api: Argument.ID set value 242 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0554.catastrophe/register.mcfunction b/Asset/data/asset/functions/artifact/0554.catastrophe/register.mcfunction index df47bf08c..3d91f6fb5 100644 --- a/Asset/data/asset/functions/artifact/0554.catastrophe/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0554.catastrophe/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/554/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 554 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:player_head" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"崩壊の騎士のための装備"}]','[{"text":"傷付く度に、快楽を求めた"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "head" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "damage_entity" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 600 -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 5 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,SkullOwner:{Id:[I;994325293,-761705917,-1324473476,-101849626],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWRiN2Q4OGExNjhmNDg4MzU0Mjc0MDlmZGViYzVjOGRjYjQwNmI2ZGIyOGU1YTc5OWE4M2MzYzljMGNmNjQ4In19fQ=="}]}},AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,554,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,554,6],Slot:"head"}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 554 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:player_head" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"崩壊の騎士のための装備"}]','[{"text":"傷付く度に、快楽を求めた"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "head" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "damage_entity" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value 600 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 5 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 242 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,SkullOwner:{Id:[I;994325293,-761705917,-1324473476,-101849626],Properties:{textures:[{Value:"eyJ0ZXh0dXJlcyI6eyJTS0lOIjp7InVybCI6Imh0dHA6Ly90ZXh0dXJlcy5taW5lY3JhZnQubmV0L3RleHR1cmUvYWRiN2Q4OGExNjhmNDg4MzU0Mjc0MDlmZGViYzVjOGRjYjQwNmI2ZGIyOGU1YTc5OWE4M2MzYzljMGNmNjQ4In19fQ=="}]}},AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,554,6],Slot:"head"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,554,6],Slot:"head"}]} diff --git a/Asset/data/asset/functions/artifact/0555.catastrophe/damage_entity/.mcfunction b/Asset/data/asset/functions/artifact/0555.catastrophe/damage_entity/.mcfunction deleted file mode 100644 index e8407e40c..000000000 --- a/Asset/data/asset/functions/artifact/0555.catastrophe/damage_entity/.mcfunction +++ /dev/null @@ -1,15 +0,0 @@ -#> asset:artifact/0555.catastrophe/damage_entity/ -# -# 神器のトリガー処理のエイリアス -# -# @within function asset:artifact/alias/555/damage_entity/ - - execute at @e[type=#lib:living,tag=Attacker,limit=1] run particle soul_fire_flame ~ ~0.5 ~ 0.4 0.6 0.4 0 100 force @a - - # ダメージ - data modify storage lib: Argument set value {Damage:600,AttackType:Magic,ElementType:None,FixedDamage:false} - function lib:damage/modifier - execute as @e[type=#lib:living,tag=Attacker,limit=1] run function lib:damage/ - - # リセット - function lib:damage/reset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0555.catastrophe/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/0555.catastrophe/damage_entity/check.mcfunction new file mode 100644 index 000000000..37f37cc11 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0555.catastrophe/damage_entity/check.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0555.catastrophe/damage_entity/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/555/damage_entity/check + +# 効果を発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0555.catastrophe/register.mcfunction b/Asset/data/asset/functions/artifact/0555.catastrophe/register.mcfunction index 77daa7eab..d68527a3a 100644 --- a/Asset/data/asset/functions/artifact/0555.catastrophe/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0555.catastrophe/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/555/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 555 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:netherite_chestplate" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"崩壊の騎士のための装備"}]','[{"text":"傷付く度に、快楽を求めた"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "chest" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "damage_entity" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 600 -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 5 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:8,Operation:0,UUID:[I;1,1,555,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,555,5],Slot:"chest"}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 555 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:netherite_chestplate" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"崩壊の騎士のための装備"}]','[{"text":"傷付く度に、快楽を求めた"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "chest" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "damage_entity" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value 600 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 5 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 242 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:8,Operation:0,UUID:[I;1,1,555,5],Slot:"chest"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,555,5],Slot:"chest"}]} diff --git a/Asset/data/asset/functions/artifact/0556.catastrophe/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/0556.catastrophe/damage_entity/check.mcfunction new file mode 100644 index 000000000..798a5e1f1 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0556.catastrophe/damage_entity/check.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0556.catastrophe/damage_entity/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/556/damage_entity/check + +# 効果を発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0556.catastrophe/register.mcfunction b/Asset/data/asset/functions/artifact/0556.catastrophe/register.mcfunction index 6521c1264..50b27a8f0 100644 --- a/Asset/data/asset/functions/artifact/0556.catastrophe/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0556.catastrophe/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/556/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 556 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:netherite_leggings" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"崩壊の騎士のための装備"}]','[{"text":"傷付く度に、快楽を求めた"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "legs" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "damage_entity" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 600 -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 5 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 556 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:netherite_leggings" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"崩壊の騎士のための装備"}]','[{"text":"傷付く度に、快楽を求めた"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "legs" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "damage_entity" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value 600 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 5 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 242 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:6,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,556,4],Slot:"legs"}]} diff --git a/Asset/data/asset/functions/artifact/0557.catastrophe/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/0557.catastrophe/damage_entity/check.mcfunction new file mode 100644 index 000000000..1f96dcf9a --- /dev/null +++ b/Asset/data/asset/functions/artifact/0557.catastrophe/damage_entity/check.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0557.catastrophe/damage_entity/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/557/damage_entity/check + +# 効果を発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0557.catastrophe/register.mcfunction b/Asset/data/asset/functions/artifact/0557.catastrophe/register.mcfunction index 2a0457d73..bf32106e0 100644 --- a/Asset/data/asset/functions/artifact/0557.catastrophe/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0557.catastrophe/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/557/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 557 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:netherite_boots" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"崩壊の騎士のための装備"}]','[{"text":"傷付く度に、快楽を求めた"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "feet" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "damage_entity" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 600 -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 5 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,557,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,557,3],Slot:"feet"}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 557 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:netherite_boots" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"†","color":"white"},{"text":"カタストロフィ","color":"gray"},{"text":"†","color":"white"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"崩壊の騎士のための装備"}]','[{"text":"傷付く度に、快楽を求めた"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "feet" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "damage_entity" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '{"text":"繋がる総てを身に纏う"}' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value 600 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 5 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 242 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Urban", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {Unbreakable:1b,AttributeModifiers:[{AttributeName:"generic.armor",Name:"generic.armor",Amount:5,Operation:0,UUID:[I;1,1,557,3],Slot:"feet"},{AttributeName:"generic.armor_toughness",Name:"generic.armor_toughness",Amount:2.5,Operation:0,UUID:[I;1,1,557,3],Slot:"feet"}]} diff --git a/Asset/data/asset/functions/artifact/0558.solitariness/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0558.solitariness/attack_melee/.mcfunction new file mode 100644 index 000000000..7a46a19f4 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0558.solitariness/attack_melee/.mcfunction @@ -0,0 +1,20 @@ +#> asset:artifact/0558.solitariness/attack_melee/ +# +# 神器のトリガー処理 +# +# @within function asset:artifact/alias/558/attack_melee/ + +# 演出 + execute at @e[type=#lib:living,tag=Victim] run particle end_rod ~ ~0.5 ~ 0.3 0.5 0.3 0 50 force @a +# 効果 + # ノックバック + data modify storage lib: Argument.VectorMagnitude set value 1 + execute as @e[type=#lib:living,tag=Victim] at @s facing entity @a[tag=this] feet rotated ~180 -15 run function lib:motion/ + data remove storage lib: Argument + # Damage + data modify storage lib: Argument set value {Damage:60,AttackType:Physical,ElementType:None} + function lib:damage/modifier + execute as @e[type=#lib:living,tag=Victim] run function lib:damage/ + +# リセット + function lib:damage/reset diff --git a/Asset/data/asset/functions/artifact/0558.solitariness/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0558.solitariness/attack_melee/check.mcfunction new file mode 100644 index 000000000..7c28b693a --- /dev/null +++ b/Asset/data/asset/functions/artifact/0558.solitariness/attack_melee/check.mcfunction @@ -0,0 +1,10 @@ +#> asset:artifact/0558.solitariness/attack_melee/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/558/attack_melee/check + +# 装備をすべて身に着けているかチェックする + data modify storage api: Argument.ID set value 236 + function api:entity/mob/effect/get/from_id + execute unless data storage api: Return.Effect{Stack:4} run tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0558.solitariness/register.mcfunction b/Asset/data/asset/functions/artifact/0558.solitariness/register.mcfunction index 6c60f5780..c3dd3a23b 100644 --- a/Asset/data/asset/functions/artifact/0558.solitariness/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0558.solitariness/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/558/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 558 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:chainmail_helmet" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"孤独が唯一の友人だった。"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "head" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "attack_melee" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '[{"text":"繋がる総てを身に纏い、蕭然の中に在る"}]' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 10 -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Physical] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.BypassResist set value false -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 5 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,558,6],AttributeName:"generic.armor",Name:"armor",Amount:3,Operation:0,Slot:head}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 558 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_helmet" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"孤独が唯一の友人だった。"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "head" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "attack_melee" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '[{"text":"繋がる総てを身に纏い、蕭然の中に在る"}]' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value 10 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.BypassResist set value false +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 5 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 236 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,558,6],AttributeName:"generic.armor",Name:"armor",Amount:3,Operation:0,Slot:head}]} diff --git a/Asset/data/asset/functions/artifact/0559.solitariness/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0559.solitariness/attack_melee/.mcfunction deleted file mode 100644 index 039ec8cf7..000000000 --- a/Asset/data/asset/functions/artifact/0559.solitariness/attack_melee/.mcfunction +++ /dev/null @@ -1,19 +0,0 @@ -#> asset:artifact/0559.solitariness/attack_melee/ -# -# 神器のトリガー処理のエイリアス -# -# @within function asset:artifact/alias/559/attack_melee/ - - execute at @e[type=#lib:living,tag=Victim] run particle end_rod ~ ~0.5 ~ 0.3 0.5 0.3 0 50 force @a - # 効果 - # ノックバック - data modify storage lib: Argument.VectorMagnitude set value 1 - execute as @e[type=#lib:living,tag=Victim] at @s facing entity @a[tag=this] feet rotated ~180 -15 run function lib:motion/ - data remove storage lib: Argument - # Damage - data modify storage lib: Argument set value {Damage:60,AttackType:Physical,ElementType:None} - function lib:damage/modifier - execute as @e[type=#lib:living,tag=Victim] run function lib:damage/ - - # リセット - function lib:damage/reset \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0559.solitariness/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0559.solitariness/attack_melee/check.mcfunction new file mode 100644 index 000000000..c0a6d72eb --- /dev/null +++ b/Asset/data/asset/functions/artifact/0559.solitariness/attack_melee/check.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0559.solitariness/attack_melee/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/559/attack_melee/check + +# 効果を発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0559.solitariness/register.mcfunction b/Asset/data/asset/functions/artifact/0559.solitariness/register.mcfunction index 20a7e17e1..d7bec0645 100644 --- a/Asset/data/asset/functions/artifact/0559.solitariness/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0559.solitariness/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/559/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 559 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:chainmail_chestplate" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"孤独が唯一の友人だった。"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "chest" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "attack_melee" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '[{"text":"繋がる総てを身に纏い、蕭然の中に在る"}]' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 10 -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Physical] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.BypassResist set value false -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 5 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - data modify storage asset:artifact LocalCooldown set value 5 -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,559,5],AttributeName:"generic.armor",Name:"armor",Slot:chest,Operation:0,Amount:8}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 559 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_chestplate" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"孤独が唯一の友人だった。"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "chest" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "attack_melee" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '[{"text":"繋がる総てを身に纏い、蕭然の中に在る"}]' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value 10 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.BypassResist set value false +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 5 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + data modify storage asset:artifact LocalCooldown set value 5 +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 236 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,559,5],AttributeName:"generic.armor",Name:"armor",Slot:chest,Operation:0,Amount:8}]} diff --git a/Asset/data/asset/functions/artifact/0560.solitariness/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0560.solitariness/attack_melee/check.mcfunction new file mode 100644 index 000000000..c59dfaf67 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0560.solitariness/attack_melee/check.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0560.solitariness/attack_melee/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/560/attack_melee/check + +# 効果を発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0560.solitariness/register.mcfunction b/Asset/data/asset/functions/artifact/0560.solitariness/register.mcfunction index cce05102c..5ef56976a 100644 --- a/Asset/data/asset/functions/artifact/0560.solitariness/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0560.solitariness/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/560/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 560 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:chainmail_leggings" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"孤独が唯一の友人だった。"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "legs" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "attack_melee" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '[{"text":"繋がる総てを身に纏い、蕭然の中に在る"}]' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 10 -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Physical] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.BypassResist set value false -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 5 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,560,4],AttributeName:"generic.armor",Name:"armor",Slot:legs,Operation:0,Amount:8}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 560 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_leggings" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"孤独が唯一の友人だった。"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "legs" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "attack_melee" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '[{"text":"繋がる総てを身に纏い、蕭然の中に在る"}]' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value 10 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.BypassResist set value false +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 5 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 236 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,560,4],AttributeName:"generic.armor",Name:"armor",Slot:legs,Operation:0,Amount:8}]} diff --git a/Asset/data/asset/functions/artifact/0561.solitariness/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/0561.solitariness/attack_melee/check.mcfunction new file mode 100644 index 000000000..18febd2bb --- /dev/null +++ b/Asset/data/asset/functions/artifact/0561.solitariness/attack_melee/check.mcfunction @@ -0,0 +1,8 @@ +#> asset:artifact/0561.solitariness/attack_melee/check +# +# 神器の使用条件の確認処理 +# +# @within function asset:artifact/alias/561/attack_melee/check + +# 効果を発動させない + tag @s remove CanUsed diff --git a/Asset/data/asset/functions/artifact/0561.solitariness/register.mcfunction b/Asset/data/asset/functions/artifact/0561.solitariness/register.mcfunction index cc4ed13ae..8fb647695 100644 --- a/Asset/data/asset/functions/artifact/0561.solitariness/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0561.solitariness/register.mcfunction @@ -4,49 +4,53 @@ # # @within function asset:artifact/alias/561/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 561 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:chainmail_boots" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"孤独が唯一の友人だった。"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "chest" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "attack_melee" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '[{"text":"繋がる総てを身に纏い、蕭然の中に在る"}]' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.Damage set value 10 -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.AttackType set value [Physical] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.ElementType set value [None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - data modify storage asset:artifact AttackInfo.BypassResist set value false -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 5 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,561,3],AttributeName:"generic.armor",Name:"armor",Slot:feet,Operation:0,Amount:3},{UUID:[I;1,1,561,3],AttributeName:"generic.max_health",Name:"max_health",Slot:feet,Operation:0,Amount:4},{UUID:[I;1,1,561,3],AttributeName:"generic.movement_speed",Name:"speed",Slot:feet,Operation:1,Amount:0.3}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 561 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:chainmail_boots" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"۞","color":"dark_gray"},{"text":"ソリタリネス","color":"gray"},{"text":"۞","color":"dark_gray"}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"孤独が唯一の友人だった。"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "chest" +# 神器のトリガー (string) Wikiを参照 + data modify storage asset:artifact Trigger set value "attack_melee" +# 神器の発動条件 (TextComponentString) (オプション) + data modify storage asset:artifact Condition set value '[{"text":"繋がる総てを身に纏い、蕭然の中に在る"}]' +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.Damage set value 10 +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.AttackType set value [Physical] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.ElementType set value [None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + data modify storage asset:artifact AttackInfo.BypassResist set value false +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + data modify storage asset:artifact MPCost set value 5 +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 236 +# 装備時補正 (Compound[]) (オプション) + # data modify storage asset:artifact Modifiers set value [] +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Wi-ki"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {HideFlags:64,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5}],AttributeModifiers:[{UUID:[I;1,1,561,3],AttributeName:"generic.armor",Name:"armor",Slot:feet,Operation:0,Amount:3},{UUID:[I;1,1,561,3],AttributeName:"generic.max_health",Name:"max_health",Slot:feet,Operation:0,Amount:4},{UUID:[I;1,1,561,3],AttributeName:"generic.movement_speed",Name:"speed",Slot:feet,Operation:1,Amount:0.3}]} diff --git a/Asset/data/asset/functions/artifact/0562.heartland/register.mcfunction b/Asset/data/asset/functions/artifact/0562.heartland/register.mcfunction index 888f3f626..3b99ff34a 100644 --- a/Asset/data/asset/functions/artifact/0562.heartland/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0562.heartland/register.mcfunction @@ -4,50 +4,56 @@ # # @within function asset:artifact/alias/562/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 562 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_helmet" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"大地の加護を得た衣"}]','[{"text":"喜ばしき"},{"text":"芽生え。","color":"green"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "head" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "tick" -# 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value 100 -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,562,6],AttributeName:"generic.armor",Name:"armor",Amount:3,Operation:0,Slot:head},{UUID:[I;1,1,562,6],AttributeName:"generic.max_health",Name:"max_health",Amount:4,Operation:0,Slot:head}]} - \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 562 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_helmet" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"大地の加護を得た衣"}]','[{"text":"喜ばしき"},{"text":"芽生え。","color":"green"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "head" +# 神器のトリガー (string) Wikiを参照 + # data modify storage asset:artifact Trigger set value +# 神器のサブトリガー (string[]) (オプション) + data modify storage asset:artifact SubTriggers set value ["tick"] +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + # data modify storage asset:artifact MPCost set value +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 237 +# 装備時補正 (Compound[]) (オプション) + data modify storage asset:artifact Modifiers set value [] + data modify storage asset:artifact Modifiers append value {Type:"generic.max_health",Amount:4d,Operation:"add"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,562,6],AttributeName:"generic.armor",Name:"armor",Amount:3,Operation:0,Slot:head}]} diff --git a/Asset/data/asset/functions/artifact/0562.heartland/tick/.mcfunction b/Asset/data/asset/functions/artifact/0562.heartland/tick/.mcfunction new file mode 100644 index 000000000..06e652de3 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0562.heartland/tick/.mcfunction @@ -0,0 +1,12 @@ +#> asset:artifact/0562.heartland/tick/ +# +# 神器のトリガー処理 +# +# @within function asset:artifact/alias/562/tick/ + +# 装備をすべて身に着けているなら +# 周囲5mのプレイヤーに自然回復エフェクトを付与 +# このとき、自然回復を上書きしないようにする + data modify storage api: Argument.ID set value 237 + function api:entity/mob/effect/get/from_id + execute if data storage api: Return.Effect{Stack:4} as @a[distance=..5] if predicate asset:artifact/0563.heartland/regene_check run effect give @s[distance=..5] regeneration 15 1 false diff --git a/Asset/data/asset/functions/artifact/0563.heartland/register.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/register.mcfunction index cc4bd8b6a..45c8b13fa 100644 --- a/Asset/data/asset/functions/artifact/0563.heartland/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0563.heartland/register.mcfunction @@ -4,49 +4,54 @@ # # @within function asset:artifact/alias/563/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 563 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_chestplate" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"大地の加護を得た衣"}]','[{"text":"我らみな"},{"text":"大地","bold":true},{"text":"に生きるもの。","bold":false}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "chest" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "tick" -# 神器の発動条件 (TextComponentString) (オプション) - data modify storage asset:artifact Condition set value '[{"text":"大地の衣で全身を覆う"}]' -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,563,5],AttributeName:"generic.armor",Name:"armor",Slot:chest,Operation:0,Amount:3},{UUID:[I;1,1,563,5],AttributeName:"generic.max_health",Name:"max_health",Slot:chest,Operation:0,Amount:4}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 563 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_chestplate" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"大地の加護を得た衣"}]','[{"text":"我らみな"},{"text":"大地","bold":true},{"text":"に生きるもの。","bold":false}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "chest" +# 神器のトリガー (string) Wikiを参照 + # data modify storage asset:artifact Trigger set value +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + # data modify storage asset:artifact MPCost set value +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 237 +# 装備時補正 (Compound[]) (オプション) + data modify storage asset:artifact Modifiers set value [] + data modify storage asset:artifact Modifiers append value {Type:"generic.max_health",Amount:4d,Operation:"add"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,563,5],AttributeName:"generic.armor",Name:"armor",Slot:chest,Operation:0,Amount:3}]} diff --git a/Asset/data/asset/functions/artifact/0563.heartland/tick/.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/tick/.mcfunction deleted file mode 100644 index a3908c90e..000000000 --- a/Asset/data/asset/functions/artifact/0563.heartland/tick/.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0563.heartland/tick/ -# -# 神器のトリガー処理のエイリアス -# -# @within function asset:artifact/alias/563/tick/ - - execute as @a[distance=..5] if predicate asset:artifact/0563.heartland/regene_check run effect give @a[distance=..5] regeneration 15 1 false \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0563.heartland/tick/check.mcfunction b/Asset/data/asset/functions/artifact/0563.heartland/tick/check.mcfunction deleted file mode 100644 index 41d527bd5..000000000 --- a/Asset/data/asset/functions/artifact/0563.heartland/tick/check.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0563.heartland/tick/check -# -# 神器の使用条件の確認処理 -# -# @within function asset:artifact/alias/563/tick/check - - execute unless data storage asset:context id{head:562,legs:564,feet:565} run tag @s remove CanUsed \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0564.heartland/register.mcfunction b/Asset/data/asset/functions/artifact/0564.heartland/register.mcfunction index c581606d7..533774ac6 100644 --- a/Asset/data/asset/functions/artifact/0564.heartland/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0564.heartland/register.mcfunction @@ -4,49 +4,54 @@ # # @within function asset:artifact/alias/564/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 564 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_leggings" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"大地の加護を得た衣"}]','[{"text":"豊穣","color":"yellow"},{"text":"はここに。","color":"white"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "legs" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "tick" -# 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,564,4],AttributeName:"generic.armor",Name:"armor",Slot:legs,Operation:0,Amount:3},{UUID:[I;1,1,564,4],AttributeName:"generic.max_health",Name:"max_health",Slot:legs,Operation:0,Amount:4}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 564 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_leggings" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"大地の加護を得た衣"}]','[{"text":"豊穣","color":"yellow"},{"text":"はここに。","color":"white"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "legs" +# 神器のトリガー (string) Wikiを参照 + # data modify storage asset:artifact Trigger set value +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + # data modify storage asset:artifact MPCost set value +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 237 +# 装備時補正 (Compound[]) (オプション) + data modify storage asset:artifact Modifiers set value [] + data modify storage asset:artifact Modifiers append value {Type:"generic.max_health",Amount:4d,Operation:"add"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,564,4],AttributeName:"generic.armor",Name:"armor",Slot:legs,Operation:0,Amount:3}]} diff --git a/Asset/data/asset/functions/artifact/0565.heartland/register.mcfunction b/Asset/data/asset/functions/artifact/0565.heartland/register.mcfunction index d50dad3e8..9ccf52631 100644 --- a/Asset/data/asset/functions/artifact/0565.heartland/register.mcfunction +++ b/Asset/data/asset/functions/artifact/0565.heartland/register.mcfunction @@ -4,49 +4,55 @@ # # @within function asset:artifact/alias/565/register -# 神器のID (int) スプレッドシートの値を入れる - data modify storage asset:artifact ID set value 565 -# 神器のベースアイテム - data modify storage asset:artifact Item set value "minecraft:leather_boots" -# 神器の名前 (TextComponentString) - data modify storage asset:artifact Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' -# 神器の説明文 (TextComponentString[]) - data modify storage asset:artifact Lore set value ['[{"text":"大地の加護を得た衣"}]','[{"text":"駆け出すものに"},{"text":"祝福","color":"light_purple"},{"text":"を。","color":"white"}]'] -# MP以外の消費物 (TextComponentString) (オプション) - # data modify storage asset:artifact CostText set value -# 使用回数 (int) (オプション) - # data modify storage asset:artifact RemainingCount set value -# 神器を発動できるスロット (string) Wikiを参照 - data modify storage asset:artifact Slot set value "feet" -# 神器のトリガー (string) Wikiを参照 - data modify storage asset:artifact Trigger set value "tick" -# 神器の発動条件 (TextComponentString) (オプション) - # data modify storage asset:artifact Condition set value -# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.Damage set value [0,0] -# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] -# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] -# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.BypassResist set value -# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.IsRangeAttack set value -# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) - # data modify storage asset:artifact AttackInfo.AttackRange set value -# MP消費量 (int) - data modify storage asset:artifact MPCost set value 0 -# MP必要量 (int) (オプション) - # data modify storage asset:artifact MPRequire set value -# 神器のクールダウン (int) (オプション) - # data modify storage asset:artifact LocalCooldown set value -# グローバルクールダウン (int) (オプション) - # data modify storage asset:artifact SpecialCooldown set value -# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableCooldownMessage set value -# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) - # data modify storage asset:artifact DisableMPMessage set value -# 扱える神 (string[]) Wikiを参照 - data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] -# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) - data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,565,3],AttributeName:"generic.armor",Name:"armor",Slot:feet,Operation:0,Amount:3},{UUID:[I;1,1,565,3],AttributeName:"generic.max_health",Name:"max_health",Slot:feet,Operation:0,Amount:4},{UUID:[I;1,1,565,3],AttributeName:"generic.movement_speed",Name:"speed",Slot:feet,Operation:1,Amount:0.3}]} \ No newline at end of file +# 神器のID (int) スプレッドシートの値を入れる + data modify storage asset:artifact ID set value 565 +# 神器のベースアイテム + data modify storage asset:artifact Item set value "minecraft:leather_boots" +# 神器の名前 (TextComponentString) + data modify storage asset:artifact Name set value '[{"text":"ハート","color":"light_purple","bold":true},{"text":"ランド","color":"green","bold":true}]' +# 神器の説明文 (TextComponentString[]) + data modify storage asset:artifact Lore set value ['[{"text":"大地の加護を得た衣"}]','[{"text":"駆け出すものに"},{"text":"祝福","color":"light_purple"},{"text":"を。","color":"white"}]'] +# MP以外の消費物 (TextComponentString) (オプション) + # data modify storage asset:artifact CostText set value +# 使用回数 (int) (オプション) + # data modify storage asset:artifact RemainingCount set value +# 神器を発動できるスロット (string) Wikiを参照 + data modify storage asset:artifact Slot set value "feet" +# 神器のトリガー (string) Wikiを参照 + # data modify storage asset:artifact Trigger set value +# 神器の発動条件 (TextComponentString) (オプション) + # data modify storage asset:artifact Condition set value +# 攻撃に関する情報 -Damage量 (literal[]/literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.Damage set value [0,0] +# 攻撃に関する情報 -攻撃タイプ (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackType set value [Physical,Magic] +# 攻撃に関する情報 -攻撃属性 (string[]) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.ElementType set value [Fire,Water,Thunder,None] +# 攻撃に関する情報 -防御無視 (boolean) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.BypassResist set value +# 攻撃に関する情報 -範囲攻撃 (string) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.IsRangeAttack set value +# 攻撃に関する情報 -攻撃範囲 (literal) Wikiを参照 (オプション) + # data modify storage asset:artifact AttackInfo.AttackRange set value +# MP消費量 (int) + # data modify storage asset:artifact MPCost set value +# MP必要量 (int) (オプション) + # data modify storage asset:artifact MPRequire set value +# 神器のクールダウン (int) (オプション) + # data modify storage asset:artifact LocalCooldown set value +# グローバルクールダウン (int) (オプション) + # data modify storage asset:artifact SpecialCooldown set value +# クールダウンによる使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableCooldownMessage set value +# MP不足による使用不可のメッセージを非表示にするか否か (boolean) (オプション) + # data modify storage asset:artifact DisableMPMessage set value +# セット装備のID (int) (オプション) + data modify storage asset:artifact EquipID set value 237 +# 装備時補正 (Compound[]) (オプション) + data modify storage asset:artifact Modifiers set value [] + data modify storage asset:artifact Modifiers append value {Type:"generic.max_health",Amount:4d,Operation:"add"} + data modify storage asset:artifact Modifiers append value {Type:"generic.movement_speed",Amount:0.30d,Operation:"multiply_base"} +# 扱える神 (string[]) Wikiを参照 + data modify storage asset:artifact CanUsedGod set value ["Flora", "Nyaptov", "Rumor"] +# カスタムNBT (NBTCompound) 追加で指定したいNBT (オプション) + data modify storage asset:artifact CustomNBT set value {display:{color:26112},HideFlags:64,Unbreakable:1b,Enchantments:[{id:unbreaking,lvl:3},{id:protection,lvl:5},{id:mending,lvl:1}],AttributeModifiers:[{UUID:[I;1,1,565,3],AttributeName:"generic.armor",Name:"armor",Slot:feet,Operation:0,Amount:3}]} diff --git a/Asset/data/asset/functions/artifact/0573.final_prism/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0573.final_prism/_index.d.mcfunction new file mode 100644 index 000000000..aeea9a4b8 --- /dev/null +++ b/Asset/data/asset/functions/artifact/0573.final_prism/_index.d.mcfunction @@ -0,0 +1,6 @@ +#> asset:artifact/0573.final_prism/_index.d +# @private + +#> tag +# @within function asset:artifact/0573.final_prism/** + #declare tag PrismDamage diff --git a/Asset/data/asset/functions/artifact/0573.final_prism/keep_sneak/.mcfunction b/Asset/data/asset/functions/artifact/0573.final_prism/keep_sneak/.mcfunction index 2a717963c..d199800ea 100644 --- a/Asset/data/asset/functions/artifact/0573.final_prism/keep_sneak/.mcfunction +++ b/Asset/data/asset/functions/artifact/0573.final_prism/keep_sneak/.mcfunction @@ -1,10 +1,12 @@ #> asset:artifact/0573.final_prism/keep_sneak/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/573/keep_sneak/ - function asset:artifact/common/use/mainhand +#> SpreadLib +# @private + #declare tag SpreadMarker # 疑似乱数取得 execute store result score $Random Temporary run function lib:random/ @@ -50,4 +52,4 @@ scoreboard players reset $Random Temporary scoreboard players reset $Spread Temporary scoreboard players reset $SneakTime Temporary - kill @e[type=marker,tag=SpreadMarker] \ No newline at end of file + kill @e[type=marker,tag=SpreadMarker] diff --git a/Asset/data/asset/functions/artifact/0573.final_prism/keep_sneak/_index.d.mcfunction b/Asset/data/asset/functions/artifact/0573.final_prism/keep_sneak/_index.d.mcfunction deleted file mode 100644 index 124f6dc97..000000000 --- a/Asset/data/asset/functions/artifact/0573.final_prism/keep_sneak/_index.d.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/0573.final_prism/keep_sneak/_index.d -# -# @private - -#> tag -# @within function asset:artifact/0573.final_prism/keep_sneak/** - #declare tag PrismDamage diff --git a/Asset/data/asset/functions/artifact/0573.final_prism/load.mcfunction b/Asset/data/asset/functions/artifact/0573.final_prism/load.mcfunction index 90b0c8d3b..97c6dd25f 100644 --- a/Asset/data/asset/functions/artifact/0573.final_prism/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0573.final_prism/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0573.final_prism/keep_sneak/** +# @within function asset:artifact/0573.final_prism/** scoreboard objectives add 573.Laser dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/.mcfunction index d0bd3297c..bc5e10290 100644 --- a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/.mcfunction @@ -1,10 +1,10 @@ #> asset:artifact/0600.xtal/attack_melee/ # -# 神器のトリガー処理のエイリアス +# 神器のトリガー処理 # # @within function asset:artifact/alias/600/attack_melee/ # スコア付与する scoreboard players add @s GO.Time 3 # スケジュール開始 - schedule function asset:artifact/0600.xtal/attack_melee/schedule 1t replace \ No newline at end of file + schedule function asset:artifact/0600.xtal/attack_melee/schedule 1t replace diff --git a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/5.slash.mcfunction b/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/5.slash.mcfunction index 443ae173a..16535d647 100644 --- a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/5.slash.mcfunction +++ b/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/5.slash.mcfunction @@ -4,7 +4,6 @@ # # @within function asset:artifact/0600.xtal/attack_melee/4.wait_time - # 演出 playsound item.trident.throw player @a ~ ~ ~ 1 0.6 playsound minecraft:entity.glow_squid.squirt player @a ~ ~ ~ 1 2 @@ -33,4 +32,4 @@ # リセット function lib:damage/reset # スコアもリセットする - scoreboard players reset @s GO.Time \ No newline at end of file + scoreboard players reset @s GO.Time diff --git a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/particle/particle_2.mcfunction b/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/particle/particle_2.mcfunction index e17bba3c4..87f3f2fc6 100644 --- a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/particle/particle_2.mcfunction +++ b/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/particle/particle_2.mcfunction @@ -4,8 +4,7 @@ # # @within function asset:artifact/0600.xtal/attack_melee/5.slash - -## 外4 +# 外4 particle dust 1 1 1 1.3 ^1.96457 ^1.96457 ^0.12107 0 0 0 0 1 particle dust 1 1 1 1.3 ^1.90211 ^1.90211 ^0.30353 0 0 0 0 1 particle dust 1 1 1 1.3 ^1.80965 ^1.80965 ^0.47867 0 0 0 0 1 @@ -130,4 +129,4 @@ particle dust 0.882 0.882 0.882 1.3 ^-1.54103 ^-1.54103 ^0.96637 0 0 0 0 1 particle dust 0.882 0.882 0.882 1.3 ^-1.68866 ^-1.68866 ^0.79162 0 0 0 0 1 particle dust 0.882 0.882 0.882 1.3 ^-1.80965 ^-1.80965 ^0.60234 0 0 0 0 1 particle dust 0.882 0.882 0.882 1.3 ^-1.90211 ^-1.90211 ^0.40151 0 0 0 0 1 -particle dust 0.882 0.882 0.882 1.3 ^-1.96457 ^-1.96457 ^0.1923 0 0 0 0 1 \ No newline at end of file +particle dust 0.882 0.882 0.882 1.3 ^-1.96457 ^-1.96457 ^0.1923 0 0 0 0 1 diff --git a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/schedule.mcfunction b/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/schedule.mcfunction index f70dd7bec..a68ec49fa 100644 --- a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/schedule.mcfunction +++ b/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/schedule.mcfunction @@ -5,8 +5,9 @@ # @within function # asset:artifact/0600.xtal/attack_melee/ # asset:artifact/0600.xtal/attack_melee/schedule -# asset:artifact/0600.xtal/attack_melee/rejoin_process +# asset:artifact/0600.xtal/rejoin_process + # プレイヤーに実行させる execute as @a[scores={GO.Time=1..}] at @s run function asset:artifact/0600.xtal/attack_melee/4.wait_time # ループする - execute if entity @a[scores={GO.Time=1..}] run schedule function asset:artifact/0600.xtal/attack_melee/schedule 1t replace \ No newline at end of file + execute if entity @a[scores={GO.Time=1..}] run schedule function asset:artifact/0600.xtal/attack_melee/schedule 1t replace diff --git a/Asset/data/asset/functions/artifact/0600.xtal/load.mcfunction b/Asset/data/asset/functions/artifact/0600.xtal/load.mcfunction index e6be59e4e..c6e52b396 100644 --- a/Asset/data/asset/functions/artifact/0600.xtal/load.mcfunction +++ b/Asset/data/asset/functions/artifact/0600.xtal/load.mcfunction @@ -5,5 +5,5 @@ # @within tag/function asset:artifact/load #> 定義類はここに -# @within function asset:artifact/0600.xtal/attack_melee/** +# @within function asset:artifact/0600.xtal/** scoreboard objectives add GO.Time dummy \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/rejoin_process.mcfunction b/Asset/data/asset/functions/artifact/0600.xtal/rejoin_process.mcfunction similarity index 66% rename from Asset/data/asset/functions/artifact/0600.xtal/attack_melee/rejoin_process.mcfunction rename to Asset/data/asset/functions/artifact/0600.xtal/rejoin_process.mcfunction index d71f72496..b1b808e6a 100644 --- a/Asset/data/asset/functions/artifact/0600.xtal/attack_melee/rejoin_process.mcfunction +++ b/Asset/data/asset/functions/artifact/0600.xtal/rejoin_process.mcfunction @@ -1,6 +1,6 @@ -#> asset:artifact/0600.xtal/attack_melee/rejoin_process +#> asset:artifact/0600.xtal/rejoin_process # -# 使い方は必ずwikiを見ること +# プレイヤー再参加時の処理 # # @within tag/function asset:rejoin diff --git a/Asset/data/asset/functions/artifact/alias/1053/equip/check.mcfunction b/Asset/data/asset/functions/artifact/alias/1053/equip/check.mcfunction new file mode 100644 index 000000000..185c9f54a --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/1053/equip/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/1053/equip/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/equip/check.m + +function asset:artifact/1053.grimoire_of_purity/equip/check \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/alias/1104/use_item/check.mcfunction b/Asset/data/asset/functions/artifact/alias/1104/use_item/check.mcfunction new file mode 100644 index 000000000..e95e4f8ad --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/1104/use_item/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/1104/use_item/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/use_item/check.m + +function asset:artifact/1104.orange/use_item/check \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/alias/535/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/alias/534/attack_melee/.mcfunction similarity index 55% rename from Asset/data/asset/functions/artifact/alias/535/attack_melee/.mcfunction rename to Asset/data/asset/functions/artifact/alias/534/attack_melee/.mcfunction index f9d6f8a07..1871f24a0 100644 --- a/Asset/data/asset/functions/artifact/alias/535/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/alias/534/attack_melee/.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/alias/535/attack_melee/ +#> asset:artifact/alias/534/attack_melee/ # # 神器のトリガー処理のエイリアス # # @within function asset_manager:artifact/triggers/attack_melee/attack_melee.m -function asset:artifact/0535.all_night_chestplate/attack_melee/ \ No newline at end of file +function asset:artifact/0534.all_night_helmet/attack_melee/ diff --git a/Asset/data/asset/functions/artifact/alias/534/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/alias/534/attack_melee/check.mcfunction new file mode 100644 index 000000000..9c37ed9f0 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/534/attack_melee/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/534/attack_melee/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/attack_melee/check.m + +function asset:artifact/0534.all_night_helmet/attack_melee/check diff --git a/Asset/data/asset/functions/artifact/alias/534/register.mcfunction b/Asset/data/asset/functions/artifact/alias/534/register.mcfunction index 95ad07c59..2838ed8b4 100644 --- a/Asset/data/asset/functions/artifact/alias/534/register.mcfunction +++ b/Asset/data/asset/functions/artifact/alias/534/register.mcfunction @@ -4,4 +4,4 @@ # # @within function asset_manager:artifact/give/register.m -function asset:artifact/0534.all_night_hellmet/register \ No newline at end of file +function asset:artifact/0534.all_night_helmet/register diff --git a/Asset/data/asset/functions/artifact/alias/535/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/alias/535/attack_melee/check.mcfunction index 430592264..154ccce6a 100644 --- a/Asset/data/asset/functions/artifact/alias/535/attack_melee/check.mcfunction +++ b/Asset/data/asset/functions/artifact/alias/535/attack_melee/check.mcfunction @@ -4,4 +4,4 @@ # # @within function asset_manager:artifact/triggers/attack_melee/check.m -function asset:artifact/0535.all_night_chestplate/attack_melee/check \ No newline at end of file +function asset:artifact/0535.all_night_chestplate/attack_melee/check diff --git a/Asset/data/asset/functions/artifact/alias/536/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/alias/536/attack_melee/check.mcfunction new file mode 100644 index 000000000..4ad235524 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/536/attack_melee/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/536/attack_melee/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/attack_melee/check.m + +function asset:artifact/0536.all_night_leggings/attack_melee/check diff --git a/Asset/data/asset/functions/artifact/alias/537/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/alias/537/attack_melee/check.mcfunction new file mode 100644 index 000000000..f3b762068 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/537/attack_melee/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/537/attack_melee/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/attack_melee/check.m + +function asset:artifact/0537.all_night_boots/attack_melee/check diff --git a/Asset/data/asset/functions/artifact/alias/555/damage_entity/.mcfunction b/Asset/data/asset/functions/artifact/alias/554/damage_entity/.mcfunction similarity index 57% rename from Asset/data/asset/functions/artifact/alias/555/damage_entity/.mcfunction rename to Asset/data/asset/functions/artifact/alias/554/damage_entity/.mcfunction index 8e0b3234f..349e6166b 100644 --- a/Asset/data/asset/functions/artifact/alias/555/damage_entity/.mcfunction +++ b/Asset/data/asset/functions/artifact/alias/554/damage_entity/.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/alias/555/damage_entity/ +#> asset:artifact/alias/554/damage_entity/ # # 神器のトリガー処理のエイリアス # # @within function asset_manager:artifact/triggers/damage_entity/damage_entity.m -function asset:artifact/0555.catastrophe/damage_entity/ \ No newline at end of file +function asset:artifact/0554.catastrophe/damage_entity/ diff --git a/Asset/data/asset/functions/artifact/alias/554/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/alias/554/damage_entity/check.mcfunction new file mode 100644 index 000000000..494f839ec --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/554/damage_entity/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/554/damage_entity/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/damage_entity/check.m + +function asset:artifact/0554.catastrophe/damage_entity/check diff --git a/Asset/data/asset/functions/artifact/alias/555/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/alias/555/damage_entity/check.mcfunction new file mode 100644 index 000000000..1afd521cc --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/555/damage_entity/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/555/damage_entity/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/damage_entity/check.m + +function asset:artifact/0555.catastrophe/damage_entity/check diff --git a/Asset/data/asset/functions/artifact/alias/556/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/alias/556/damage_entity/check.mcfunction new file mode 100644 index 000000000..16f82b0cb --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/556/damage_entity/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/556/damage_entity/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/damage_entity/check.m + +function asset:artifact/0556.catastrophe/damage_entity/check diff --git a/Asset/data/asset/functions/artifact/alias/557/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/alias/557/damage_entity/check.mcfunction new file mode 100644 index 000000000..4ff05d194 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/557/damage_entity/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/557/damage_entity/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/damage_entity/check.m + +function asset:artifact/0557.catastrophe/damage_entity/check diff --git a/Asset/data/asset/functions/artifact/alias/559/attack_melee/.mcfunction b/Asset/data/asset/functions/artifact/alias/558/attack_melee/.mcfunction similarity index 57% rename from Asset/data/asset/functions/artifact/alias/559/attack_melee/.mcfunction rename to Asset/data/asset/functions/artifact/alias/558/attack_melee/.mcfunction index 1006e6e60..775d9c828 100644 --- a/Asset/data/asset/functions/artifact/alias/559/attack_melee/.mcfunction +++ b/Asset/data/asset/functions/artifact/alias/558/attack_melee/.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/alias/559/attack_melee/ +#> asset:artifact/alias/558/attack_melee/ # # 神器のトリガー処理のエイリアス # # @within function asset_manager:artifact/triggers/attack_melee/attack_melee.m -function asset:artifact/0559.solitariness/attack_melee/ \ No newline at end of file +function asset:artifact/0558.solitariness/attack_melee/ diff --git a/Asset/data/asset/functions/artifact/alias/558/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/alias/558/attack_melee/check.mcfunction new file mode 100644 index 000000000..8531bc42a --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/558/attack_melee/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/558/attack_melee/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/attack_melee/check.m + +function asset:artifact/0558.solitariness/attack_melee/check diff --git a/Asset/data/asset/functions/artifact/alias/559/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/alias/559/attack_melee/check.mcfunction new file mode 100644 index 000000000..08b79652c --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/559/attack_melee/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/559/attack_melee/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/attack_melee/check.m + +function asset:artifact/0559.solitariness/attack_melee/check diff --git a/Asset/data/asset/functions/artifact/alias/560/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/alias/560/attack_melee/check.mcfunction new file mode 100644 index 000000000..09130d78d --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/560/attack_melee/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/560/attack_melee/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/attack_melee/check.m + +function asset:artifact/0560.solitariness/attack_melee/check diff --git a/Asset/data/asset/functions/artifact/alias/561/attack_melee/check.mcfunction b/Asset/data/asset/functions/artifact/alias/561/attack_melee/check.mcfunction new file mode 100644 index 000000000..0d5d3d003 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/561/attack_melee/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/561/attack_melee/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/attack_melee/check.m + +function asset:artifact/0561.solitariness/attack_melee/check diff --git a/Asset/data/asset/functions/artifact/alias/563/tick/.mcfunction b/Asset/data/asset/functions/artifact/alias/562/tick/.mcfunction similarity index 59% rename from Asset/data/asset/functions/artifact/alias/563/tick/.mcfunction rename to Asset/data/asset/functions/artifact/alias/562/tick/.mcfunction index db4534a6a..e8fb9c559 100644 --- a/Asset/data/asset/functions/artifact/alias/563/tick/.mcfunction +++ b/Asset/data/asset/functions/artifact/alias/562/tick/.mcfunction @@ -1,7 +1,7 @@ -#> asset:artifact/alias/563/tick/ +#> asset:artifact/alias/562/tick/ # # 神器のトリガー処理のエイリアス # # @within function asset_manager:artifact/triggers/tick/tick.m -function asset:artifact/0563.heartland/tick/ \ No newline at end of file +function asset:artifact/0562.heartland/tick/ diff --git a/Asset/data/asset/functions/artifact/alias/563/tick/check.mcfunction b/Asset/data/asset/functions/artifact/alias/563/tick/check.mcfunction deleted file mode 100644 index a9321ef9c..000000000 --- a/Asset/data/asset/functions/artifact/alias/563/tick/check.mcfunction +++ /dev/null @@ -1,7 +0,0 @@ -#> asset:artifact/alias/563/tick/check -# -# 神器の使用条件の確認処理のエイリアス -# -# @within function asset_manager:artifact/triggers/tick/check.m - -function asset:artifact/0563.heartland/tick/check \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/alias/801/damage_entity/check.mcfunction b/Asset/data/asset/functions/artifact/alias/801/damage_entity/check.mcfunction new file mode 100644 index 000000000..b8bf01fff --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/801/damage_entity/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/801/damage_entity/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/damage_entity/check.m + +function asset:artifact/0801.red_secret_stone/damage_entity/check \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/alias/932/equip/.mcfunction b/Asset/data/asset/functions/artifact/alias/932/equip/.mcfunction new file mode 100644 index 000000000..983aa6b14 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/932/equip/.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/932/equip/ +# +# 神器のトリガー処理のエイリアス +# +# @within function asset_manager:artifact/triggers/equip/equip.m + +function asset:artifact/0932.equal_speed_charlie_london/equip/ \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/alias/960/equip/check.mcfunction b/Asset/data/asset/functions/artifact/alias/960/equip/check.mcfunction new file mode 100644 index 000000000..f99d93704 --- /dev/null +++ b/Asset/data/asset/functions/artifact/alias/960/equip/check.mcfunction @@ -0,0 +1,7 @@ +#> asset:artifact/alias/960/equip/check +# +# 神器の使用条件の確認処理のエイリアス +# +# @within function asset_manager:artifact/triggers/equip/check.m + +function asset:artifact/0960.heavy_charm/equip/check \ No newline at end of file diff --git a/Asset/data/asset/tags/functions/artifact/enroll_pool.json b/Asset/data/asset/tags/functions/artifact/enroll_pool.json index 4fa9b56af..a7123c14c 100644 --- a/Asset/data/asset/tags/functions/artifact/enroll_pool.json +++ b/Asset/data/asset/tags/functions/artifact/enroll_pool.json @@ -131,7 +131,7 @@ "asset:artifact/0501.infinity/enroll_pool", "asset:artifact/0522.humanism/enroll_pool", "asset:artifact/0529.safety_helmet/enroll_pool", - "asset:artifact/0534.all_night_hellmet/enroll_pool", + "asset:artifact/0534.all_night_helmet/enroll_pool", "asset:artifact/0554.catastrophe/enroll_pool", "asset:artifact/0558.solitariness/enroll_pool", "asset:artifact/0562.heartland/enroll_pool", diff --git a/Asset/data/asset/tags/functions/rejoin.json b/Asset/data/asset/tags/functions/rejoin.json index edb5a10ef..50c0fc04d 100644 --- a/Asset/data/asset/tags/functions/rejoin.json +++ b/Asset/data/asset/tags/functions/rejoin.json @@ -1,62 +1,62 @@ { "values": [ - "asset:artifact/0002.blessing/trigger/rejoin_process", - "asset:artifact/1024.brave_rod/trigger/rejoin_process", - "asset:artifact/0837.the_world_knife/trigger/rejoin_process", - "asset:artifact/0600.xtal/trigger/rejoin_process", - "asset:artifact/0664.soul_fire_armor/trigger/rejoin_process", - "asset:artifact/0643.raimei_chestplate/trigger/rejoin_process", - "asset:artifact/1048.thunder_storm/trigger/rejoin_process", - "asset:artifact/1045.mini_black_hole/trigger/rejoin_process", - "asset:artifact/1079.allochromatic/trigger/rejoin_process", - "asset:artifact/1078.pigeon_blood/trigger/rejoin_process", - "asset:artifact/0987.ghost_step/trigger/rejoin_process", - "asset:artifact/0769.shaking_splash/trigger/rejoin_process", - "asset:artifact/0758.sina_tk/trigger/rejoin_process", - "asset:artifact/0737.summer_festival_of_remembrance/trigger/rejoin_process", - "asset:artifact/0724.oblivious_snow/trigger/rejoin_process", - "asset:artifact/0787.aurora_helm/trigger/rejoin_process", - "asset:artifact/0711.deep_sea_coral_crown/trigger/rejoin_process", - "asset:artifact/0730.lake_reflecting_starry_sky/trigger/rejoin_process", - "asset:artifact/0738.voltage_striker/trigger/rejoin_process", - "asset:artifact/0606.traffic_sign/trigger/rejoin_process", - "asset:artifact/1033.thelema_of_blue_sea/trigger/rejoin_process", - "asset:artifact/1043.gamma_ray/trigger/rejoin_process", - "asset:artifact/1037.grand_flame/trigger/rejoin_process", - "asset:artifact/1034.eiya/trigger/rejoin_process", - "asset:artifact/0985.ark_of_the_sanctuary/trigger/rejoin_process", - "asset:artifact/0647.thorn_armor/trigger/rejoin_process", - "asset:artifact/0976.brave_sword/trigger/rejoin_process", - "asset:artifact/0953.meteor_rain/trigger/rejoin_process", - "asset:artifact/0981.soulfire_burst/trigger/rejoin_process", - "asset:artifact/0295.call_elemental_familiar/trigger/rejoin_process", + "asset:artifact/0002.blessing/rejoin_process", + "asset:artifact/0035.malleus_maleficarum/rejoin_process", + "asset:artifact/0077.swords_of_waterfall_climbing/rejoin_process", + "asset:artifact/0078.self_destruct_order/rejoin_process", + "asset:artifact/0172.icicle/rejoin_process", + "asset:artifact/0210.terra_blade/rejoin_process", + "asset:artifact/0261.holy_symbol_lv.1/rejoin_process", + "asset:artifact/0265.holy_symbol_lv.5/rejoin_process", + "asset:artifact/0269.holy_symbol_lv.10/rejoin_process", + "asset:artifact/0295.call_elemental_familiar/rejoin_process", + "asset:artifact/0369.fire_magic/rejoin_process", + "asset:artifact/0373.ice_sorcery/rejoin_process", + "asset:artifact/0431.weather_lock_cane/rejoin_process", + "asset:artifact/0600.xtal/rejoin_process", + "asset:artifact/0606.traffic_sign/rejoin_process", + "asset:artifact/0609.lunar_flare/rejoin_process", + "asset:artifact/0610.call_fish/rejoin_process", + "asset:artifact/0643.raimei_chestplate/rejoin_process", + "asset:artifact/0647.thorn_armor/rejoin_process", + "asset:artifact/0664.soul_fire_armor/rejoin_process", + "asset:artifact/0711.deep_sea_coral_crown/rejoin_process", + "asset:artifact/0724.oblivious_snow/rejoin_process", + "asset:artifact/0730.lake_reflecting_starry_sky/rejoin_process", + "asset:artifact/0737.summer_festival_of_remembrance/rejoin_process", + "asset:artifact/0738.voltage_striker/rejoin_process", + "asset:artifact/0758.sina_tk/rejoin_process", + "asset:artifact/0769.shaking_splash/rejoin_process", + "asset:artifact/0787.aurora_helm/rejoin_process", + "asset:artifact/0793.queen_bee_rocket/rejoin_process", + "asset:artifact/0822.sound_of_a_star/rejoin_process", + "asset:artifact/0837.the_world_knife/rejoin_process", + "asset:artifact/0870.samurai_blade/rejoin_process", + "asset:artifact/0905.book_of_metastasis/rejoin_process", + "asset:artifact/0907.rod_of_rain/rejoin_process", + "asset:artifact/0920.dal_i_thalion/rejoin_process", + "asset:artifact/0953.meteor_rain/rejoin_process", + "asset:artifact/0976.brave_sword/rejoin_process", + "asset:artifact/0981.soulfire_burst/rejoin_process", + "asset:artifact/0985.ark_of_the_sanctuary/rejoin_process", + "asset:artifact/0987.ghost_step/rejoin_process", + "asset:artifact/1024.brave_rod/rejoin_process", + "asset:artifact/1033.thelema_of_blue_sea/rejoin_process", + "asset:artifact/1034.eiya/rejoin_process", + "asset:artifact/1037.grand_flame/rejoin_process", + "asset:artifact/1043.gamma_ray/rejoin_process", + "asset:artifact/1045.mini_black_hole/rejoin_process", + "asset:artifact/1048.thunder_storm/rejoin_process", + "asset:artifact/1078.pigeon_blood/rejoin_process", + "asset:artifact/1079.allochromatic/rejoin_process", "asset:mob/0120.convict/rejoin_process", - "asset:artifact/0172.icicle/trigger/rejoin_process", - "asset:artifact/0793.queen_bee_rocket/trigger/rejoin_process", - "asset:artifact/0870.samurai_blade/trigger/rejoin_process", - "asset:artifact/0920.dal_i_thalion/trigger/rejoin_process", - "asset:artifact/0822.sound_of_a_star/trigger/rejoin_process", - "asset:artifact/0431.weather_lock_cane/trigger/rejoin_process", - "asset:mob/0262.frestchika/rejoin_process", - "asset:artifact/0905.book_of_metastasis/trigger/rejoin_process", - "asset:artifact/0907.rod_of_rain/trigger/rejoin_process", - "asset:mob/0217.medousa_eye/rejoin_process", - "asset:mob/1008.yellow_star/rejoin_process", - "asset:mob/1005.blue_star/rejoin_process", - "asset:mob/1004.tultaria/rejoin_process", - "asset:artifact/0609.lunar_flare/trigger/rejoin_process", - "asset:artifact/0369.fire_magic/trigger/rejoin_process", - "asset:artifact/0210.terra_blade/trigger/rejoin_process", - "asset:artifact/0035.malleus_maleficarum/trigger/rejoin_process", - "asset:artifact/0077.swords_of_waterfall_climbing/trigger/rejoin_process", - "asset:artifact/0078.self_destruct_order/trigger/rejoin_process", "asset:mob/0129.lexiel/rejoin_process", - "asset:artifact/0261.holy_symbol_lv.1/trigger/rejoin_process", - "asset:artifact/0265.holy_symbol_lv.5/trigger/rejoin_process", - "asset:artifact/0269.holy_symbol_lv.10/trigger/rejoin_process", - "asset:artifact/0373.ice_sorcery/trigger/rejoin_process", + "asset:mob/0131.haruclaire/rejoin_process", "asset:mob/0151.recombined/rejoin_process", - "asset:artifact/0610.call_fish/trigger/rejoin_process", - "asset:mob/0131.haruclaire/rejoin_process" + "asset:mob/0217.medousa_eye/rejoin_process", + "asset:mob/0262.frestchika/rejoin_process", + "asset:mob/1004.tultaria/rejoin_process", + "asset:mob/1005.blue_star/rejoin_process", + "asset:mob/1008.yellow_star/rejoin_process" ] }