From f8f1897bbeb350744cf528755ad8268c17e1e73a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=81=AF=E3=81=84=E3=81=84=E3=82=8D?= Date: Thu, 25 Jan 2024 20:22:37 +0900 Subject: [PATCH] =?UTF-8?q?:truck:=20DollarPrefix=E3=82=92HashPrefix?= =?UTF-8?q?=E3=81=AB=E5=A4=89=E6=8F=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .vscode/settings.json | 4 +- .../give/get_random_name.mcfunction | 12 +- .../0002.blessing/trigger/3.main.mcfunction | 4 +- .../trigger/on_trigger.mcfunction | 8 +- .../trigger/show_trigger_chat.mcfunction | 8 +- .../trigger/update/attack_bonus.mcfunction | 30 +- .../trigger/update/defense_bonus.mcfunction | 30 +- .../trigger/update/health_bonus.mcfunction | 30 +- .../trigger/update/mp_bonus.mcfunction | 30 +- OhMyDat/README.md | 2 +- .../oh_its_dat/functions/please.mcfunction | 4 +- .../oh_my_dat/functions/please.mcfunction | 4 +- .../functions/sys/allocate.mcfunction | 16 +- .../oh_my_dat/functions/sys/gc.mcfunction | 42 +- .../functions/sys/gc_loop.mcfunction | 4 +- .../oh_my_dat/functions/sys/init.mcfunction | 2 +- .../functions/sys/provide.mcfunction | 82 +- ScoreToHealth/changes.diff | 444 ++++----- .../functions/check.mcfunction | 10 +- .../functions/modify.mcfunction | 142 +-- .../functions/modify_max_health.mcfunction | 292 +++--- .../api/functions/damage/_index.d.mcfunction | 16 +- .../functions/damage/core/attack.mcfunction | 4 +- .../functions/damage/core/calc/.mcfunction | 26 +- .../damage/core/calc/defense.mcfunction | 102 +- .../damage/core/calc/enchantment.mcfunction | 22 +- .../damage/core/calc/resistance.mcfunction | 20 +- .../functions/damage/core/get_epf/.mcfunction | 2 +- .../get_epf/get_non-protection_epf.mcfunction | 26 +- .../damage/core/get_status/.mcfunction | 18 +- .../get_status/get_resistance_lv.mcfunction | 10 +- .../modify_and_get_damage.mcfunction | 2 +- .../health_subtract/non-player.mcfunction | 34 +- .../core/health_subtract/player.mcfunction | 4 +- .../damage/core/modify/non-player.mcfunction | 2 +- .../damage/core/modify/player.mcfunction | 2 +- .../damage/core/modify_damage.mcfunction | 60 +- .../functions/damage/core/reset.mcfunction | 4 +- .../damage/core/trigger_on_attack.mcfunction | 2 +- .../damage/core/trigger_on_damage/.mcfunction | 2 +- .../functions/data_get/abilities.mcfunction | 6 +- .../data_get/absorption_amount.mcfunction | 6 +- .../data_get/active_effects.mcfunction | 6 +- .../api/functions/data_get/air.mcfunction | 6 +- .../functions/data_get/attributes.mcfunction | 6 +- .../api/functions/data_get/brain.mcfunction | 6 +- .../functions/data_get/custom_name.mcfunction | 6 +- .../data_get/custom_name_visible.mcfunction | 6 +- .../data_get/data_version.mcfunction | 6 +- .../functions/data_get/death_time.mcfunction | 6 +- .../functions/data_get/dimension.mcfunction | 6 +- .../functions/data_get/ender_items.mcfunction | 6 +- .../entered_nether_position.mcfunction | 6 +- .../data_get/fall_distance.mcfunction | 6 +- .../functions/data_get/fall_flying.mcfunction | 6 +- .../api/functions/data_get/fire.mcfunction | 6 +- .../data_get/food_exhaustion_level.mcfunction | 6 +- .../functions/data_get/food_level.mcfunction | 6 +- .../data_get/food_saturation_level.mcfunction | 6 +- .../data_get/food_tick_timer.mcfunction | 6 +- .../api/functions/data_get/glowing.mcfunction | 6 +- .../api/functions/data_get/health.mcfunction | 6 +- .../functions/data_get/hurt_time.mcfunction | 6 +- .../data/api/functions/data_get/id.mcfunction | 6 +- .../functions/data_get/inventory.mcfunction | 6 +- .../data_get/invulnerable.mcfunction | 6 +- .../api/functions/data_get/motion.mcfunction | 6 +- .../api/functions/data_get/no_ai.mcfunction | 6 +- .../functions/data_get/no_gravity.mcfunction | 6 +- .../functions/data_get/on_ground.mcfunction | 6 +- .../functions/data_get/passengers.mcfunction | 6 +- .../data_get/player_game_type.mcfunction | 6 +- .../data_get/portal_cooldown.mcfunction | 6 +- .../api/functions/data_get/pos.mcfunction | 6 +- .../previous_player_game_type.mcfunction | 6 +- .../functions/data_get/recipe_book.mcfunction | 6 +- .../data_get/root_vehicle.mcfunction | 6 +- .../functions/data_get/rotation.mcfunction | 6 +- .../api/functions/data_get/score.mcfunction | 6 +- .../data_get/seen_credits.mcfunction | 6 +- .../data_get/selected_item.mcfunction | 6 +- .../data_get/selected_item_slot.mcfunction | 6 +- .../data_get/shoulder_entity_left.mcfunction | 6 +- .../data_get/shoulder_entity_right.mcfunction | 6 +- .../api/functions/data_get/silent.mcfunction | 6 +- .../functions/data_get/sleep_timer.mcfunction | 6 +- .../functions/data_get/sleeping_x.mcfunction | 6 +- .../functions/data_get/sleeping_y.mcfunction | 6 +- .../functions/data_get/sleeping_z.mcfunction | 6 +- .../data_get/spawn_forced.mcfunction | 6 +- .../api/functions/data_get/spawn_x.mcfunction | 6 +- .../api/functions/data_get/spawn_y.mcfunction | 6 +- .../api/functions/data_get/spawn_z.mcfunction | 6 +- .../api/functions/data_get/tags.mcfunction | 6 +- .../api/functions/data_get/team.mcfunction | 6 +- .../api/functions/data_get/uuid.mcfunction | 2 +- .../functions/data_get/xp_level.mcfunction | 6 +- .../api/functions/data_get/xp_p.mcfunction | 6 +- .../api/functions/data_get/xp_seed.mcfunction | 6 +- .../functions/data_get/xp_total.mcfunction | 6 +- .../mob/effect/core/get/from_id.m.mcfunction | 2 +- .../remove/from_level/recursion.mcfunction | 10 +- .../global_vars/get_difficulty.mcfunction | 2 +- .../functions/heal/core/modifier.mcfunction | 16 +- .../functions/heal/core/non-player.mcfunction | 40 +- .../api/functions/heal/core/player.mcfunction | 8 +- .../heal/core/receive_modifier.mcfunction | 16 +- .../functions/inventory/_index.d.mcfunction | 10 +- .../api/functions/inventory/clear.mcfunction | 10 +- .../core/clear/remove/map.mcfunction | 12 +- .../clear/remove/subtract_values.mcfunction | 16 +- .../inventory/core/clear/test/.mcfunction | 2 +- .../core/clear/test/foreach.mcfunction | 10 +- .../functions/inventory/get_size.mcfunction | 16 +- .../api/functions/lost_items/give.mcfunction | 4 +- .../mob/get_health_percent.mcfunction | 14 +- .../functions/modifier/_index.d.mcfunction | 6 +- .../core/common/remove_modifier.mcfunction | 10 +- .../core/common/update_modifier/.mcfunction | 20 +- .../update_modifier/multiples.mcfunction | 12 +- .../separate_modifiers.mcfunction | 10 +- .../data/api/functions/mp/check.mcfunction | 10 +- .../api/functions/mp/fluctuation.mcfunction | 10 +- .../data/api/functions/mp/set.mcfunction | 8 +- .../api/functions/mp/update_max.mcfunction | 2 +- .../data/api/functions/rom/please.mcfunction | 10 +- .../global_vars/difficulty/easy.json | 2 +- .../global_vars/difficulty/hard.json | 2 +- .../global_vars/difficulty/max/hard.json | 2 +- .../global_vars/difficulty/max/normal.json | 2 +- .../global_vars/difficulty/min/hard.json | 2 +- .../global_vars/difficulty/min/normal.json | 2 +- .../difficulty/min/over_difficulty.json | 2 +- .../global_vars/difficulty/normal.json | 2 +- .../functions/artifact/common/give.mcfunction | 10 +- .../example/trigger/add_modifier.mcfunction | 14 +- .../example/trigger/attack/3.main.mcfunction | 2 +- .../functions/effect/ex/tick/.mcfunction | 14 +- .../functions/artifact/_index.d.mcfunction | 16 +- .../functions/artifact/check/.mcfunction | 2 +- .../check/check_local_cooldown/.mcfunction | 4 +- .../check_local_cooldown/foreach.mcfunction | 20 +- .../artifact/check/check_mp.mcfunction | 8 +- .../check/check_special_cooldown.mcfunction | 4 +- .../functions/artifact/cooldown/.mcfunction | 6 +- .../construct_msgs_and_revert_lcds.mcfunction | 22 +- .../cooldown/foreach/decrement.mcfunction | 6 +- .../cooldown/foreach/store_lcd_bar.mcfunction | 34 +- .../artifact/cooldown/main_bar/.mcfunction | 30 +- .../cooldown/main_bar/_index.d.mcfunction | 2 +- .../main_bar/append_bar_left.mcfunction | 4 +- .../main_bar/append_bar_right.mcfunction | 4 +- .../create/set_attack_info.mcfunction | 14 +- .../artifact/create/set_cooltime.mcfunction | 36 +- .../artifact/create/set_data.mcfunction | 6 +- .../create/set_special_cooltime.mcfunction | 36 +- .../artifact/data/current/filter.mcfunction | 8 +- .../functions/artifact/give.mcfunction | 12 +- .../functions/artifact/tick/.mcfunction | 6 +- .../triggers/equipments/compare.mcfunction | 4 +- .../equipments/update_cooldown/.mcfunction | 4 +- .../update_cooldown/foreach/.mcfunction | 24 +- .../foreach/get_cooldown.mcfunction | 8 +- .../foreach/get_tick.mcfunction | 2 +- .../artifact/triggers/sneak/.mcfunction | 26 +- .../sneak/reset_threshold_less.mcfunction | 34 +- .../sneak/reset_value_not-equal.mcfunction | 34 +- .../sneak/reset_when_change_item.mcfunction | 2 +- .../triggers/use_item/check_change.mcfunction | 18 +- .../use_item/check_hand_swap.mcfunction | 18 +- .../functions/artifact/use/.mcfunction | 6 +- .../functions/artifact/use/item/.mcfunction | 2 +- .../artifact/use/item/has_remain.mcfunction | 14 +- .../update_local_cooldown/hotbar.mcfunction | 18 +- .../non-hotbar.mcfunction | 10 +- .../artifact/use/remove_mp.mcfunction | 14 +- .../functions/effect/foreach.mcfunction | 8 +- .../effect/give/make_effect_data.mcfunction | 52 +- .../functions/island/dispel/.mcfunction | 14 +- .../island/dispel/boss/summon.mcfunction | 2 +- .../functions/mob/bossbar/init.mcfunction | 10 +- .../anti_void_action/init.mcfunction | 10 +- .../mob/common_tag/check_burning.mcfunction | 10 +- .../mob/common_tag/check_drowning.mcfunction | 8 +- .../common_tag/check_fall_distance.mcfunction | 8 +- .../mob/common_tag/check_frozen.mcfunction | 8 +- .../mob/triggers/death/find_player.mcfunction | 8 +- .../triggers/death/resolve_uuid/.mcfunction | 4 +- .../functions/spawner/_index.d.mcfunction | 32 +- .../process_spawn_potentials/.mcfunction | 18 +- .../from_int/.mcfunction | 2 +- .../from_int_list/.mcfunction | 2 +- .../from_weighted_list/.mcfunction | 2 +- .../from_weighted_list/for_each.mcfunction | 6 +- .../spawner/register/set_data.mcfunction | 2 +- .../functions/spawner/spawn/.mcfunction | 64 +- .../spawner/spawn/choose_mob_id/.mcfunction | 8 +- .../subtract_for_each.mcfunction | 12 +- .../spawn/nearby_entities/get.mcfunction | 4 +- .../get_from_selector/.mcfunction | 14 +- .../get_from_selector/1-16.mcfunction | 4 +- .../get_from_selector/1-2.mcfunction | 4 +- .../get_from_selector/1-32.mcfunction | 4 +- .../get_from_selector/1-4.mcfunction | 4 +- .../get_from_selector/1-8.mcfunction | 4 +- .../get_from_selector/11-12.mcfunction | 4 +- .../get_from_selector/13-14.mcfunction | 4 +- .../get_from_selector/13-16.mcfunction | 4 +- .../get_from_selector/15-16.mcfunction | 4 +- .../get_from_selector/17-18.mcfunction | 4 +- .../get_from_selector/17-20.mcfunction | 4 +- .../get_from_selector/17-24.mcfunction | 4 +- .../get_from_selector/17-32.mcfunction | 4 +- .../get_from_selector/19-20.mcfunction | 4 +- .../get_from_selector/21-22.mcfunction | 4 +- .../get_from_selector/21-24.mcfunction | 4 +- .../get_from_selector/23-24.mcfunction | 4 +- .../get_from_selector/25-26.mcfunction | 4 +- .../get_from_selector/25-28.mcfunction | 4 +- .../get_from_selector/25-32.mcfunction | 4 +- .../get_from_selector/27-28.mcfunction | 4 +- .../get_from_selector/29-30.mcfunction | 4 +- .../get_from_selector/29-32.mcfunction | 4 +- .../get_from_selector/3-4.mcfunction | 4 +- .../get_from_selector/31-32.mcfunction | 4 +- .../get_from_selector/33-34.mcfunction | 4 +- .../get_from_selector/33-36.mcfunction | 4 +- .../get_from_selector/33-40.mcfunction | 4 +- .../get_from_selector/33-48.mcfunction | 4 +- .../get_from_selector/33-64.mcfunction | 4 +- .../get_from_selector/35-36.mcfunction | 4 +- .../get_from_selector/37-38.mcfunction | 4 +- .../get_from_selector/37-40.mcfunction | 4 +- .../get_from_selector/39-40.mcfunction | 4 +- .../get_from_selector/41-42.mcfunction | 4 +- .../get_from_selector/41-44.mcfunction | 4 +- .../get_from_selector/41-48.mcfunction | 4 +- .../get_from_selector/43-44.mcfunction | 4 +- .../get_from_selector/45-46.mcfunction | 4 +- .../get_from_selector/45-48.mcfunction | 4 +- .../get_from_selector/47-48.mcfunction | 4 +- .../get_from_selector/49-50.mcfunction | 4 +- .../get_from_selector/49-52.mcfunction | 4 +- .../get_from_selector/49-56.mcfunction | 4 +- .../get_from_selector/49-64.mcfunction | 4 +- .../get_from_selector/5-6.mcfunction | 4 +- .../get_from_selector/5-8.mcfunction | 4 +- .../get_from_selector/51-52.mcfunction | 4 +- .../get_from_selector/53-54.mcfunction | 4 +- .../get_from_selector/53-56.mcfunction | 4 +- .../get_from_selector/55-56.mcfunction | 4 +- .../get_from_selector/57-58.mcfunction | 4 +- .../get_from_selector/57-60.mcfunction | 4 +- .../get_from_selector/57-64.mcfunction | 4 +- .../get_from_selector/59-60.mcfunction | 4 +- .../get_from_selector/61-62.mcfunction | 4 +- .../get_from_selector/61-64.mcfunction | 4 +- .../get_from_selector/63-64.mcfunction | 4 +- .../get_from_selector/7-8.mcfunction | 4 +- .../get_from_selector/9-10.mcfunction | 4 +- .../get_from_selector/9-12.mcfunction | 4 +- .../get_from_selector/9-16.mcfunction | 4 +- .../try_get_from_cache/find.mcfunction | 20 +- .../functions/spawner/spawn/single.mcfunction | 14 +- .../functions/spawner/subtract_hp/.mcfunction | 4 +- .../subtract_hp/check_id_foreach.mcfunction | 8 +- .../functions/spawner/tick/.mcfunction | 6 +- .../tick/6_distributed_interval.mcfunction | 12 +- .../spawner/tick/is_near_player.mcfunction | 62 +- .../functions/teleporter/_index.d.mcfunction | 2 +- .../teleporter/tick/star_init/.mcfunction | 18 +- .../update_activation_state/.mcfunction | 12 +- ..._get_storage_id_from_teleporter.mcfunction | 8 +- .../functions/trader/_index.d.mcfunction | 2 +- .../trader/resolve_artifact/.mcfunction | 2 +- .../foreach_artifact.mcfunction | 2 +- .../resolve_artifact/repeat_give.mcfunction | 4 +- .../data/core/functions/_index.d.mcfunction | 8 +- .../core/functions/define_const.mcfunction | 938 +++++++++--------- .../functions/handler/first_join.mcfunction | 6 +- .../data/core/functions/load_once.mcfunction | 20 +- .../functions/migration/v0.1.2/.mcfunction | 2 +- .../functions/patcher/load_once.mcfunction | 22 +- .../data/core/functions/tick/.mcfunction | 12 +- .../tick/6_distributed_interval.mcfunction | 4 +- .../debug/functions/stopwatch.stop.mcfunction | 6 +- .../data/debug/functions/tps/1.mcfunction | 2 +- .../data/debug/functions/tps/10.mcfunction | 2 +- .../data/debug/functions/tps/2.mcfunction | 2 +- .../data/debug/functions/tps/3.mcfunction | 2 +- .../data/debug/functions/tps/4.mcfunction | 2 +- .../data/debug/functions/tps/5.mcfunction | 2 +- .../debug/functions/tps/_index.d.mcfunction | 2 +- .../data/debug/functions/tps/reset.mcfunction | 2 +- .../data/debug/functions/tps/watch.mcfunction | 10 +- .../lib/functions/array/_index.d.mcfunction | 22 +- .../lib/functions/array/compare.mcfunction | 2 +- .../functions/array/compare_single.mcfunction | 2 +- .../functions/array/core/compare.mcfunction | 4 +- .../array/core/compare_single.mcfunction | 4 +- .../functions/array/core/math/add.mcfunction | 8 +- .../core/math/scalar_multiply.mcfunction | 6 +- .../functions/array/core/math/sqr.mcfunction | 6 +- .../functions/array/core/math/sub.mcfunction | 8 +- .../functions/array/core/math/sum.mcfunction | 6 +- .../lib/functions/array/core/move.mcfunction | 4 +- .../array/core/packing_chest.mcfunction | 6 +- .../lib/functions/array/core/picks.mcfunction | 14 +- .../functions/array/core/reverse.mcfunction | 4 +- .../functions/array/core/shuffle.mcfunction | 10 +- .../lib/functions/array/core/sum.mcfunction | 4 +- .../lib/functions/array/math/add.mcfunction | 4 +- .../array/math/scalar_multiply.mcfunction | 6 +- .../lib/functions/array/math/sqr.mcfunction | 4 +- .../lib/functions/array/math/sub.mcfunction | 4 +- .../lib/functions/array/math/sum.mcfunction | 12 +- .../data/lib/functions/array/move.mcfunction | 12 +- .../functions/array/packing_chest.mcfunction | 4 +- .../data/lib/functions/array/picks.mcfunction | 6 +- .../lib/functions/array/shuffle.mcfunction | 2 +- .../data/lib/functions/array/sum.mcfunction | 8 +- .../bit_array_to_integer/.mcfunction | 2 +- .../bit_array_to_integer/_index.d.mcfunction | 4 +- .../bit_array_to_integer/core/main.mcfunction | 4 +- .../core/recursive.mcfunction | 6 +- .../forward_spreader/_index.d.mcfunction | 30 +- .../forward_spreader/circle.mcfunction | 4 +- .../forward_spreader/core/.mcfunction | 26 +- .../forward_spreader/core/calc.mcfunction | 74 +- .../core/check_distance.mcfunction | 20 +- .../forward_spreader/core/fetch.mcfunction | 30 +- .../forward_spreader/core/pitch.mcfunction | 4 +- .../core/pre_randomizer.mcfunction | 8 +- .../core/randomizer.mcfunction | 14 +- .../forward_spreader/core/yaw.mcfunction | 4 +- .../integer_to_bit_array/.mcfunction | 6 +- .../integer_to_bit_array/_index.d.mcfunction | 4 +- .../integer_to_bit_array/core/main.mcfunction | 4 +- .../core/recursive.mcfunction | 10 +- .../message/common/die/fire.mcfunction | 12 +- .../message/common/die/magic.mcfunction | 12 +- .../message/common/die/physical.mcfunction | 14 +- .../message/common/die/thunder.mcfunction | 12 +- .../message/common/die/unknown.mcfunction | 2 +- .../message/common/die/water.mcfunction | 12 +- .../message/tutorial/goal.mcfunction | 4 +- .../message/tutorial/island.mcfunction | 4 +- .../message/tutorial/lost_items.mcfunction | 4 +- .../message/tutorial/religion.mcfunction | 4 +- .../lib/functions/motion/_index.d.mcfunction | 4 +- .../lib/functions/motion/core/.mcfunction | 16 +- .../functions/motion/core/apply.mcfunction | 30 +- .../core/knockback_resistance.mcfunction | 16 +- .../lib/functions/mp/fluctuation.mcfunction | 8 +- .../data/lib/functions/mp/set.mcfunction | 8 +- .../data/lib/functions/random/.mcfunction | 12 +- .../lib/functions/random/_index.d.mcfunction | 4 +- .../core/show_custom_death_message.mcfunction | 12 +- .../core/store_attack_info.mcfunction | 8 +- .../fluctuation.mcfunction | 10 +- .../score_to_health_wrapper/set.mcfunction | 8 +- .../lib/functions/score_to_move/.mcfunction | 4 +- .../score_to_move/_index.d.mcfunction | 2 +- .../functions/score_to_move/core/0.mcfunction | 6 +- .../functions/score_to_move/core/1.mcfunction | 6 +- .../score_to_move/core/10.mcfunction | 6 +- .../score_to_move/core/11.mcfunction | 6 +- .../score_to_move/core/12.mcfunction | 6 +- .../score_to_move/core/13.mcfunction | 6 +- .../score_to_move/core/14.mcfunction | 6 +- .../score_to_move/core/15.mcfunction | 6 +- .../score_to_move/core/16.mcfunction | 6 +- .../score_to_move/core/17.mcfunction | 6 +- .../score_to_move/core/18.mcfunction | 6 +- .../score_to_move/core/19.mcfunction | 6 +- .../functions/score_to_move/core/2.mcfunction | 6 +- .../score_to_move/core/20.mcfunction | 6 +- .../score_to_move/core/21.mcfunction | 6 +- .../score_to_move/core/22.mcfunction | 6 +- .../score_to_move/core/23.mcfunction | 6 +- .../score_to_move/core/24.mcfunction | 6 +- .../score_to_move/core/25.mcfunction | 6 +- .../score_to_move/core/26.mcfunction | 6 +- .../score_to_move/core/27.mcfunction | 6 +- .../score_to_move/core/28.mcfunction | 6 +- .../score_to_move/core/29.mcfunction | 6 +- .../functions/score_to_move/core/3.mcfunction | 6 +- .../score_to_move/core/30.mcfunction | 6 +- .../functions/score_to_move/core/4.mcfunction | 6 +- .../functions/score_to_move/core/5.mcfunction | 6 +- .../functions/score_to_move/core/6.mcfunction | 6 +- .../functions/score_to_move/core/7.mcfunction | 6 +- .../functions/score_to_move/core/8.mcfunction | 6 +- .../functions/score_to_move/core/9.mcfunction | 6 +- .../spread_entity/core/teleport.mcfunction | 120 +-- .../functions/status_log/_index.d.mcfunction | 6 +- .../status_log/show_health.mcfunction | 30 +- .../functions/status_log/show_mp.mcfunction | 2 +- .../lib/loot_tables/status_log/damage.json | 4 +- .../data/lib/loot_tables/status_log/heal.json | 4 +- .../data/lib/loot_tables/status_log/mp.json | 2 +- .../mob_manager/functions/_index.d.mcfunction | 2 +- .../attacked_entity/_index.d.mcfunction | 2 +- .../attacking_entity/_index.d.mcfunction | 2 +- .../functions/init/add_flag.mcfunction | 110 +- .../functions/init/modify_health.mcfunction | 2 +- .../multiplay_multiplier/angel.mcfunction | 24 +- .../multiplay_multiplier/normal.mcfunction | 26 +- .../god/mercy/offering/set_next.mcfunction | 40 +- .../god/mercy/on_mercy/check.mcfunction | 14 +- .../functions/god/nyaptov/passive.mcfunction | 14 +- .../functions/lost_item/_index.d.mcfunction | 8 +- .../give_all/minecart.summon.mcfunction | 4 +- .../give_all/packing.minecart.mcfunction | 6 +- .../give_all/packing.user.mcfunction | 2 +- .../functions/lost_item/give_part/.mcfunction | 8 +- .../give_part/generate_index.mcfunction | 10 +- .../functions/mp/_index.d.mcfunction | 2 +- .../functions/mp/regen/do.mcfunction | 38 +- .../mp/viewer/adjust_xpbar.mcfunction | 86 +- .../mp/viewer/check_xpbar.mcfunction | 26 +- .../pos_fix_and_calc_diff.mcfunction | 34 +- .../set_team_and_per_health.mcfunction | 56 +- .../vanilla_attack/calculate.mcfunction | 10 +- .../vanilla_attack/show_log.mcfunction | 4 +- .../data/rom/functions/_index.d.mcfunction | 4 +- .../data/rom/functions/provide.mcfunction | 70 +- .../world_manager/functions/area/.mcfunction | 12 +- .../area/01-01.tutorial-goal.mcfunction | 2 +- .../area/01-02.tutorial-island.mcfunction | 2 +- .../area/01-03.tutorial-artifact.mcfunction | 2 +- .../area/01-04.tutorial-religion.mcfunction | 2 +- .../area/01-05.tutorial-spawner.mcfunction | 2 +- .../area/01-06.tutorial-lost_items.mcfunction | 2 +- .../area/01-07.tutorial-recommend.mcfunction | 2 +- .../area/01-08.tutorial-tp_point.mcfunction | 2 +- .../area/01-10.flora_temple.mcfunction | 2 +- .../area/01-11.nyaptov_temple.mcfunction | 2 +- .../area/01-12.rumor_temple.mcfunction | 2 +- .../area/01-13.urban_temple.mcfunction | 2 +- .../area/01-14.wi-ki_temple.mcfunction | 2 +- .../area/01-30.gate_island-lower.mcfunction | 2 +- .../area/01-98-world-spawn-higher.mcfunction | 2 +- .../area/01-99.world-spawn.mcfunction | 2 +- .../area/01.god_boundaries/.mcfunction | 2 +- .../area/02-01.shard_processor.mcfunction | 2 +- .../functions/area/02.islands/.mcfunction | 2 +- .../functions/area/03.nether/.mcfunction | 2 +- .../area/04-01.end_mansion_void.mcfunction | 4 +- .../04-02.end_forgotten_star_lower.mcfunction | 4 +- ...04-03.end_forgotten_star_higher.mcfunction | 6 +- .../functions/area/04.end/.mcfunction | 2 +- .../functions/area/_index.d.mcfunction | 4 +- .../check_dimension.mcfunction | 8 +- .../chunk_io_protect/check_move.mcfunction | 36 +- .../functions/force_difficulty.mcfunction | 8 +- .../shard_processor/process/.mcfunction | 26 +- .../process/model_modifier.mcfunction | 14 +- 458 files changed, 3160 insertions(+), 3160 deletions(-) diff --git a/.vscode/settings.json b/.vscode/settings.json index 339e1af0b..24f29aca1 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -83,8 +83,8 @@ "datapack.lint.nameOfScoreHolders": [ "error", { - "label": "DollerPrefix", - "prefix": "$" + "label": "HashPrefix", + "prefix": "#" } ], "datapack.lint.nameOfTeams": [ diff --git a/Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction index b08efca81..fdcd6a6e0 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/give/get_random_name.mcfunction @@ -6,22 +6,22 @@ #> Length # @private - #declare score_holder $CandidatesLength - #declare score_holder $Argument.Index + #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 #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 + 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 lib:array/session/close - scoreboard players reset $CandidatesLength \ No newline at end of file + scoreboard players reset #CandidatesLength \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0002.blessing/trigger/3.main.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/trigger/3.main.mcfunction index 9cf1b4a9f..97a9e3ce8 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/trigger/3.main.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/trigger/3.main.mcfunction @@ -14,9 +14,9 @@ # 50島極振り時: HP +50, MP+100, Atk+40%, Def+40% # 固定加算 - scoreboard players add $BonusHealth Global 2 + scoreboard players add #BonusHealth Global 2 execute as @a run function asset:artifact/0002.blessing/trigger/update/health_bonus - scoreboard players add $BonusMP Global 4 + scoreboard players add #BonusMP Global 4 execute as @a run function asset:artifact/0002.blessing/trigger/update/mp_bonus # 選択トリガー scoreboard players enable @s 02.Trigger diff --git a/Asset/data/asset/functions/artifact/0002.blessing/trigger/on_trigger.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/trigger/on_trigger.mcfunction index 9cedee976..c386d60e0 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/trigger/on_trigger.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/trigger/on_trigger.mcfunction @@ -8,16 +8,16 @@ execute unless score @s 02.Trigger matches 1..4 run function lib:message/invalid_operation execute unless score @s 02.Trigger matches 1..4 run function asset:artifact/0002.blessing/trigger/show_trigger_chat # 体力 - execute if score @s 02.Trigger matches 1 run scoreboard players add $BonusHealth Global 1 + execute if score @s 02.Trigger matches 1 run scoreboard players add #BonusHealth Global 1 execute if score @s 02.Trigger matches 1 as @a run function asset:artifact/0002.blessing/trigger/update/health_bonus # MP - execute if score @s 02.Trigger matches 2 run scoreboard players add $BonusMP Global 2 + execute if score @s 02.Trigger matches 2 run scoreboard players add #BonusMP Global 2 execute if score @s 02.Trigger matches 2 as @a run function asset:artifact/0002.blessing/trigger/update/mp_bonus # 攻撃 - execute if score @s 02.Trigger matches 3 run scoreboard players add $AttackBonus Global 1 + execute if score @s 02.Trigger matches 3 run scoreboard players add #AttackBonus Global 1 execute if score @s 02.Trigger matches 3 as @a run function asset:artifact/0002.blessing/trigger/update/attack_bonus # 防御 - execute if score @s 02.Trigger matches 4 run scoreboard players add $DefenseBonus Global 1 + execute if score @s 02.Trigger matches 4 run scoreboard players add #DefenseBonus Global 1 execute if score @s 02.Trigger matches 4 as @a run function asset:artifact/0002.blessing/trigger/update/defense_bonus # リセット scoreboard players reset @s 02.Trigger \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0002.blessing/trigger/show_trigger_chat.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/trigger/show_trigger_chat.mcfunction index 5f37352c6..b75d830e3 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/trigger/show_trigger_chat.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/trigger/show_trigger_chat.mcfunction @@ -6,7 +6,7 @@ # 出力 tellraw @s {"text":"能力ボーナスを一つ選んでください"} - tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 1"},"color":"gold"},{"text":" 体力(現在値: +","color":"white"},{"score":{"name": "$BonusHealth","objective":"Global"},"color":"aqua"},{"text":") +","color":"white"},{"text":"1","color":"aqua"}] - tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 2"},"color":"gold"},{"text":" 魔力(現在値: +","color":"white"},{"score":{"name": "$BonusMP","objective":"Global"},"color":"aqua"},{"text":") +","color":"white"},{"text":"2","color":"aqua"}] - tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 3"},"color":"gold"},{"text":" 攻撃(現在値: +","color":"white"},{"score":{"name": "$AttackBonus","objective":"Global"},"color":"aqua"},{"text":"%) +","color":"white"},{"text":"1","color":"aqua"},{"text":"%","color":"white"}] - tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 4"},"color":"gold"},{"text":" 防御(現在値: +","color":"white"},{"score":{"name": "$DefenseBonus","objective":"Global"},"color":"aqua"},{"text":"%) +","color":"white"},{"text":"1","color":"aqua"},{"text":"%","color":"white"}] \ No newline at end of file + tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 1"},"color":"gold"},{"text":" 体力(現在値: +","color":"white"},{"score":{"name": "#BonusHealth","objective":"Global"},"color":"aqua"},{"text":") +","color":"white"},{"text":"1","color":"aqua"}] + tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 2"},"color":"gold"},{"text":" 魔力(現在値: +","color":"white"},{"score":{"name": "#BonusMP","objective":"Global"},"color":"aqua"},{"text":") +","color":"white"},{"text":"2","color":"aqua"}] + tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 3"},"color":"gold"},{"text":" 攻撃(現在値: +","color":"white"},{"score":{"name": "#AttackBonus","objective":"Global"},"color":"aqua"},{"text":"%) +","color":"white"},{"text":"1","color":"aqua"},{"text":"%","color":"white"}] + tellraw @s [{"text":"[選ぶ]","clickEvent":{"action":"run_command","value":"/trigger 02.Trigger set 4"},"color":"gold"},{"text":" 防御(現在値: +","color":"white"},{"score":{"name": "#DefenseBonus","objective":"Global"},"color":"aqua"},{"text":"%) +","color":"white"},{"text":"1","color":"aqua"},{"text":"%","color":"white"}] \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/attack_bonus.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/attack_bonus.mcfunction index 6e3404a60..6daffebd4 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/attack_bonus.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/attack_bonus.mcfunction @@ -8,29 +8,29 @@ #> Diff # @private - #declare score_holder $Diff - #declare score_holder $RemovedAmount - #declare score_holder $isNegative + #declare score_holder #Diff + #declare score_holder #RemovedAmount + #declare score_holder #isNegative # 古いのをremove data modify storage api: Argument.UUID set value [I;1,1,2,0] function api:modifier/attack/base/remove # 差分にする - scoreboard players operation $Diff Temporary = $AttackBonus Global - execute store result score $RemovedAmount Temporary run data get storage api: Removed.Amount 100 - execute unless score $RemovedAmount Temporary matches -2147483648..2147483647 run scoreboard players set $RemovedAmount Temporary 0 - scoreboard players operation $Diff Temporary -= $RemovedAmount Temporary + scoreboard players operation #Diff Temporary = #AttackBonus Global + execute store result score #RemovedAmount Temporary run data get storage api: Removed.Amount 100 + execute unless score #RemovedAmount Temporary matches -2147483648..2147483647 run scoreboard players set #RemovedAmount Temporary 0 + scoreboard players operation #Diff Temporary -= #RemovedAmount Temporary # 出力 - execute store result score $isNegative Temporary if score $Diff Temporary matches ..-1 - execute if score $isNegative Temporary matches 1 run scoreboard players operation $Diff Temporary *= $-1 Const - execute if score $isNegative Temporary matches 0 if score $Diff Temporary matches 1.. run tellraw @s [{"text":"攻撃力が","color":"white"},{"score":{"name":"$Diff","objective":"Temporary"},"color":"aqua"},{"text":"%増加した","color":"white"}] - execute if score $isNegative Temporary matches 1 if score $Diff Temporary matches 1.. run tellraw @s [{"text":"攻撃力が","color":"white"},{"score":{"name":"$Diff","objective":"Temporary"},"color":"aqua"},{"text":"%減少した","color":"white"}] + execute store result score #isNegative Temporary if score #Diff Temporary matches ..-1 + execute if score #isNegative Temporary matches 1 run scoreboard players operation #Diff Temporary *= #-1 Const + execute if score #isNegative Temporary matches 0 if score #Diff Temporary matches 1.. run tellraw @s [{"text":"攻撃力が","color":"white"},{"score":{"name":"#Diff","objective":"Temporary"},"color":"aqua"},{"text":"%増加した","color":"white"}] + execute if score #isNegative Temporary matches 1 if score #Diff Temporary matches 1.. run tellraw @s [{"text":"攻撃力が","color":"white"},{"score":{"name":"#Diff","objective":"Temporary"},"color":"aqua"},{"text":"%減少した","color":"white"}] # リセット - scoreboard players reset $Diff Temporary - scoreboard players reset $RemovedAmount Temporary - scoreboard players reset $isNegative Temporary + scoreboard players reset #Diff Temporary + scoreboard players reset #RemovedAmount Temporary + scoreboard players reset #isNegative Temporary # 適用 data modify storage api: Argument set value {Amount:-1,UUID:[I;1,1,2,0],Operation:"multiply"} - execute store result storage api: Argument.Amount double 0.01 run scoreboard players get $AttackBonus Global + execute store result storage api: Argument.Amount double 0.01 run scoreboard players get #AttackBonus Global function api:modifier/attack/base/add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/defense_bonus.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/defense_bonus.mcfunction index 1a0434217..b9be16d7e 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/defense_bonus.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/defense_bonus.mcfunction @@ -8,29 +8,29 @@ #> Diff # @private - #declare score_holder $Diff - #declare score_holder $RemovedAmount - #declare score_holder $isNegative + #declare score_holder #Diff + #declare score_holder #RemovedAmount + #declare score_holder #isNegative # 古いのをremove data modify storage api: Argument.UUID set value [I;1,1,2,0] function api:modifier/defense/base/remove # 差分にする - scoreboard players operation $Diff Temporary = $DefenseBonus Global - execute store result score $RemovedAmount Temporary run data get storage api: Removed.Amount 100 - execute unless score $RemovedAmount Temporary matches -2147483648..2147483647 run scoreboard players set $RemovedAmount Temporary 0 - scoreboard players operation $Diff Temporary -= $RemovedAmount Temporary + scoreboard players operation #Diff Temporary = #DefenseBonus Global + execute store result score #RemovedAmount Temporary run data get storage api: Removed.Amount 100 + execute unless score #RemovedAmount Temporary matches -2147483648..2147483647 run scoreboard players set #RemovedAmount Temporary 0 + scoreboard players operation #Diff Temporary -= #RemovedAmount Temporary # 出力 - execute store result score $isNegative Temporary if score $Diff Temporary matches ..-1 - execute if score $isNegative Temporary matches 1 run scoreboard players operation $Diff Temporary *= $-1 Const - execute if score $isNegative Temporary matches 0 if score $Diff Temporary matches 1.. run tellraw @s [{"text":"防御力が","color":"white"},{"score":{"name":"$Diff","objective":"Temporary"},"color":"aqua"},{"text":"%増加した","color":"white"}] - execute if score $isNegative Temporary matches 1 if score $Diff Temporary matches 1.. run tellraw @s [{"text":"防御力が","color":"white"},{"score":{"name":"$Diff","objective":"Temporary"},"color":"aqua"},{"text":"%減少した","color":"white"}] + execute store result score #isNegative Temporary if score #Diff Temporary matches ..-1 + execute if score #isNegative Temporary matches 1 run scoreboard players operation #Diff Temporary *= #-1 Const + execute if score #isNegative Temporary matches 0 if score #Diff Temporary matches 1.. run tellraw @s [{"text":"防御力が","color":"white"},{"score":{"name":"#Diff","objective":"Temporary"},"color":"aqua"},{"text":"%増加した","color":"white"}] + execute if score #isNegative Temporary matches 1 if score #Diff Temporary matches 1.. run tellraw @s [{"text":"防御力が","color":"white"},{"score":{"name":"#Diff","objective":"Temporary"},"color":"aqua"},{"text":"%減少した","color":"white"}] # リセット - scoreboard players reset $Diff Temporary - scoreboard players reset $RemovedAmount Temporary - scoreboard players reset $isNegative Temporary + scoreboard players reset #Diff Temporary + scoreboard players reset #RemovedAmount Temporary + scoreboard players reset #isNegative Temporary # 適用 data modify storage api: Argument set value {Amount:-1,UUID:[I;1,1,2,0],Operation:"multiply"} - execute store result storage api: Argument.Amount double 0.01 run scoreboard players get $DefenseBonus Global + execute store result storage api: Argument.Amount double 0.01 run scoreboard players get #DefenseBonus Global function api:modifier/defense/base/add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/health_bonus.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/health_bonus.mcfunction index 8c0ece7bc..316fa7d71 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/health_bonus.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/health_bonus.mcfunction @@ -8,30 +8,30 @@ #> Diff # @private - #declare score_holder $Diff - #declare score_holder $RemovedAmount - #declare score_holder $isNegative + #declare score_holder #Diff + #declare score_holder #RemovedAmount + #declare score_holder #isNegative # 古いのをremove data modify storage api: Argument.UUID set value [I;1,1,2,0] function api:modifier/max_health/remove # 差分にする - scoreboard players operation $Diff Temporary = $BonusHealth Global - execute store result score $RemovedAmount Temporary run data get storage api: Removed.Amount 1 - execute unless score $RemovedAmount Temporary matches -2147483648..2147483647 run scoreboard players set $RemovedAmount Temporary 0 - scoreboard players operation $Diff Temporary -= $RemovedAmount Temporary + scoreboard players operation #Diff Temporary = #BonusHealth Global + execute store result score #RemovedAmount Temporary run data get storage api: Removed.Amount 1 + execute unless score #RemovedAmount Temporary matches -2147483648..2147483647 run scoreboard players set #RemovedAmount Temporary 0 + scoreboard players operation #Diff Temporary -= #RemovedAmount Temporary # 出力 - execute store result score $isNegative Temporary if score $Diff Temporary matches ..-1 - execute if score $isNegative Temporary matches 1 run scoreboard players operation $Diff Temporary *= $-1 Const - execute if score $isNegative Temporary matches 0 if score $Diff Temporary matches 1.. run tellraw @s [{"text":"最大体力が","color":"white"},{"score":{"name":"$Diff","objective":"Temporary"},"color":"aqua"},{"text":"増加した","color":"white"}] - execute if score $isNegative Temporary matches 1 if score $Diff Temporary matches 1.. run tellraw @s [{"text":"最大体力が","color":"white"},{"score":{"name":"$Diff","objective":"Temporary"},"color":"aqua"},{"text":"減少した","color":"white"}] + execute store result score #isNegative Temporary if score #Diff Temporary matches ..-1 + execute if score #isNegative Temporary matches 1 run scoreboard players operation #Diff Temporary *= #-1 Const + execute if score #isNegative Temporary matches 0 if score #Diff Temporary matches 1.. run tellraw @s [{"text":"最大体力が","color":"white"},{"score":{"name":"#Diff","objective":"Temporary"},"color":"aqua"},{"text":"増加した","color":"white"}] + execute if score #isNegative Temporary matches 1 if score #Diff Temporary matches 1.. run tellraw @s [{"text":"最大体力が","color":"white"},{"score":{"name":"#Diff","objective":"Temporary"},"color":"aqua"},{"text":"減少した","color":"white"}] # リセット - scoreboard players reset $Diff Temporary - scoreboard players reset $RemovedAmount Temporary - scoreboard players reset $isNegative Temporary + scoreboard players reset #Diff Temporary + scoreboard players reset #RemovedAmount Temporary + scoreboard players reset #isNegative Temporary # 適用 data modify storage api: Argument set value {Amount:-1,UUID:[I;1,1,2,0],Operation:"add"} - execute store result storage api: Argument.Amount double 1 run scoreboard players get $BonusHealth Global + execute store result storage api: Argument.Amount double 1 run scoreboard players get #BonusHealth Global function api:modifier/max_health/add \ No newline at end of file diff --git a/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/mp_bonus.mcfunction b/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/mp_bonus.mcfunction index 821528934..ae341052f 100644 --- a/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/mp_bonus.mcfunction +++ b/Asset/data/asset/functions/artifact/0002.blessing/trigger/update/mp_bonus.mcfunction @@ -8,30 +8,30 @@ #> Diff # @private - #declare score_holder $Diff - #declare score_holder $RemovedAmount - #declare score_holder $isNegative + #declare score_holder #Diff + #declare score_holder #RemovedAmount + #declare score_holder #isNegative # 古いのをremove data modify storage api: Argument.UUID set value [I;1,1,2,0] function api:modifier/max_mp/remove # 差分にする - scoreboard players operation $Diff Temporary = $BonusMP Global - execute store result score $RemovedAmount Temporary run data get storage api: Removed.Amount 1 - execute unless score $RemovedAmount Temporary matches -2147483648..2147483647 run scoreboard players set $RemovedAmount Temporary 0 - scoreboard players operation $Diff Temporary -= $RemovedAmount Temporary + scoreboard players operation #Diff Temporary = #BonusMP Global + execute store result score #RemovedAmount Temporary run data get storage api: Removed.Amount 1 + execute unless score #RemovedAmount Temporary matches -2147483648..2147483647 run scoreboard players set #RemovedAmount Temporary 0 + scoreboard players operation #Diff Temporary -= #RemovedAmount Temporary # 出力 - execute store result score $isNegative Temporary if score $Diff Temporary matches ..-1 - execute if score $isNegative Temporary matches 1 run scoreboard players operation $Diff Temporary *= $-1 Const - execute if score $isNegative Temporary matches 0 if score $Diff Temporary matches 1.. run tellraw @s [{"text":"最大魔力が","color":"white"},{"score":{"name":"$Diff","objective":"Temporary"},"color":"aqua"},{"text":"増加した","color":"white"}] - execute if score $isNegative Temporary matches 1 if score $Diff Temporary matches 1.. run tellraw @s [{"text":"最大魔力が","color":"white"},{"score":{"name":"$Diff","objective":"Temporary"},"color":"aqua"},{"text":"減少した","color":"white"}] + execute store result score #isNegative Temporary if score #Diff Temporary matches ..-1 + execute if score #isNegative Temporary matches 1 run scoreboard players operation #Diff Temporary *= #-1 Const + execute if score #isNegative Temporary matches 0 if score #Diff Temporary matches 1.. run tellraw @s [{"text":"最大魔力が","color":"white"},{"score":{"name":"#Diff","objective":"Temporary"},"color":"aqua"},{"text":"増加した","color":"white"}] + execute if score #isNegative Temporary matches 1 if score #Diff Temporary matches 1.. run tellraw @s [{"text":"最大魔力が","color":"white"},{"score":{"name":"#Diff","objective":"Temporary"},"color":"aqua"},{"text":"減少した","color":"white"}] # リセット - scoreboard players reset $Diff Temporary - scoreboard players reset $RemovedAmount Temporary - scoreboard players reset $isNegative Temporary + scoreboard players reset #Diff Temporary + scoreboard players reset #RemovedAmount Temporary + scoreboard players reset #isNegative Temporary # 適用 data modify storage api: Argument set value {Amount:-1,UUID:[I;1,1,2,0],Operation:"add"} - execute store result storage api: Argument.Amount double 1 run scoreboard players get $BonusMP Global + execute store result storage api: Argument.Amount double 1 run scoreboard players get #BonusMP Global function api:modifier/max_mp/add \ No newline at end of file diff --git a/OhMyDat/README.md b/OhMyDat/README.md index aafe37d13..3d6e92753 100644 --- a/OhMyDat/README.md +++ b/OhMyDat/README.md @@ -23,7 +23,7 @@ data remove storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataName ## 既知のストレージにIDでアクセスしたい場合 / If you want to use known storage by storage ID ``` -scoreboard players set $ OhMyDatID +scoreboard players set # OhMyDatID function oh_its_dat:please ``` diff --git a/OhMyDat/data/oh_its_dat/functions/please.mcfunction b/OhMyDat/data/oh_its_dat/functions/please.mcfunction index 22e36b986..f3823358d 100644 --- a/OhMyDat/data/oh_its_dat/functions/please.mcfunction +++ b/OhMyDat/data/oh_its_dat/functions/please.mcfunction @@ -1,7 +1,7 @@ ### Copyright © 2020 赤石愛 ### This software is released under the MIT License, see LICENSE. -### 指定された値($ OhMyDatID)の個別ストレージを提供(特定のオフセットで呼び出せるように)する +### 指定された値(# OhMyDatID)の個別ストレージを提供(特定のオフセットで呼び出せるように)する # ストレージ提供 -execute unless score $ OhMyDatID = $LatestProvidedID OhMyDatID run function oh_my_dat:sys/provide \ No newline at end of file +execute unless score # OhMyDatID = #LatestProvidedID OhMyDatID run function oh_my_dat:sys/provide \ No newline at end of file diff --git a/OhMyDat/data/oh_my_dat/functions/please.mcfunction b/OhMyDat/data/oh_my_dat/functions/please.mcfunction index 15ed937ea..da8a4e4ba 100644 --- a/OhMyDat/data/oh_my_dat/functions/please.mcfunction +++ b/OhMyDat/data/oh_my_dat/functions/please.mcfunction @@ -6,6 +6,6 @@ # IDを持っていなければ、IDを割り当て execute unless score @s OhMyDatID matches 1.. run function oh_my_dat:sys/allocate # IDを一時変数にコピー -execute unless score @s OhMyDatID = $LatestProvidedID OhMyDatID run scoreboard players operation $ OhMyDatID = @s OhMyDatID +execute unless score @s OhMyDatID = #LatestProvidedID OhMyDatID run scoreboard players operation # OhMyDatID = @s OhMyDatID # ストレージ提供 -execute unless score @s OhMyDatID = $LatestProvidedID OhMyDatID run function oh_my_dat:sys/provide \ No newline at end of file +execute unless score @s OhMyDatID = #LatestProvidedID OhMyDatID run function oh_my_dat:sys/provide \ No newline at end of file diff --git a/OhMyDat/data/oh_my_dat/functions/sys/allocate.mcfunction b/OhMyDat/data/oh_my_dat/functions/sys/allocate.mcfunction index d57041f80..5fff94dac 100644 --- a/OhMyDat/data/oh_my_dat/functions/sys/allocate.mcfunction +++ b/OhMyDat/data/oh_my_dat/functions/sys/allocate.mcfunction @@ -7,15 +7,15 @@ function oh_my_dat:sys/gc # id[0] + id[-1] / 2 を割り当てIDに取る -execute store result score $ OhMyDatID run data get storage oh_my_dat: id[-1] -execute store result score $ OhMyDat run data get storage oh_my_dat: id[0] -execute if score $ OhMyDatID matches 0 run scoreboard players set $ OhMyDatID 65536 -scoreboard players operation $ OhMyDatID += $ OhMyDat -scoreboard players set $ OhMyDat 2 -scoreboard players operation $ OhMyDatID /= $ OhMyDat +execute store result score # OhMyDatID run data get storage oh_my_dat: id[-1] +execute store result score # OhMyDat run data get storage oh_my_dat: id[0] +execute if score # OhMyDatID matches 0 run scoreboard players set # OhMyDatID 65536 +scoreboard players operation # OhMyDatID += # OhMyDat +scoreboard players set # OhMyDat 2 +scoreboard players operation # OhMyDatID /= # OhMyDat # 割り当てIDに追加 data modify storage oh_my_dat: id append value -1 -execute store result storage oh_my_dat: id[-1] int 1 run scoreboard players get $ OhMyDatID +execute store result storage oh_my_dat: id[-1] int 1 run scoreboard players get # OhMyDatID # 割り当てる -scoreboard players operation @s OhMyDatID = $ OhMyDatID \ No newline at end of file +scoreboard players operation @s OhMyDatID = # OhMyDatID \ No newline at end of file diff --git a/OhMyDat/data/oh_my_dat/functions/sys/gc.mcfunction b/OhMyDat/data/oh_my_dat/functions/sys/gc.mcfunction index 187edd15a..b68cf3e5d 100644 --- a/OhMyDat/data/oh_my_dat/functions/sys/gc.mcfunction +++ b/OhMyDat/data/oh_my_dat/functions/sys/gc.mcfunction @@ -10,32 +10,32 @@ data modify storage oh_my_dat: id append from storage oh_my_dat: id[0] data remove storage oh_my_dat: id[0] # 割り当て済みID[0]以下の最大値を取得(_ IDに入る) -execute store result score $ OhMyDat run data get storage oh_my_dat: id[0] -scoreboard players remove $ OhMyDat 2147483647 -scoreboard players set $ OhMyDatID 0 -scoreboard players operation * OhMyDatID -= $ OhMyDat -scoreboard players operation $ OhMyDatID > * OhMyDatID -scoreboard players operation * OhMyDatID += $ OhMyDat +execute store result score # OhMyDat run data get storage oh_my_dat: id[0] +scoreboard players remove # OhMyDat 2147483647 +scoreboard players set # OhMyDatID 0 +scoreboard players operation * OhMyDatID -= # OhMyDat +scoreboard players operation # OhMyDatID > * OhMyDatID +scoreboard players operation * OhMyDatID += # OhMyDat # 不要なデータを解放(先頭から続く基準より大きいIDは全部要らない) -scoreboard players operation $ OhMyDat >< $ OhMyDatID -execute store result score $ OhMyDatID run data get storage oh_my_dat: id[0] -execute if score $ OhMyDatID > $ OhMyDat run function oh_my_dat:sys/gc_loop -scoreboard players operation $ OhMyDat >< $ OhMyDatID +scoreboard players operation # OhMyDat >< # OhMyDatID +execute store result score # OhMyDatID run data get storage oh_my_dat: id[0] +execute if score # OhMyDatID > # OhMyDat run function oh_my_dat:sys/gc_loop +scoreboard players operation # OhMyDat >< # OhMyDatID # loop while x - next >= 2(prev - x) - 1 (⇔ 3x - 2prev - next + 1 >= 0) # 2prev -execute store result score $ OhMyDat run data get storage oh_my_dat: id[-1] -execute if score $ OhMyDat matches 0 run scoreboard players add $ OhMyDat 65536 -execute if score $ OhMyDatID matches 0 run scoreboard players add $ OhMyDat 65536 -execute if score $ OhMyDatID matches 0 run scoreboard players add $ OhMyDatID 65536 -scoreboard players operation $ OhMyDat += $ OhMyDat +execute store result score # OhMyDat run data get storage oh_my_dat: id[-1] +execute if score # OhMyDat matches 0 run scoreboard players add # OhMyDat 65536 +execute if score # OhMyDatID matches 0 run scoreboard players add # OhMyDat 65536 +execute if score # OhMyDatID matches 0 run scoreboard players add # OhMyDatID 65536 +scoreboard players operation # OhMyDat += # OhMyDat # 2prev - 2x -scoreboard players operation $ OhMyDat -= $ OhMyDatID -scoreboard players operation $ OhMyDat -= $ OhMyDatID +scoreboard players operation # OhMyDat -= # OhMyDatID +scoreboard players operation # OhMyDat -= # OhMyDatID # 3x - 2prev -scoreboard players operation $ OhMyDatID -= $ OhMyDat +scoreboard players operation # OhMyDatID -= # OhMyDat # 3x - 2prev - next -execute store result score $ OhMyDat run data get storage oh_my_dat: id[1] -scoreboard players operation $ OhMyDatID -= $ OhMyDat -execute if score $ OhMyDatID matches -1.. run function oh_my_dat:sys/gc +execute store result score # OhMyDat run data get storage oh_my_dat: id[1] +scoreboard players operation # OhMyDatID -= # OhMyDat +execute if score # OhMyDatID matches -1.. run function oh_my_dat:sys/gc diff --git a/OhMyDat/data/oh_my_dat/functions/sys/gc_loop.mcfunction b/OhMyDat/data/oh_my_dat/functions/sys/gc_loop.mcfunction index c06114326..cab01b49e 100644 --- a/OhMyDat/data/oh_my_dat/functions/sys/gc_loop.mcfunction +++ b/OhMyDat/data/oh_my_dat/functions/sys/gc_loop.mcfunction @@ -9,5 +9,5 @@ data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4] set value {} # 割り当て済みIDを削除 data remove storage oh_my_dat: id[0] # 不要なデータを解放(先頭から続く基準より大きいIDは全部要らない) -execute store result score $ OhMyDatID run data get storage oh_my_dat: id[0] -execute if score $ OhMyDatID > $ OhMyDat run function oh_my_dat:sys/gc_loop +execute store result score # OhMyDatID run data get storage oh_my_dat: id[0] +execute if score # OhMyDatID > # OhMyDat run function oh_my_dat:sys/gc_loop diff --git a/OhMyDat/data/oh_my_dat/functions/sys/init.mcfunction b/OhMyDat/data/oh_my_dat/functions/sys/init.mcfunction index 80fbeb793..7a41a1669 100644 --- a/OhMyDat/data/oh_my_dat/functions/sys/init.mcfunction +++ b/OhMyDat/data/oh_my_dat/functions/sys/init.mcfunction @@ -30,5 +30,5 @@ data modify storage oh_my_dat: IDSet set value [I;] scoreboard objectives add OhMyDatID dummy #> 計算に使うスコアボード # @within function oh_*:** - #declare score_holder $LatestProvidedID + #declare score_holder #LatestProvidedID scoreboard objectives add OhMyDat dummy \ No newline at end of file diff --git a/OhMyDat/data/oh_my_dat/functions/sys/provide.mcfunction b/OhMyDat/data/oh_my_dat/functions/sys/provide.mcfunction index 644c2be1e..3d09ef342 100644 --- a/OhMyDat/data/oh_my_dat/functions/sys/provide.mcfunction +++ b/OhMyDat/data/oh_my_dat/functions/sys/provide.mcfunction @@ -2,7 +2,7 @@ ### This software is released under the MIT License, see LICENSE. # 最後に呼び出したIDを記録する -scoreboard players operation $LatestProvidedID OhMyDatID = $ OhMyDatID +scoreboard players operation #LatestProvidedID OhMyDatID = # OhMyDatID ### 指定されたエンティティのデータを、特定のオフセットで呼び出せるようにする @@ -36,95 +36,95 @@ data remove storage oh_my_dat: _[5] data remove storage oh_my_dat: _[4] # ストレージシフト１ -scoreboard players set $ OhMyDat 65536 -scoreboard players operation $ OhMyDatID *= $ OhMyDat +scoreboard players set # OhMyDat 65536 +scoreboard players operation # OhMyDatID *= # OhMyDat # 01.... -execute if score $ OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _ append value [] +execute if score # OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _ append value [] # 10.... -execute if score $ OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _ append from storage oh_my_dat: two_empty_lists[] +execute if score # OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _ append from storage oh_my_dat: two_empty_lists[] # 11.... -execute if score $ OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _ append from storage oh_my_dat: three_empty_lists[] +execute if score # OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _ append from storage oh_my_dat: three_empty_lists[] # ストレージチェック２ execute unless data storage oh_my_dat: _[-4][0] run data modify storage oh_my_dat: _[-4] set from storage oh_my_dat: initial[0] # ストレージシフト２ -scoreboard players operation $ OhMyDatID += $ OhMyDatID -scoreboard players operation $ OhMyDatID += $ OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID # 01.... -execute if score $ OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4] append value [] +execute if score # OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4] append value [] # 10.... -execute if score $ OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4] append from storage oh_my_dat: two_empty_lists[] +execute if score # OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4] append from storage oh_my_dat: two_empty_lists[] # 11.... -execute if score $ OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4] append from storage oh_my_dat: three_empty_lists[] +execute if score # OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4] append from storage oh_my_dat: three_empty_lists[] # ストレージチェック３ execute unless data storage oh_my_dat: _[-4][-4][0] run data modify storage oh_my_dat: _[-4][-4] set from storage oh_my_dat: initial[0][0] # ストレージシフト３ -scoreboard players operation $ OhMyDatID += $ OhMyDatID -scoreboard players operation $ OhMyDatID += $ OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID # 01.... -execute if score $ OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4] append value [] +execute if score # OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4] append value [] # 10.... -execute if score $ OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4] append from storage oh_my_dat: two_empty_lists[] +execute if score # OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4] append from storage oh_my_dat: two_empty_lists[] # 11.... -execute if score $ OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4] append from storage oh_my_dat: three_empty_lists[] +execute if score # OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4] append from storage oh_my_dat: three_empty_lists[] # ストレージチェック４ execute unless data storage oh_my_dat: _[-4][-4][-4][0] run data modify storage oh_my_dat: _[-4][-4][-4] set from storage oh_my_dat: initial[0][0][0] # ストレージシフト４ -scoreboard players operation $ OhMyDatID += $ OhMyDatID -scoreboard players operation $ OhMyDatID += $ OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID # 01.... -execute if score $ OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4] append value [] +execute if score # OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4] append value [] # 10.... -execute if score $ OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4] append from storage oh_my_dat: two_empty_lists[] +execute if score # OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4] append from storage oh_my_dat: two_empty_lists[] # 11.... -execute if score $ OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4] append from storage oh_my_dat: three_empty_lists[] +execute if score # OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4] append from storage oh_my_dat: three_empty_lists[] # ストレージチェック５ execute unless data storage oh_my_dat: _[-4][-4][-4][-4][0] run data modify storage oh_my_dat: _[-4][-4][-4][-4] set from storage oh_my_dat: initial[0][0][0][0] # ストレージシフト５ -scoreboard players operation $ OhMyDatID += $ OhMyDatID -scoreboard players operation $ OhMyDatID += $ OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID # 01.... -execute if score $ OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4][-4] append value [] +execute if score # OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4][-4] append value [] # 10.... -execute if score $ OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4][-4] append from storage oh_my_dat: two_empty_lists[] +execute if score # OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4][-4] append from storage oh_my_dat: two_empty_lists[] # 11.... -execute if score $ OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4][-4] append from storage oh_my_dat: three_empty_lists[] +execute if score # OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4][-4] append from storage oh_my_dat: three_empty_lists[] # ストレージチェック６ execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][0] run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4] set from storage oh_my_dat: initial[0][0][0][0][0] # ストレージシフト６ -scoreboard players operation $ OhMyDatID += $ OhMyDatID -scoreboard players operation $ OhMyDatID += $ OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID # 01.... -execute if score $ OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4] append value [] +execute if score # OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4] append value [] # 10.... -execute if score $ OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4] append from storage oh_my_dat: two_empty_lists[] +execute if score # OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4] append from storage oh_my_dat: two_empty_lists[] # 11.... -execute if score $ OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4] append from storage oh_my_dat: three_empty_lists[] +execute if score # OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4] append from storage oh_my_dat: three_empty_lists[] # ストレージチェック７ execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][0] run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4] set from storage oh_my_dat: initial[0][0][0][0][0][0] # ストレージシフト７ -scoreboard players operation $ OhMyDatID += $ OhMyDatID -scoreboard players operation $ OhMyDatID += $ OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID # 01.... -execute if score $ OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4] append value [] +execute if score # OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4] append value [] # 10.... -execute if score $ OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4] append from storage oh_my_dat: two_empty_lists[] +execute if score # OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4] append from storage oh_my_dat: two_empty_lists[] # 11.... -execute if score $ OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4] append from storage oh_my_dat: three_empty_lists[] +execute if score # OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4] append from storage oh_my_dat: three_empty_lists[] # ストレージチェック８ execute unless data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][0] run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4] set from storage oh_my_dat: initial[0][0][0][0][0][0][0] # ストレージシフト８ -scoreboard players operation $ OhMyDatID += $ OhMyDatID -scoreboard players operation $ OhMyDatID += $ OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID +scoreboard players operation # OhMyDatID += # OhMyDatID # 01.... -execute if score $ OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4] append value {} +execute if score # OhMyDatID matches 1073741824.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4] append value {} # 10.... -execute if score $ OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4] append from storage oh_my_dat: two_empty_maps[] +execute if score # OhMyDatID matches ..-1073741825 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4] append from storage oh_my_dat: two_empty_maps[] # 11.... -execute if score $ OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4] append from storage oh_my_dat: three_empty_maps[] +execute if score # OhMyDatID matches -1073741824..-1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4] append from storage oh_my_dat: three_empty_maps[] diff --git a/ScoreToHealth/changes.diff b/ScoreToHealth/changes.diff index 7612430f0..d2fcbace9 100644 --- a/ScoreToHealth/changes.diff +++ b/ScoreToHealth/changes.diff @@ -4,16 +4,16 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute store result score #__ ScoreToHealth run data get entity @s Health 100 -scoreboard players operation #__ ScoreToHealth -= #_ ScoreToHealth -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +function api:data_get/health -+execute store result score $__ ScoreToHealth run data get storage api: Health 100 -+scoreboard players operation $__ ScoreToHealth -= $_ ScoreToHealth ++execute store result score #__ ScoreToHealth run data get storage api: Health 100 ++scoreboard players operation #__ ScoreToHealth -= #_ ScoreToHealth @@ -19 +19 @@ -execute if score #__ ScoreToHealth matches ..0 unless entity @s[tag=ScoreToHealth.AntiGlitch.UnsafeTick] run function score_to_health:modify -+execute if score $__ ScoreToHealth matches ..0 unless entity @s[tag=ScoreToHealth.AntiGlitch.UnsafeTick] run function score_to_health:modify ++execute if score #__ ScoreToHealth matches ..0 unless entity @s[tag=ScoreToHealth.AntiGlitch.UnsafeTick] run function score_to_health:modify @@ -21 +21 @@ -execute if score #__ ScoreToHealth matches 1.. run function score_to_health:anti_glitch/protect -+execute if score $__ ScoreToHealth matches 1.. run function score_to_health:anti_glitch/protect ++execute if score #__ ScoreToHealth matches 1.. run function score_to_health:anti_glitch/protect --- original/ScoreToHealth/data/score_to_health/functions/load.mcfunction +++ modified/ScoreToHealth/data/score_to_health/functions/load.mcfunction @@ -15 +15,15 @@ @@ -44,169 +44,169 @@ @@ -17,2 +17,2 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -scoreboard players operation @s ScoreToHealth < #_ ScoreToHealth -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+scoreboard players operation @s ScoreToHealth < $_ ScoreToHealth ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++scoreboard players operation @s ScoreToHealth < #_ ScoreToHealth @@ -21,3 +21,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" -419.4304 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" 419.4304 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" -419.4304 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" 419.4304 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" -419.4304 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" 419.4304 add @@ -25,3 +25,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" -209.7152 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" 209.7152 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" -209.7152 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" 209.7152 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" -209.7152 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" 209.7152 add @@ -29,3 +29,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" -104.8576 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" 104.8576 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" -104.8576 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" 104.8576 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" -104.8576 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" 104.8576 add @@ -33,3 +33,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" -52.4288 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" 52.4288 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" -52.4288 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" 52.4288 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" -52.4288 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" 52.4288 add @@ -37,3 +37,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" -26.2144 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" 26.2144 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" -26.2144 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" 26.2144 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" -26.2144 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" 26.2144 add @@ -41,3 +41,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" -13.1072 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" 13.1072 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" -13.1072 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" 13.1072 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" -13.1072 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" 13.1072 add @@ -45,3 +45,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" -6.5536 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" 6.5536 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" -6.5536 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" 6.5536 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" -6.5536 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" 6.5536 add @@ -49,3 +49,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" -3.2768 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" 3.2768 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" -3.2768 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" 3.2768 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" -3.2768 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" 3.2768 add @@ -53,3 +53,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" -1.6384 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" 1.6384 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" -1.6384 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" 1.6384 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" -1.6384 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" 1.6384 add @@ -57,3 +57,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" -0.8192 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" 0.8192 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" -0.8192 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" 0.8192 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" -0.8192 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" 0.8192 add @@ -61,3 +61,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" -0.4096 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" 0.4096 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" -0.4096 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" 0.4096 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" -0.4096 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" 0.4096 add @@ -65,3 +65,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" -0.2048 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" 0.2048 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" -0.2048 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" 0.2048 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" -0.2048 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" 0.2048 add @@ -69,3 +69,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" -0.1024 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" 0.1024 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" -0.1024 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" 0.1024 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" -0.1024 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" 0.1024 add @@ -73,3 +73,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" -0.0512 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" 0.0512 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" -0.0512 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" 0.0512 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" -0.0512 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" 0.0512 add @@ -77,3 +77,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" -0.0256 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" 0.0256 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" -0.0256 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" 0.0256 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" -0.0256 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" 0.0256 add @@ -81,3 +81,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" -0.0128 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" 0.0128 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" -0.0128 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" 0.0128 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" -0.0128 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" 0.0128 add @@ -85,3 +85,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" -0.0064 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" 0.0064 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" -0.0064 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" 0.0064 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" -0.0064 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" 0.0064 add @@ -89,3 +89,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" -0.0032 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" 0.0032 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" -0.0032 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" 0.0032 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" -0.0032 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" 0.0032 add @@ -93,3 +93,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" -0.0016 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" 0.0016 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" -0.0016 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" 0.0016 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" -0.0016 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" 0.0016 add @@ -97,3 +97,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" -0.0008 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" 0.0008 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" -0.0008 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" 0.0008 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" -0.0008 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" 0.0008 add @@ -101,3 +101,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" -0.0004 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" 0.0004 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" -0.0004 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" 0.0004 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" -0.0004 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" 0.0004 add @@ -105,3 +105,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" -0.0002 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" 0.0002 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" -0.0002 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" 0.0002 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" -0.0002 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" 0.0002 add @@ -109,3 +109,3 @@ -execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" -0.0001 add -execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" 0.0001 add -+execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -+execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" -0.0001 add -+execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" 0.0001 add ++execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 ++execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" -0.0001 add ++execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" 0.0001 add --- /dev/null +++ modified/ScoreToHealth/data/score_to_health/functions/modify_max_health.mcfunction @@ -0,0 +1,189 @@ @@ -249,152 +249,152 @@ +attribute @s minecraft:generic.max_health modifier remove bab7cdc2-fb6a-47f6-0002-01 +attribute @s minecraft:generic.max_health modifier remove bab7cdc2-fb6a-47f6-0002-00 + -+execute store result score $_ ScoreToMaxHealth run attribute @s generic.max_health base get 10000 -+ -+scoreboard players operation $__ ScoreToMaxHealth = $_ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-17 "ScoreToMaxHealth" -838.8607 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 8388607 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-17 "ScoreToMaxHealth" 838.8607 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 8388607 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-16 "ScoreToMaxHealth" -419.4304 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 4194304 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-16 "ScoreToMaxHealth" 419.4304 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 4194304 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-15 "ScoreToMaxHealth" -209.7152 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 2097152 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-15 "ScoreToMaxHealth" 209.7152 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 2097152 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-14 "ScoreToMaxHealth" -104.8576 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 1048576 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-14 "ScoreToMaxHealth" 104.8576 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 1048576 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-13 "ScoreToMaxHealth" -52.4288 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 524288 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-13 "ScoreToMaxHealth" 52.4288 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 524288 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-12 "ScoreToMaxHealth" -26.2144 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 262144 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-12 "ScoreToMaxHealth" 26.2144 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 262144 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-11 "ScoreToMaxHealth" -13.1072 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 131072 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-11 "ScoreToMaxHealth" 13.1072 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 131072 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-10 "ScoreToMaxHealth" -6.5536 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 65536 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-10 "ScoreToMaxHealth" 6.5536 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 65536 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0F "ScoreToMaxHealth" -3.2768 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 32768 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0F "ScoreToMaxHealth" 3.2768 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 32768 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0E "ScoreToMaxHealth" -1.6384 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 16384 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0E "ScoreToMaxHealth" 1.6384 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 16384 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0D "ScoreToMaxHealth" -0.8192 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 8192 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0D "ScoreToMaxHealth" 0.8192 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 8192 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0C "ScoreToMaxHealth" -0.4096 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 4096 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0C "ScoreToMaxHealth" 0.4096 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 4096 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0B "ScoreToMaxHealth" -0.2048 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 2048 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0B "ScoreToMaxHealth" 0.2048 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 2048 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0A "ScoreToMaxHealth" -0.1024 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 1024 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0A "ScoreToMaxHealth" 0.1024 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 1024 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-09 "ScoreToMaxHealth" -0.0512 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0512 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-09 "ScoreToMaxHealth" 0.0512 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0512 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-08 "ScoreToMaxHealth" -0.0256 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0256 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-08 "ScoreToMaxHealth" 0.0256 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0256 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-07 "ScoreToMaxHealth" -0.0128 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0128 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-07 "ScoreToMaxHealth" 0.0128 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0128 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-06 "ScoreToMaxHealth" -0.0064 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0064 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-06 "ScoreToMaxHealth" 0.0064 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0064 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-05 "ScoreToMaxHealth" -0.0032 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0032 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-05 "ScoreToMaxHealth" 0.0032 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0032 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-04 "ScoreToMaxHealth" -0.0016 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0016 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-04 "ScoreToMaxHealth" 0.0016 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0016 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-03 "ScoreToMaxHealth" -0.0008 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0008 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-03 "ScoreToMaxHealth" 0.0008 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0008 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-02 "ScoreToMaxHealth" -0.0004 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0004 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-02 "ScoreToMaxHealth" 0.0004 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0004 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-01 "ScoreToMaxHealth" -0.0002 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0002 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-01 "ScoreToMaxHealth" 0.0002 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0002 -+scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth -+ -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-00 "ScoreToMaxHealth" -0.0001 add -+execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0001 -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-00 "ScoreToMaxHealth" 0.0001 add -+execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0001 ++execute store result score #_ ScoreToMaxHealth run attribute @s generic.max_health base get 10000 ++ ++scoreboard players operation #__ ScoreToMaxHealth = #_ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-17 "ScoreToMaxHealth" -838.8607 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 8388607 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-17 "ScoreToMaxHealth" 838.8607 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 8388607 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-16 "ScoreToMaxHealth" -419.4304 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 4194304 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-16 "ScoreToMaxHealth" 419.4304 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 4194304 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-15 "ScoreToMaxHealth" -209.7152 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 2097152 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-15 "ScoreToMaxHealth" 209.7152 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 2097152 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-14 "ScoreToMaxHealth" -104.8576 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 1048576 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-14 "ScoreToMaxHealth" 104.8576 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 1048576 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-13 "ScoreToMaxHealth" -52.4288 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 524288 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-13 "ScoreToMaxHealth" 52.4288 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 524288 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-12 "ScoreToMaxHealth" -26.2144 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 262144 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-12 "ScoreToMaxHealth" 26.2144 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 262144 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-11 "ScoreToMaxHealth" -13.1072 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 131072 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-11 "ScoreToMaxHealth" 13.1072 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 131072 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-10 "ScoreToMaxHealth" -6.5536 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 65536 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-10 "ScoreToMaxHealth" 6.5536 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 65536 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0F "ScoreToMaxHealth" -3.2768 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 32768 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0F "ScoreToMaxHealth" 3.2768 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 32768 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0E "ScoreToMaxHealth" -1.6384 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 16384 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0E "ScoreToMaxHealth" 1.6384 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 16384 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0D "ScoreToMaxHealth" -0.8192 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 8192 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0D "ScoreToMaxHealth" 0.8192 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 8192 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0C "ScoreToMaxHealth" -0.4096 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 4096 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0C "ScoreToMaxHealth" 0.4096 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 4096 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0B "ScoreToMaxHealth" -0.2048 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 2048 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0B "ScoreToMaxHealth" 0.2048 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 2048 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0A "ScoreToMaxHealth" -0.1024 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 1024 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0A "ScoreToMaxHealth" 0.1024 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 1024 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-09 "ScoreToMaxHealth" -0.0512 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0512 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-09 "ScoreToMaxHealth" 0.0512 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0512 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-08 "ScoreToMaxHealth" -0.0256 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0256 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-08 "ScoreToMaxHealth" 0.0256 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0256 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-07 "ScoreToMaxHealth" -0.0128 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0128 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-07 "ScoreToMaxHealth" 0.0128 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0128 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-06 "ScoreToMaxHealth" -0.0064 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0064 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-06 "ScoreToMaxHealth" 0.0064 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0064 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-05 "ScoreToMaxHealth" -0.0032 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0032 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-05 "ScoreToMaxHealth" 0.0032 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0032 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-04 "ScoreToMaxHealth" -0.0016 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0016 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-04 "ScoreToMaxHealth" 0.0016 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0016 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-03 "ScoreToMaxHealth" -0.0008 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0008 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-03 "ScoreToMaxHealth" 0.0008 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0008 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-02 "ScoreToMaxHealth" -0.0004 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0004 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-02 "ScoreToMaxHealth" 0.0004 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0004 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-01 "ScoreToMaxHealth" -0.0002 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0002 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-01 "ScoreToMaxHealth" 0.0002 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0002 ++scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth ++ ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-00 "ScoreToMaxHealth" -0.0001 add ++execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0001 ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-00 "ScoreToMaxHealth" 0.0001 add ++execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0001 + +effect give @s minecraft:instant_health 1 252 true +scoreboard players operation @s STMHBackup = @s ScoreToMaxHealth diff --git a/ScoreToHealth/data/score_to_health/functions/check.mcfunction b/ScoreToHealth/data/score_to_health/functions/check.mcfunction index 8e65bee50..0a286a7a7 100644 --- a/ScoreToHealth/data/score_to_health/functions/check.mcfunction +++ b/ScoreToHealth/data/score_to_health/functions/check.mcfunction @@ -12,11 +12,11 @@ # See the License for the specific language governing permissions and # limitations under the License. -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 function api:data_get/health -execute store result score $__ ScoreToHealth run data get storage api: Health 100 -scoreboard players operation $__ ScoreToHealth -= $_ ScoreToHealth +execute store result score #__ ScoreToHealth run data get storage api: Health 100 +scoreboard players operation #__ ScoreToHealth -= #_ ScoreToHealth -execute if score $__ ScoreToHealth matches ..0 unless entity @s[tag=ScoreToHealth.AntiGlitch.UnsafeTick] run function score_to_health:modify +execute if score #__ ScoreToHealth matches ..0 unless entity @s[tag=ScoreToHealth.AntiGlitch.UnsafeTick] run function score_to_health:modify tag @s remove ScoreToHealth.AntiGlitch.UnsafeTick -execute if score $__ ScoreToHealth matches 1.. run function score_to_health:anti_glitch/protect +execute if score #__ ScoreToHealth matches 1.. run function score_to_health:anti_glitch/protect diff --git a/ScoreToHealth/data/score_to_health/functions/modify.mcfunction b/ScoreToHealth/data/score_to_health/functions/modify.mcfunction index 6b7069ee0..cf237626e 100644 --- a/ScoreToHealth/data/score_to_health/functions/modify.mcfunction +++ b/ScoreToHealth/data/score_to_health/functions/modify.mcfunction @@ -14,101 +14,101 @@ execute if entity @s[tag=ScoreToHealth.AntiGlitch.Protected] run function score_to_health:anti_glitch/modify -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -scoreboard players operation @s ScoreToHealth < $_ ScoreToHealth +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +scoreboard players operation @s ScoreToHealth < #_ ScoreToHealth attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-17 "ScoreToHealth" -838.8607 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" -419.4304 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" 419.4304 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" -419.4304 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-16 "ScoreToHealth" 419.4304 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" -209.7152 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" 209.7152 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" -209.7152 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-15 "ScoreToHealth" 209.7152 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" -104.8576 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" 104.8576 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" -104.8576 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-14 "ScoreToHealth" 104.8576 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" -52.4288 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" 52.4288 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" -52.4288 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-13 "ScoreToHealth" 52.4288 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" -26.2144 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" 26.2144 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" -26.2144 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-12 "ScoreToHealth" 26.2144 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" -13.1072 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" 13.1072 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" -13.1072 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-11 "ScoreToHealth" 13.1072 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" -6.5536 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" 6.5536 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" -6.5536 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-10 "ScoreToHealth" 6.5536 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" -3.2768 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" 3.2768 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" -3.2768 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0F "ScoreToHealth" 3.2768 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" -1.6384 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" 1.6384 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" -1.6384 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0E "ScoreToHealth" 1.6384 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" -0.8192 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" 0.8192 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" -0.8192 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0D "ScoreToHealth" 0.8192 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" -0.4096 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" 0.4096 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" -0.4096 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0C "ScoreToHealth" 0.4096 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" -0.2048 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" 0.2048 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" -0.2048 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0B "ScoreToHealth" 0.2048 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" -0.1024 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" 0.1024 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" -0.1024 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-0A "ScoreToHealth" 0.1024 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" -0.0512 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" 0.0512 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" -0.0512 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-09 "ScoreToHealth" 0.0512 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" -0.0256 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" 0.0256 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" -0.0256 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-08 "ScoreToHealth" 0.0256 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" -0.0128 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" 0.0128 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" -0.0128 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-07 "ScoreToHealth" 0.0128 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" -0.0064 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" 0.0064 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" -0.0064 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-06 "ScoreToHealth" 0.0064 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" -0.0032 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" 0.0032 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" -0.0032 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-05 "ScoreToHealth" 0.0032 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" -0.0016 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" 0.0016 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" -0.0016 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-04 "ScoreToHealth" 0.0016 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" -0.0008 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" 0.0008 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" -0.0008 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-03 "ScoreToHealth" 0.0008 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" -0.0004 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" 0.0004 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" -0.0004 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-02 "ScoreToHealth" 0.0004 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" -0.0002 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" 0.0002 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" -0.0002 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-01 "ScoreToHealth" 0.0002 add -execute store result score $_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 -execute if score @s ScoreToHealth <= $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" -0.0001 add -execute if score @s ScoreToHealth > $_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" 0.0001 add +execute store result score #_ ScoreToHealth run attribute @s minecraft:generic.max_health get 100 +execute if score @s ScoreToHealth <= #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" -0.0001 add +execute if score @s ScoreToHealth > #_ ScoreToHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0001-00 "ScoreToHealth" 0.0001 add effect give @s minecraft:instant_health 1 252 true tag @s add ScoreToHealth.Modified diff --git a/ScoreToHealth/data/score_to_health/functions/modify_max_health.mcfunction b/ScoreToHealth/data/score_to_health/functions/modify_max_health.mcfunction index 28e9e3a44..e4d02b362 100644 --- a/ScoreToHealth/data/score_to_health/functions/modify_max_health.mcfunction +++ b/ScoreToHealth/data/score_to_health/functions/modify_max_health.mcfunction @@ -37,152 +37,152 @@ attribute @s minecraft:generic.max_health modifier remove bab7cdc2-fb6a-47f6-000 attribute @s minecraft:generic.max_health modifier remove bab7cdc2-fb6a-47f6-0002-01 attribute @s minecraft:generic.max_health modifier remove bab7cdc2-fb6a-47f6-0002-00 -execute store result score $_ ScoreToMaxHealth run attribute @s generic.max_health base get 10000 - -scoreboard players operation $__ ScoreToMaxHealth = $_ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-17 "ScoreToMaxHealth" -838.8607 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 8388607 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-17 "ScoreToMaxHealth" 838.8607 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 8388607 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-16 "ScoreToMaxHealth" -419.4304 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 4194304 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-16 "ScoreToMaxHealth" 419.4304 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 4194304 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-15 "ScoreToMaxHealth" -209.7152 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 2097152 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-15 "ScoreToMaxHealth" 209.7152 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 2097152 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-14 "ScoreToMaxHealth" -104.8576 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 1048576 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-14 "ScoreToMaxHealth" 104.8576 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 1048576 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-13 "ScoreToMaxHealth" -52.4288 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 524288 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-13 "ScoreToMaxHealth" 52.4288 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 524288 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-12 "ScoreToMaxHealth" -26.2144 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 262144 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-12 "ScoreToMaxHealth" 26.2144 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 262144 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-11 "ScoreToMaxHealth" -13.1072 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 131072 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-11 "ScoreToMaxHealth" 13.1072 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 131072 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-10 "ScoreToMaxHealth" -6.5536 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 65536 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-10 "ScoreToMaxHealth" 6.5536 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 65536 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0F "ScoreToMaxHealth" -3.2768 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 32768 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0F "ScoreToMaxHealth" 3.2768 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 32768 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0E "ScoreToMaxHealth" -1.6384 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 16384 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0E "ScoreToMaxHealth" 1.6384 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 16384 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0D "ScoreToMaxHealth" -0.8192 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 8192 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0D "ScoreToMaxHealth" 0.8192 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 8192 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0C "ScoreToMaxHealth" -0.4096 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 4096 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0C "ScoreToMaxHealth" 0.4096 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 4096 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0B "ScoreToMaxHealth" -0.2048 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 2048 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0B "ScoreToMaxHealth" 0.2048 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 2048 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0A "ScoreToMaxHealth" -0.1024 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 1024 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0A "ScoreToMaxHealth" 0.1024 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 1024 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-09 "ScoreToMaxHealth" -0.0512 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0512 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-09 "ScoreToMaxHealth" 0.0512 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0512 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-08 "ScoreToMaxHealth" -0.0256 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0256 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-08 "ScoreToMaxHealth" 0.0256 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0256 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-07 "ScoreToMaxHealth" -0.0128 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0128 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-07 "ScoreToMaxHealth" 0.0128 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0128 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-06 "ScoreToMaxHealth" -0.0064 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0064 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-06 "ScoreToMaxHealth" 0.0064 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0064 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-05 "ScoreToMaxHealth" -0.0032 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0032 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-05 "ScoreToMaxHealth" 0.0032 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0032 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-04 "ScoreToMaxHealth" -0.0016 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0016 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-04 "ScoreToMaxHealth" 0.0016 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0016 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-03 "ScoreToMaxHealth" -0.0008 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0008 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-03 "ScoreToMaxHealth" 0.0008 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0008 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-02 "ScoreToMaxHealth" -0.0004 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0004 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-02 "ScoreToMaxHealth" 0.0004 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0004 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-01 "ScoreToMaxHealth" -0.0002 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0002 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-01 "ScoreToMaxHealth" 0.0002 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0002 -scoreboard players operation $_ ScoreToMaxHealth = $__ ScoreToMaxHealth - -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-00 "ScoreToMaxHealth" -0.0001 add -execute if score @s ScoreToMaxHealth <= $_ ScoreToMaxHealth run scoreboard players remove $__ ScoreToMaxHealth 0001 -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-00 "ScoreToMaxHealth" 0.0001 add -execute if score @s ScoreToMaxHealth > $_ ScoreToMaxHealth run scoreboard players add $__ ScoreToMaxHealth 0001 +execute store result score #_ ScoreToMaxHealth run attribute @s generic.max_health base get 10000 + +scoreboard players operation #__ ScoreToMaxHealth = #_ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-17 "ScoreToMaxHealth" -838.8607 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 8388607 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-17 "ScoreToMaxHealth" 838.8607 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 8388607 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-16 "ScoreToMaxHealth" -419.4304 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 4194304 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-16 "ScoreToMaxHealth" 419.4304 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 4194304 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-15 "ScoreToMaxHealth" -209.7152 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 2097152 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-15 "ScoreToMaxHealth" 209.7152 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 2097152 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-14 "ScoreToMaxHealth" -104.8576 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 1048576 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-14 "ScoreToMaxHealth" 104.8576 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 1048576 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-13 "ScoreToMaxHealth" -52.4288 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 524288 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-13 "ScoreToMaxHealth" 52.4288 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 524288 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-12 "ScoreToMaxHealth" -26.2144 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 262144 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-12 "ScoreToMaxHealth" 26.2144 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 262144 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-11 "ScoreToMaxHealth" -13.1072 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 131072 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-11 "ScoreToMaxHealth" 13.1072 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 131072 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-10 "ScoreToMaxHealth" -6.5536 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 65536 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-10 "ScoreToMaxHealth" 6.5536 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 65536 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0F "ScoreToMaxHealth" -3.2768 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 32768 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0F "ScoreToMaxHealth" 3.2768 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 32768 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0E "ScoreToMaxHealth" -1.6384 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 16384 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0E "ScoreToMaxHealth" 1.6384 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 16384 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0D "ScoreToMaxHealth" -0.8192 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 8192 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0D "ScoreToMaxHealth" 0.8192 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 8192 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0C "ScoreToMaxHealth" -0.4096 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 4096 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0C "ScoreToMaxHealth" 0.4096 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 4096 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0B "ScoreToMaxHealth" -0.2048 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 2048 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0B "ScoreToMaxHealth" 0.2048 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 2048 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0A "ScoreToMaxHealth" -0.1024 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 1024 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-0A "ScoreToMaxHealth" 0.1024 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 1024 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-09 "ScoreToMaxHealth" -0.0512 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0512 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-09 "ScoreToMaxHealth" 0.0512 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0512 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-08 "ScoreToMaxHealth" -0.0256 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0256 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-08 "ScoreToMaxHealth" 0.0256 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0256 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-07 "ScoreToMaxHealth" -0.0128 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0128 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-07 "ScoreToMaxHealth" 0.0128 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0128 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-06 "ScoreToMaxHealth" -0.0064 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0064 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-06 "ScoreToMaxHealth" 0.0064 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0064 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-05 "ScoreToMaxHealth" -0.0032 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0032 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-05 "ScoreToMaxHealth" 0.0032 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0032 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-04 "ScoreToMaxHealth" -0.0016 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0016 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-04 "ScoreToMaxHealth" 0.0016 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0016 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-03 "ScoreToMaxHealth" -0.0008 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0008 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-03 "ScoreToMaxHealth" 0.0008 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0008 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-02 "ScoreToMaxHealth" -0.0004 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0004 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-02 "ScoreToMaxHealth" 0.0004 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0004 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-01 "ScoreToMaxHealth" -0.0002 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0002 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-01 "ScoreToMaxHealth" 0.0002 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0002 +scoreboard players operation #_ ScoreToMaxHealth = #__ ScoreToMaxHealth + +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-00 "ScoreToMaxHealth" -0.0001 add +execute if score @s ScoreToMaxHealth <= #_ ScoreToMaxHealth run scoreboard players remove #__ ScoreToMaxHealth 0001 +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run attribute @s minecraft:generic.max_health modifier add bab7cdc2-fb6a-47f6-0002-00 "ScoreToMaxHealth" 0.0001 add +execute if score @s ScoreToMaxHealth > #_ ScoreToMaxHealth run scoreboard players add #__ ScoreToMaxHealth 0001 effect give @s minecraft:instant_health 1 252 true scoreboard players operation @s STMHBackup = @s ScoreToMaxHealth diff --git a/TheSkyBlessing/data/api/functions/damage/_index.d.mcfunction b/TheSkyBlessing/data/api/functions/damage/_index.d.mcfunction index b7b94245a..a3a111344 100644 --- a/TheSkyBlessing/data/api/functions/damage/_index.d.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/_index.d.mcfunction @@ -3,14 +3,14 @@ #> 変数定義 # @within function api:damage/core/** - #declare score_holder $Damage - #declare score_holder $EPF - #declare score_holder $Health - #declare score_holder $defensePoints - #declare score_holder $toughness - #declare score_holder $Resistance - #declare score_holder $LatestModifiedUser - #declare score_holder $LatestModifiedEntity + #declare score_holder #Damage + #declare score_holder #EPF + #declare score_holder #Health + #declare score_holder #defensePoints + #declare score_holder #toughness + #declare score_holder #Resistance + #declare score_holder #LatestModifiedUser + #declare score_holder #LatestModifiedEntity #> タグ定義 # @within diff --git a/TheSkyBlessing/data/api/functions/damage/core/attack.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/attack.mcfunction index 252401bad..4524cb13f 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/attack.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/attack.mcfunction @@ -11,5 +11,5 @@ # Mobに適用 function api:damage/core/health_subtract/ # リセット - scoreboard players reset $Health Temporary - scoreboard players reset $Damage Temporary \ No newline at end of file + scoreboard players reset #Health Temporary + scoreboard players reset #Damage Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/calc/.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/calc/.mcfunction index 67048d4ea..20fadfa77 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/calc/.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/calc/.mcfunction @@ -6,26 +6,26 @@ #> Temp # @private - #declare score_holder $isDefenseCalcSkip + #declare score_holder #isDefenseCalcSkip # 計算式: # damage * (1 - min(20, max(defensePoints / 5, defensePoints - damage / (2 + toughness / 4))) / 25) * (1 - min(5, resistanceLv) / 5) * (1 - (min(20, cappedEPF) / 25)) # 計算的なダメージ上限(21474.83)チェック - execute if score $Damage Temporary matches 2147483.. run scoreboard players set $Damage Temporary 2147483 + execute if score #Damage Temporary matches 2147483.. run scoreboard players set #Damage Temporary 2147483 # 防御による軽減計算部 - execute if score $defensePoints Temporary matches 0 if score $toughness Temporary matches 0 run scoreboard players set $isDefenseCalcSkip Temporary 1 - execute unless score $isDefenseCalcSkip Temporary matches 1 run function api:damage/core/calc/defense - execute if score $isDefenseCalcSkip Temporary matches 1 run scoreboard players operation $Damage Temporary *= $100 Const + execute if score #defensePoints Temporary matches 0 if score #toughness Temporary matches 0 run scoreboard players set #isDefenseCalcSkip Temporary 1 + execute unless score #isDefenseCalcSkip Temporary matches 1 run function api:damage/core/calc/defense + execute if score #isDefenseCalcSkip Temporary matches 1 run scoreboard players operation #Damage Temporary *= #100 Const # 耐性エフェクトによる軽減計算部 - execute if score $Resistance Temporary matches 1.. run function api:damage/core/calc/resistance + execute if score #Resistance Temporary matches 1.. run function api:damage/core/calc/resistance # エンチャントによる軽減計算部 - execute if score $EPF Temporary matches 1.. run function api:damage/core/calc/enchantment + execute if score #EPF Temporary matches 1.. run function api:damage/core/calc/enchantment # システム的なダメージ上限(9999.99/99999999(e4))チェック - execute if score $Damage Temporary matches 99999000.. run scoreboard players set $Damage Temporary 99999000 + execute if score #Damage Temporary matches 99999000.. run scoreboard players set #Damage Temporary 99999000 # Reset - scoreboard players reset $isDefenseCalcSkip Temporary - scoreboard players reset $defensePoints Temporary - scoreboard players reset $toughness Temporary - scoreboard players reset $EPF Temporary - scoreboard players reset $Resistance Temporary \ No newline at end of file + scoreboard players reset #isDefenseCalcSkip Temporary + scoreboard players reset #defensePoints Temporary + scoreboard players reset #toughness Temporary + scoreboard players reset #EPF Temporary + scoreboard players reset #Resistance Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/calc/defense.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/calc/defense.mcfunction index 01fc0fa0c..d1a749999 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/calc/defense.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/calc/defense.mcfunction @@ -6,56 +6,56 @@ #> Temp # @private - #declare score_holder $CalcA - #declare score_holder $CalcB - #declare score_holder $CalcB2 - #declare score_holder $CalcB3 - #declare score_holder $CalcC - #declare score_holder $CalcD - #declare score_holder $CalcE + #declare score_holder #CalcA + #declare score_holder #CalcB + #declare score_holder #CalcB2 + #declare score_holder #CalcB3 + #declare score_holder #CalcC + #declare score_holder #CalcD + #declare score_holder #CalcE -# $CalcA(e2) = $defensePoints(e2) * e2 / 5 / e2 - scoreboard players operation $CalcA Temporary = $defensePoints Temporary - scoreboard players operation $CalcA Temporary *= $20 Const - scoreboard players operation $CalcA Temporary /= $100 Const -# $CalcB3(e2) = $toughness(e2) * e2 / 4 / e2 + 2 * e2 : $damage >= 1000 * e2 -# $CalcB3(e4) = $toughness(e2) * e2 / 4 + 2 * e4 : $damage < 1000 * e2 - scoreboard players operation $CalcB3 Temporary = $toughness Temporary - scoreboard players operation $CalcB3 Temporary *= $25 Const - execute if score $Damage Temporary matches 100000.. run scoreboard players operation $CalcB3 Temporary /= $100 Const - execute if score $Damage Temporary matches 100000.. run scoreboard players operation $CalcB3 Temporary += $200 Const - execute if score $Damage Temporary matches ..099999 run scoreboard players operation $CalcB3 Temporary += $20000 Const -# $CalcB2(e2) = $damage(e2) * e2 / $CalcB3(e2) : $damage >= 1000 * e2 -# $CalcB2(e2) = $damage(e2) * e4 / $CalcB3(e4) : $damage < 1000 * e2 - scoreboard players operation $CalcB2 Temporary = $Damage Temporary - execute if score $Damage Temporary matches 100000.. run scoreboard players operation $CalcB2 Temporary *= $100 Const - execute if score $Damage Temporary matches ..099999 run scoreboard players operation $CalcB2 Temporary *= $10000 Const - scoreboard players operation $CalcB2 Temporary /= $CalcB3 Temporary -# $CalcB(e2) = $defensePoints(e2) - $CalcB2(e2) - scoreboard players operation $CalcB Temporary = $defensePoints Temporary - scoreboard players operation $CalcB Temporary -= $CalcB2 Temporary -# $CalcC(e4) = min(max($CalcA(e2), $CalcB(e2)), 20 * e2) * e2 / 25 - scoreboard players operation $CalcC Temporary = $CalcA Temporary - scoreboard players operation $CalcC Temporary > $CalcB Temporary - scoreboard players operation $CalcC Temporary < $2000 Const - scoreboard players operation $CalcC Temporary *= $4 Const -# $CalcD(e3) = (1 * e4 - $CalcC(e4)) / e1 : $damage >= 1000 * e2 -# $CalcD(e4) = (1 * e4 - $CalcC(e4)) : $damage < 1000 * e2 - scoreboard players operation $CalcD Temporary = $10000 Const - scoreboard players operation $CalcD Temporary -= $CalcC Temporary - execute if score $Damage Temporary matches 100000.. run scoreboard players operation $CalcD Temporary /= $10 Const -# $damage(e4) = $damage(e2) * $CalcD(e3) / e1 : $damage >= 1000 * e2 -# $damage(e4) = $damage(e2) * $CalcD(e4) / e2 : $damage < 1000 * e2 - scoreboard players operation $CalcE Temporary = $Damage Temporary - scoreboard players operation $CalcE Temporary *= $CalcD Temporary - execute if score $Damage Temporary matches 100000.. run scoreboard players operation $CalcE Temporary /= $10 Const - execute if score $Damage Temporary matches ..099999 run scoreboard players operation $CalcE Temporary /= $100 Const - scoreboard players operation $Damage Temporary = $CalcE Temporary +# #CalcA(e2) = #defensePoints(e2) * e2 / 5 / e2 + scoreboard players operation #CalcA Temporary = #defensePoints Temporary + scoreboard players operation #CalcA Temporary *= #20 Const + scoreboard players operation #CalcA Temporary /= #100 Const +# #CalcB3(e2) = #toughness(e2) * e2 / 4 / e2 + 2 * e2 : #damage >= 1000 * e2 +# #CalcB3(e4) = #toughness(e2) * e2 / 4 + 2 * e4 : #damage < 1000 * e2 + scoreboard players operation #CalcB3 Temporary = #toughness Temporary + scoreboard players operation #CalcB3 Temporary *= #25 Const + execute if score #Damage Temporary matches 100000.. run scoreboard players operation #CalcB3 Temporary /= #100 Const + execute if score #Damage Temporary matches 100000.. run scoreboard players operation #CalcB3 Temporary += #200 Const + execute if score #Damage Temporary matches ..099999 run scoreboard players operation #CalcB3 Temporary += #20000 Const +# #CalcB2(e2) = #damage(e2) * e2 / #CalcB3(e2) : #damage >= 1000 * e2 +# #CalcB2(e2) = #damage(e2) * e4 / #CalcB3(e4) : #damage < 1000 * e2 + scoreboard players operation #CalcB2 Temporary = #Damage Temporary + execute if score #Damage Temporary matches 100000.. run scoreboard players operation #CalcB2 Temporary *= #100 Const + execute if score #Damage Temporary matches ..099999 run scoreboard players operation #CalcB2 Temporary *= #10000 Const + scoreboard players operation #CalcB2 Temporary /= #CalcB3 Temporary +# #CalcB(e2) = #defensePoints(e2) - #CalcB2(e2) + scoreboard players operation #CalcB Temporary = #defensePoints Temporary + scoreboard players operation #CalcB Temporary -= #CalcB2 Temporary +# #CalcC(e4) = min(max(#CalcA(e2), #CalcB(e2)), 20 * e2) * e2 / 25 + scoreboard players operation #CalcC Temporary = #CalcA Temporary + scoreboard players operation #CalcC Temporary > #CalcB Temporary + scoreboard players operation #CalcC Temporary < #2000 Const + scoreboard players operation #CalcC Temporary *= #4 Const +# #CalcD(e3) = (1 * e4 - #CalcC(e4)) / e1 : #damage >= 1000 * e2 +# #CalcD(e4) = (1 * e4 - #CalcC(e4)) : #damage < 1000 * e2 + scoreboard players operation #CalcD Temporary = #10000 Const + scoreboard players operation #CalcD Temporary -= #CalcC Temporary + execute if score #Damage Temporary matches 100000.. run scoreboard players operation #CalcD Temporary /= #10 Const +# #damage(e4) = #damage(e2) * #CalcD(e3) / e1 : #damage >= 1000 * e2 +# #damage(e4) = #damage(e2) * #CalcD(e4) / e2 : #damage < 1000 * e2 + scoreboard players operation #CalcE Temporary = #Damage Temporary + scoreboard players operation #CalcE Temporary *= #CalcD Temporary + execute if score #Damage Temporary matches 100000.. run scoreboard players operation #CalcE Temporary /= #10 Const + execute if score #Damage Temporary matches ..099999 run scoreboard players operation #CalcE Temporary /= #100 Const + scoreboard players operation #Damage Temporary = #CalcE Temporary # リセット - scoreboard players reset $CalcA Temporary - scoreboard players reset $CalcB Temporary - scoreboard players reset $CalcB2 Temporary - scoreboard players reset $CalcB3 Temporary - scoreboard players reset $CalcC Temporary - scoreboard players reset $CalcD Temporary - scoreboard players reset $CalcE Temporary \ No newline at end of file + scoreboard players reset #CalcA Temporary + scoreboard players reset #CalcB Temporary + scoreboard players reset #CalcB2 Temporary + scoreboard players reset #CalcB3 Temporary + scoreboard players reset #CalcC Temporary + scoreboard players reset #CalcD Temporary + scoreboard players reset #CalcE Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/calc/enchantment.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/calc/enchantment.mcfunction index dbef4f293..227c54a28 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/calc/enchantment.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/calc/enchantment.mcfunction @@ -6,16 +6,16 @@ #> Temp # @private - #declare score_holder $Mul + #declare score_holder #Mul -# $EPF(e2) = min(20, $EPF(e0)) * e2 / 50 - scoreboard players operation $EPF Temporary < $20 Const - scoreboard players operation $EPF Temporary *= $2 Const -# $CalcF(e2) = 1 * e2 - $EPF(e2) - scoreboard players operation $Mul Temporary = $100 Const - scoreboard players operation $Mul Temporary -= $EPF Temporary -# $damage(e2) = $damage(e2) * $CalcF(e2) / e2 - scoreboard players operation $Damage Temporary *= $Mul Temporary - scoreboard players operation $Damage Temporary /= $100 Const +# #EPF(e2) = min(20, #EPF(e0)) * e2 / 50 + scoreboard players operation #EPF Temporary < #20 Const + scoreboard players operation #EPF Temporary *= #2 Const +# #CalcF(e2) = 1 * e2 - #EPF(e2) + scoreboard players operation #Mul Temporary = #100 Const + scoreboard players operation #Mul Temporary -= #EPF Temporary +# #damage(e2) = #damage(e2) * #CalcF(e2) / e2 + scoreboard players operation #Damage Temporary *= #Mul Temporary + scoreboard players operation #Damage Temporary /= #100 Const # リセット - scoreboard players reset $Mul Temporary \ No newline at end of file + scoreboard players reset #Mul Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/calc/resistance.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/calc/resistance.mcfunction index 63d41ee49..38c4ec503 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/calc/resistance.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/calc/resistance.mcfunction @@ -6,15 +6,15 @@ #> Temp # @private - #declare score_holder $Mul + #declare score_holder #Mul -# $Resistance(e1) *= min(5, $Resistance(e0)) * e1 / 5 - scoreboard players operation $Resistance Temporary < $10 Const -# $Mul(e1) = 1 * e1 - $Resistance(e1) - scoreboard players operation $Mul Temporary = $10 Const - scoreboard players operation $Mul Temporary -= $Resistance Temporary -# $damage(e2) = $damage(e2) * $Mul(e1) / e1 - scoreboard players operation $Damage Temporary *= $Mul Temporary - scoreboard players operation $Damage Temporary /= $10 Const +# #Resistance(e1) *= min(5, #Resistance(e0)) * e1 / 5 + scoreboard players operation #Resistance Temporary < #10 Const +# #Mul(e1) = 1 * e1 - #Resistance(e1) + scoreboard players operation #Mul Temporary = #10 Const + scoreboard players operation #Mul Temporary -= #Resistance Temporary +# #damage(e2) = #damage(e2) * #Mul(e1) / e1 + scoreboard players operation #Damage Temporary *= #Mul Temporary + scoreboard players operation #Damage Temporary /= #10 Const # リセット - scoreboard players reset $Mul Temporary \ No newline at end of file + scoreboard players reset #Mul Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/get_epf/.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/get_epf/.mcfunction index 30e543cd1..435b6506b 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/get_epf/.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/get_epf/.mcfunction @@ -14,7 +14,7 @@ # 総和を取る data modify storage lib: Array append from storage api: Enchantments[{id:"minecraft:protection"}].lvl function lib:array/math/sum - execute store result score $EPF Temporary run data get storage lib: SumResult + execute store result score #EPF Temporary run data get storage lib: SumResult # セッション閉じる function lib:array/session/close # protection以外のなんらかのエンチャントで軽減できる場合の計算処理 diff --git a/TheSkyBlessing/data/api/functions/damage/core/get_epf/get_non-protection_epf.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/get_epf/get_non-protection_epf.mcfunction index 218ca4a4c..e64b0e4a2 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/get_epf/get_non-protection_epf.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/get_epf/get_non-protection_epf.mcfunction @@ -6,8 +6,8 @@ #> Temp # @private - #declare score_holder $Temp - #declare score_holder $TypeModifier + #declare score_holder #Temp + #declare score_holder #TypeModifier # ReduceEnchantmentIdのデータ正規化 execute if data storage lib: Argument.ReduceEnchantment.id run data modify storage lib: ReduceEnchantmentID set from storage lib: Argument.ReduceEnchantment.id @@ -33,20 +33,20 @@ execute unless data storage lib: Argument.ReduceEnchantment.id run data modify s data remove storage lib: Temp function lib:array/math/sum # 計算結果を取得する - execute store result score $Temp Temporary run data get storage lib: SumResult + execute store result score #Temp Temporary run data get storage lib: SumResult # セッションを閉じる function lib:array/session/close # エンチャント係数を取得する - execute if data storage lib: Argument.ReduceEnchantment.modifier store result score $TypeModifier Temporary run data get storage lib: Argument.ReduceEnchantment.modifier - execute unless score $TypeModifier Temporary matches -2147483648.. if data storage lib: {ReduceEnchantmentID: "minecraft:fire_protection"} run scoreboard players set $TypeModifier Temporary 2 - execute unless score $TypeModifier Temporary matches -2147483648.. if data storage lib: {ReduceEnchantmentID: "minecraft:blast_protection"} run scoreboard players set $TypeModifier Temporary 2 - execute unless score $TypeModifier Temporary matches -2147483648.. if data storage lib: {ReduceEnchantmentID:"minecraft:projectile_protection"} run scoreboard players set $TypeModifier Temporary 2 - execute unless score $TypeModifier Temporary matches -2147483648.. if data storage lib: {ReduceEnchantmentID: "minecraft:feather_falling"} run scoreboard players set $TypeModifier Temporary 3 - execute unless score $TypeModifier Temporary matches -2147483648.. run scoreboard players set $TypeModifier Temporary 1 + execute if data storage lib: Argument.ReduceEnchantment.modifier store result score #TypeModifier Temporary run data get storage lib: Argument.ReduceEnchantment.modifier + execute unless score #TypeModifier Temporary matches -2147483648.. if data storage lib: {ReduceEnchantmentID: "minecraft:fire_protection"} run scoreboard players set #TypeModifier Temporary 2 + execute unless score #TypeModifier Temporary matches -2147483648.. if data storage lib: {ReduceEnchantmentID: "minecraft:blast_protection"} run scoreboard players set #TypeModifier Temporary 2 + execute unless score #TypeModifier Temporary matches -2147483648.. if data storage lib: {ReduceEnchantmentID:"minecraft:projectile_protection"} run scoreboard players set #TypeModifier Temporary 2 + execute unless score #TypeModifier Temporary matches -2147483648.. if data storage lib: {ReduceEnchantmentID: "minecraft:feather_falling"} run scoreboard players set #TypeModifier Temporary 3 + execute unless score #TypeModifier Temporary matches -2147483648.. run scoreboard players set #TypeModifier Temporary 1 # エンチャント係数を掛ける - scoreboard players operation $Temp Temporary *= $TypeModifier Temporary + scoreboard players operation #Temp Temporary *= #TypeModifier Temporary # EPFに加算する - scoreboard players operation $EPF Temporary += $Temp Temporary + scoreboard players operation #EPF Temporary += #Temp Temporary # リセット - scoreboard players reset $Temp Temporary - scoreboard players reset $TypeModifier Temporary + scoreboard players reset #Temp Temporary + scoreboard players reset #TypeModifier Temporary diff --git a/TheSkyBlessing/data/api/functions/damage/core/get_status/.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/get_status/.mcfunction index 59baa3184..e93f9b928 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/get_status/.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/get_status/.mcfunction @@ -5,20 +5,20 @@ # @within function api:damage/core/attack # 体力 - execute if entity @s[type=!player] store result score $Health Temporary run scoreboard players get @s MobHealth - execute if entity @s[type=!player] run scoreboard players operation $Health Temporary *= $10 Const + execute if entity @s[type=!player] store result score #Health Temporary run scoreboard players get @s MobHealth + execute if entity @s[type=!player] run scoreboard players operation #Health Temporary *= #10 Const # ダメージ execute if data storage api: Argument{BypassModifier:false} run function api:damage/core/get_status/modify_and_get_damage - execute if data storage api: Argument{BypassModifier: true} store result score $Damage Temporary run data get storage api: Argument.Damage 100 + execute if data storage api: Argument{BypassModifier: true} store result score #Damage Temporary run data get storage api: Argument.Damage 100 # 防御力 - execute if data storage api: Argument{BypassArmorDefense:false} store result score $defensePoints Temporary run attribute @s generic.armor get 100 - execute if data storage api: Argument{BypassArmorDefense: true} run scoreboard players set $defensePoints Temporary 0 + execute if data storage api: Argument{BypassArmorDefense:false} store result score #defensePoints Temporary run attribute @s generic.armor get 100 + execute if data storage api: Argument{BypassArmorDefense: true} run scoreboard players set #defensePoints Temporary 0 # 防具強度 - execute if data storage api: Argument{BypassToughness:false} store result score $toughness Temporary run attribute @s generic.armor_toughness get 100 - execute if data storage api: Argument{BypassToughness: true} run scoreboard players set $toughness Temporary 0 + execute if data storage api: Argument{BypassToughness:false} store result score #toughness Temporary run attribute @s generic.armor_toughness get 100 + execute if data storage api: Argument{BypassToughness: true} run scoreboard players set #toughness Temporary 0 # エンチャント値の取得 execute if data storage api: Argument{BypassEnchantments:false} run function api:damage/core/get_epf/ - execute if data storage api: Argument{BypassEnchantments: true} run scoreboard players set $EPF Temporary 0 + execute if data storage api: Argument{BypassEnchantments: true} run scoreboard players set #EPF Temporary 0 # 耐性エフェクト execute if data storage api: Argument{BypassResistance:false} run function api:damage/core/get_status/get_resistance_lv - execute if data storage api: Argument{BypassResistance: true} run scoreboard players set $Resistance Temporary 0 \ No newline at end of file + execute if data storage api: Argument{BypassResistance: true} run scoreboard players set #Resistance Temporary 0 \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/get_status/get_resistance_lv.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/get_status/get_resistance_lv.mcfunction index 3bc31b5ad..9b80bbb1b 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/get_status/get_resistance_lv.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/get_status/get_resistance_lv.mcfunction @@ -8,12 +8,12 @@ execute if entity @s[type=player] run function api:data_get/active_effects execute if entity @s[type=!player] run data modify storage api: active_effects set from entity @s active_effects # 耐性lv(0-indexed)の取得 - execute store result score $Resistance Temporary run data get storage api: active_effects[{id:"minecraft:resistance"}].amplifier - execute unless data storage api: active_effects[{id:"minecraft:resistance"}].amplifier run scoreboard players set $Resistance Temporary -1 + execute store result score #Resistance Temporary run data get storage api: active_effects[{id:"minecraft:resistance"}].amplifier + execute unless data storage api: active_effects[{id:"minecraft:resistance"}].amplifier run scoreboard players set #Resistance Temporary -1 # 127lv(0-indexed)の場合、lib:damageの演出用に付与されているものなので、HiddenEffectを再度参照する - execute if score $Resistance Temporary matches 127 unless data storage api: active_effects[{id:"minecraft:resistance"}].hidden_effect run scoreboard players set $Resistance Temporary -1 - execute if score $Resistance Temporary matches 127 store result score $Resistance Temporary run data get storage api: active_effects[{id:"minecraft:resistance"}].hidden_effect.amplifier + execute if score #Resistance Temporary matches 127 unless data storage api: active_effects[{id:"minecraft:resistance"}].hidden_effect run scoreboard players set #Resistance Temporary -1 + execute if score #Resistance Temporary matches 127 store result score #Resistance Temporary run data get storage api: active_effects[{id:"minecraft:resistance"}].hidden_effect.amplifier # 0-indexed -> 1-indexed - scoreboard players add $Resistance Temporary 1 + scoreboard players add #Resistance Temporary 1 # リセット data remove storage api: active_effects \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/get_status/modify_and_get_damage.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/get_status/modify_and_get_damage.mcfunction index 8d74d523f..e6a91c6a6 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/get_status/modify_and_get_damage.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/get_status/modify_and_get_damage.mcfunction @@ -8,6 +8,6 @@ function oh_my_dat:please data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.Defense function api:damage/core/modify_damage - execute store result score $Damage Temporary run data get storage api: ModifiedDamage 100 + execute store result score #Damage Temporary run data get storage api: ModifiedDamage 100 # リセット data remove storage api: ModifiedDamage \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player.mcfunction index f28445fd0..14ee8393c 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/health_subtract/non-player.mcfunction @@ -6,41 +6,41 @@ #> Val # @private - #declare score_holder $Fluctuation + #declare score_holder #Fluctuation #declare tag UUIDAttacker # ダメージ表示 - scoreboard players operation $Fluctuation Lib = $Damage Temporary - scoreboard players operation $Fluctuation Lib /= $-100 Const + scoreboard players operation #Fluctuation Lib = #Damage Temporary + scoreboard players operation #Fluctuation Lib /= #-100 Const execute at @s run function lib:status_log/show_health # ダメージを一桁下げる - scoreboard players operation $Damage Temporary /= $10 Const + scoreboard players operation #Damage Temporary /= #10 Const # MobのHealthよりダメージが高い場合Healthに設定 - scoreboard players operation $Damage Temporary < $Health Temporary + scoreboard players operation #Damage Temporary < #Health Temporary # 減算 - scoreboard players operation $Health Temporary -= $Damage Temporary + scoreboard players operation #Health Temporary -= #Damage Temporary # ノックバックを無効に attribute @s minecraft:generic.knockback_resistance modifier add 3-0-1-0-100000001 "Temp_Resist" 1 add # 敵対させるためのダメージ tag @s add Attacked - execute if score $Health Temporary matches 1.. as @a if score @s UserID = $LatestModifiedUser UserID run tag @s add UUIDAttacker - execute if score $Health Temporary matches 1.. run damage @s 0 minecraft:player_attack by @p[tag=UUIDAttacker] + execute if score #Health Temporary matches 1.. as @a if score @s UserID = #LatestModifiedUser UserID run tag @s add UUIDAttacker + execute if score #Health Temporary matches 1.. run damage @s 0 minecraft:player_attack by @p[tag=UUIDAttacker] tag @s remove Attacked # ノックバック無効を削除 attribute @s minecraft:generic.knockback_resistance modifier remove 3-0-1-0-100000001 # 代入 / kill - execute if score $Health Temporary matches 1.. run scoreboard players operation $Health Temporary /= $10 Const - execute if score $Health Temporary matches 1.. run scoreboard players operation @s MobHealth = $Health Temporary - execute if score $Health Temporary matches ..0 as @a if score @s UserID = $LatestModifiedUser UserID run tag @s add Killer - execute if score $Health Temporary matches ..0 as @p[tag=Killer] run advancement grant @s only core:handler/killed + execute if score #Health Temporary matches 1.. run scoreboard players operation #Health Temporary /= #10 Const + execute if score #Health Temporary matches 1.. run scoreboard players operation @s MobHealth = #Health Temporary + execute if score #Health Temporary matches ..0 as @a if score @s UserID = #LatestModifiedUser UserID run tag @s add Killer + execute if score #Health Temporary matches ..0 as @p[tag=Killer] run advancement grant @s only core:handler/killed tag @s add Attacked - execute if score $Health Temporary matches ..0 run damage @s 9999 minecraft:player_attack by @p[tag=Killer] + execute if score #Health Temporary matches ..0 run damage @s 9999 minecraft:player_attack by @p[tag=Killer] tag @s remove Attacked - execute if score $Health Temporary matches ..0 run kill @s + execute if score #Health Temporary matches ..0 run kill @s # リセット tag @a[tag=UUIDAttacker] remove UUIDAttacker # 演出 - execute if score $Health Temporary matches 1.. if entity @s[type=#lib:undead] run summon area_effect_cloud ~ ~ ~ {Duration:14,Age:4,effects:[{id:"resistance",amplifier:127b,duration:1,show_particles:0b},{id:"instant_health",amplifier:0b,duration:1,show_particles:0b}]} - execute if score $Health Temporary matches 1.. if entity @s[type=!#lib:undead] run summon area_effect_cloud ~ ~ ~ {Duration:14,Age:4,effects:[{id:"resistance",amplifier:127b,duration:1,show_particles:0b},{id:"instant_damage",amplifier:0b,duration:1,show_particles:0b}]} + execute if score #Health Temporary matches 1.. if entity @s[type=#lib:undead] run summon area_effect_cloud ~ ~ ~ {Duration:14,Age:4,effects:[{id:"resistance",amplifier:127b,duration:1,show_particles:0b},{id:"instant_health",amplifier:0b,duration:1,show_particles:0b}]} + execute if score #Health Temporary matches 1.. if entity @s[type=!#lib:undead] run summon area_effect_cloud ~ ~ ~ {Duration:14,Age:4,effects:[{id:"resistance",amplifier:127b,duration:1,show_particles:0b},{id:"instant_damage",amplifier:0b,duration:1,show_particles:0b}]} # onAttackのトリガー - execute if score $Health Temporary matches 1.. run function api:damage/core/trigger_on_attack \ No newline at end of file + execute if score #Health Temporary matches 1.. run function api:damage/core/trigger_on_attack \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/health_subtract/player.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/health_subtract/player.mcfunction index 2b20f063c..5bf389e37 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/health_subtract/player.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/health_subtract/player.mcfunction @@ -5,8 +5,8 @@ # @within function api:damage/core/health_subtract/ # 引数として代入 - execute store result storage api: Argument.Fluctuation double -0.0001 run scoreboard players get $Damage Temporary - execute store result storage api: Argument.Attacker int 1 run scoreboard players get $LatestModifiedEntity MobUUID + execute store result storage api: Argument.Fluctuation double -0.0001 run scoreboard players get #Damage Temporary + execute store result storage api: Argument.Attacker int 1 run scoreboard players get #LatestModifiedEntity MobUUID data modify storage api: Argument.AttackType set from storage api: Argument.AttackType data modify storage api: Argument.ElementType set from storage api: Argument.ElementType # 体力の減少を反映させる diff --git a/TheSkyBlessing/data/api/functions/damage/core/modify/non-player.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/modify/non-player.mcfunction index c0ac5c1bd..b9118c618 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/modify/non-player.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/modify/non-player.mcfunction @@ -5,4 +5,4 @@ # @within function api:damage/modifier* # プレイヤー情報の記録 - scoreboard players operation $LatestModifiedEntity MobUUID = @s MobUUID \ No newline at end of file + scoreboard players operation #LatestModifiedEntity MobUUID = @s MobUUID \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/modify/player.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/modify/player.mcfunction index 40c25f0c8..b9bdb603b 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/modify/player.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/modify/player.mcfunction @@ -5,7 +5,7 @@ # @within function api:damage/modifier* # プレイヤー情報の記録 - scoreboard players operation $LatestModifiedUser UserID = @s UserID + scoreboard players operation #LatestModifiedUser UserID = @s UserID # ダメージに補正値を掛ける execute if data storage api: Argument{BypassModifier:false} run function oh_my_dat:please execute if data storage api: Argument{BypassModifier:false} run data modify storage api: Modifiers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.Attack diff --git a/TheSkyBlessing/data/api/functions/damage/core/modify_damage.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/modify_damage.mcfunction index 6faa572d3..aac6c31ab 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/modify_damage.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/modify_damage.mcfunction @@ -8,45 +8,45 @@ #> Temp # @private - #declare score_holder $Damage - #declare score_holder $Modifier - #declare score_holder $Temp - #declare score_holder $Multiplier + #declare score_holder #Damage + #declare score_holder #Modifier + #declare score_holder #Temp + #declare score_holder #Multiplier # 必要なデータの取得と加算 # 元ダメージ - execute store result score $Damage Temporary run data get storage api: Argument.Damage 100 + execute store result score #Damage Temporary run data get storage api: Argument.Damage 100 # Base値による補正 - execute store result score $Modifier Temporary run data get storage api: Modifiers.Base 100 - execute unless data storage api: Modifiers.Base run scoreboard players set $Modifier Temporary 100 + execute store result score #Modifier Temporary run data get storage api: Modifiers.Base 100 + execute unless data storage api: Modifiers.Base run scoreboard players set #Modifier Temporary 100 # 第一属性 - execute if data storage api: Argument{AttackType:"Physical"} store result score $Temp Temporary run data get storage api: Modifiers.Physical 100 - execute if data storage api: Argument{AttackType:"Physical"} unless data storage api: Modifiers.Physical run scoreboard players set $Temp Temporary 100 - execute if data storage api: Argument{AttackType:"Magic"} store result score $Temp Temporary run data get storage api: Modifiers.Magic 100 - execute if data storage api: Argument{AttackType:"Magic"} unless data storage api: Modifiers.Magic run scoreboard players set $Temp Temporary 100 - scoreboard players operation $Multiplier Temporary = $Temp Temporary + execute if data storage api: Argument{AttackType:"Physical"} store result score #Temp Temporary run data get storage api: Modifiers.Physical 100 + execute if data storage api: Argument{AttackType:"Physical"} unless data storage api: Modifiers.Physical run scoreboard players set #Temp Temporary 100 + execute if data storage api: Argument{AttackType:"Magic"} store result score #Temp Temporary run data get storage api: Modifiers.Magic 100 + execute if data storage api: Argument{AttackType:"Magic"} unless data storage api: Modifiers.Magic run scoreboard players set #Temp Temporary 100 + scoreboard players operation #Multiplier Temporary = #Temp Temporary # 第二属性 - execute if data storage api: Argument{ElementType:"None"} run scoreboard players set $Temp Temporary 100 - execute if data storage api: Argument{ElementType:"Fire"} store result score $Temp Temporary run data get storage api: Modifiers.Fire 100 - execute if data storage api: Argument{ElementType:"Fire"} unless data storage api: Modifiers.Fire run scoreboard players set $Temp Temporary 100 - execute if data storage api: Argument{ElementType:"Water"} store result score $Temp Temporary run data get storage api: Modifiers.Water 100 - execute if data storage api: Argument{ElementType:"Water"} unless data storage api: Modifiers.Water run scoreboard players set $Temp Temporary 100 - execute if data storage api: Argument{ElementType:"Thunder"} store result score $Temp Temporary run data get storage api: Modifiers.Thunder 100 - execute if data storage api: Argument{ElementType:"Thunder"} unless data storage api: Modifiers.Thunder run scoreboard players set $Temp Temporary 100 - scoreboard players operation $Multiplier Temporary *= $Temp Temporary + execute if data storage api: Argument{ElementType:"None"} run scoreboard players set #Temp Temporary 100 + execute if data storage api: Argument{ElementType:"Fire"} store result score #Temp Temporary run data get storage api: Modifiers.Fire 100 + execute if data storage api: Argument{ElementType:"Fire"} unless data storage api: Modifiers.Fire run scoreboard players set #Temp Temporary 100 + execute if data storage api: Argument{ElementType:"Water"} store result score #Temp Temporary run data get storage api: Modifiers.Water 100 + execute if data storage api: Argument{ElementType:"Water"} unless data storage api: Modifiers.Water run scoreboard players set #Temp Temporary 100 + execute if data storage api: Argument{ElementType:"Thunder"} store result score #Temp Temporary run data get storage api: Modifiers.Thunder 100 + execute if data storage api: Argument{ElementType:"Thunder"} unless data storage api: Modifiers.Thunder run scoreboard players set #Temp Temporary 100 + scoreboard players operation #Multiplier Temporary *= #Temp Temporary # 補正値の計算 - scoreboard players operation $Modifier Temporary *= $Multiplier Temporary - scoreboard players operation $Modifier Temporary /= $10000 Const + scoreboard players operation #Modifier Temporary *= #Multiplier Temporary + scoreboard players operation #Modifier Temporary /= #10000 Const # 最低値設定 - scoreboard players operation $Modifier Temporary > $25 Const - execute if predicate api:global_vars/difficulty/min/hard run scoreboard players operation $Modifier Temporary > $10 Const + scoreboard players operation #Modifier Temporary > #25 Const + execute if predicate api:global_vars/difficulty/min/hard run scoreboard players operation #Modifier Temporary > #10 Const # 補正 - scoreboard players operation $Damage Temporary *= $Modifier Temporary + scoreboard players operation #Damage Temporary *= #Modifier Temporary # 代入 - execute store result storage api: ModifiedDamage double 0.0001 run scoreboard players get $Damage Temporary + execute store result storage api: ModifiedDamage double 0.0001 run scoreboard players get #Damage Temporary # リセット data remove storage api: Modifiers - scoreboard players reset $Multiplier Temporary - scoreboard players reset $Damage Temporary - scoreboard players reset $Modifier Temporary - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Multiplier Temporary + scoreboard players reset #Damage Temporary + scoreboard players reset #Modifier Temporary + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/reset.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/reset.mcfunction index 87360f41f..8dd7bbea7 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/reset.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/reset.mcfunction @@ -17,5 +17,5 @@ data remove storage api: Argument.BypassResistance data remove storage api: Argument.DisableParticle data remove storage api: Argument.ReduceEnchantment -scoreboard players reset $LatestModifiedUser UserID -scoreboard players reset $LatestModifiedEntity MobUUID \ No newline at end of file +scoreboard players reset #LatestModifiedUser UserID +scoreboard players reset #LatestModifiedEntity MobUUID \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/damage/core/trigger_on_attack.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/trigger_on_attack.mcfunction index e332a7e71..4fcc7e967 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/trigger_on_attack.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/trigger_on_attack.mcfunction @@ -9,7 +9,7 @@ #declare tag TargetAttacker # プレイヤー特定 - execute as @a if score @s UserID = $LatestModifiedUser UserID run tag @s add TargetAttacker + execute as @a if score @s UserID = #LatestModifiedUser UserID run tag @s add TargetAttacker # 特定用タグ tag @s add VictimFromLibrary # トリガー diff --git a/TheSkyBlessing/data/api/functions/damage/core/trigger_on_damage/.mcfunction b/TheSkyBlessing/data/api/functions/damage/core/trigger_on_damage/.mcfunction index 2584bdd02..e5e778999 100644 --- a/TheSkyBlessing/data/api/functions/damage/core/trigger_on_damage/.mcfunction +++ b/TheSkyBlessing/data/api/functions/damage/core/trigger_on_damage/.mcfunction @@ -5,7 +5,7 @@ # @within function api:damage/core/health_subtract/player # MOB特定 - execute as @e[type=!player,distance=..150] if score @s MobUUID = $LatestModifiedEntity MobUUID run tag @s add TargetAttacker + execute as @e[type=!player,distance=..150] if score @s MobUUID = #LatestModifiedEntity MobUUID run tag @s add TargetAttacker # トリガー tag @s add TriggerFlag.Damage advancement grant @s only asset_manager:artifact/damage/from_entity/ diff --git a/TheSkyBlessing/data/api/functions/data_get/abilities.mcfunction b/TheSkyBlessing/data/api/functions/data_get/abilities.mcfunction index 161111d6d..fed298e66 100644 --- a/TheSkyBlessing/data/api/functions/data_get/abilities.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/abilities.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.abilities.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.abilities.Data set from entity @s abilities + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.abilities.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.abilities.Data set from entity @s abilities # outputのstorageに移す data modify storage api: abilities set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.abilities.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/absorption_amount.mcfunction b/TheSkyBlessing/data/api/functions/data_get/absorption_amount.mcfunction index b95cddc17..841ffadcb 100644 --- a/TheSkyBlessing/data/api/functions/data_get/absorption_amount.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/absorption_amount.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.AbsorptionAmount.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.AbsorptionAmount.Data set from entity @s AbsorptionAmount + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.AbsorptionAmount.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.AbsorptionAmount.Data set from entity @s AbsorptionAmount # outputのstorageに移す data modify storage api: AbsorptionAmount set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.AbsorptionAmount.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/active_effects.mcfunction b/TheSkyBlessing/data/api/functions/data_get/active_effects.mcfunction index 8d4c8ec91..477750dfb 100644 --- a/TheSkyBlessing/data/api/functions/data_get/active_effects.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/active_effects.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.active_effects.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run function api:data_get/active_effects_fetch + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.active_effects.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run function api:data_get/active_effects_fetch # outputのstorageに移す data modify storage api: active_effects set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.active_effects.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/air.mcfunction b/TheSkyBlessing/data/api/functions/data_get/air.mcfunction index a13987205..9b47d6e66 100644 --- a/TheSkyBlessing/data/api/functions/data_get/air.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/air.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Air.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Air.Data set from entity @s Air + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Air.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Air.Data set from entity @s Air # outputのstorageに移す data modify storage api: Air set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Air.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/attributes.mcfunction b/TheSkyBlessing/data/api/functions/data_get/attributes.mcfunction index c0333a5ed..9a0e2b92a 100644 --- a/TheSkyBlessing/data/api/functions/data_get/attributes.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/attributes.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Attributes.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Attributes.Data set from entity @s Attributes + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Attributes.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Attributes.Data set from entity @s Attributes # outputのstorageに移す data modify storage api: Attributes set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Attributes.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/brain.mcfunction b/TheSkyBlessing/data/api/functions/data_get/brain.mcfunction index e2104ffe6..57a3dbed5 100644 --- a/TheSkyBlessing/data/api/functions/data_get/brain.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/brain.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Brain.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Brain.Data set from entity @s Brain + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Brain.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Brain.Data set from entity @s Brain # outputのstorageに移す data modify storage api: Brain set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Brain.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/custom_name.mcfunction b/TheSkyBlessing/data/api/functions/data_get/custom_name.mcfunction index e7f61bf78..5bf7f9053 100644 --- a/TheSkyBlessing/data/api/functions/data_get/custom_name.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/custom_name.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomName.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomName.Data set from entity @s CustomName + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomName.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomName.Data set from entity @s CustomName # outputのstorageに移す data modify storage api: CustomName set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomName.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/custom_name_visible.mcfunction b/TheSkyBlessing/data/api/functions/data_get/custom_name_visible.mcfunction index ac74ee4bf..ec9368410 100644 --- a/TheSkyBlessing/data/api/functions/data_get/custom_name_visible.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/custom_name_visible.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomNameVisible.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomNameVisible.Data set from entity @s CustomNameVisible + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomNameVisible.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomNameVisible.Data set from entity @s CustomNameVisible # outputのstorageに移す data modify storage api: CustomNameVisible set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.CustomNameVisible.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/data_version.mcfunction b/TheSkyBlessing/data/api/functions/data_get/data_version.mcfunction index d2cc03160..aa48d682a 100644 --- a/TheSkyBlessing/data/api/functions/data_get/data_version.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/data_version.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DataVersion.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DataVersion.Data set from entity @s DataVersion + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DataVersion.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DataVersion.Data set from entity @s DataVersion # outputのstorageに移す data modify storage api: DataVersion set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DataVersion.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/death_time.mcfunction b/TheSkyBlessing/data/api/functions/data_get/death_time.mcfunction index 049ba0653..1fcee7dff 100644 --- a/TheSkyBlessing/data/api/functions/data_get/death_time.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/death_time.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DeathTime.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DeathTime.Data set from entity @s DeathTime + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DeathTime.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DeathTime.Data set from entity @s DeathTime # outputのstorageに移す data modify storage api: DeathTime set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.DeathTime.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/dimension.mcfunction b/TheSkyBlessing/data/api/functions/data_get/dimension.mcfunction index 3f37bf9f3..ad2698239 100644 --- a/TheSkyBlessing/data/api/functions/data_get/dimension.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/dimension.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Dimension.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Dimension.Data set from entity @s Dimension + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Dimension.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Dimension.Data set from entity @s Dimension # outputのstorageに移す data modify storage api: Dimension set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Dimension.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/ender_items.mcfunction b/TheSkyBlessing/data/api/functions/data_get/ender_items.mcfunction index 4340cbca1..36840eb2c 100644 --- a/TheSkyBlessing/data/api/functions/data_get/ender_items.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/ender_items.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.EnderItems.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.EnderItems.Data set from entity @s EnderItems + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.EnderItems.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.EnderItems.Data set from entity @s EnderItems # outputのstorageに移す data modify storage api: EnderItems set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.EnderItems.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/entered_nether_position.mcfunction b/TheSkyBlessing/data/api/functions/data_get/entered_nether_position.mcfunction index 5de845c2f..b6bd5b81c 100644 --- a/TheSkyBlessing/data/api/functions/data_get/entered_nether_position.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/entered_nether_position.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.enteredNetherPosition.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.enteredNetherPosition.Data set from entity @s enteredNetherPosition + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.enteredNetherPosition.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.enteredNetherPosition.Data set from entity @s enteredNetherPosition # outputのstorageに移す data modify storage api: enteredNetherPosition set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.enteredNetherPosition.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/fall_distance.mcfunction b/TheSkyBlessing/data/api/functions/data_get/fall_distance.mcfunction index 52cdef264..43be6c826 100644 --- a/TheSkyBlessing/data/api/functions/data_get/fall_distance.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/fall_distance.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallDistance.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallDistance.Data set from entity @s FallDistance + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallDistance.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallDistance.Data set from entity @s FallDistance # outputのstorageに移す data modify storage api: FallDistance set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallDistance.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/fall_flying.mcfunction b/TheSkyBlessing/data/api/functions/data_get/fall_flying.mcfunction index 494dc7214..7b0b6256c 100644 --- a/TheSkyBlessing/data/api/functions/data_get/fall_flying.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/fall_flying.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallFlying.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallFlying.Data set from entity @s FallFlying + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallFlying.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallFlying.Data set from entity @s FallFlying # outputのstorageに移す data modify storage api: FallFlying set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.FallFlying.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/fire.mcfunction b/TheSkyBlessing/data/api/functions/data_get/fire.mcfunction index cc46b0fbc..b5b2c9e32 100644 --- a/TheSkyBlessing/data/api/functions/data_get/fire.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/fire.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Fire.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Fire.Data set from entity @s Fire + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Fire.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Fire.Data set from entity @s Fire # outputのstorageに移す data modify storage api: Fire set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Fire.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/food_exhaustion_level.mcfunction b/TheSkyBlessing/data/api/functions/data_get/food_exhaustion_level.mcfunction index 0125885e2..5ba5c7ff8 100644 --- a/TheSkyBlessing/data/api/functions/data_get/food_exhaustion_level.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/food_exhaustion_level.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodExhaustionLevel.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodExhaustionLevel.Data set from entity @s foodExhaustionLevel + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodExhaustionLevel.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodExhaustionLevel.Data set from entity @s foodExhaustionLevel # outputのstorageに移す data modify storage api: foodExhaustionLevel set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodExhaustionLevel.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/food_level.mcfunction b/TheSkyBlessing/data/api/functions/data_get/food_level.mcfunction index 937dd7ecf..a9cf4ad9c 100644 --- a/TheSkyBlessing/data/api/functions/data_get/food_level.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/food_level.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodLevel.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodLevel.Data set from entity @s foodLevel + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodLevel.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodLevel.Data set from entity @s foodLevel # outputのstorageに移す data modify storage api: foodLevel set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodLevel.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/food_saturation_level.mcfunction b/TheSkyBlessing/data/api/functions/data_get/food_saturation_level.mcfunction index abda945ba..e6a29b39f 100644 --- a/TheSkyBlessing/data/api/functions/data_get/food_saturation_level.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/food_saturation_level.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodSaturationLevel.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodSaturationLevel.Data set from entity @s foodSaturationLevel + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodSaturationLevel.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodSaturationLevel.Data set from entity @s foodSaturationLevel # outputのstorageに移す data modify storage api: foodSaturationLevel set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodSaturationLevel.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/food_tick_timer.mcfunction b/TheSkyBlessing/data/api/functions/data_get/food_tick_timer.mcfunction index 2722e91a2..deec96d20 100644 --- a/TheSkyBlessing/data/api/functions/data_get/food_tick_timer.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/food_tick_timer.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodTickTimer.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodTickTimer.Data set from entity @s foodTickTimer + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodTickTimer.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodTickTimer.Data set from entity @s foodTickTimer # outputのstorageに移す data modify storage api: foodTickTimer set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.foodTickTimer.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/glowing.mcfunction b/TheSkyBlessing/data/api/functions/data_get/glowing.mcfunction index 89454f754..f7b77d95d 100644 --- a/TheSkyBlessing/data/api/functions/data_get/glowing.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/glowing.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Glowing.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Glowing.Data set from entity @s Glowing + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Glowing.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Glowing.Data set from entity @s Glowing # outputのstorageに移す data modify storage api: Glowing set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Glowing.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/health.mcfunction b/TheSkyBlessing/data/api/functions/data_get/health.mcfunction index df149ae61..2a9e61e62 100644 --- a/TheSkyBlessing/data/api/functions/data_get/health.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/health.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Health.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Health.Data set from entity @s Health + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Health.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Health.Data set from entity @s Health # outputのstorageに移す data modify storage api: Health set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Health.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/hurt_time.mcfunction b/TheSkyBlessing/data/api/functions/data_get/hurt_time.mcfunction index 3bd6607ca..d1d088374 100644 --- a/TheSkyBlessing/data/api/functions/data_get/hurt_time.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/hurt_time.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.HurtTime.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.HurtTime.Data set from entity @s HurtTime + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.HurtTime.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.HurtTime.Data set from entity @s HurtTime # outputのstorageに移す data modify storage api: HurtTime set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.HurtTime.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/id.mcfunction b/TheSkyBlessing/data/api/functions/data_get/id.mcfunction index e1e12571c..8fb4858cb 100644 --- a/TheSkyBlessing/data/api/functions/data_get/id.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/id.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.id.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.id.Data set from entity @s id + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.id.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.id.Data set from entity @s id # outputのstorageに移す data modify storage api: id set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.id.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/inventory.mcfunction b/TheSkyBlessing/data/api/functions/data_get/inventory.mcfunction index 509b4a3d4..6f6fe10ed 100644 --- a/TheSkyBlessing/data/api/functions/data_get/inventory.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/inventory.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Inventory.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Inventory.Data set from entity @s Inventory + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Inventory.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Inventory.Data set from entity @s Inventory # outputのstorageに移す data modify storage api: Inventory set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Inventory.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/invulnerable.mcfunction b/TheSkyBlessing/data/api/functions/data_get/invulnerable.mcfunction index 4ca8a3a8f..1595be804 100644 --- a/TheSkyBlessing/data/api/functions/data_get/invulnerable.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/invulnerable.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Invulnerable.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Invulnerable.Data set from entity @s Invulnerable + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Invulnerable.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Invulnerable.Data set from entity @s Invulnerable # outputのstorageに移す data modify storage api: Invulnerable set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Invulnerable.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/motion.mcfunction b/TheSkyBlessing/data/api/functions/data_get/motion.mcfunction index b8a401230..50b0e3e87 100644 --- a/TheSkyBlessing/data/api/functions/data_get/motion.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/motion.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Motion.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Motion.Data set from entity @s Motion + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Motion.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Motion.Data set from entity @s Motion # outputのstorageに移す data modify storage api: Motion set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Motion.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/no_ai.mcfunction b/TheSkyBlessing/data/api/functions/data_get/no_ai.mcfunction index 754fb22c4..e2c103e82 100644 --- a/TheSkyBlessing/data/api/functions/data_get/no_ai.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/no_ai.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoAI.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoAI.Data set from entity @s NoAI + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoAI.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoAI.Data set from entity @s NoAI # outputのstorageに移す data modify storage api: NoAI set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoAI.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/no_gravity.mcfunction b/TheSkyBlessing/data/api/functions/data_get/no_gravity.mcfunction index 0d4532524..6f88b4824 100644 --- a/TheSkyBlessing/data/api/functions/data_get/no_gravity.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/no_gravity.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoGravity.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoGravity.Data set from entity @s NoGravity + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoGravity.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoGravity.Data set from entity @s NoGravity # outputのstorageに移す data modify storage api: NoGravity set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.NoGravity.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/on_ground.mcfunction b/TheSkyBlessing/data/api/functions/data_get/on_ground.mcfunction index c89682fa7..bad496eeb 100644 --- a/TheSkyBlessing/data/api/functions/data_get/on_ground.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/on_ground.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.OnGround.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.OnGround.Data set from entity @s OnGround + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.OnGround.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.OnGround.Data set from entity @s OnGround # outputのstorageに移す data modify storage api: OnGround set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.OnGround.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/passengers.mcfunction b/TheSkyBlessing/data/api/functions/data_get/passengers.mcfunction index 54f8afb7c..bf1aee373 100644 --- a/TheSkyBlessing/data/api/functions/data_get/passengers.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/passengers.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Passengers.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Passengers.Data set from entity @s Passengers + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Passengers.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Passengers.Data set from entity @s Passengers # outputのstorageに移す data modify storage api: Passengers set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Passengers.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/player_game_type.mcfunction b/TheSkyBlessing/data/api/functions/data_get/player_game_type.mcfunction index 16bf2d7d7..e0151468d 100644 --- a/TheSkyBlessing/data/api/functions/data_get/player_game_type.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/player_game_type.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.playerGameType.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.playerGameType.Data set from entity @s playerGameType + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.playerGameType.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.playerGameType.Data set from entity @s playerGameType # outputのstorageに移す data modify storage api: playerGameType set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.playerGameType.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/portal_cooldown.mcfunction b/TheSkyBlessing/data/api/functions/data_get/portal_cooldown.mcfunction index 11f212956..9ddaaea04 100644 --- a/TheSkyBlessing/data/api/functions/data_get/portal_cooldown.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/portal_cooldown.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.PortalCooldown.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.PortalCooldown.Data set from entity @s PortalCooldown + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.PortalCooldown.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.PortalCooldown.Data set from entity @s PortalCooldown # outputのstorageに移す data modify storage api: PortalCooldown set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.PortalCooldown.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/pos.mcfunction b/TheSkyBlessing/data/api/functions/data_get/pos.mcfunction index df84f11d0..1066eebba 100644 --- a/TheSkyBlessing/data/api/functions/data_get/pos.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/pos.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Pos.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 at @s as 0-0-0-0-0 run function api:data_get/pos_fetch + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Pos.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 at @s as 0-0-0-0-0 run function api:data_get/pos_fetch # outputのstorageに移す data modify storage api: Pos set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Pos.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/previous_player_game_type.mcfunction b/TheSkyBlessing/data/api/functions/data_get/previous_player_game_type.mcfunction index 53ee43658..1c197737a 100644 --- a/TheSkyBlessing/data/api/functions/data_get/previous_player_game_type.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/previous_player_game_type.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.previousPlayerGameType.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.previousPlayerGameType.Data set from entity @s previousPlayerGameType + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.previousPlayerGameType.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.previousPlayerGameType.Data set from entity @s previousPlayerGameType # outputのstorageに移す data modify storage api: previousPlayerGameType set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.previousPlayerGameType.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/recipe_book.mcfunction b/TheSkyBlessing/data/api/functions/data_get/recipe_book.mcfunction index 734d4211f..d9026ae37 100644 --- a/TheSkyBlessing/data/api/functions/data_get/recipe_book.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/recipe_book.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.recipeBook.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.recipeBook.Data set from entity @s recipeBook + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.recipeBook.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.recipeBook.Data set from entity @s recipeBook # outputのstorageに移す data modify storage api: recipeBook set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.recipeBook.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/root_vehicle.mcfunction b/TheSkyBlessing/data/api/functions/data_get/root_vehicle.mcfunction index 32eccd007..3ebfc3546 100644 --- a/TheSkyBlessing/data/api/functions/data_get/root_vehicle.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/root_vehicle.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.RootVehicle.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.RootVehicle.Data set from entity @s RootVehicle + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.RootVehicle.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.RootVehicle.Data set from entity @s RootVehicle # outputのstorageに移す data modify storage api: RootVehicle set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.RootVehicle.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/rotation.mcfunction b/TheSkyBlessing/data/api/functions/data_get/rotation.mcfunction index 32a5a1388..1744ec2ae 100644 --- a/TheSkyBlessing/data/api/functions/data_get/rotation.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/rotation.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Rotation.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 at @s as 0-0-0-0-0 run function api:data_get/rotation_fetch + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Rotation.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 at @s as 0-0-0-0-0 run function api:data_get/rotation_fetch # outputのstorageに移す data modify storage api: Rotation set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Rotation.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/score.mcfunction b/TheSkyBlessing/data/api/functions/data_get/score.mcfunction index 6e5d86474..4901ab50a 100644 --- a/TheSkyBlessing/data/api/functions/data_get/score.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/score.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Score.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Score.Data set from entity @s Score + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Score.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Score.Data set from entity @s Score # outputのstorageに移す data modify storage api: Score set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Score.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/seen_credits.mcfunction b/TheSkyBlessing/data/api/functions/data_get/seen_credits.mcfunction index 6122c1738..d1837cb0d 100644 --- a/TheSkyBlessing/data/api/functions/data_get/seen_credits.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/seen_credits.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.seenCredits.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.seenCredits.Data set from entity @s seenCredits + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.seenCredits.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.seenCredits.Data set from entity @s seenCredits # outputのstorageに移す data modify storage api: seenCredits set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.seenCredits.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/selected_item.mcfunction b/TheSkyBlessing/data/api/functions/data_get/selected_item.mcfunction index a06ee4fd3..813d92168 100644 --- a/TheSkyBlessing/data/api/functions/data_get/selected_item.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/selected_item.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SelectedItem.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run function api:data_get/selected_item_fetch + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SelectedItem.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run function api:data_get/selected_item_fetch # outputのstorageに移す data modify storage api: SelectedItem set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SelectedItem.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/selected_item_slot.mcfunction b/TheSkyBlessing/data/api/functions/data_get/selected_item_slot.mcfunction index 1d6d36be1..d6c550d86 100644 --- a/TheSkyBlessing/data/api/functions/data_get/selected_item_slot.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/selected_item_slot.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SelectedItemSlot.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SelectedItemSlot.Data set from entity @s SelectedItemSlot + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SelectedItemSlot.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SelectedItemSlot.Data set from entity @s SelectedItemSlot # outputのstorageに移す data modify storage api: SelectedItemSlot set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SelectedItemSlot.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/shoulder_entity_left.mcfunction b/TheSkyBlessing/data/api/functions/data_get/shoulder_entity_left.mcfunction index b9a39504d..ba169d05f 100644 --- a/TheSkyBlessing/data/api/functions/data_get/shoulder_entity_left.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/shoulder_entity_left.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityLeft.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityLeft.Data set from entity @s ShoulderEntityLeft + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityLeft.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityLeft.Data set from entity @s ShoulderEntityLeft # outputのstorageに移す data modify storage api: ShoulderEntityLeft set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityLeft.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/shoulder_entity_right.mcfunction b/TheSkyBlessing/data/api/functions/data_get/shoulder_entity_right.mcfunction index 1a23f5247..12a113f4a 100644 --- a/TheSkyBlessing/data/api/functions/data_get/shoulder_entity_right.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/shoulder_entity_right.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityRight.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityRight.Data set from entity @s ShoulderEntityRight + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityRight.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityRight.Data set from entity @s ShoulderEntityRight # outputのstorageに移す data modify storage api: ShoulderEntityRight set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.ShoulderEntityRight.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/silent.mcfunction b/TheSkyBlessing/data/api/functions/data_get/silent.mcfunction index 24d1f3c86..69ffc78da 100644 --- a/TheSkyBlessing/data/api/functions/data_get/silent.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/silent.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Silent.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Silent.Data set from entity @s Silent + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Silent.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Silent.Data set from entity @s Silent # outputのstorageに移す data modify storage api: Silent set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Silent.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/sleep_timer.mcfunction b/TheSkyBlessing/data/api/functions/data_get/sleep_timer.mcfunction index 9c6130942..1a1a55c56 100644 --- a/TheSkyBlessing/data/api/functions/data_get/sleep_timer.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/sleep_timer.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepTimer.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepTimer.Data set from entity @s SleepTimer + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepTimer.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepTimer.Data set from entity @s SleepTimer # outputのstorageに移す data modify storage api: SleepTimer set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepTimer.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/sleeping_x.mcfunction b/TheSkyBlessing/data/api/functions/data_get/sleeping_x.mcfunction index 0f5875002..52ff3b468 100644 --- a/TheSkyBlessing/data/api/functions/data_get/sleeping_x.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/sleeping_x.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingX.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingX.Data set from entity @s SleepingX + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingX.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingX.Data set from entity @s SleepingX # outputのstorageに移す data modify storage api: SleepingX set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingX.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/sleeping_y.mcfunction b/TheSkyBlessing/data/api/functions/data_get/sleeping_y.mcfunction index 307b4cca5..59a81cfbe 100644 --- a/TheSkyBlessing/data/api/functions/data_get/sleeping_y.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/sleeping_y.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingY.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingY.Data set from entity @s SleepingY + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingY.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingY.Data set from entity @s SleepingY # outputのstorageに移す data modify storage api: SleepingY set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingY.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/sleeping_z.mcfunction b/TheSkyBlessing/data/api/functions/data_get/sleeping_z.mcfunction index a0536b812..ce14b7a15 100644 --- a/TheSkyBlessing/data/api/functions/data_get/sleeping_z.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/sleeping_z.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingZ.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingZ.Data set from entity @s SleepingZ + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingZ.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingZ.Data set from entity @s SleepingZ # outputのstorageに移す data modify storage api: SleepingZ set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SleepingZ.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/spawn_forced.mcfunction b/TheSkyBlessing/data/api/functions/data_get/spawn_forced.mcfunction index 3f2417e2e..bece7fa74 100644 --- a/TheSkyBlessing/data/api/functions/data_get/spawn_forced.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/spawn_forced.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnForced.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnForced.Data set from entity @s SpawnForced + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnForced.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnForced.Data set from entity @s SpawnForced # outputのstorageに移す data modify storage api: SpawnForced set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnForced.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/spawn_x.mcfunction b/TheSkyBlessing/data/api/functions/data_get/spawn_x.mcfunction index 1b4c1ec74..5c148ab81 100644 --- a/TheSkyBlessing/data/api/functions/data_get/spawn_x.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/spawn_x.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnX.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnX.Data set from entity @s SpawnX + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnX.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnX.Data set from entity @s SpawnX # outputのstorageに移す data modify storage api: SpawnX set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnX.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/spawn_y.mcfunction b/TheSkyBlessing/data/api/functions/data_get/spawn_y.mcfunction index 7822a4f2b..12052d66c 100644 --- a/TheSkyBlessing/data/api/functions/data_get/spawn_y.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/spawn_y.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnY.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnY.Data set from entity @s SpawnY + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnY.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnY.Data set from entity @s SpawnY # outputのstorageに移す data modify storage api: SpawnY set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnY.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/spawn_z.mcfunction b/TheSkyBlessing/data/api/functions/data_get/spawn_z.mcfunction index 21f2a378a..b65510ec6 100644 --- a/TheSkyBlessing/data/api/functions/data_get/spawn_z.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/spawn_z.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnZ.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnZ.Data set from entity @s SpawnZ + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnZ.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnZ.Data set from entity @s SpawnZ # outputのstorageに移す data modify storage api: SpawnZ set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.SpawnZ.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/tags.mcfunction b/TheSkyBlessing/data/api/functions/data_get/tags.mcfunction index 73dac3754..73c8e2609 100644 --- a/TheSkyBlessing/data/api/functions/data_get/tags.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/tags.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Tags.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Tags.Data set from entity @s Tags + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Tags.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Tags.Data set from entity @s Tags # outputのstorageに移す data modify storage api: Tags set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Tags.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/team.mcfunction b/TheSkyBlessing/data/api/functions/data_get/team.mcfunction index 43e9dd58b..0e8139b3c 100644 --- a/TheSkyBlessing/data/api/functions/data_get/team.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/team.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Team.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Team.Data set from entity @s Team + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Team.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Team.Data set from entity @s Team # outputのstorageに移す data modify storage api: Team set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Team.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/uuid.mcfunction b/TheSkyBlessing/data/api/functions/data_get/uuid.mcfunction index 95605250b..949b94137 100644 --- a/TheSkyBlessing/data/api/functions/data_get/uuid.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/uuid.mcfunction @@ -8,7 +8,7 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please diff --git a/TheSkyBlessing/data/api/functions/data_get/xp_level.mcfunction b/TheSkyBlessing/data/api/functions/data_get/xp_level.mcfunction index 11e7a15be..dcf92425c 100644 --- a/TheSkyBlessing/data/api/functions/data_get/xp_level.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/xp_level.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpLevel.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpLevel.Data set from entity @s XpLevel + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpLevel.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpLevel.Data set from entity @s XpLevel # outputのstorageに移す data modify storage api: XpLevel set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpLevel.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/xp_p.mcfunction b/TheSkyBlessing/data/api/functions/data_get/xp_p.mcfunction index c3e7d1b5d..f499fc476 100644 --- a/TheSkyBlessing/data/api/functions/data_get/xp_p.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/xp_p.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpP.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpP.Data set from entity @s XpP + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpP.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpP.Data set from entity @s XpP # outputのstorageに移す data modify storage api: XpP set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpP.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/xp_seed.mcfunction b/TheSkyBlessing/data/api/functions/data_get/xp_seed.mcfunction index aaba767a6..7e93d4fd8 100644 --- a/TheSkyBlessing/data/api/functions/data_get/xp_seed.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/xp_seed.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpSeed.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpSeed.Data set from entity @s XpSeed + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpSeed.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpSeed.Data set from entity @s XpSeed # outputのstorageに移す data modify storage api: XpSeed set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpSeed.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/data_get/xp_total.mcfunction b/TheSkyBlessing/data/api/functions/data_get/xp_total.mcfunction index 90f47d8ea..b9402af20 100644 --- a/TheSkyBlessing/data/api/functions/data_get/xp_total.mcfunction +++ b/TheSkyBlessing/data/api/functions/data_get/xp_total.mcfunction @@ -8,12 +8,12 @@ #>Temp # @private - #declare score_holder $NotLatestData + #declare score_holder #NotLatestData # EntityStorage呼び出し function oh_my_dat:please # 最新のものかチェックし、最新じゃなければ取得 - execute store result score $NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpTotal.Time set from storage global Time - execute if score $NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpTotal.Data set from entity @s XpTotal + execute store result score #NotLatestData Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpTotal.Time set from storage global Time + execute if score #NotLatestData Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpTotal.Data set from entity @s XpTotal # outputのstorageに移す data modify storage api: XpTotal set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.XpTotal.Data \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/entity/mob/effect/core/get/from_id.m.mcfunction b/TheSkyBlessing/data/api/functions/entity/mob/effect/core/get/from_id.m.mcfunction index a0d2fc9fc..24fd50499 100644 --- a/TheSkyBlessing/data/api/functions/entity/mob/effect/core/get/from_id.m.mcfunction +++ b/TheSkyBlessing/data/api/functions/entity/mob/effect/core/get/from_id.m.mcfunction @@ -6,4 +6,4 @@ data remove storage api: Return.Effect function oh_my_dat:please -$data modify storage api: Return.Effect set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Effects[{ID:$(ID)}] \ No newline at end of file +#data modify storage api: Return.Effect set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Effects[{ID:#(ID)}] \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/entity/mob/effect/core/remove/from_level/recursion.mcfunction b/TheSkyBlessing/data/api/functions/entity/mob/effect/core/remove/from_level/recursion.mcfunction index 026a65a53..8d894ea99 100644 --- a/TheSkyBlessing/data/api/functions/entity/mob/effect/core/remove/from_level/recursion.mcfunction +++ b/TheSkyBlessing/data/api/functions/entity/mob/effect/core/remove/from_level/recursion.mcfunction @@ -8,8 +8,8 @@ #> private # @private - #declare score_holder $ClearLv - #declare score_holder $RequiredLv + #declare score_holder #ClearLv + #declare score_holder #RequiredLv # 末尾を取り出す data modify storage asset:effect ID set from storage asset:effect IDList[-1] @@ -19,9 +19,9 @@ data modify storage asset:effect CanRemove set value true # レベルチェック execute unless data storage asset:effect TargetEffectData run data modify storage asset:effect CanRemove set value false - execute if data storage asset:effect TargetEffectData store result score $ClearLv Temporary run data get storage api: Argument.ClearLv 1 - execute if data storage asset:effect TargetEffectData store result score $RequiredLv Temporary run data get storage api: Argument.RequireClearLv 1 - execute unless score $ClearLv Temporary >= $RequiredLv Temporary run data modify storage asset:effect CanRemove set value false + execute if data storage asset:effect TargetEffectData store result score #ClearLv Temporary run data get storage api: Argument.ClearLv 1 + execute if data storage asset:effect TargetEffectData store result score #RequiredLv Temporary run data get storage api: Argument.RequireClearLv 1 + execute unless score #ClearLv Temporary >= #RequiredLv Temporary run data modify storage asset:effect CanRemove set value false # 削除条件の確認 execute if data storage asset:effect {TargetEffectData:{IsBadEffect:false},ClearType:"bad"} run data modify storage asset:effect CanRemove set value false execute if data storage asset:effect {TargetEffectData:{IsBadEffect:true},ClearType:"good"} run data modify storage asset:effect CanRemove set value false diff --git a/TheSkyBlessing/data/api/functions/global_vars/get_difficulty.mcfunction b/TheSkyBlessing/data/api/functions/global_vars/get_difficulty.mcfunction index b1be4d209..28022201b 100644 --- a/TheSkyBlessing/data/api/functions/global_vars/get_difficulty.mcfunction +++ b/TheSkyBlessing/data/api/functions/global_vars/get_difficulty.mcfunction @@ -10,4 +10,4 @@ # @output storage api: Return.Difficulty : int @ 1..6 # @api -execute store result storage api: Return.Difficulty int 1 run scoreboard players get $Difficulty Global +execute store result storage api: Return.Difficulty int 1 run scoreboard players get #Difficulty Global diff --git a/TheSkyBlessing/data/api/functions/heal/core/modifier.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/modifier.mcfunction index 6284f48ee..e8228eb22 100644 --- a/TheSkyBlessing/data/api/functions/heal/core/modifier.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/core/modifier.mcfunction @@ -6,18 +6,18 @@ #> Temp # @private - #declare score_holder $Heal - #declare score_holder $Modifier + #declare score_holder #Heal + #declare score_holder #Modifier # ユーザーストレージ呼び出し function oh_my_dat:please # 必要なデータ取得 - execute store result score $Heal Temporary run data get storage api: Argument.Heal 100 - execute store result score $Modifier Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.Heal 100 + execute store result score #Heal Temporary run data get storage api: Argument.Heal 100 + execute store result score #Modifier Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.Heal 100 # 補正 - scoreboard players operation $Heal Temporary *= $Modifier Temporary + scoreboard players operation #Heal Temporary *= #Modifier Temporary # 代入 - execute store result storage api: Argument.Heal float 0.0001 run scoreboard players get $Heal Temporary + execute store result storage api: Argument.Heal float 0.0001 run scoreboard players get #Heal Temporary # リセット - scoreboard players reset $Heal Temporary - scoreboard players reset $Modifier Temporary \ No newline at end of file + scoreboard players reset #Heal Temporary + scoreboard players reset #Modifier Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/heal/core/non-player.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/non-player.mcfunction index f0b5bdb4e..92547f251 100644 --- a/TheSkyBlessing/data/api/functions/heal/core/non-player.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/core/non-player.mcfunction @@ -6,34 +6,34 @@ #> Private # @private - #declare score_holder $Health (e2) - #declare score_holder $MaxHealth (e2) - #declare score_holder $MaxHealthMultiplier (e1) - #declare score_holder $Heal (e2) - #declare score_holder $Fluctuation (e2) + #declare score_holder #Health (e2) + #declare score_holder #MaxHealth (e2) + #declare score_holder #MaxHealthMultiplier (e1) + #declare score_holder #Heal (e2) + #declare score_holder #Fluctuation (e2) # HP取得 - scoreboard players operation $Health Temporary = @s MobHealth + scoreboard players operation #Health Temporary = @s MobHealth # 最大体力/最大体力倍率取得 - execute store result score $MaxHealth Temporary run function api:mob/get_max_health - scoreboard players operation $MaxHealth Temporary *= $100 Const - execute store result score $MaxHealthMultiplier Temporary run function api:mob/get_max_health_multiplier + execute store result score #MaxHealth Temporary run function api:mob/get_max_health + scoreboard players operation #MaxHealth Temporary *= #100 Const + execute store result score #MaxHealthMultiplier Temporary run function api:mob/get_max_health_multiplier # 代入 - execute store result score $Heal Temporary run data get storage api: Argument.Heal 100 + execute store result score #Heal Temporary run data get storage api: Argument.Heal 100 # マルチ補正 - execute unless data storage api: Argument{FixedHeal:true} if score $MaxHealthMultiplier Temporary matches 1.. run scoreboard players operation $Heal Temporary *= $MaxHealthMultiplier Temporary - execute unless data storage api: Argument{FixedHeal:true} run scoreboard players operation $Heal Temporary /= $100 Const + execute unless data storage api: Argument{FixedHeal:true} if score #MaxHealthMultiplier Temporary matches 1.. run scoreboard players operation #Heal Temporary *= #MaxHealthMultiplier Temporary + execute unless data storage api: Argument{FixedHeal:true} run scoreboard players operation #Heal Temporary /= #100 Const # 減算 - scoreboard players operation $Health Temporary += $Heal Temporary + scoreboard players operation #Health Temporary += #Heal Temporary # 最大体力チェック - scoreboard players operation $Health Temporary < $MaxHealth Temporary + scoreboard players operation #Health Temporary < #MaxHealth Temporary # 代入 / kill - scoreboard players operation @s MobHealth = $Health Temporary + scoreboard players operation @s MobHealth = #Health Temporary # 回復量表示 - scoreboard players operation $Fluctuation Lib = $Heal Temporary + scoreboard players operation #Fluctuation Lib = #Heal Temporary execute at @s run function lib:status_log/show_health # リセット - scoreboard players reset $Health Temporary - scoreboard players reset $MaxHealth Temporary - scoreboard players reset $MaxHealthMultiplier Temporary - scoreboard players reset $Heal Temporary + scoreboard players reset #Health Temporary + scoreboard players reset #MaxHealth Temporary + scoreboard players reset #MaxHealthMultiplier Temporary + scoreboard players reset #Heal Temporary diff --git a/TheSkyBlessing/data/api/functions/heal/core/player.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/player.mcfunction index 3df7ad66c..9c88c149d 100644 --- a/TheSkyBlessing/data/api/functions/heal/core/player.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/core/player.mcfunction @@ -6,13 +6,13 @@ #> Private # @private - #declare score_holder $Fluctuation + #declare score_holder #Fluctuation # 負数の場合の処理 - execute store result score $Fluctuation Temporary run data get storage api: Argument.Heal - execute if score $Fluctuation Temporary matches ..-1 run data modify storage api: Argument.Heal set value 0 + execute store result score #Fluctuation Temporary run data get storage api: Argument.Heal + execute if score #Fluctuation Temporary matches ..-1 run data modify storage api: Argument.Heal set value 0 # リセット - scoreboard players reset $Fluctuation Temporary + scoreboard players reset #Fluctuation Temporary # 被回復量補正を掛ける execute unless data storage lib: Argument{FixedHeal:true} run function api:heal/core/receive_modifier # 代入 diff --git a/TheSkyBlessing/data/api/functions/heal/core/receive_modifier.mcfunction b/TheSkyBlessing/data/api/functions/heal/core/receive_modifier.mcfunction index cc17adeb1..cab9834d8 100644 --- a/TheSkyBlessing/data/api/functions/heal/core/receive_modifier.mcfunction +++ b/TheSkyBlessing/data/api/functions/heal/core/receive_modifier.mcfunction @@ -6,18 +6,18 @@ #> Temp # @private - #declare score_holder $Heal - #declare score_holder $Modifier + #declare score_holder #Heal + #declare score_holder #Modifier # ユーザーストレージ呼び出し function oh_my_dat:please # 必要なデータ取得 - execute store result score $Heal Temporary run data get storage api: Argument.Heal 100 - execute store result score $Modifier Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.ReceiveHeal 100 + execute store result score #Heal Temporary run data get storage api: Argument.Heal 100 + execute store result score #Modifier Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.ReceiveHeal 100 # 補正 - scoreboard players operation $Heal Temporary *= $Modifier Temporary + scoreboard players operation #Heal Temporary *= #Modifier Temporary # 代入 - execute store result storage api: Argument.Heal float 0.0001 run scoreboard players get $Heal Temporary + execute store result storage api: Argument.Heal float 0.0001 run scoreboard players get #Heal Temporary # リセット - scoreboard players reset $Heal Temporary - scoreboard players reset $Modifier Temporary + scoreboard players reset #Heal Temporary + scoreboard players reset #Modifier Temporary diff --git a/TheSkyBlessing/data/api/functions/inventory/_index.d.mcfunction b/TheSkyBlessing/data/api/functions/inventory/_index.d.mcfunction index 68b3a9bb3..73d3b00ba 100644 --- a/TheSkyBlessing/data/api/functions/inventory/_index.d.mcfunction +++ b/TheSkyBlessing/data/api/functions/inventory/_index.d.mcfunction @@ -3,8 +3,8 @@ #> clear # @within api:inventory/**clear** - #declare score_holder $Amount - #declare score_holder $notEqual - #declare score_holder $Count - #declare score_holder $NewCount - #declare score_holder $Return.Amount \ No newline at end of file + #declare score_holder #Amount + #declare score_holder #notEqual + #declare score_holder #Count + #declare score_holder #NewCount + #declare score_holder #Return.Amount \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/inventory/clear.mcfunction b/TheSkyBlessing/data/api/functions/inventory/clear.mcfunction index de291a882..f1eba8781 100644 --- a/TheSkyBlessing/data/api/functions/inventory/clear.mcfunction +++ b/TheSkyBlessing/data/api/functions/inventory/clear.mcfunction @@ -7,7 +7,7 @@ # storage api: # Argument.Target: Item(Count will be ignored) # Argument.Amount?: int -# @output score $Return.Amount Lib : if Argument.Amount == 0 +# @output score #Return.Amount Lib : if Argument.Amount == 0 # @api # インベントリの取得 @@ -17,17 +17,17 @@ data remove storage api: Argument.Target.Count execute unless data storage api: Argument.Amount run data modify storage api: Argument.Amount set value 8192 # 削除個数の取得 - execute store result score $Amount Temporary run data get storage api: Argument.Amount + execute store result score #Amount Temporary run data get storage api: Argument.Amount # セッション開ける function lib:array/session/open # インベントリを反転する data modify storage lib: Array set from storage api: Inventory function lib:array/reverse # インベントリのチェック - execute if score $Amount Temporary matches 0 run function api:inventory/core/clear/test/ - execute if score $Amount Temporary matches 1.. run function api:inventory/core/clear/remove/ + execute if score #Amount Temporary matches 0 run function api:inventory/core/clear/test/ + execute if score #Amount Temporary matches 1.. run function api:inventory/core/clear/remove/ # リセット function lib:array/session/close data remove storage api: NewInv data remove storage api: Argument - scoreboard players reset $Amount Temporary \ No newline at end of file + scoreboard players reset #Amount Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/inventory/core/clear/remove/map.mcfunction b/TheSkyBlessing/data/api/functions/inventory/core/clear/remove/map.mcfunction index 124e470af..4ec4a6565 100644 --- a/TheSkyBlessing/data/api/functions/inventory/core/clear/remove/map.mcfunction +++ b/TheSkyBlessing/data/api/functions/inventory/core/clear/remove/map.mcfunction @@ -9,14 +9,14 @@ data remove storage lib: Array[-1].Count data remove storage lib: Array[-1].Slot # 比較 - execute store success score $notEqual Temporary run data modify storage lib: Array[-1] set from storage api: Argument.Target + execute store success score #notEqual Temporary run data modify storage lib: Array[-1] set from storage api: Argument.Target # 同アイテムの場合はそれぞれの個数を書き換える - execute if score $notEqual Temporary matches 0 run function api:inventory/core/clear/remove/subtract_values + execute if score #notEqual Temporary matches 0 run function api:inventory/core/clear/remove/subtract_values # 末尾データ削除 data remove storage lib: Array[-1] # リセット - scoreboard players reset $notEqual Temporary + scoreboard players reset #notEqual Temporary # まだアイテムがある場合は再帰 - execute if score $Amount Temporary matches ..0 if data storage lib: Array[0] run function lib:array/reverse - execute if score $Amount Temporary matches ..0 if data storage lib: Array[0] run data modify storage api: NewInv append from storage lib: Array[] - execute if score $Amount Temporary matches 1.. if data storage lib: Array[0] run function api:inventory/core/clear/remove/map \ No newline at end of file + execute if score #Amount Temporary matches ..0 if data storage lib: Array[0] run function lib:array/reverse + execute if score #Amount Temporary matches ..0 if data storage lib: Array[0] run data modify storage api: NewInv append from storage lib: Array[] + execute if score #Amount Temporary matches 1.. if data storage lib: Array[0] run function api:inventory/core/clear/remove/map \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/inventory/core/clear/remove/subtract_values.mcfunction b/TheSkyBlessing/data/api/functions/inventory/core/clear/remove/subtract_values.mcfunction index 1b7a46750..4b2fac49f 100644 --- a/TheSkyBlessing/data/api/functions/inventory/core/clear/remove/subtract_values.mcfunction +++ b/TheSkyBlessing/data/api/functions/inventory/core/clear/remove/subtract_values.mcfunction @@ -2,14 +2,14 @@ # @within function api:inventory/core/clear/remove/map # 個数取得 - execute store result score $Count Temporary run data get storage api: NewInv[-1].Count + execute store result score #Count Temporary run data get storage api: NewInv[-1].Count # アイテムの新しい個数をセット - scoreboard players operation $NewCount Temporary = $Count Temporary - scoreboard players operation $NewCount Temporary -= $Amount Temporary - execute if score $NewCount Temporary matches ..-1 run scoreboard players set $NewCount Temporary 0 - execute store result storage api: NewInv[-1].Count byte 1 run scoreboard players get $NewCount Temporary + scoreboard players operation #NewCount Temporary = #Count Temporary + scoreboard players operation #NewCount Temporary -= #Amount Temporary + execute if score #NewCount Temporary matches ..-1 run scoreboard players set #NewCount Temporary 0 + execute store result storage api: NewInv[-1].Count byte 1 run scoreboard players get #NewCount Temporary # 目標数を減算 - scoreboard players operation $Amount Temporary -= $Count Temporary + scoreboard players operation #Amount Temporary -= #Count Temporary # リセット - scoreboard players reset $Count Temporary - scoreboard players reset $NewCount Temporary \ No newline at end of file + scoreboard players reset #Count Temporary + scoreboard players reset #NewCount Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/inventory/core/clear/test/.mcfunction b/TheSkyBlessing/data/api/functions/inventory/core/clear/test/.mcfunction index dbf8e5f42..2ed8524d9 100644 --- a/TheSkyBlessing/data/api/functions/inventory/core/clear/test/.mcfunction +++ b/TheSkyBlessing/data/api/functions/inventory/core/clear/test/.mcfunction @@ -4,6 +4,6 @@ # # @within function api:inventory/clear -scoreboard players set $Return.Amount Lib 0 +scoreboard players set #Return.Amount Lib 0 data remove storage lib: Array[].Slot function api:inventory/core/clear/test/foreach \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/inventory/core/clear/test/foreach.mcfunction b/TheSkyBlessing/data/api/functions/inventory/core/clear/test/foreach.mcfunction index 4a90e5b43..d2bf8d98b 100644 --- a/TheSkyBlessing/data/api/functions/inventory/core/clear/test/foreach.mcfunction +++ b/TheSkyBlessing/data/api/functions/inventory/core/clear/test/foreach.mcfunction @@ -7,17 +7,17 @@ # api:inventory/core/clear/test/foreach # Countを保存しておく - execute store result score $Count Temporary run data get storage lib: Array[-1].Count + execute store result score #Count Temporary run data get storage lib: Array[-1].Count # Count削除 data remove storage lib: Array[-1].Count # 比較 - execute store success score $notEqual Temporary run data modify storage lib: Array[-1] set from storage api: Argument.Target + execute store success score #notEqual Temporary run data modify storage lib: Array[-1] set from storage api: Argument.Target # 同アイテムの場合、 - execute if score $notEqual Temporary matches 0 run scoreboard players operation $Return.Amount Lib += $Count Temporary + execute if score #notEqual Temporary matches 0 run scoreboard players operation #Return.Amount Lib += #Count Temporary # 末尾データ削除 data remove storage lib: Array[-1] # リセット - scoreboard players reset $Count Temporary - scoreboard players reset $notEqual Temporary + scoreboard players reset #Count Temporary + scoreboard players reset #notEqual Temporary # まだアイテムがある場合は再帰 execute if data storage lib: Array[0] run function api:inventory/core/clear/test/foreach \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/inventory/get_size.mcfunction b/TheSkyBlessing/data/api/functions/inventory/get_size.mcfunction index 7c51d066a..43034cf6f 100644 --- a/TheSkyBlessing/data/api/functions/inventory/get_size.mcfunction +++ b/TheSkyBlessing/data/api/functions/inventory/get_size.mcfunction @@ -2,17 +2,17 @@ # # 実行者の防具スロット/オフハンドを除くインベントリのサイズを取得します # -# @output score $InvSize Lib +# @output score #InvSize Lib # @api #> Inv # @private - #declare score_holder $InvSize + #declare score_holder #InvSize function api:data_get/inventory -execute store result score $InvSize Lib if data storage api: Inventory[] -execute if data storage api: Inventory[{Slot:100b}] run scoreboard players remove $InvSize Lib 1 -execute if data storage api: Inventory[{Slot:101b}] run scoreboard players remove $InvSize Lib 1 -execute if data storage api: Inventory[{Slot:102b}] run scoreboard players remove $InvSize Lib 1 -execute if data storage api: Inventory[{Slot:103b}] run scoreboard players remove $InvSize Lib 1 -execute if data storage api: Inventory[{Slot:-106b}] run scoreboard players remove $InvSize Lib 1 \ No newline at end of file +execute store result score #InvSize Lib if data storage api: Inventory[] +execute if data storage api: Inventory[{Slot:100b}] run scoreboard players remove #InvSize Lib 1 +execute if data storage api: Inventory[{Slot:101b}] run scoreboard players remove #InvSize Lib 1 +execute if data storage api: Inventory[{Slot:102b}] run scoreboard players remove #InvSize Lib 1 +execute if data storage api: Inventory[{Slot:103b}] run scoreboard players remove #InvSize Lib 1 +execute if data storage api: Inventory[{Slot:-106b}] run scoreboard players remove #InvSize Lib 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/lost_items/give.mcfunction b/TheSkyBlessing/data/api/functions/lost_items/give.mcfunction index 79be6b1ec..026559a3f 100644 --- a/TheSkyBlessing/data/api/functions/lost_items/give.mcfunction +++ b/TheSkyBlessing/data/api/functions/lost_items/give.mcfunction @@ -10,8 +10,8 @@ # validate execute unless data storage api: Argument.Count run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません","color":"white"},{"text":" Count","color":"red"}] # 代入 - execute store result score $GiveCount Temporary run data get storage api: Argument.Count + execute store result score #GiveCount Temporary run data get storage api: Argument.Count # 呼び出し - execute if score $GiveCount Temporary matches 1.. run function player_manager:lost_item/give_part/ + execute if score #GiveCount Temporary matches 1.. run function player_manager:lost_item/give_part/ # リセット data remove storage api: Argument.Count \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/mob/get_health_percent.mcfunction b/TheSkyBlessing/data/api/functions/mob/get_health_percent.mcfunction index 981a13424..2c1522e00 100644 --- a/TheSkyBlessing/data/api/functions/mob/get_health_percent.mcfunction +++ b/TheSkyBlessing/data/api/functions/mob/get_health_percent.mcfunction @@ -7,16 +7,16 @@ #> 計算用スコアホルダー # @private - #declare score_holder $Health - #declare score_holder $MaxHealth + #declare score_holder #Health + #declare score_holder #MaxHealth # 現在体力を割合で出す - scoreboard players operation $Health Temporary = @s MobHealth - execute store result score $MaxHealth Temporary run function api:mob/get_max_health + scoreboard players operation #Health Temporary = @s MobHealth + execute store result score #MaxHealth Temporary run function api:mob/get_max_health # 計算結果を api: Return.HealthPer - execute store result storage api: Return.HealthPer double 0.01 run scoreboard players operation $Health Temporary /= $MaxHealth Temporary + execute store result storage api: Return.HealthPer double 0.01 run scoreboard players operation #Health Temporary /= #MaxHealth Temporary # リセット - scoreboard players reset $Health Temporary - scoreboard players reset $MaxHealth Temporary \ No newline at end of file + scoreboard players reset #Health Temporary + scoreboard players reset #MaxHealth Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/modifier/_index.d.mcfunction b/TheSkyBlessing/data/api/functions/modifier/_index.d.mcfunction index a68449994..c99b48ca7 100644 --- a/TheSkyBlessing/data/api/functions/modifier/_index.d.mcfunction +++ b/TheSkyBlessing/data/api/functions/modifier/_index.d.mcfunction @@ -3,6 +3,6 @@ #> Temp # @within function api:modifier/core/common/update_modifier/* - #declare score_holder $Add - #declare score_holder $MultiplyBase - #declare score_holder $Modifier \ No newline at end of file + #declare score_holder #Add + #declare score_holder #MultiplyBase + #declare score_holder #Modifier \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/modifier/core/common/remove_modifier.mcfunction b/TheSkyBlessing/data/api/functions/modifier/core/common/remove_modifier.mcfunction index fe86081a4..13bb98f0e 100644 --- a/TheSkyBlessing/data/api/functions/modifier/core/common/remove_modifier.mcfunction +++ b/TheSkyBlessing/data/api/functions/modifier/core/common/remove_modifier.mcfunction @@ -8,19 +8,19 @@ #> Temp # @private - #declare score_holder $isSuccess + #declare score_holder #isSuccess # 比較用にコピー data modify storage api: UUID set from storage api: Argument.UUID # 比較 - execute store success score $isSuccess Temporary run data modify storage api: UUID set from storage api: Modifiers[-1].UUID + execute store success score #isSuccess Temporary run data modify storage api: UUID set from storage api: Modifiers[-1].UUID # 同じ場合はRemoveに設定する - execute if score $isSuccess Temporary matches 0 run data modify storage api: Removed set from storage api: Modifiers[-1] + execute if score #isSuccess Temporary matches 0 run data modify storage api: Removed set from storage api: Modifiers[-1] # 違う場合は新しい配列に追加 - execute if score $isSuccess Temporary matches 1 run data modify storage api: NewModifiers append from storage api: Modifiers[-1] + execute if score #isSuccess Temporary matches 1 run data modify storage api: NewModifiers append from storage api: Modifiers[-1] # リストから削除 data remove storage api: Modifiers[-1] # リセット - scoreboard players reset $isSuccess Temporary + scoreboard players reset #isSuccess Temporary # 要素が残ってたら再帰 execute if data storage api: Modifiers[0] run function api:modifier/core/common/remove_modifier \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/.mcfunction b/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/.mcfunction index 274969538..1a158f4f3 100644 --- a/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/.mcfunction +++ b/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/.mcfunction @@ -10,19 +10,19 @@ # Operation毎に分離する function api:modifier/core/common/update_modifier/separate_modifiers # ベース値の設定 - execute store result score $Modifier Temporary run data get storage api: Base 1000 + execute store result score #Modifier Temporary run data get storage api: Base 1000 # Addの処理 - scoreboard players operation $Modifier Temporary += $Add Temporary + scoreboard players operation #Modifier Temporary += #Add Temporary # MultiplyBaseの処理 - scoreboard players add $MultiplyBase Temporary 1000 - scoreboard players operation $Modifier Temporary *= $MultiplyBase Temporary - scoreboard players operation $Modifier Temporary /= $1000 Const + scoreboard players add #MultiplyBase Temporary 1000 + scoreboard players operation #Modifier Temporary *= #MultiplyBase Temporary + scoreboard players operation #Modifier Temporary /= #1000 Const # Multiplyの処理 execute if data storage api: Multiples[0] run function api:modifier/core/common/update_modifier/multiples # ストレージに戻す - execute store result storage api: Modifier double 0.001 run scoreboard players get $Modifier Temporary + execute store result storage api: Modifier double 0.001 run scoreboard players get #Modifier Temporary # リセット - scoreboard players reset $Add Temporary - scoreboard players reset $Modifier Temporary - scoreboard players reset $MultiplyBase Temporary - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Add Temporary + scoreboard players reset #Modifier Temporary + scoreboard players reset #MultiplyBase Temporary + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/multiples.mcfunction b/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/multiples.mcfunction index a53357c84..538cae9dc 100644 --- a/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/multiples.mcfunction +++ b/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/multiples.mcfunction @@ -8,18 +8,18 @@ #> Temp # @private - #declare score_holder $Multiply + #declare score_holder #Multiply # Multiply値を取得 - execute store result score $Multiply Temporary run data get storage api: Multiples[-1] 1000 + execute store result score #Multiply Temporary run data get storage api: Multiples[-1] 1000 # ベース分1.0追加 - scoreboard players add $Multiply Temporary 1000 + scoreboard players add #Multiply Temporary 1000 # 乗算する - scoreboard players operation $Modifier Temporary *= $Multiply Temporary - scoreboard players operation $Modifier Temporary /= $1000 Const + scoreboard players operation #Modifier Temporary *= #Multiply Temporary + scoreboard players operation #Modifier Temporary /= #1000 Const # 最後の要素を削除する data remove storage api: Multiples[-1] # リセット - scoreboard players reset $Multiply Temporary + scoreboard players reset #Multiply Temporary # 要素がまだあったら再帰する execute if data storage api: Multiples[0] run function api:modifier/core/common/update_modifier/multiples \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/separate_modifiers.mcfunction b/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/separate_modifiers.mcfunction index e955fd421..83fddd4d7 100644 --- a/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/separate_modifiers.mcfunction +++ b/TheSkyBlessing/data/api/functions/modifier/core/common/update_modifier/separate_modifiers.mcfunction @@ -8,15 +8,15 @@ #> Temp # @private - #declare score_holder $Temp + #declare score_holder #Temp # おのれもやんで直接参照(Modifiers[-1]{Operation:"~"})が出来ないので移す data modify storage api: Op set from storage api: Modifiers[-1].Operation # Operationを見て別に配列に移す - execute if data storage api: {Op:"add"} store result score $Temp Temporary run data get storage api: Modifiers[-1].Amount 1000 - execute if data storage api: {Op:"add"} run scoreboard players operation $Add Temporary += $Temp Temporary - execute if data storage api: {Op:"multiply_base"} store result score $Temp Temporary run data get storage api: Modifiers[-1].Amount 1000 - execute if data storage api: {Op:"multiply_base"} run scoreboard players operation $MultiplyBase Temporary += $Temp Temporary + execute if data storage api: {Op:"add"} store result score #Temp Temporary run data get storage api: Modifiers[-1].Amount 1000 + execute if data storage api: {Op:"add"} run scoreboard players operation #Add Temporary += #Temp Temporary + execute if data storage api: {Op:"multiply_base"} store result score #Temp Temporary run data get storage api: Modifiers[-1].Amount 1000 + execute if data storage api: {Op:"multiply_base"} run scoreboard players operation #MultiplyBase Temporary += #Temp Temporary execute if data storage api: {Op:"multiply"} run data modify storage api: Multiples append from storage api: Modifiers[-1].Amount # 最後の要素を削除 data remove storage api: Modifiers[-1] diff --git a/TheSkyBlessing/data/api/functions/mp/check.mcfunction b/TheSkyBlessing/data/api/functions/mp/check.mcfunction index e6d59b65f..444a895df 100644 --- a/TheSkyBlessing/data/api/functions/mp/check.mcfunction +++ b/TheSkyBlessing/data/api/functions/mp/check.mcfunction @@ -12,13 +12,13 @@ #> temp # @private - #declare score_holder $CheckMP + #declare score_holder #CheckMP # 閾値を取得 - execute store result score $CheckMP Temporary run data get storage api: Argument.Threshold + execute store result score #CheckMP Temporary run data get storage api: Argument.Threshold # Bypass - execute if entity @s[tag=DevPrivilege] run scoreboard players set $CheckMP Temporary 0 + execute if entity @s[tag=DevPrivilege] run scoreboard players set #CheckMP Temporary 0 # チェック - execute store success storage api: Return.IsThresholdOrMore byte 1 if score $CheckMP Temporary <= @s MP + execute store success storage api: Return.IsThresholdOrMore byte 1 if score #CheckMP Temporary <= @s MP # リセット - scoreboard players reset $CheckMP Temporary \ No newline at end of file + scoreboard players reset #CheckMP Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/mp/fluctuation.mcfunction b/TheSkyBlessing/data/api/functions/mp/fluctuation.mcfunction index dfaf7b391..a698f89ff 100644 --- a/TheSkyBlessing/data/api/functions/mp/fluctuation.mcfunction +++ b/TheSkyBlessing/data/api/functions/mp/fluctuation.mcfunction @@ -10,17 +10,17 @@ #> temp # @private - #declare score_holder $Fluctuation + #declare score_holder #Fluctuation # 増減量取得 - execute store result score $Fluctuation Temporary run data get storage api: Argument.Fluctuation + execute store result score #Fluctuation Temporary run data get storage api: Argument.Fluctuation # 増減 - scoreboard players operation @s MP += $Fluctuation Temporary - scoreboard players operation @s MP > $0 Const + scoreboard players operation @s MP += #Fluctuation Temporary + scoreboard players operation @s MP > #0 Const scoreboard players operation @s MP < @s MPMax # 表示 execute unless data storage api: Argument{DisableLog:1b} at @s run function lib:status_log/show_mp # リセット - scoreboard players reset $Fluctuation Temporary + scoreboard players reset #Fluctuation Temporary data remove storage api: Argument.Fluctuation data remove storage api: Argument.DisableLog \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/mp/set.mcfunction b/TheSkyBlessing/data/api/functions/mp/set.mcfunction index 605803eaa..3873f136a 100644 --- a/TheSkyBlessing/data/api/functions/mp/set.mcfunction +++ b/TheSkyBlessing/data/api/functions/mp/set.mcfunction @@ -9,12 +9,12 @@ #> temp # @private - #declare score_holder $MP + #declare score_holder #MP # 取得 - execute store result score $MP Temporary run data get storage api: Argument.MP + execute store result score #MP Temporary run data get storage api: Argument.MP # セット - scoreboard players operation @s MP = $MP Temporary + scoreboard players operation @s MP = #MP Temporary # リセット - scoreboard players reset $MP Temporary + scoreboard players reset #MP Temporary data remove storage api: Argument.MP \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/mp/update_max.mcfunction b/TheSkyBlessing/data/api/functions/mp/update_max.mcfunction index d34029c10..31f19dedc 100644 --- a/TheSkyBlessing/data/api/functions/mp/update_max.mcfunction +++ b/TheSkyBlessing/data/api/functions/mp/update_max.mcfunction @@ -13,4 +13,4 @@ function oh_my_dat:please # 最大MP変更 execute store result score @s MPMax run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.MaxMP 1 - scoreboard players operation @s MPMax > $0 Const \ No newline at end of file + scoreboard players operation @s MPMax > #0 Const \ No newline at end of file diff --git a/TheSkyBlessing/data/api/functions/rom/please.mcfunction b/TheSkyBlessing/data/api/functions/rom/please.mcfunction index 55bdabf35..37f4a1579 100644 --- a/TheSkyBlessing/data/api/functions/rom/please.mcfunction +++ b/TheSkyBlessing/data/api/functions/rom/please.mcfunction @@ -8,12 +8,12 @@ # validate execute unless data storage api: Argument.Address run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません","color":"white"},{"text":" Address","color":"red"}] # 新たに提供する必要があるかをチェックする - execute store result score $Address Temporary run data get storage api: Argument.ID + execute store result score #Address Temporary run data get storage api: Argument.ID # validate 2 - execute unless score $Address Temporary matches 0..65535 run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"アドレスは0から65535の範囲でのみ提供されますが、","color":"white"},{"score":{"name":"$Address","objective":"Temporary"}},{"text":"が要求されました。"}] + execute unless score #Address Temporary matches 0..65535 run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"アドレスは0から65535の範囲でのみ提供されますが、","color":"white"},{"score":{"name":"#Address","objective":"Temporary"}},{"text":"が要求されました。"}] # 必要な場合は提供する - execute unless score $Address Temporary = $LatestProvidedAddress Global run function rom:provide + execute unless score #Address Temporary = #LatestProvidedAddress Global run function rom:provide # リセット data remove storage api: Argument.Address - scoreboard players reset $Address Temporary - scoreboard players reset $LatestProvidedAddress Global \ No newline at end of file + scoreboard players reset #Address Temporary + scoreboard players reset #LatestProvidedAddress Global \ No newline at end of file diff --git a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/easy.json b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/easy.json index 96c966a88..392ad254e 100644 --- a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/easy.json +++ b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/easy.json @@ -4,7 +4,7 @@ "type": "minecraft:score", "target": { "type": "minecraft:fixed", - "name": "$Difficulty" + "name": "#Difficulty" }, "score": "Global" }, diff --git a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/hard.json b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/hard.json index 24ab95356..47ea275e5 100644 --- a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/hard.json +++ b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/hard.json @@ -4,7 +4,7 @@ "type": "minecraft:score", "target": { "type": "minecraft:fixed", - "name": "$Difficulty" + "name": "#Difficulty" }, "score": "Global" }, diff --git a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/max/hard.json b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/max/hard.json index 32b8494b8..0eb997b0a 100644 --- a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/max/hard.json +++ b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/max/hard.json @@ -4,7 +4,7 @@ "type": "minecraft:score", "target": { "type": "minecraft:fixed", - "name": "$Difficulty" + "name": "#Difficulty" }, "score": "Global" }, diff --git a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/max/normal.json b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/max/normal.json index cb91623b7..f6ef9e58c 100644 --- a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/max/normal.json +++ b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/max/normal.json @@ -4,7 +4,7 @@ "type": "minecraft:score", "target": { "type": "minecraft:fixed", - "name": "$Difficulty" + "name": "#Difficulty" }, "score": "Global" }, diff --git a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/hard.json b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/hard.json index 9d40ba563..54332892d 100644 --- a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/hard.json +++ b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/hard.json @@ -4,7 +4,7 @@ "type": "minecraft:score", "target": { "type": "minecraft:fixed", - "name": "$Difficulty" + "name": "#Difficulty" }, "score": "Global" }, diff --git a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/normal.json b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/normal.json index 3eb94fa00..5ecda6a08 100644 --- a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/normal.json +++ b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/normal.json @@ -4,7 +4,7 @@ "type": "minecraft:score", "target": { "type": "minecraft:fixed", - "name": "$Difficulty" + "name": "#Difficulty" }, "score": "Global" }, diff --git a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/over_difficulty.json b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/over_difficulty.json index 9f9259b3e..70e17c57e 100644 --- a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/over_difficulty.json +++ b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/min/over_difficulty.json @@ -4,7 +4,7 @@ "type": "minecraft:score", "target": { "type": "minecraft:fixed", - "name": "$Difficulty" + "name": "#Difficulty" }, "score": "Global" }, diff --git a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/normal.json b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/normal.json index 885083620..38491a0be 100644 --- a/TheSkyBlessing/data/api/predicates/global_vars/difficulty/normal.json +++ b/TheSkyBlessing/data/api/predicates/global_vars/difficulty/normal.json @@ -4,7 +4,7 @@ "type": "minecraft:score", "target": { "type": "minecraft:fixed", - "name": "$Difficulty" + "name": "#Difficulty" }, "score": "Global" }, diff --git a/TheSkyBlessing/data/asset/functions/artifact/common/give.mcfunction b/TheSkyBlessing/data/asset/functions/artifact/common/give.mcfunction index 7c8453943..ed3a3983a 100644 --- a/TheSkyBlessing/data/asset/functions/artifact/common/give.mcfunction +++ b/TheSkyBlessing/data/asset/functions/artifact/common/give.mcfunction @@ -27,7 +27,7 @@ #> Inv # @private - #declare score_holder $InvSize + #declare score_holder #InvSize # Triggerの並列化 execute unless data storage asset:artifact Triggers[0] run function asset:artifact/common/trigger/migrate @@ -52,13 +52,13 @@ execute if data storage asset:context {Type:"drop"} run loot spawn ~ ~ ~ mine 10000 0 10000 debug_stick execute if data storage asset:context {Type:"drop",Important:true} as @e[type=item,nbt={Item:{tag:{TSB:{}}}},distance=..0.3] run function asset:artifact/common/protect execute if data storage asset:context {Type:"give"} run function api:inventory/get_size - execute if data storage asset:context {Type:"give"} if score $InvSize Lib matches ..35 run loot give @s mine 10000 0 10000 debug_stick - execute if data storage asset:context {Type:"give"} if score $InvSize Lib matches 36.. run loot spawn ~ ~ ~ mine 10000 0 10000 debug_stick - execute if data storage asset:context {Type:"give"} if score $InvSize Lib matches 36.. as @e[type=item,nbt={Item:{tag:{TSB:{}}}},distance=..0.3] run function asset:artifact/common/protect + execute if data storage asset:context {Type:"give"} if score #InvSize Lib matches ..35 run loot give @s mine 10000 0 10000 debug_stick + execute if data storage asset:context {Type:"give"} if score #InvSize Lib matches 36.. run loot spawn ~ ~ ~ mine 10000 0 10000 debug_stick + execute if data storage asset:context {Type:"give"} if score #InvSize Lib matches 36.. as @e[type=item,nbt={Item:{tag:{TSB:{}}}},distance=..0.3] run function asset:artifact/common/protect execute if data storage asset:context {Type:"replace"} run function asset:artifact/common/replace # リセット - scoreboard players reset $InvSize Lib + scoreboard players reset #InvSize Lib data remove storage asset:context Type data remove storage asset:artifact ID data remove storage asset:artifact Item diff --git a/TheSkyBlessing/data/asset/functions/artifact/example/trigger/add_modifier.mcfunction b/TheSkyBlessing/data/asset/functions/artifact/example/trigger/add_modifier.mcfunction index a4cbaba6b..7661097ce 100644 --- a/TheSkyBlessing/data/asset/functions/artifact/example/trigger/add_modifier.mcfunction +++ b/TheSkyBlessing/data/asset/functions/artifact/example/trigger/add_modifier.mcfunction @@ -3,7 +3,7 @@ #> modifier multiplier # @private - #declare score_holder $Count + #declare score_holder #Count # 補正を削除 data modify storage api: Argument.UUID set value [I;1,1,65535,7] @@ -16,29 +16,29 @@ function api:modifier/max_mp/remove # 個数 - execute store result score $Count Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:65535}}}] + execute store result score #Count Temporary if data storage asset:context New.Items.hotbar[{tag:{TSB:{ID:65535}}}] # 補正を追加 # 基礎攻撃力 N*5% data modify storage api: Argument.UUID set value [I;1,1,65535,7] - execute store result storage api: Argument.Amount double 0.05 run scoreboard players get $Count Temporary + execute store result storage api: Argument.Amount double 0.05 run scoreboard players get #Count Temporary data modify storage api: Argument.Operation set value "multiply" execute unless data storage api: Argument{Amount:0.0d} run function api:modifier/attack/base/add # 基礎防御力 N*5% data modify storage api: Argument.UUID set value [I;1,1,65535,7] - execute store result storage api: Argument.Amount double 0.05 run scoreboard players get $Count Temporary + execute store result storage api: Argument.Amount double 0.05 run scoreboard players get #Count Temporary data modify storage api: Argument.Operation set value "multiply" execute unless data storage api: Argument{Amount:0.0d} run function api:modifier/defense/base/add # 最大体力 N*2.5% data modify storage api: Argument.UUID set value [I;1,1,65535,7] - execute store result storage api: Argument.Amount double 0.025 run scoreboard players get $Count Temporary + execute store result storage api: Argument.Amount double 0.025 run scoreboard players get #Count Temporary data modify storage api: Argument.Operation set value "multiply" execute unless data storage api: Argument{Amount:0.0d} run function api:modifier/max_health/add # 最大魔力 N*2.5% data modify storage api: Argument.UUID set value [I;1,1,65535,7] - execute store result storage api: Argument.Amount double 0.025 run scoreboard players get $Count Temporary + execute store result storage api: Argument.Amount double 0.025 run scoreboard players get #Count Temporary data modify storage api: Argument.Operation set value "multiply" execute unless data storage api: Argument{Amount:0.0d} run function api:modifier/max_mp/add # リセット - scoreboard players reset $Count Temporary + scoreboard players reset #Count Temporary data remove storage api: Argument \ No newline at end of file diff --git a/TheSkyBlessing/data/asset/functions/artifact/example/trigger/attack/3.main.mcfunction b/TheSkyBlessing/data/asset/functions/artifact/example/trigger/attack/3.main.mcfunction index 9bf3bba36..d305a9f37 100644 --- a/TheSkyBlessing/data/asset/functions/artifact/example/trigger/attack/3.main.mcfunction +++ b/TheSkyBlessing/data/asset/functions/artifact/example/trigger/attack/3.main.mcfunction @@ -6,7 +6,7 @@ #> health # @private - #declare score_holder $MaxHealth + #declare score_holder #MaxHealth # 基本的な使用時の処理(MP消費や使用回数の処理など)を行う function asset:artifact/common/use/mainhand diff --git a/TheSkyBlessing/data/asset/functions/effect/ex/tick/.mcfunction b/TheSkyBlessing/data/asset/functions/effect/ex/tick/.mcfunction index edc3d043f..a0054c49e 100644 --- a/TheSkyBlessing/data/asset/functions/effect/ex/tick/.mcfunction +++ b/TheSkyBlessing/data/asset/functions/effect/ex/tick/.mcfunction @@ -8,14 +8,14 @@ particle dust 1 0.6 0.8 1 ~ ~1 ~ 0.4 0.7 0.4 1 2 #> Private # @private - #declare score_holder $Tick + #declare score_holder #Tick -execute store result score $Tick Temporary run data get storage asset:context this.Tick +execute store result score #Tick Temporary run data get storage asset:context this.Tick -scoreboard players add $Tick Temporary 1 -scoreboard players operation $Tick Temporary %= $4 Const +scoreboard players add #Tick Temporary 1 +scoreboard players operation #Tick Temporary %= #4 Const -execute if score $Tick Temporary matches 0 run function asset:effect/ex/tick/heal +execute if score #Tick Temporary matches 0 run function asset:effect/ex/tick/heal -execute store result storage asset:context this.Tick int 1 run scoreboard players get $Tick Temporary -scoreboard players reset $Tick Temporary \ No newline at end of file +execute store result storage asset:context this.Tick int 1 run scoreboard players get #Tick Temporary +scoreboard players reset #Tick Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction index 745b0b6fa..f9035d1f8 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/_index.d.mcfunction @@ -17,7 +17,7 @@ # asset_manager:artifact/use/ # asset_manager:artifact/tick/ # core:tick/ - #declare score_holder $ArtifactSpecialCooldown + #declare score_holder #ArtifactSpecialCooldown #> Trigger検知用 # @within function @@ -40,7 +40,7 @@ #> スニークの閾値用スコアホルダー # @within function asset_manager:artifact/triggers/sneak/* - #declare score_holder $SneakThreshold + #declare score_holder #SneakThreshold #> use_itemの誤検知対策タグ # @within function @@ -63,12 +63,12 @@ #> クールダウン表示用 # @within function asset_manager:artifact/cooldown/** - #declare score_holder $Cooldown - #declare score_holder $Value - #declare score_holder $NormalizedValue - #declare score_holder $Max + #declare score_holder #Cooldown + #declare score_holder #Value + #declare score_holder #NormalizedValue + #declare score_holder #Max #> リセット用 # @within function asset_manager:artifact/triggers/equipments/update_cooldown/** - #declare score_holder $Tick - #declare score_holder $LatestUsedTick \ No newline at end of file + #declare score_holder #Tick + #declare score_holder #LatestUsedTick \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/check/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/check/.mcfunction index 51d5553ce..a55d6ceb6 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/check/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/check/.mcfunction @@ -19,7 +19,7 @@ execute if data storage asset:artifact {IgnoreCondition:"all"} run data modify storage asset:artifact IgnoreCondition set value ["believe","specialcd","mp","localcd"] # 処理用ストレージに移動 execute unless data storage asset:artifact TargetItems[0].tag.TSB.Triggers[0] run function asset_manager:artifact/data/migrate -$data modify storage asset:temp Trigger set from storage asset:artifact TargetItems[0].tag.TSB.Triggers[$(Index)] +#data modify storage asset:temp Trigger set from storage asset:artifact TargetItems[0].tag.TSB.Triggers[#(Index)] # 条件を満たしてなかったらtag削除 # 信仰による制限 execute unless data storage asset:artifact {IgnoreCondition:["believe"]} run function asset_manager:artifact/check/check_believe diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_local_cooldown/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_local_cooldown/.mcfunction index 81ade08f5..e5df0f131 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_local_cooldown/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_local_cooldown/.mcfunction @@ -6,7 +6,7 @@ #> TickScore # @within function asset_manager:artifact/check/check_local_cooldown/* - #declare score_holder $Tick + #declare score_holder #Tick # データをコピー data modify storage asset:artifact CopiedItem set from storage asset:artifact TargetItems @@ -14,4 +14,4 @@ function asset_manager:artifact/check/check_local_cooldown/foreach with storage asset:artifact # リセット data remove storage asset:artifact CopiedItem - scoreboard players reset $Tick Temporary \ No newline at end of file + scoreboard players reset #Tick Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_local_cooldown/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_local_cooldown/foreach.mcfunction index 4dbd2817a..e6b93f8d7 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_local_cooldown/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_local_cooldown/foreach.mcfunction @@ -6,23 +6,23 @@ #> Private # @private - #declare score_holder $LatestUsedTick - #declare score_holder $Cooldown + #declare score_holder #LatestUsedTick + #declare score_holder #Cooldown # 時間を取得 - execute store result score $Tick Temporary run time query gametime + execute store result score #Tick Temporary run time query gametime # 最後に使用したtickとLocalCooldownを取得 -$execute store result score $LatestUsedTick Temporary run data get storage asset:artifact CopiedItem[-1].tag.TSB.Triggers.[$(Index)].LatestUseTick -$execute store result score $Cooldown Temporary run data get storage asset:artifact CopiedItem[-1].tag.TSB.Triggers[$(Index)].LocalCooldown +#execute store result score #LatestUsedTick Temporary run data get storage asset:artifact CopiedItem[-1].tag.TSB.Triggers.[#(Index)].LatestUseTick +#execute store result score #Cooldown Temporary run data get storage asset:artifact CopiedItem[-1].tag.TSB.Triggers[#(Index)].LocalCooldown # 減算 - scoreboard players operation $Tick Temporary -= $LatestUsedTick Temporary + scoreboard players operation #Tick Temporary -= #LatestUsedTick Temporary # 比較 - execute unless score $Tick Temporary >= $Cooldown Temporary run tag @s add CheckFailed + execute unless score #Tick Temporary >= #Cooldown Temporary run tag @s add CheckFailed # 末尾削除 data remove storage asset:artifact CopiedItem[-1] # リセット - scoreboard players reset $Cooldown Temporary - scoreboard players reset $LatestUsedTick Temporary - scoreboard players reset $Tick Temporary + scoreboard players reset #Cooldown Temporary + scoreboard players reset #LatestUsedTick Temporary + scoreboard players reset #Tick Temporary # 要素がまだあるなら再帰 execute if data storage asset:artifact CopiedItem[0] run function asset_manager:artifact/check/check_local_cooldown/foreach \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_mp.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_mp.mcfunction index 9fde33d21..6c16836e6 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_mp.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_mp.mcfunction @@ -6,17 +6,17 @@ #> Private # @private - #declare score_holder $Length + #declare score_holder #Length # MP必要量を取得 execute if data storage asset:temp Trigger.MPRequire run data modify storage api: Argument.Threshold set from storage asset:temp Trigger.MPRequire execute unless data storage asset:temp Trigger.MPRequire run data modify storage api: Argument.Threshold set from storage asset:temp Trigger.MPCost # アイテム数だけ増やす - # execute store result score $Length Temporary if data storage asset:artifact TargetItems[] - # scoreboard players operation $CheckMP Lib *= $Length Temporary + # execute store result score #Length Temporary if data storage asset:artifact TargetItems[] + # scoreboard players operation #CheckMP Lib *= #Length Temporary # チェック function api:mp/check # タグ付与 execute unless data storage api: Return{IsThresholdOrMore:true} run tag @s add CheckFailed # リセット - scoreboard players reset $Length Temporary \ No newline at end of file + scoreboard players reset #Length Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_special_cooldown.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_special_cooldown.mcfunction index 5d2f3f974..923ae5b0a 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_special_cooldown.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/check/check_special_cooldown.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:artifact/check/ -# 特殊クールダウンが存在する∧$ArtifactSpecialCooldownが1以上ならタグ付与 // Item.tag.TSB.SpecialCooldown && $ArtifactSpecialCooldown >= 1 - execute if data storage asset:temp Trigger.SpecialCooldown if score $ArtifactSpecialCooldown Global matches 1.. run tag @s add CheckFailed \ No newline at end of file +# 特殊クールダウンが存在する∧#ArtifactSpecialCooldownが1以上ならタグ付与 // Item.tag.TSB.SpecialCooldown && #ArtifactSpecialCooldown >= 1 + execute if data storage asset:temp Trigger.SpecialCooldown if score #ArtifactSpecialCooldown Global matches 1.. run tag @s add CheckFailed \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/.mcfunction index a07f514ae..7c59f9ff8 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/.mcfunction @@ -47,9 +47,9 @@ # 元に戻す data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown set from storage asset:artifact LCDs # リセット - scoreboard players reset $Value Temporary - scoreboard players reset $NormalizedValue Temporary - scoreboard players reset $Max Temporary + scoreboard players reset #Value Temporary + scoreboard players reset #NormalizedValue Temporary + scoreboard players reset #Max Temporary data remove storage asset:artifact LCDs data remove storage asset:artifact DecrementedCLDs data remove storage asset:artifact MainBarMessage diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/construct_msgs_and_revert_lcds.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/construct_msgs_and_revert_lcds.mcfunction index 905a25023..7503cafb3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/construct_msgs_and_revert_lcds.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/construct_msgs_and_revert_lcds.mcfunction @@ -29,21 +29,21 @@ data modify storage asset:artifact LCDs append from storage asset:artifact DecrementedLCDs[-1] # 表示する値を算出する # 取得 - execute store result score $Value Temporary run data get storage asset:artifact LCDs[-1].Value - execute store result score $Max Temporary run data get storage asset:artifact LCDs[-1].Max + execute store result score #Value Temporary run data get storage asset:artifact LCDs[-1].Value + execute store result score #Max Temporary run data get storage asset:artifact LCDs[-1].Max # 0除算回避の為に0なら1にする - execute if score $Max Temporary matches 0 run scoreboard players set $Max Temporary 1 - # $Valueを移す - scoreboard players operation $NormalizedValue Temporary = $Value Temporary + execute if score #Max Temporary matches 0 run scoreboard players set #Max Temporary 1 + # #Valueを移す + scoreboard players operation #NormalizedValue Temporary = #Value Temporary # valueが負数(!= -15)なら0にする - execute if score $NormalizedValue Temporary matches -14..-1 run scoreboard players set $NormalizedValue Temporary 0 + execute if score #NormalizedValue Temporary matches -14..-1 run scoreboard players set #NormalizedValue Temporary 0 # 0~16の範囲に切り上げで補正する - scoreboard players operation $NormalizedValue Temporary *= $-16 Const - scoreboard players operation $NormalizedValue Temporary /= $Max Temporary - scoreboard players operation $NormalizedValue Temporary *= $-1 Const + scoreboard players operation #NormalizedValue Temporary *= #-16 Const + scoreboard players operation #NormalizedValue Temporary /= #Max Temporary + scoreboard players operation #NormalizedValue Temporary *= #-1 Const # LCDMessagesに追加 - execute if score $Value Temporary matches -15 run data modify storage asset:artifact LCDMessages append value '{"text":"ε","color":"white"}' - execute unless score $Value Temporary matches -15 run function asset_manager:artifact/cooldown/foreach/store_lcd_bar + execute if score #Value Temporary matches -15 run data modify storage asset:artifact LCDMessages append value '{"text":"ε","color":"white"}' + execute unless score #Value Temporary matches -15 run function asset_manager:artifact/cooldown/foreach/store_lcd_bar # 末尾削除 data remove storage asset:artifact DecrementedLCDs[-1] # 要素があれば再帰 diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/decrement.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/decrement.mcfunction index 36c08cc15..90c0447e6 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/decrement.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/decrement.mcfunction @@ -8,9 +8,9 @@ # デクリメント data modify storage asset:artifact DecrementedLCDs append from storage asset:artifact LCDs[-1] - execute store result score $Value Temporary run data get storage asset:artifact LCDs[-1].Value - execute if score $Value Temporary matches -14.. run scoreboard players remove $Value Temporary 1 - execute store result storage asset:artifact DecrementedLCDs[-1].Value int 1 run scoreboard players get $Value Temporary + execute store result score #Value Temporary run data get storage asset:artifact LCDs[-1].Value + execute if score #Value Temporary matches -14.. run scoreboard players remove #Value Temporary 1 + execute store result storage asset:artifact DecrementedLCDs[-1].Value int 1 run scoreboard players get #Value Temporary # 末尾削除 data remove storage asset:artifact LCDs[-1] # 要素があれば再帰 diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/store_lcd_bar.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/store_lcd_bar.mcfunction index ae3eb5e82..e9c6039ee 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/store_lcd_bar.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/foreach/store_lcd_bar.mcfunction @@ -4,20 +4,20 @@ # # @within function asset_manager:artifact/cooldown/foreach/construct_msgs_and_revert_lcds -execute if score $NormalizedValue Temporary matches 00 run data modify storage asset:artifact LCDMessages append value '{"text":"a","color":"white"}' -execute if score $NormalizedValue Temporary matches 01 run data modify storage asset:artifact LCDMessages append value '{"text":"b","color":"white"}' -execute if score $NormalizedValue Temporary matches 02 run data modify storage asset:artifact LCDMessages append value '{"text":"c","color":"white"}' -execute if score $NormalizedValue Temporary matches 03 run data modify storage asset:artifact LCDMessages append value '{"text":"d","color":"white"}' -execute if score $NormalizedValue Temporary matches 04 run data modify storage asset:artifact LCDMessages append value '{"text":"e","color":"white"}' -execute if score $NormalizedValue Temporary matches 05 run data modify storage asset:artifact LCDMessages append value '{"text":"f","color":"white"}' -execute if score $NormalizedValue Temporary matches 06 run data modify storage asset:artifact LCDMessages append value '{"text":"g","color":"white"}' -execute if score $NormalizedValue Temporary matches 07 run data modify storage asset:artifact LCDMessages append value '{"text":"h","color":"white"}' -execute if score $NormalizedValue Temporary matches 08 run data modify storage asset:artifact LCDMessages append value '{"text":"i","color":"white"}' -execute if score $NormalizedValue Temporary matches 09 run data modify storage asset:artifact LCDMessages append value '{"text":"j","color":"white"}' -execute if score $NormalizedValue Temporary matches 10 run data modify storage asset:artifact LCDMessages append value '{"text":"k","color":"white"}' -execute if score $NormalizedValue Temporary matches 11 run data modify storage asset:artifact LCDMessages append value '{"text":"l","color":"white"}' -execute if score $NormalizedValue Temporary matches 12 run data modify storage asset:artifact LCDMessages append value '{"text":"m","color":"white"}' -execute if score $NormalizedValue Temporary matches 13 run data modify storage asset:artifact LCDMessages append value '{"text":"n","color":"white"}' -execute if score $NormalizedValue Temporary matches 14 run data modify storage asset:artifact LCDMessages append value '{"text":"o","color":"white"}' -execute if score $NormalizedValue Temporary matches 15 run data modify storage asset:artifact LCDMessages append value '{"text":"p","color":"white"}' -execute if score $NormalizedValue Temporary matches 16 run data modify storage asset:artifact LCDMessages append value '{"text":"q","color":"white"}' \ No newline at end of file +execute if score #NormalizedValue Temporary matches 00 run data modify storage asset:artifact LCDMessages append value '{"text":"a","color":"white"}' +execute if score #NormalizedValue Temporary matches 01 run data modify storage asset:artifact LCDMessages append value '{"text":"b","color":"white"}' +execute if score #NormalizedValue Temporary matches 02 run data modify storage asset:artifact LCDMessages append value '{"text":"c","color":"white"}' +execute if score #NormalizedValue Temporary matches 03 run data modify storage asset:artifact LCDMessages append value '{"text":"d","color":"white"}' +execute if score #NormalizedValue Temporary matches 04 run data modify storage asset:artifact LCDMessages append value '{"text":"e","color":"white"}' +execute if score #NormalizedValue Temporary matches 05 run data modify storage asset:artifact LCDMessages append value '{"text":"f","color":"white"}' +execute if score #NormalizedValue Temporary matches 06 run data modify storage asset:artifact LCDMessages append value '{"text":"g","color":"white"}' +execute if score #NormalizedValue Temporary matches 07 run data modify storage asset:artifact LCDMessages append value '{"text":"h","color":"white"}' +execute if score #NormalizedValue Temporary matches 08 run data modify storage asset:artifact LCDMessages append value '{"text":"i","color":"white"}' +execute if score #NormalizedValue Temporary matches 09 run data modify storage asset:artifact LCDMessages append value '{"text":"j","color":"white"}' +execute if score #NormalizedValue Temporary matches 10 run data modify storage asset:artifact LCDMessages append value '{"text":"k","color":"white"}' +execute if score #NormalizedValue Temporary matches 11 run data modify storage asset:artifact LCDMessages append value '{"text":"l","color":"white"}' +execute if score #NormalizedValue Temporary matches 12 run data modify storage asset:artifact LCDMessages append value '{"text":"m","color":"white"}' +execute if score #NormalizedValue Temporary matches 13 run data modify storage asset:artifact LCDMessages append value '{"text":"n","color":"white"}' +execute if score #NormalizedValue Temporary matches 14 run data modify storage asset:artifact LCDMessages append value '{"text":"o","color":"white"}' +execute if score #NormalizedValue Temporary matches 15 run data modify storage asset:artifact LCDMessages append value '{"text":"p","color":"white"}' +execute if score #NormalizedValue Temporary matches 16 run data modify storage asset:artifact LCDMessages append value '{"text":"q","color":"white"}' \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/.mcfunction index 22c4855d3..aa79e288a 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/.mcfunction @@ -15,25 +15,25 @@ execute if data storage api: {SelectedItemSlot:7} run data modify storage asset:artifact TargetLCD set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[12] execute if data storage api: {SelectedItemSlot:8} run data modify storage asset:artifact TargetLCD set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[13] # 取得 - execute store result score $Value Temporary run data get storage asset:artifact TargetLCD.Value - execute store result score $Max Temporary run data get storage asset:artifact TargetLCD.Max + execute store result score #Value Temporary run data get storage asset:artifact TargetLCD.Value + execute store result score #Max Temporary run data get storage asset:artifact TargetLCD.Max # valueが負数(!= -15)なら0にする - execute if score $Value Temporary matches -14..-1 run scoreboard players set $Value Temporary 0 + execute if score #Value Temporary matches -14..-1 run scoreboard players set #Value Temporary 0 # 0~100の範囲にする - scoreboard players operation $Value Temporary *= $-100 Const - scoreboard players operation $Value Temporary /= $Max Temporary - scoreboard players operation $Value Temporary *= $-1 Const -# $LeftBarを求める - scoreboard players operation $LeftBar Temporary = $100 Const - scoreboard players operation $LeftBar Temporary -= $Value Temporary + scoreboard players operation #Value Temporary *= #-100 Const + scoreboard players operation #Value Temporary /= #Max Temporary + scoreboard players operation #Value Temporary *= #-1 Const +# #LeftBarを求める + scoreboard players operation #LeftBar Temporary = #100 Const + scoreboard players operation #LeftBar Temporary -= #Value Temporary # if (Maxが0では無い && valueが負数で無い) ならば表示バーを構築する // ここで負数であるのは-15の場合のみ。 - execute unless score $Max Temporary matches 0 if score $Value Temporary matches 1.. run data modify storage asset:artifact MainBarMessage append value '{"text":"","color":"#00D3FF"}' - execute unless score $Max Temporary matches 0 if score $Value Temporary matches 0 run data modify storage asset:artifact MainBarMessage append value '{"text":"","color":"#64FF00"}' - execute unless score $Max Temporary matches 0 if score $Value Temporary matches 0.. if score $LeftBar Temporary matches 1.. run function asset_manager:artifact/cooldown/main_bar/append_bar_left - execute unless score $Max Temporary matches 0 if score $Value Temporary matches 0.. if score $Value Temporary matches 1.. run function asset_manager:artifact/cooldown/main_bar/append_bar_right - execute unless score $Max Temporary matches 0 if score $Value Temporary matches 0.. run data modify storage asset:artifact MainBarMessage append value '{"text":"-]","color":"white"}' + execute unless score #Max Temporary matches 0 if score #Value Temporary matches 1.. run data modify storage asset:artifact MainBarMessage append value '{"text":"","color":"#00D3FF"}' + execute unless score #Max Temporary matches 0 if score #Value Temporary matches 0 run data modify storage asset:artifact MainBarMessage append value '{"text":"","color":"#64FF00"}' + execute unless score #Max Temporary matches 0 if score #Value Temporary matches 0.. if score #LeftBar Temporary matches 1.. run function asset_manager:artifact/cooldown/main_bar/append_bar_left + execute unless score #Max Temporary matches 0 if score #Value Temporary matches 0.. if score #Value Temporary matches 1.. run function asset_manager:artifact/cooldown/main_bar/append_bar_right + execute unless score #Max Temporary matches 0 if score #Value Temporary matches 0.. run data modify storage asset:artifact MainBarMessage append value '{"text":"-]","color":"white"}' # else execute unless data storage asset:artifact MainBarMessage[0] run data modify storage asset:artifact MainBarMessage set value ['{"text":"#"}'] # リセット - scoreboard players reset $LeftBar Temporary + scoreboard players reset #LeftBar Temporary data remove storage asset:artifact TargetLCD \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/_index.d.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/_index.d.mcfunction index d65476260..bf3872c15 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/_index.d.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/_index.d.mcfunction @@ -3,4 +3,4 @@ #> declare # @within function asset_manager:artifact/cooldown/main_bar/* - #declare score_holder $LeftBar \ No newline at end of file + #declare score_holder #LeftBar \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/append_bar_left.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/append_bar_left.mcfunction index 9f85e2343..884f0944a 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/append_bar_left.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/append_bar_left.mcfunction @@ -7,5 +7,5 @@ # asset_manager:artifact/cooldown/main_bar/append_bar_left data modify storage asset:artifact MainBarMessage append value '{"text":"|."}' -scoreboard players remove $LeftBar Temporary 1 -execute if score $LeftBar Temporary matches 1.. run function asset_manager:artifact/cooldown/main_bar/append_bar_left \ No newline at end of file +scoreboard players remove #LeftBar Temporary 1 +execute if score #LeftBar Temporary matches 1.. run function asset_manager:artifact/cooldown/main_bar/append_bar_left \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/append_bar_right.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/append_bar_right.mcfunction index a5b5b8315..9ee44a9a3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/append_bar_right.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/cooldown/main_bar/append_bar_right.mcfunction @@ -7,5 +7,5 @@ # asset_manager:artifact/cooldown/main_bar/append_bar_right data modify storage asset:artifact MainBarMessage append value '{"text":"|.","color":"#233645"}' -scoreboard players remove $Value Temporary 1 -execute if score $Value Temporary matches 1.. run function asset_manager:artifact/cooldown/main_bar/append_bar_right \ No newline at end of file +scoreboard players remove #Value Temporary 1 +execute if score #Value Temporary matches 1.. run function asset_manager:artifact/cooldown/main_bar/append_bar_right \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_attack_info.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_attack_info.mcfunction index 659174110..c98ddf3e5 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_attack_info.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_attack_info.mcfunction @@ -6,7 +6,7 @@ #> private # @private - #declare score_holder $IsList + #declare score_holder #IsList # 初期化 data modify storage asset:temp Line1 set value ['""','{"text":"???"}','[{"text":"範囲-"},{"text":"不明","color":"gray"}]','""'] @@ -19,14 +19,14 @@ # ダメージ量を表示 //未設定-??? # Listかを確認 - execute if data storage asset:temp Trigger.AttackInfo.Damage[0] run scoreboard players set $IsList Temporary 1 - execute if data storage asset:temp Trigger{AttackInfo:{Damage:[]}} run scoreboard players set $IsList Temporary 1 + execute if data storage asset:temp Trigger.AttackInfo.Damage[0] run scoreboard players set #IsList Temporary 1 + execute if data storage asset:temp Trigger{AttackInfo:{Damage:[]}} run scoreboard players set #IsList Temporary 1 # Literalのとき - execute unless score $IsList Temporary matches 1.. if data storage asset:temp Trigger.AttackInfo.Damage run data modify storage asset:temp Line1[1] set value '[{"storage":"asset:temp","nbt":"Trigger.AttackInfo.Damage"}]' + execute unless score #IsList Temporary matches 1.. if data storage asset:temp Trigger.AttackInfo.Damage run data modify storage asset:temp Line1[1] set value '[{"storage":"asset:temp","nbt":"Trigger.AttackInfo.Damage"}]' # List(要素数1)のとき - execute if score $IsList Temporary matches 1.. if data storage asset:temp Trigger.AttackInfo.Damage[0] run data modify storage asset:temp Line1[1] set value '[{"storage":"asset:temp","nbt":"Trigger.AttackInfo.Damage[0]"}]' + execute if score #IsList Temporary matches 1.. if data storage asset:temp Trigger.AttackInfo.Damage[0] run data modify storage asset:temp Line1[1] set value '[{"storage":"asset:temp","nbt":"Trigger.AttackInfo.Damage[0]"}]' # List(要素数2)のとき - execute if score $IsList Temporary matches 1.. if data storage asset:temp Trigger.AttackInfo.Damage[1] run data modify storage asset:temp Line1[1] set value '[{"storage":"asset:temp","nbt":"Trigger.AttackInfo.Damage[0]"},{"text":"-"},{"storage":"asset:temp","nbt":"Trigger.AttackInfo.Damage[1]"}]' + execute if score #IsList Temporary matches 1.. if data storage asset:temp Trigger.AttackInfo.Damage[1] run data modify storage asset:temp Line1[1] set value '[{"storage":"asset:temp","nbt":"Trigger.AttackInfo.Damage[0]"},{"text":"-"},{"storage":"asset:temp","nbt":"Trigger.AttackInfo.Damage[1]"}]' # 単体/確率範囲/条件範囲/常時範囲 を表示 //未設定-不明 execute if data storage asset:temp Trigger{AttackInfo:{IsRangeAttack:never}} run data modify storage asset:temp Line1[2] set value '[{"text":"単体"}]' @@ -58,4 +58,4 @@ # リセット data remove storage asset:temp Line1 data remove storage asset:temp Line2 - scoreboard players reset $IsList Temporary \ No newline at end of file + scoreboard players reset #IsList Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_cooltime.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_cooltime.mcfunction index 4343c206d..4b28f576f 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_cooltime.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_cooltime.mcfunction @@ -6,36 +6,36 @@ #> Temp # @private - #declare score_holder $Cooldown - #declare score_holder $CooldownDecimal - #declare score_holder $CooldownMinutes + #declare score_holder #Cooldown + #declare score_holder #CooldownDecimal + #declare score_holder #CooldownMinutes # 5? クールタイムを秒数に変換 - execute store result score $Cooldown Temporary run data get storage asset:temp Trigger.LocalCooldown - scoreboard players operation $Cooldown Temporary /= $20 Const + execute store result score #Cooldown Temporary run data get storage asset:temp Trigger.LocalCooldown + scoreboard players operation #Cooldown Temporary /= #20 Const # 5? クールタイムの小数第一位まで求める - execute store result score $CooldownDecimal Temporary run data get storage asset:temp Trigger.LocalCooldown - scoreboard players operation $CooldownDecimal Temporary %= $20 Const - scoreboard players operation $CooldownDecimal Temporary *= $5 Const + execute store result score #CooldownDecimal Temporary run data get storage asset:temp Trigger.LocalCooldown + scoreboard players operation #CooldownDecimal Temporary %= #20 Const + scoreboard players operation #CooldownDecimal Temporary *= #5 Const # 5? 秒数を分に変換 - scoreboard players operation $CooldownMinutes Temporary = $Cooldown Temporary - scoreboard players operation $CooldownMinutes Temporary /= $60 Const + scoreboard players operation #CooldownMinutes Temporary = #Cooldown Temporary + scoreboard players operation #CooldownMinutes Temporary /= #60 Const # 用がなくなったらmod演算 - scoreboard players operation $Cooldown Temporary %= $60 Const + scoreboard players operation #Cooldown Temporary %= #60 Const # 分がいるかをloot_table側で判断するためのフラグ - execute if score $CooldownMinutes Temporary matches 1.. run scoreboard players set @s Temporary 1 + execute if score #CooldownMinutes Temporary matches 1.. run scoreboard players set @s Temporary 1 # 5?ストレージに入れる - execute store result storage asset:temp LocalCooldownSecond int 1 run scoreboard players get $Cooldown Temporary - execute store result storage asset:temp LocalCooldownDecimal int 1 run scoreboard players get $CooldownDecimal Temporary - execute store result storage asset:temp LocalCooldownMinutes int 1 run scoreboard players get $CooldownMinutes Temporary + execute store result storage asset:temp LocalCooldownSecond int 1 run scoreboard players get #Cooldown Temporary + execute store result storage asset:temp LocalCooldownDecimal int 1 run scoreboard players get #CooldownDecimal Temporary + execute store result storage asset:temp LocalCooldownMinutes int 1 run scoreboard players get #CooldownMinutes Temporary # lootする loot replace block 10000 0 10000 container.6 loot asset_manager:artifact/generate_lore/cooldown # リセット - scoreboard players reset $Cooldown - scoreboard players reset $CooldownDecimal - scoreboard players reset $CooldownMinutes + scoreboard players reset #Cooldown + scoreboard players reset #CooldownDecimal + scoreboard players reset #CooldownMinutes scoreboard players reset @s Temporary data remove storage asset:temp LocalCooldownSecond data remove storage asset:temp LocalCooldownDecimal diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_data.mcfunction index 075d6031b..3c7f03047 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_data.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_data.mcfunction @@ -25,7 +25,7 @@ #> Private # @private - #declare score_holder $ArtifactIndex + #declare score_holder #ArtifactIndex # 移行 data modify storage asset:artifact BaseItem set from storage asset:artifact Item @@ -37,8 +37,8 @@ # Version data modify storage asset:artifact Item.tag.TSB.Version set from storage global GameVersion # Unique Universal Identifier - scoreboard players add $ArtifactIndex Global 1 - execute store result storage asset:artifact Item.tag.TSB.UUID int 1 run scoreboard players get $ArtifactIndex Global + scoreboard players add #ArtifactIndex Global 1 + execute store result storage asset:artifact Item.tag.TSB.UUID int 1 run scoreboard players get #ArtifactIndex Global # 扱える神のエイリアスを修正する execute if data storage asset:artifact {CanUsedGod:"ALL"} run data modify storage asset:artifact CanUsedGod set value ['Flora','Urban','Nyaptov','Wi-ki','Rumor'] # 使用回数の最大値（デフォルト） diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_special_cooltime.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_special_cooltime.mcfunction index 257ee2cb6..6de13588f 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_special_cooltime.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/create/set_special_cooltime.mcfunction @@ -6,36 +6,36 @@ #> Temp # @private - #declare score_holder $Cooldown - #declare score_holder $CooldownDecimal - #declare score_holder $CooldownMinutes + #declare score_holder #Cooldown + #declare score_holder #CooldownDecimal + #declare score_holder #CooldownMinutes # 5? スペシャル☆クールタイムを秒数に変換 - execute store result score $Cooldown Temporary run data get storage asset:temp Trigger.SpecialCooldown - scoreboard players operation $Cooldown Temporary /= $20 Const + execute store result score #Cooldown Temporary run data get storage asset:temp Trigger.SpecialCooldown + scoreboard players operation #Cooldown Temporary /= #20 Const # 5? スペシャル☆クールタイムの小数第一位まで求める - execute store result score $CooldownDecimal Temporary run data get storage asset:temp Trigger.SpecialCooldown - scoreboard players operation $CooldownDecimal Temporary %= $20 Const - scoreboard players operation $CooldownDecimal Temporary *= $5 Const + execute store result score #CooldownDecimal Temporary run data get storage asset:temp Trigger.SpecialCooldown + scoreboard players operation #CooldownDecimal Temporary %= #20 Const + scoreboard players operation #CooldownDecimal Temporary *= #5 Const # 5? 秒数を分に変換 - scoreboard players operation $CooldownMinutes Temporary = $Cooldown Temporary - scoreboard players operation $CooldownMinutes Temporary /= $60 Const + scoreboard players operation #CooldownMinutes Temporary = #Cooldown Temporary + scoreboard players operation #CooldownMinutes Temporary /= #60 Const # 用がなくなったらmod演算 - scoreboard players operation $Cooldown Temporary %= $60 Const + scoreboard players operation #Cooldown Temporary %= #60 Const # 分がいるかをloot_table側で判断するためのフラグ - execute if score $CooldownMinutes Temporary matches 1.. run scoreboard players set @s Temporary 1 + execute if score #CooldownMinutes Temporary matches 1.. run scoreboard players set @s Temporary 1 # 5?ストレージに入れる - execute store result storage asset:temp SpecialCooldownSecond int 1 run scoreboard players get $Cooldown Temporary - execute store result storage asset:temp SpecialCooldownDecimal int 1 run scoreboard players get $CooldownDecimal Temporary - execute store result storage asset:temp SpecialCooldownMinutes int 1 run scoreboard players get $CooldownMinutes Temporary + execute store result storage asset:temp SpecialCooldownSecond int 1 run scoreboard players get #Cooldown Temporary + execute store result storage asset:temp SpecialCooldownDecimal int 1 run scoreboard players get #CooldownDecimal Temporary + execute store result storage asset:temp SpecialCooldownMinutes int 1 run scoreboard players get #CooldownMinutes Temporary # lootする loot replace block 10000 0 10000 container.7 loot asset_manager:artifact/generate_lore/special_cooldown # リセット - scoreboard players reset $Cooldown - scoreboard players reset $CooldownDecimal - scoreboard players reset $CooldownMinutes + scoreboard players reset #Cooldown + scoreboard players reset #CooldownDecimal + scoreboard players reset #CooldownMinutes scoreboard players reset @s Temporary data remove storage asset:temp SpecialCooldownSecond data remove storage asset:temp SpecialCooldownDecimal diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/data/current/filter.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/data/current/filter.mcfunction index 059d885dd..1d5e33305 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/data/current/filter.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/data/current/filter.mcfunction @@ -8,15 +8,15 @@ #> Private # @private - #declare score_holder $nonIDEquals + #declare score_holder #nonIDEquals # 比較 data modify storage asset:artifact Temp set from storage asset:artifact TargetID - execute store success score $nonIDEquals Temporary run data modify storage asset:artifact Temp set from storage asset:artifact HotbarItems[-1].tag.TSB.ID + execute store success score #nonIDEquals Temporary run data modify storage asset:artifact Temp set from storage asset:artifact HotbarItems[-1].tag.TSB.ID # 一致してたら追加 - execute if score $nonIDEquals Temporary matches 0 run data modify storage asset:artifact TargetItems append from storage asset:artifact HotbarItems[-1] + execute if score #nonIDEquals Temporary matches 0 run data modify storage asset:artifact TargetItems append from storage asset:artifact HotbarItems[-1] # リセット - scoreboard players reset $nonIDEquals Temporary + scoreboard players reset #nonIDEquals Temporary data remove storage asset:artifact Temp data remove storage asset:artifact HotbarItems[-1] # 要素が残ってたら再帰 diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/give.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/give.mcfunction index bb1a155e6..b607ba26e 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/give.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/give.mcfunction @@ -6,8 +6,8 @@ #> For calc # @private - #declare score_holder $CandidateLength - #declare score_holder $Argument.Index + #declare score_holder #CandidateLength + #declare score_holder #Argument.Index # セッション開ける function lib:array/session/open @@ -17,10 +17,10 @@ execute if data storage api: Argument{Rarity:3} run data modify storage lib: Array set from storage asset:artifact RarityRegistry[3] execute if data storage api: Argument{Rarity:4} run data modify storage lib: Array set from storage asset:artifact RarityRegistry[4] # データサイズを取得 - execute store result score $CandidateLength Temporary if data storage lib: Array[] + execute store result score #CandidateLength Temporary if data storage lib: Array[] # 対象Indexを決定 - execute store result score $Argument.Index Lib run function lib:random/ - scoreboard players operation $Argument.Index Lib %= $CandidateLength Temporary + execute store result score #Argument.Index Lib run function lib:random/ + scoreboard players operation #Argument.Index Lib %= #CandidateLength Temporary # 候補データを操作して対象Indexを-1に持ってくる function lib:array/move # asset:context idがある場合は退避 @@ -33,5 +33,5 @@ function asset_manager:common/context_id/pop # リセット function lib:array/session/close - scoreboard players reset $CandidateLength Temporary + scoreboard players reset #CandidateLength Temporary data remove storage lib: Array \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/tick/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/tick/.mcfunction index c0cd6c425..fd68adc02 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/tick/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/tick/.mcfunction @@ -5,6 +5,6 @@ # @within function core:tick/ # グローバルクールダウン処理 - execute if score $ArtifactSpecialCooldown Global matches 1.. run scoreboard players remove $ArtifactSpecialCooldown Global 1 - execute if score $ArtifactSpecialCooldown Global matches 0 run bossbar set asset:special_cooldown players - execute store result bossbar asset:special_cooldown value run scoreboard players get $ArtifactSpecialCooldown Global \ No newline at end of file + execute if score #ArtifactSpecialCooldown Global matches 1.. run scoreboard players remove #ArtifactSpecialCooldown Global 1 + execute if score #ArtifactSpecialCooldown Global matches 0 run bossbar set asset:special_cooldown players + execute store result bossbar asset:special_cooldown value run scoreboard players get #ArtifactSpecialCooldown Global \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/compare.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/compare.mcfunction index 9e549b8c5..b129be584 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/compare.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/compare.mcfunction @@ -6,7 +6,7 @@ #> private use # @private - #declare score_holder $Temp + #declare score_holder #Temp # イベント発火前に実行するやつ function asset_manager:artifact/data/new/set_to_current @@ -34,4 +34,4 @@ data modify storage asset:artifact EquipmentChanges set from storage lib: CompareResult # リセット function lib:array/session/close - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/.mcfunction index 0b5e97b99..1243019f5 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/.mcfunction @@ -32,5 +32,5 @@ # リセット function lib:array/session/close data remove storage asset:artifact ItemData - scoreboard players reset $Tick Temporary - scoreboard players reset $LatestUsedTick Temporary \ No newline at end of file + scoreboard players reset #Tick Temporary + scoreboard players reset #LatestUsedTick Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/.mcfunction index 7dbdd271b..0329a2fd3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/.mcfunction @@ -6,29 +6,29 @@ #> Private # @private - #declare score_holder $Max - #declare score_holder $Current + #declare score_holder #Max + #declare score_holder #Current # データ取得 - execute store result score $Tick Temporary run time query gametime + execute store result score #Tick Temporary run time query gametime data modify storage asset:temp Triggers set from storage asset:artifact ItemData[-1].Triggers function asset_manager:artifact/triggers/equipments/update_cooldown/foreach/get_cooldown - execute store result storage asset:temp MaxLCD int 1 run scoreboard players get $Max Temporary + execute store result storage asset:temp MaxLCD int 1 run scoreboard players get #Max Temporary function asset_manager:artifact/triggers/equipments/update_cooldown/foreach/get_tick with storage asset:temp # 使用してからの時間を取得 - scoreboard players operation $Current Temporary = $Max Temporary - scoreboard players operation $Tick Temporary -= $LatestUsedTick Temporary - scoreboard players operation $Current Temporary -= $Tick Temporary - execute if score $Current Temporary matches ..-15 run scoreboard players set $Current Temporary -15 + scoreboard players operation #Current Temporary = #Max Temporary + scoreboard players operation #Tick Temporary -= #LatestUsedTick Temporary + scoreboard players operation #Current Temporary -= #Tick Temporary + execute if score #Current Temporary matches ..-15 run scoreboard players set #Current Temporary -15 # 設定 data modify storage lib: Array append value {} - execute store result storage lib: Array[-1].Value int 1 run scoreboard players get $Current Temporary - execute store result storage lib: Array[-1].Max int 1 run scoreboard players get $Max Temporary + execute store result storage lib: Array[-1].Value int 1 run scoreboard players get #Current Temporary + execute store result storage lib: Array[-1].Max int 1 run scoreboard players get #Max Temporary # 末尾削除 data remove storage asset:artifact ItemData[-1] # リセット data remove storage asset:temp Triggers - scoreboard players reset $Max Temporary - scoreboard players reset $Current Temporary + scoreboard players reset #Max Temporary + scoreboard players reset #Current Temporary # 要素があれば再帰 execute if data storage asset:artifact ItemData[0] run function asset_manager:artifact/triggers/equipments/update_cooldown/foreach/ \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/get_cooldown.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/get_cooldown.mcfunction index 6bd562382..0f203d56c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/get_cooldown.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/get_cooldown.mcfunction @@ -5,14 +5,14 @@ #> private # @private - #declare score_holder $LCD + #declare score_holder #LCD # maximize - execute store result score $LCD Temporary run data get storage asset:temp Triggers[-1].LocalCooldown 1 - scoreboard players operation $Max Temporary > $LCD Temporary + execute store result score #LCD Temporary run data get storage asset:temp Triggers[-1].LocalCooldown 1 + scoreboard players operation #Max Temporary > #LCD Temporary # loop - scoreboard players reset $LCD Temporary + scoreboard players reset #LCD Temporary data remove storage asset:temp Triggers[-1] execute unless data storage asset:temp Triggers[0] run data remove storage asset:temp Triggers execute if data storage asset:temp Triggers[0] run function asset_manager:artifact/triggers/equipments/update_cooldown/foreach/get_cooldown \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/get_tick.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/get_tick.mcfunction index 3f9c9910b..589e13e21 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/get_tick.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/equipments/update_cooldown/foreach/get_tick.mcfunction @@ -2,5 +2,5 @@ # @within function # asset_manager:artifact/triggers/equipments/update_cooldown/foreach/ -$execute store result score $LatestUsedTick Temporary run data get storage asset:artifact ItemData[-1].Triggers[{LocalCooldown:$(MaxLCD)}].LatestUseTick +#execute store result score #LatestUsedTick Temporary run data get storage asset:artifact ItemData[-1].Triggers[{LocalCooldown:#(MaxLCD)}].LatestUseTick data remove storage asset:temp MaxLCD \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/.mcfunction index b29503db0..cefa606fb 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/.mcfunction @@ -14,56 +14,56 @@ # keepトリガー類 function #asset:artifact/sneak/keep/ - execute if score @s Sneak matches 20.. run scoreboard players set $SneakThreshold Temporary 20 + execute if score @s Sneak matches 20.. run scoreboard players set #SneakThreshold Temporary 20 execute if score @s Sneak matches 20.. run function asset_manager:artifact/triggers/sneak/reset_threshold_less execute if score @s Sneak matches 20.. run function #asset:artifact/sneak/keep/1s - execute if score @s Sneak matches 40.. run scoreboard players set $SneakThreshold Temporary 40 + execute if score @s Sneak matches 40.. run scoreboard players set #SneakThreshold Temporary 40 execute if score @s Sneak matches 40.. run function asset_manager:artifact/triggers/sneak/reset_threshold_less execute if score @s Sneak matches 40.. run function #asset:artifact/sneak/keep/2s - execute if score @s Sneak matches 60.. run scoreboard players set $SneakThreshold Temporary 60 + execute if score @s Sneak matches 60.. run scoreboard players set #SneakThreshold Temporary 60 execute if score @s Sneak matches 60.. run function asset_manager:artifact/triggers/sneak/reset_threshold_less execute if score @s Sneak matches 60.. run function #asset:artifact/sneak/keep/3s - execute if score @s Sneak matches 80.. run scoreboard players set $SneakThreshold Temporary 80 + execute if score @s Sneak matches 80.. run scoreboard players set #SneakThreshold Temporary 80 execute if score @s Sneak matches 80.. run function asset_manager:artifact/triggers/sneak/reset_threshold_less execute if score @s Sneak matches 80.. run function #asset:artifact/sneak/keep/4s - execute if score @s Sneak matches 100.. run scoreboard players set $SneakThreshold Temporary 100 + execute if score @s Sneak matches 100.. run scoreboard players set #SneakThreshold Temporary 100 execute if score @s Sneak matches 100.. run function asset_manager:artifact/triggers/sneak/reset_threshold_less execute if score @s Sneak matches 100.. run function #asset:artifact/sneak/keep/5s - execute if score @s Sneak matches 200.. run scoreboard players set $SneakThreshold Temporary 200 + execute if score @s Sneak matches 200.. run scoreboard players set #SneakThreshold Temporary 200 execute if score @s Sneak matches 200.. run function asset_manager:artifact/triggers/sneak/reset_threshold_less execute if score @s Sneak matches 200.. run function #asset:artifact/sneak/keep/10s # 単発トリガー類 - scoreboard players set $SneakThreshold Temporary 1 + scoreboard players set #SneakThreshold Temporary 1 function asset_manager:artifact/triggers/sneak/reset_value_not-equal function #asset:artifact/sneak/ - execute if score @s Sneak matches 20.. run scoreboard players set $SneakThreshold Temporary 20 + execute if score @s Sneak matches 20.. run scoreboard players set #SneakThreshold Temporary 20 execute if score @s Sneak matches 20.. run function asset_manager:artifact/triggers/sneak/reset_value_not-equal execute if score @s Sneak matches 20.. run function #asset:artifact/sneak/1s - execute if score @s Sneak matches 40.. run scoreboard players set $SneakThreshold Temporary 40 + execute if score @s Sneak matches 40.. run scoreboard players set #SneakThreshold Temporary 40 execute if score @s Sneak matches 40.. run function asset_manager:artifact/triggers/sneak/reset_value_not-equal execute if score @s Sneak matches 40.. run function #asset:artifact/sneak/2s - execute if score @s Sneak matches 60.. run scoreboard players set $SneakThreshold Temporary 60 + execute if score @s Sneak matches 60.. run scoreboard players set #SneakThreshold Temporary 60 execute if score @s Sneak matches 60.. run function asset_manager:artifact/triggers/sneak/reset_value_not-equal execute if score @s Sneak matches 60.. run function #asset:artifact/sneak/3s - execute if score @s Sneak matches 80.. run scoreboard players set $SneakThreshold Temporary 80 + execute if score @s Sneak matches 80.. run scoreboard players set #SneakThreshold Temporary 80 execute if score @s Sneak matches 80.. run function asset_manager:artifact/triggers/sneak/reset_value_not-equal execute if score @s Sneak matches 80.. run function #asset:artifact/sneak/4s - execute if score @s Sneak matches 100.. run scoreboard players set $SneakThreshold Temporary 100 + execute if score @s Sneak matches 100.. run scoreboard players set #SneakThreshold Temporary 100 execute if score @s Sneak matches 100.. run function asset_manager:artifact/triggers/sneak/reset_value_not-equal execute if score @s Sneak matches 100.. run function #asset:artifact/sneak/5s - execute if score @s Sneak matches 200.. run scoreboard players set $SneakThreshold Temporary 200 + execute if score @s Sneak matches 200.. run scoreboard players set #SneakThreshold Temporary 200 execute if score @s Sneak matches 200.. run function asset_manager:artifact/triggers/sneak/reset_value_not-equal execute if score @s Sneak matches 200.. run function #asset:artifact/sneak/10s # イベント発火後に実行するやつ diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_threshold_less.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_threshold_less.mcfunction index 844edeca6..a2af2dee5 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_threshold_less.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_threshold_less.mcfunction @@ -1,24 +1,24 @@ #> asset_manager:artifact/triggers/sneak/reset_threshold_less # -# 各slotについて$SneakThreshold未満の値の場合、その値を-1に設定します +# 各slotについて#SneakThreshold未満の値の場合、その値を-1に設定します # # @within function asset_manager:artifact/triggers/sneak/ # 処理 - execute unless score @s Sneak.Mainhand >= $SneakThreshold Temporary run data modify storage asset:context id.mainhand set value -1 - execute unless score @s Sneak.Offhand >= $SneakThreshold Temporary run data modify storage asset:context id.offhand set value -1 - execute unless score @s Sneak.Head >= $SneakThreshold Temporary run data modify storage asset:context id.head set value -1 - execute unless score @s Sneak.Chest >= $SneakThreshold Temporary run data modify storage asset:context id.chest set value -1 - execute unless score @s Sneak.Legs >= $SneakThreshold Temporary run data modify storage asset:context id.legs set value -1 - execute unless score @s Sneak.Feet >= $SneakThreshold Temporary run data modify storage asset:context id.feet set value -1 - execute unless score @s Sneak.Hotbar0 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[0] set value -1 - execute unless score @s Sneak.Hotbar1 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[1] set value -1 - execute unless score @s Sneak.Hotbar2 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[2] set value -1 - execute unless score @s Sneak.Hotbar3 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[3] set value -1 - execute unless score @s Sneak.Hotbar4 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[4] set value -1 - execute unless score @s Sneak.Hotbar5 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[5] set value -1 - execute unless score @s Sneak.Hotbar6 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[6] set value -1 - execute unless score @s Sneak.Hotbar7 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[7] set value -1 - execute unless score @s Sneak.Hotbar8 >= $SneakThreshold Temporary run data modify storage asset:context id.hotbar[8] set value -1 + execute unless score @s Sneak.Mainhand >= #SneakThreshold Temporary run data modify storage asset:context id.mainhand set value -1 + execute unless score @s Sneak.Offhand >= #SneakThreshold Temporary run data modify storage asset:context id.offhand set value -1 + execute unless score @s Sneak.Head >= #SneakThreshold Temporary run data modify storage asset:context id.head set value -1 + execute unless score @s Sneak.Chest >= #SneakThreshold Temporary run data modify storage asset:context id.chest set value -1 + execute unless score @s Sneak.Legs >= #SneakThreshold Temporary run data modify storage asset:context id.legs set value -1 + execute unless score @s Sneak.Feet >= #SneakThreshold Temporary run data modify storage asset:context id.feet set value -1 + execute unless score @s Sneak.Hotbar0 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[0] set value -1 + execute unless score @s Sneak.Hotbar1 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[1] set value -1 + execute unless score @s Sneak.Hotbar2 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[2] set value -1 + execute unless score @s Sneak.Hotbar3 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[3] set value -1 + execute unless score @s Sneak.Hotbar4 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[4] set value -1 + execute unless score @s Sneak.Hotbar5 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[5] set value -1 + execute unless score @s Sneak.Hotbar6 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[6] set value -1 + execute unless score @s Sneak.Hotbar7 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[7] set value -1 + execute unless score @s Sneak.Hotbar8 >= #SneakThreshold Temporary run data modify storage asset:context id.hotbar[8] set value -1 # リセット - scoreboard players reset $SneakThreshold \ No newline at end of file + scoreboard players reset #SneakThreshold \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_value_not-equal.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_value_not-equal.mcfunction index b3cb11098..2137a993e 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_value_not-equal.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_value_not-equal.mcfunction @@ -1,26 +1,26 @@ #> asset_manager:artifact/triggers/sneak/reset_value_not-equal # -# 各slotについて$SneakThresholdと同値ではない場合、その値を-1に設定します +# 各slotについて#SneakThresholdと同値ではない場合、その値を-1に設定します # # @within function asset_manager:artifact/triggers/sneak/ # 初期化 data modify storage asset:context id set from storage asset:context New.id # 処理 - execute unless score @s Sneak.Mainhand = $SneakThreshold Temporary run data modify storage asset:context id.mainhand set value -1 - execute unless score @s Sneak.Offhand = $SneakThreshold Temporary run data modify storage asset:context id.offhand set value -1 - execute unless score @s Sneak.Head = $SneakThreshold Temporary run data modify storage asset:context id.head set value -1 - execute unless score @s Sneak.Chest = $SneakThreshold Temporary run data modify storage asset:context id.chest set value -1 - execute unless score @s Sneak.Legs = $SneakThreshold Temporary run data modify storage asset:context id.legs set value -1 - execute unless score @s Sneak.Feet = $SneakThreshold Temporary run data modify storage asset:context id.feet set value -1 - execute unless score @s Sneak.Hotbar0 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[0] set value -1 - execute unless score @s Sneak.Hotbar1 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[1] set value -1 - execute unless score @s Sneak.Hotbar2 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[2] set value -1 - execute unless score @s Sneak.Hotbar3 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[3] set value -1 - execute unless score @s Sneak.Hotbar4 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[4] set value -1 - execute unless score @s Sneak.Hotbar5 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[5] set value -1 - execute unless score @s Sneak.Hotbar6 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[6] set value -1 - execute unless score @s Sneak.Hotbar7 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[7] set value -1 - execute unless score @s Sneak.Hotbar8 = $SneakThreshold Temporary run data modify storage asset:context id.hotbar[8] set value -1 + execute unless score @s Sneak.Mainhand = #SneakThreshold Temporary run data modify storage asset:context id.mainhand set value -1 + execute unless score @s Sneak.Offhand = #SneakThreshold Temporary run data modify storage asset:context id.offhand set value -1 + execute unless score @s Sneak.Head = #SneakThreshold Temporary run data modify storage asset:context id.head set value -1 + execute unless score @s Sneak.Chest = #SneakThreshold Temporary run data modify storage asset:context id.chest set value -1 + execute unless score @s Sneak.Legs = #SneakThreshold Temporary run data modify storage asset:context id.legs set value -1 + execute unless score @s Sneak.Feet = #SneakThreshold Temporary run data modify storage asset:context id.feet set value -1 + execute unless score @s Sneak.Hotbar0 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[0] set value -1 + execute unless score @s Sneak.Hotbar1 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[1] set value -1 + execute unless score @s Sneak.Hotbar2 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[2] set value -1 + execute unless score @s Sneak.Hotbar3 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[3] set value -1 + execute unless score @s Sneak.Hotbar4 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[4] set value -1 + execute unless score @s Sneak.Hotbar5 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[5] set value -1 + execute unless score @s Sneak.Hotbar6 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[6] set value -1 + execute unless score @s Sneak.Hotbar7 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[7] set value -1 + execute unless score @s Sneak.Hotbar8 = #SneakThreshold Temporary run data modify storage asset:context id.hotbar[8] set value -1 # リセット - scoreboard players reset $SneakThreshold \ No newline at end of file + scoreboard players reset #SneakThreshold \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_when_change_item.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_when_change_item.mcfunction index e545d361e..d45b45dc1 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_when_change_item.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/sneak/reset_when_change_item.mcfunction @@ -8,7 +8,7 @@ #> private use # @private - #declare score_holder $Temp + #declare score_holder #Temp # 変更のあったスロットのデータをリセットする execute if data storage asset:artifact EquipmentChanges[00]._{_:false} run scoreboard players set @s Sneak.Mainhand 1 diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/use_item/check_change.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/use_item/check_change.mcfunction index e63d2836f..4b1bbcf9c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/use_item/check_change.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/use_item/check_change.mcfunction @@ -6,22 +6,22 @@ #> private # @private - #declare score_holder $notEqualM - #declare score_holder $notEqualO + #declare score_holder #notEqualM + #declare score_holder #notEqualO # メインハンドの比較 data modify storage asset:artifact Temp set from storage asset:context Old.Items.mainhand - execute store success score $notEqualM Temporary run data modify storage asset:artifact Temp set from storage api: Item + execute store success score #notEqualM Temporary run data modify storage asset:artifact Temp set from storage api: Item # オフハンドの比較 data modify storage asset:artifact Temp set from storage asset:context Old.Items.offhand - execute store success score $notEqualO Temporary run data modify storage asset:artifact Temp set from storage asset:context New.Items.offhand + execute store success score #notEqualO Temporary run data modify storage asset:artifact Temp set from storage asset:context New.Items.offhand # 比較結果から設定 - execute if score $notEqualM Temporary matches 0 if score $notEqualO Temporary matches 0 run data modify storage asset:artifact Argument.AutoSlot set value 'none' - execute if score $notEqualM Temporary matches 1 if score $notEqualO Temporary matches 0 run data modify storage asset:artifact Argument.AutoSlot set value 'mainhand' - execute if score $notEqualM Temporary matches 0 if score $notEqualO Temporary matches 1 run data modify storage asset:artifact Argument.AutoSlot set value 'offhand' + execute if score #notEqualM Temporary matches 0 if score #notEqualO Temporary matches 0 run data modify storage asset:artifact Argument.AutoSlot set value 'none' + execute if score #notEqualM Temporary matches 1 if score #notEqualO Temporary matches 0 run data modify storage asset:artifact Argument.AutoSlot set value 'mainhand' + execute if score #notEqualM Temporary matches 0 if score #notEqualO Temporary matches 1 run data modify storage asset:artifact Argument.AutoSlot set value 'offhand' # リセット - scoreboard players reset $notEqualM Temporary - scoreboard players reset $notEqualO Temporary + scoreboard players reset #notEqualM Temporary + scoreboard players reset #notEqualO Temporary data remove storage asset:artifact Temp \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/use_item/check_hand_swap.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/use_item/check_hand_swap.mcfunction index ca5322bd8..a6bbea995 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/use_item/check_hand_swap.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/triggers/use_item/check_hand_swap.mcfunction @@ -6,24 +6,24 @@ #> p # @private - #declare score_holder $notMainToOff - #declare score_holder $notOffToMain + #declare score_holder #notMainToOff + #declare score_holder #notOffToMain # メインハンド -> オフハンド data modify storage asset:artifact Temp set from storage asset:context New.Items.offhand data remove storage asset:artifact Temp.Slot - execute store success score $notMainToOff Temporary run data modify storage asset:artifact Temp set from storage asset:context Old.Items.mainhand + execute store success score #notMainToOff Temporary run data modify storage asset:artifact Temp set from storage asset:context Old.Items.mainhand # オフハンド -> メインハンド data modify storage asset:artifact Temp set from storage asset:context Old.Items.offhand data remove storage asset:artifact Temp.Slot - execute store success score $notOffToMain Temporary run data modify storage asset:artifact Temp set from storage api: Item + execute store success score #notOffToMain Temporary run data modify storage asset:artifact Temp set from storage api: Item # 比較結果から設定 - execute if score $notMainToOff Temporary matches 0 if score $notOffToMain Temporary matches 0 run data modify storage asset:artifact Argument.AutoSlot set value 'none' - execute if score $notMainToOff Temporary matches 0 if score $notOffToMain Temporary matches 1 run data modify storage asset:artifact Argument.AutoSlot set value 'offhand' - execute if score $notMainToOff Temporary matches 1 if score $notOffToMain Temporary matches 0 run data modify storage asset:artifact Argument.AutoSlot set value 'mainhand' + execute if score #notMainToOff Temporary matches 0 if score #notOffToMain Temporary matches 0 run data modify storage asset:artifact Argument.AutoSlot set value 'none' + execute if score #notMainToOff Temporary matches 0 if score #notOffToMain Temporary matches 1 run data modify storage asset:artifact Argument.AutoSlot set value 'offhand' + execute if score #notMainToOff Temporary matches 1 if score #notOffToMain Temporary matches 0 run data modify storage asset:artifact Argument.AutoSlot set value 'mainhand' # リセット - scoreboard players reset $notMainToOff Temporary - scoreboard players reset $notOffToMain Temporary + scoreboard players reset #notMainToOff Temporary + scoreboard players reset #notOffToMain Temporary data remove storage asset:artifact Temp \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/use/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/use/.mcfunction index 3467df7a9..8fb2cf6e5 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/use/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/use/.mcfunction @@ -11,9 +11,9 @@ # MP減少処理 function asset_manager:artifact/use/remove_mp with storage asset:artifact # 特殊クールダウン保存 -$execute if data storage asset:artifact TargetItems[0].tag.TSB.Triggers[$(Index)].SpecialCooldown store result score $ArtifactSpecialCooldown Global run data get storage asset:artifact TargetItems[0].tag.TSB.Triggers[$(Index)].SpecialCooldown -$execute if data storage asset:artifact TargetItems[0].tag.TSB.Triggers[$(Index)].SpecialCooldown store result bossbar asset:special_cooldown max run scoreboard players get $ArtifactSpecialCooldown Global -$execute if data storage asset:artifact TargetItems[0].tag.TSB.Triggers[$(Index)].SpecialCooldown run bossbar set asset:special_cooldown players @a +#execute if data storage asset:artifact TargetItems[0].tag.TSB.Triggers[#(Index)].SpecialCooldown store result score #ArtifactSpecialCooldown Global run data get storage asset:artifact TargetItems[0].tag.TSB.Triggers[#(Index)].SpecialCooldown +#execute if data storage asset:artifact TargetItems[0].tag.TSB.Triggers[#(Index)].SpecialCooldown store result bossbar asset:special_cooldown max run scoreboard players get #ArtifactSpecialCooldown Global +#execute if data storage asset:artifact TargetItems[0].tag.TSB.Triggers[#(Index)].SpecialCooldown run bossbar set asset:special_cooldown players @a # すべてのアイテムについて更新処理を行う execute unless data storage asset:artifact {IgnoreItemUpdate:true} run function asset_manager:artifact/use/item/ with storage asset:artifact # リセット diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/.mcfunction index d25938eb4..afb5bae0b 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/.mcfunction @@ -7,7 +7,7 @@ # asset_manager:artifact/use/item/ # 最終使用tick保存 -$execute store result storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LatestUseTick int 1 run time query gametime +#execute store result storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LatestUseTick int 1 run time query gametime # アイテム更新 execute unless data storage asset:artifact TargetItems[-1].tag.TSB.RemainingCount run function asset_manager:artifact/use/item/update execute if data storage asset:artifact TargetItems[-1].tag.TSB.RemainingCount run function asset_manager:artifact/use/item/has_remain diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/has_remain.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/has_remain.mcfunction index 5551fb39b..8137ac79c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/has_remain.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/has_remain.mcfunction @@ -11,16 +11,16 @@ #> ScoreHolder # @private - #declare score_holder $Remain + #declare score_holder #Remain # 対象スロットの残り使用回数取得 - execute store result score $Remain Temporary run data get storage asset:artifact TargetItems[-1].tag.TSB.RemainingCount + execute store result score #Remain Temporary run data get storage asset:artifact TargetItems[-1].tag.TSB.RemainingCount # 減算 - scoreboard players remove $Remain Temporary 1 + scoreboard players remove #Remain Temporary 1 # アイテム更新処理 - execute store result storage asset:artifact TargetItems[-1].tag.TSB.RemainingCount int 1 run scoreboard players get $Remain Temporary - execute if score $Remain Temporary matches 1.. run function asset_manager:artifact/use/item/update + execute store result storage asset:artifact TargetItems[-1].tag.TSB.RemainingCount int 1 run scoreboard players get #Remain Temporary + execute if score #Remain Temporary matches 1.. run function asset_manager:artifact/use/item/update # 破壊処理 - execute if score $Remain Temporary matches ..0 run function asset_manager:artifact/use/item/break + execute if score #Remain Temporary matches ..0 run function asset_manager:artifact/use/item/break # リセット - scoreboard players reset $Remain Temporary \ No newline at end of file + scoreboard players reset #Remain Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/update_local_cooldown/hotbar.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/update_local_cooldown/hotbar.mcfunction index ecbf7a7bd..347678a8d 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/update_local_cooldown/hotbar.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/update_local_cooldown/hotbar.mcfunction @@ -7,14 +7,14 @@ # asset_manager:artifact/use/item/update_local_cooldown/non-hotbar # 設定 -$execute if data storage asset:artifact {SpecificTargetSlot:0b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[05].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[05].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {SpecificTargetSlot:1b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[06].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[06].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {SpecificTargetSlot:2b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[07].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[07].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {SpecificTargetSlot:3b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[08].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[08].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {SpecificTargetSlot:4b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[09].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[09].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {SpecificTargetSlot:5b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[10].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[10].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {SpecificTargetSlot:6b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[11].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[11].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {SpecificTargetSlot:7b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[12].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[12].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {SpecificTargetSlot:8b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[13].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[13].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:0b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[05].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[05].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:1b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[06].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[06].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:2b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[07].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[07].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:3b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[08].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[08].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:4b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[09].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[09].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:5b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[10].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[10].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:6b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[11].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[11].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:7b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[12].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[12].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {SpecificTargetSlot:8b} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[13].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[13].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown # リセット data remove storage asset:artifact SpecificTargetSlot \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/update_local_cooldown/non-hotbar.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/update_local_cooldown/non-hotbar.mcfunction index 1b49c48d6..235127e07 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/update_local_cooldown/non-hotbar.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/use/item/update_local_cooldown/non-hotbar.mcfunction @@ -6,8 +6,8 @@ execute if data storage asset:artifact {TargetDefaultSlot:"mainhand"} store result storage asset:artifact SpecificTargetSlot byte 1 run data get storage asset:context SelectedItemSlot execute if data storage asset:artifact {TargetDefaultSlot:"mainhand"} run function asset_manager:artifact/use/item/update_local_cooldown/hotbar with storage asset:artifact -$execute if data storage asset:artifact {TargetDefaultSlot:"offhand"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[0].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[0].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {TargetDefaultSlot:"feet"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[1].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[1].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {TargetDefaultSlot:"legs"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[2].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[2].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {TargetDefaultSlot:"chest"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[3].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[3].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown -$execute if data storage asset:artifact {TargetDefaultSlot:"head"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[4].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[4].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[$(Index)].LocalCooldown \ No newline at end of file +#execute if data storage asset:artifact {TargetDefaultSlot:"offhand"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[0].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[0].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {TargetDefaultSlot:"feet"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[1].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[1].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {TargetDefaultSlot:"legs"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[2].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[2].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {TargetDefaultSlot:"chest"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[3].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[3].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown +#execute if data storage asset:artifact {TargetDefaultSlot:"head"} store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[4].Value int 1 store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LocalCoolDown[4].Max int 1 run data get storage asset:artifact TargetItems[-1].tag.TSB.Triggers[#(Index)].LocalCooldown \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/artifact/use/remove_mp.mcfunction b/TheSkyBlessing/data/asset_manager/functions/artifact/use/remove_mp.mcfunction index 75ca662a9..60b17c85b 100644 --- a/TheSkyBlessing/data/asset_manager/functions/artifact/use/remove_mp.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/artifact/use/remove_mp.mcfunction @@ -9,17 +9,17 @@ #> val # @private - #declare score_holder $Fluctuation - #declare score_holder $Length + #declare score_holder #Fluctuation + #declare score_holder #Length # 取得 -$execute store result score $Fluctuation Lib run data get storage asset:artifact TargetItems[0].tag.TSB.Triggers[$(Index)].MPCost +#execute store result score #Fluctuation Lib run data get storage asset:artifact TargetItems[0].tag.TSB.Triggers[#(Index)].MPCost # アイテム数だけ増やす - # execute store result score $Length Temporary if data storage asset:artifact TargetItems[] - # scoreboard players operation $Fluctuation Lib *= $Length Temporary + # execute store result score #Length Temporary if data storage asset:artifact TargetItems[] + # scoreboard players operation #Fluctuation Lib *= #Length Temporary # 反転して減算 - scoreboard players operation $Fluctuation Lib *= $-1 Const + scoreboard players operation #Fluctuation Lib *= #-1 Const data modify storage lib: Argument.DisableLog set value true function lib:mp/fluctuation # リセット - scoreboard players reset $Length Temporary \ No newline at end of file + scoreboard players reset #Length Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/effect/foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/effect/foreach.mcfunction index 2d0be5f92..a1e986277 100644 --- a/TheSkyBlessing/data/asset_manager/functions/effect/foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/effect/foreach.mcfunction @@ -8,14 +8,14 @@ #> Private # @private - #declare score_holder $RequireClearLv + #declare score_holder #RequireClearLv # 移動 data modify storage asset:effect TargetEffect set from storage asset:effect Effects[-1] data remove storage asset:effect Effects[-1] # 牛乳チェック - execute if score @s UsedMilk matches 1.. store result score $RequireClearLv Temporary run data get storage asset:effect TargetEffect.RequireClearLv - execute if score @s UsedMilk matches 1.. if score $RequireClearLv Temporary matches ..3 run data modify storage asset:effect TargetEffect.Duration set value -1 + execute if score @s UsedMilk matches 1.. store result score #RequireClearLv Temporary run data get storage asset:effect TargetEffect.RequireClearLv + execute if score @s UsedMilk matches 1.. if score #RequireClearLv Temporary matches ..3 run data modify storage asset:effect TargetEffect.Duration set value -1 # 効果時間を減少させる execute unless data storage asset:effect TargetEffect{Duration:-1} store result storage asset:effect TargetEffect.Duration int 1 run data get storage asset:effect TargetEffect.Duration 0.9999999999 # context作成 @@ -44,7 +44,7 @@ # 残っていれば引継ぎ execute if data storage asset:effect TargetEffect run data modify storage asset:effect NextTickEffects append from storage asset:effect TargetEffect # リセット - scoreboard players reset $RequireClearLv Temporary + scoreboard players reset #RequireClearLv Temporary data remove storage asset:context this data remove storage asset:context id data remove storage asset:effect TargetEffect diff --git a/TheSkyBlessing/data/asset_manager/functions/effect/give/make_effect_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/effect/give/make_effect_data.mcfunction index 03509cf5d..2750d0d64 100644 --- a/TheSkyBlessing/data/asset_manager/functions/effect/give/make_effect_data.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/effect/give/make_effect_data.mcfunction @@ -11,38 +11,38 @@ #> Private # @private - #declare score_holder $OriginDuration - #declare score_holder $OriginStack - #declare score_holder $Duration - #declare score_holder $Stack - #declare score_holder $MaxDuration - #declare score_holder $MaxStack + #declare score_holder #OriginDuration + #declare score_holder #OriginStack + #declare score_holder #Duration + #declare score_holder #Stack + #declare score_holder #MaxDuration + #declare score_holder #MaxStack # 計算用にスコアとして取得する - execute store result score $OriginDuration Temporary run data get storage asset:effect TargetEffectData.Duration - execute store result score $Duration Temporary run data get storage asset:effect Duration - execute store result score $MaxDuration Temporary run data get storage asset:effect MaxDuration + execute store result score #OriginDuration Temporary run data get storage asset:effect TargetEffectData.Duration + execute store result score #Duration Temporary run data get storage asset:effect Duration + execute store result score #MaxDuration Temporary run data get storage asset:effect MaxDuration - execute store result score $OriginStack Temporary run data get storage asset:effect TargetEffectData.Stack - execute store result score $Stack Temporary run data get storage asset:effect Stack - execute store result score $MaxStack Temporary run data get storage asset:effect MaxStack + execute store result score #OriginStack Temporary run data get storage asset:effect TargetEffectData.Stack + execute store result score #Stack Temporary run data get storage asset:effect Stack + execute store result score #MaxStack Temporary run data get storage asset:effect MaxStack # Operationに合わせてDurationとStackを計算する // forceReplaceはそのまま新しい値が使われるので何もしなくて良い - execute if data storage asset:effect {DurationOperation:"replace"} run scoreboard players operation $Duration Temporary > $OriginDuration Temporary - execute if data storage asset:effect {DurationOperation:"add"} run scoreboard players operation $Duration Temporary += $OriginDuration Temporary + execute if data storage asset:effect {DurationOperation:"replace"} run scoreboard players operation #Duration Temporary > #OriginDuration Temporary + execute if data storage asset:effect {DurationOperation:"add"} run scoreboard players operation #Duration Temporary += #OriginDuration Temporary - execute if data storage asset:effect {StackOperation:"replace"} run scoreboard players operation $Stack Temporary > $OriginStack Temporary - execute if data storage asset:effect {StackOperation:"add"} run scoreboard players operation $Stack Temporary += $OriginStack Temporary + execute if data storage asset:effect {StackOperation:"replace"} run scoreboard players operation #Stack Temporary > #OriginStack Temporary + execute if data storage asset:effect {StackOperation:"add"} run scoreboard players operation #Stack Temporary += #OriginStack Temporary # 最大値を超えてたら最大値にする - scoreboard players operation $Duration Temporary < $MaxDuration Temporary - scoreboard players operation $Stack Temporary < $MaxStack Temporary + scoreboard players operation #Duration Temporary < #MaxDuration Temporary + scoreboard players operation #Stack Temporary < #MaxStack Temporary # データを作る data modify storage asset:effect EffectData set value {} data modify storage asset:effect EffectData.ID set from storage asset:effect ID data modify storage asset:effect EffectData.Name set from storage asset:effect Name data modify storage asset:effect EffectData.Description set from storage asset:effect Description - execute store result storage asset:effect EffectData.Duration int 1 run scoreboard players get $Duration Temporary - execute store result storage asset:effect EffectData.Stack int 1 run scoreboard players get $Stack Temporary + execute store result storage asset:effect EffectData.Duration int 1 run scoreboard players get #Duration Temporary + execute store result storage asset:effect EffectData.Stack int 1 run scoreboard players get #Stack Temporary data modify storage asset:effect EffectData.IsBadEffect set from storage asset:effect IsBadEffect data modify storage asset:effect EffectData.ProcessOnDied set from storage asset:effect ProcessOnDied data modify storage asset:effect EffectData.RequireClearLv set from storage asset:effect RequireClearLv @@ -51,9 +51,9 @@ execute unless data storage asset:effect TargetEffectData run data modify storage asset:effect EffectData.NextEvent set value "given" execute if data storage asset:effect TargetEffectData run data modify storage asset:effect EffectData.NextEvent set value "re-given" # リセット - scoreboard players reset $OriginDuration Temporary - scoreboard players reset $OriginStack Temporary - scoreboard players reset $Duration Temporary - scoreboard players reset $Stack Temporary - scoreboard players reset $MaxDuration Temporary - scoreboard players reset $MaxStack Temporary + scoreboard players reset #OriginDuration Temporary + scoreboard players reset #OriginStack Temporary + scoreboard players reset #Duration Temporary + scoreboard players reset #Stack Temporary + scoreboard players reset #MaxDuration Temporary + scoreboard players reset #MaxStack Temporary diff --git a/TheSkyBlessing/data/asset_manager/functions/island/dispel/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/island/dispel/.mcfunction index 72f5eb575..c93d2ea06 100644 --- a/TheSkyBlessing/data/asset_manager/functions/island/dispel/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/island/dispel/.mcfunction @@ -6,16 +6,16 @@ #> Tag # @private - #declare score_holder $Temp - #declare score_holder $nonPosEqual + #declare score_holder #Temp + #declare score_holder #nonPosEqual # 時間加算 scoreboard players add @s DispelTime 1 # VFX - scoreboard players operation $Temp Temporary = @s DispelTime - scoreboard players operation $Temp Temporary %= $5 Const - execute if score $Temp Temporary matches 0 at @p[predicate=lib:is_sneaking,distance=..2] facing entity @s feet run function asset_manager:island/dispel/vfx/dispelling + scoreboard players operation #Temp Temporary = @s DispelTime + scoreboard players operation #Temp Temporary %= #5 Const + execute if score #Temp Temporary matches 0 at @p[predicate=lib:is_sneaking,distance=..2] facing entity @s feet run function asset_manager:island/dispel/vfx/dispelling # 座標が変わってる場合はリセット execute unless entity @p[predicate=lib:is_sneaking,predicate=!lib:is_player_moving,distance=..2] run function asset_manager:island/dispel/cancelled @@ -30,5 +30,5 @@ execute if score @s DispelTime matches 160 run function asset_manager:island/dispel/successful # リセット - scoreboard players reset $nonPosEqual Temporary - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #nonPosEqual Temporary + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/island/dispel/boss/summon.mcfunction b/TheSkyBlessing/data/asset_manager/functions/island/dispel/boss/summon.mcfunction index dff2d0663..ebc1012a9 100644 --- a/TheSkyBlessing/data/asset_manager/functions/island/dispel/boss/summon.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/island/dispel/boss/summon.mcfunction @@ -8,4 +8,4 @@ execute store result storage api: Argument.ID int 1 run scoreboard players get @s TargetBossID function api:mob/summon # UUID保存 - scoreboard players operation @e[type=armor_stand,tag=CursedArtifact,distance=..2.5,limit=1] TargetBossID = $FlagIndex Global \ No newline at end of file + scoreboard players operation @e[type=armor_stand,tag=CursedArtifact,distance=..2.5,limit=1] TargetBossID = #FlagIndex Global \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/init.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/init.mcfunction index 40ac17567..37de127ee 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/init.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/bossbar/init.mcfunction @@ -6,7 +6,7 @@ #> Val # @private - #declare score_holder $MaxHealth + #declare score_holder #MaxHealth # 追跡対象の設定 tag @e[type=#lib:living,tag=BossbarTarget] remove BossbarTarget @@ -14,10 +14,10 @@ # ボスバー名に天使の名前を入れる bossbar set asset:bossbar name {"selector":"@s"} # ボスバーに体力を設定する - execute store result score $MaxHealth Temporary run function api:mob/get_max_health - scoreboard players operation $MaxHealth Temporary *= $100 Const - execute store result bossbar asset:bossbar value store result bossbar asset:bossbar max run scoreboard players get $MaxHealth Temporary + execute store result score #MaxHealth Temporary run function api:mob/get_max_health + scoreboard players operation #MaxHealth Temporary *= #100 Const + execute store result bossbar asset:bossbar value store result bossbar asset:bossbar max run scoreboard players get #MaxHealth Temporary # ボスバーを表示する bossbar set asset:bossbar players @a # リセット - scoreboard players reset $MaxHealth Temporary \ No newline at end of file + scoreboard players reset #MaxHealth Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/anti_void_action/init.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/anti_void_action/init.mcfunction index a09ea8365..6d244ba36 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/anti_void_action/init.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/anti_void_action/init.mcfunction @@ -7,14 +7,14 @@ #> Temp # @private #declare tag AntiVoidTargetInit - #declare score_holder $isSetSuccess + #declare score_holder #isSetSuccess # Entity座標にAEC召喚 summon minecraft:area_effect_cloud ~ ~ ~ {Age:0,Duration:120,WaitTime:0,Tags:["AntiVoidTargets", "AntiVoidTargetInit"]} # AECにMobUUIDを移す scoreboard players operation @e[type=area_effect_cloud,tag=AntiVoidTargetInit,distance=..0.01,limit=1] VoidMobID = @s MobUUID # 落下距離取得 - execute store result score $Move Lib run data get entity @s FallDistance 10000 + execute store result score #Move Lib run data get entity @s FallDistance 10000 # 落下元らしき場所にAECをTPする execute as @e[type=area_effect_cloud,tag=AntiVoidTargetInit,distance=..0.01,limit=1] at @s rotated ~ -90 run function lib:score_to_move/ # その位置から35m以内のランダムなプレイヤーにAECをTPする / 居ない場合は一番近いプレイヤー @@ -24,10 +24,10 @@ tag @e[type=area_effect_cloud,tag=AntiVoidTargetInit,limit=1] remove AntiVoidTargetInit # entityにNoGravity付与と慣性リセットをする - execute store success score $isSetSuccess Temporary run data modify entity @s NoGravity set value 1b + execute store success score #isSetSuccess Temporary run data modify entity @s NoGravity set value 1b effect give @s slow_falling 1 255 true tp @s @s # NoGravityのセットに失敗してた場合は元から1bなので後で戻せるようにタグ付与 - execute if score $isSetSuccess Temporary matches 0 run tag @s add DefaultNoGravity + execute if score #isSetSuccess Temporary matches 0 run tag @s add DefaultNoGravity # リセット - scoreboard players reset $isSetSuccess Temporary \ No newline at end of file + scoreboard players reset #isSetSuccess Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_burning.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_burning.mcfunction index e8758eb31..1136b9378 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_burning.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_burning.mcfunction @@ -6,12 +6,12 @@ #> Temp # @private - #declare score_holder $Fire + #declare score_holder #Fire # Fireを取得 - execute store result score $Fire Temporary run data get entity @s Fire 100 + execute store result score #Fire Temporary run data get entity @s Fire 100 # AntiかAlwaysかによって処理を変える - execute if entity @s[tag=AntiBurn] if score $Fire Temporary matches 1.. run data modify entity @s Fire set value 0s - execute if entity @s[tag=AlwaysBurn] if score $Fire Temporary matches 0 run data modify entity @s Fire set value 32767s + execute if entity @s[tag=AntiBurn] if score #Fire Temporary matches 1.. run data modify entity @s Fire set value 0s + execute if entity @s[tag=AlwaysBurn] if score #Fire Temporary matches 0 run data modify entity @s Fire set value 32767s # リセット - scoreboard players reset $Fire Temporary \ No newline at end of file + scoreboard players reset #Fire Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_drowning.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_drowning.mcfunction index 7d82e536b..d22ac76ed 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_drowning.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_drowning.mcfunction @@ -6,12 +6,12 @@ #> Temp # @private - #declare score_holder $InWaterTime + #declare score_holder #InWaterTime # InWaterTimeを取得 - execute store result score $InWaterTime Temporary run data get entity @s InWaterTime 100 + execute store result score #InWaterTime Temporary run data get entity @s InWaterTime 100 # InWaterTimeが1以上なら値をマイナスにして溺れないように - execute if score $InWaterTime Temporary matches 1.. run data modify entity @s InWaterTime set value -999999 + execute if score #InWaterTime Temporary matches 1.. run data modify entity @s InWaterTime set value -999999 # リセット - scoreboard players reset $InWaterTime Temporary \ No newline at end of file + scoreboard players reset #InWaterTime Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_fall_distance.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_fall_distance.mcfunction index 3b11643af..79e68bf15 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_fall_distance.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_fall_distance.mcfunction @@ -6,11 +6,11 @@ #> Temp # @private - #declare score_holder $FallDistance + #declare score_holder #FallDistance # FallDistanceを取得 - execute store result score $FallDistance Temporary run data get entity @s FallDistance 100 + execute store result score #FallDistance Temporary run data get entity @s FallDistance 100 # 1以上なら負数に設定する - execute if score $FallDistance Temporary matches 1.. run data modify entity @s FallDistance set value -200000f + execute if score #FallDistance Temporary matches 1.. run data modify entity @s FallDistance set value -200000f # リセット - scoreboard players reset $FallDistance Temporary \ No newline at end of file + scoreboard players reset #FallDistance Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_frozen.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_frozen.mcfunction index bafbd50cb..ff43e69e9 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_frozen.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/common_tag/check_frozen.mcfunction @@ -6,11 +6,11 @@ #> Temp # @private - #declare score_holder $Frozen + #declare score_holder #Frozen # Frozenを取得 - execute store result score $Frozen Temporary run data get entity @s StrayConversionTime 100 + execute store result score #Frozen Temporary run data get entity @s StrayConversionTime 100 # 300以下なら巨大な数に設定する - execute if score $Frozen Temporary matches 1..300 run data modify entity @s StrayConversionTime set value 100000 + execute if score #Frozen Temporary matches 1..300 run data modify entity @s StrayConversionTime set value 100000 # リセット - scoreboard players reset $Frozen Temporary \ No newline at end of file + scoreboard players reset #Frozen Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/triggers/death/find_player.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/triggers/death/find_player.mcfunction index eaaaff66d..4e1c8b44c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/triggers/death/find_player.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/triggers/death/find_player.mcfunction @@ -6,15 +6,15 @@ #> Private # @private - #declare score_holder $isSuccess + #declare score_holder #isSuccess # UUIDの取得 function api:data_get/uuid data modify storage asset:mob Temp set from storage api: UUID # 比較 - execute store success score $isSuccess Temporary run data modify storage asset:mob Temp set from storage asset:mob UUID + execute store success score #isSuccess Temporary run data modify storage asset:mob Temp set from storage asset:mob UUID # 当人ならtag追加 - execute if score $isSuccess Temporary matches 0 run tag @s add Killer + execute if score #isSuccess Temporary matches 0 run tag @s add Killer # リセット data remove storage asset:mob Temp - scoreboard players reset $isSuccess Temporary \ No newline at end of file + scoreboard players reset #isSuccess Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/mob/triggers/death/resolve_uuid/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/mob/triggers/death/resolve_uuid/.mcfunction index d780a1ac8..0a8eb1af7 100644 --- a/TheSkyBlessing/data/asset_manager/functions/mob/triggers/death/resolve_uuid/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/mob/triggers/death/resolve_uuid/.mcfunction @@ -7,5 +7,5 @@ data modify storage lib: Argument.BitArray set value [] function asset_manager:mob/triggers/death/resolve_uuid/str2int function lib:bit_array_to_integer/ -execute store result storage asset:context uuid int 1 run scoreboard players get $Return.Number Lib -scoreboard players reset $Return.Number \ No newline at end of file +execute store result storage asset:context uuid int 1 run scoreboard players get #Return.Number Lib +scoreboard players reset #Return.Number \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/_index.d.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/_index.d.mcfunction index 195e355dc..ab3834ac7 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/_index.d.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/_index.d.mcfunction @@ -23,34 +23,34 @@ #> Register # @within * asset_manager:spawner/register/** #declare tag SpawnerInit - #declare score_holder $SpawnPotentialsWeightSum - #declare score_holder $Weight + #declare score_holder #SpawnPotentialsWeightSum + #declare score_holder #Weight #> Process tag # @within * asset_manager:spawner/tick/* #declare tag Success - #declare score_holder $RequiredPlayerRange + #declare score_holder #RequiredPlayerRange #declare tag this #> SpawnData # @within * asset_manager:spawner/spawn/** - #declare score_holder $SpawnPotentialsWeightSum - #declare score_holder $MobID - #declare score_holder $PosX - #declare score_holder $PosY - #declare score_holder $PosZ - #declare score_holder $MinSpawnDelay - #declare score_holder $MaxSpawnDelay - #declare score_holder $SpawnCount - #declare score_holder $SpawnRange - #declare score_holder $NearbyEntities - #declare score_holder $MaxNearbyEntities + #declare score_holder #SpawnPotentialsWeightSum + #declare score_holder #MobID + #declare score_holder #PosX + #declare score_holder #PosY + #declare score_holder #PosZ + #declare score_holder #MinSpawnDelay + #declare score_holder #MaxSpawnDelay + #declare score_holder #SpawnCount + #declare score_holder #SpawnRange + #declare score_holder #NearbyEntities + #declare score_holder #MaxNearbyEntities #declare tag SpawnMarker #> Choose # @within * asset_manager:spawner/spawn/choose_mob_id/* - #declare score_holder $TargetWeight + #declare score_holder #TargetWeight #> SubtractHPSystem # @within * asset_manager:spawner/subtract_hp/** - #declare score_holder $TargetMobID \ No newline at end of file + #declare score_holder #TargetMobID \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/.mcfunction index 0ad3a3955..0a0d1aa29 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/.mcfunction @@ -9,17 +9,17 @@ # 1 -> int[] # 2 -> { Id: int, Weight: int }[] # @private - #declare score_holder $Type + #declare score_holder #Type # 初期化 - scoreboard players set $SpawnPotentialsWeightSum Temporary 0 + scoreboard players set #SpawnPotentialsWeightSum Temporary 0 # 型判別 - scoreboard players set $Type Temporary 0 - execute if data storage asset:spawner SpawnPotentials[0] run scoreboard players add $Type Temporary 1 - execute if data storage asset:spawner SpawnPotentials[0].Id run scoreboard players add $Type Temporary 1 + scoreboard players set #Type Temporary 0 + execute if data storage asset:spawner SpawnPotentials[0] run scoreboard players add #Type Temporary 1 + execute if data storage asset:spawner SpawnPotentials[0].Id run scoreboard players add #Type Temporary 1 # 型に応じた処理をする - execute if score $Type Temporary matches 0 run function asset_manager:spawner/register/process_spawn_potentials/from_int/ - execute if score $Type Temporary matches 1 run function asset_manager:spawner/register/process_spawn_potentials/from_int_list/ - execute if score $Type Temporary matches 2 run function asset_manager:spawner/register/process_spawn_potentials/from_weighted_list/ + execute if score #Type Temporary matches 0 run function asset_manager:spawner/register/process_spawn_potentials/from_int/ + execute if score #Type Temporary matches 1 run function asset_manager:spawner/register/process_spawn_potentials/from_int_list/ + execute if score #Type Temporary matches 2 run function asset_manager:spawner/register/process_spawn_potentials/from_weighted_list/ # リセット - scoreboard players reset $Type Temporary \ No newline at end of file + scoreboard players reset #Type Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_int/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_int/.mcfunction index ffa38ab1a..fab7ed87e 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_int/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_int/.mcfunction @@ -4,6 +4,6 @@ # # @within function asset_manager:spawner/register/process_spawn_potentials/ -scoreboard players set $SpawnPotentialsWeightSum Temporary 1 +scoreboard players set #SpawnPotentialsWeightSum Temporary 1 data modify storage asset:spawner NormalizedSpawnPotentials set value [{Id:-1,Weight:1}] data modify storage asset:spawner NormalizedSpawnPotentials[0].Id set from storage asset:spawner SpawnPotentials \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_int_list/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_int_list/.mcfunction index 2d1e0b37f..3ed35db41 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_int_list/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_int_list/.mcfunction @@ -4,6 +4,6 @@ # # @within function asset_manager:spawner/register/process_spawn_potentials/ -execute store result score $SpawnPotentialsWeightSum Temporary if data storage asset:spawner SpawnPotentials[] +execute store result score #SpawnPotentialsWeightSum Temporary if data storage asset:spawner SpawnPotentials[] data modify storage asset:spawner NormalizedSpawnPotentials set value [] function asset_manager:spawner/register/process_spawn_potentials/from_int_list/for_each \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_weighted_list/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_weighted_list/.mcfunction index 67d79c61d..60022c935 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_weighted_list/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_weighted_list/.mcfunction @@ -4,6 +4,6 @@ # # @within function asset_manager:spawner/register/process_spawn_potentials/ -scoreboard players set $SpawnPotentialsWeightSum Temporary 0 +scoreboard players set #SpawnPotentialsWeightSum Temporary 0 data modify storage asset:spawner NormalizedSpawnPotentials set from storage asset:spawner SpawnPotentials function asset_manager:spawner/register/process_spawn_potentials/from_weighted_list/for_each \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_weighted_list/for_each.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_weighted_list/for_each.mcfunction index 6c9396194..fc274a04c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_weighted_list/for_each.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/register/process_spawn_potentials/from_weighted_list/for_each.mcfunction @@ -5,10 +5,10 @@ # @within function asset_manager:spawner/register/process_spawn_potentials/from_weighted_list/* # Weightを取得して加算 - execute store result score $Weight Temporary run data get storage asset:spawner SpawnPotentials[-1].Weight - scoreboard players operation $SpawnPotentialsWeightSum Temporary += $Weight Temporary + execute store result score #Weight Temporary run data get storage asset:spawner SpawnPotentials[-1].Weight + scoreboard players operation #SpawnPotentialsWeightSum Temporary += #Weight Temporary # リセット - scoreboard players reset $Weight Temporary + scoreboard players reset #Weight Temporary # 要素がまだあったら再帰する data remove storage asset:spawner SpawnPotentials[-1] execute if data storage asset:spawner SpawnPotentials[-1] run function asset_manager:spawner/register/process_spawn_potentials/from_weighted_list/for_each \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/register/set_data.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/register/set_data.mcfunction index 13ed7048b..7d6f203c8 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/register/set_data.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/register/set_data.mcfunction @@ -21,7 +21,7 @@ data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.MaxSpawnDelay set from storage asset:spawner MaxSpawnDelay data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.MaxNearbyEntities set from storage asset:spawner MaxNearbyEntities data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.RequiredPlayerRange set from storage asset:spawner RequiredPlayerRange - execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnPotentialsWeightSum int 1 run scoreboard players get $SpawnPotentialsWeightSum Temporary + execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnPotentialsWeightSum int 1 run scoreboard players get #SpawnPotentialsWeightSum Temporary # リセット data remove storage asset:spawner NormalizedSpawnPotentials tag @s remove SpawnerInit \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/.mcfunction index 5094b8052..0d4f573eb 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/.mcfunction @@ -6,8 +6,8 @@ #> Temp # @private - #declare score_holder $SpawnDelayBound - #declare score_holder $NextDelay + #declare score_holder #SpawnDelayBound + #declare score_holder #NextDelay # 炎パーティクル particle flame ~ ~0.1 ~ 0.3 0.3 0.3 0 10 @@ -15,41 +15,41 @@ function oh_my_dat:please data modify storage asset:spawner NearbyEntitiesCache set value [] data modify storage asset:spawner SpawnPotentials set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnPotentials - execute store result score $SpawnPotentialsWeightSum Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnPotentialsWeightSum - execute store result score $PosX Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[0] 100 - execute store result score $PosY Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[1] 100 - execute store result score $PosZ Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[2] 100 - execute store result score $MinSpawnDelay Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.MinSpawnDelay - execute store result score $MaxSpawnDelay Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.MaxSpawnDelay - execute store result score $SpawnCount Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnCount - execute store result score $SpawnRange Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnRange 30 - execute store result score $MaxNearbyEntities Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.MaxNearbyEntities + execute store result score #SpawnPotentialsWeightSum Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnPotentialsWeightSum + execute store result score #PosX Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[0] 100 + execute store result score #PosY Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[1] 100 + execute store result score #PosZ Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[2] 100 + execute store result score #MinSpawnDelay Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.MinSpawnDelay + execute store result score #MaxSpawnDelay Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.MaxSpawnDelay + execute store result score #SpawnCount Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnCount + execute store result score #SpawnRange Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.SpawnRange 30 + execute store result score #MaxNearbyEntities Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.MaxNearbyEntities # 召喚するMobをランダムに選択する function asset_manager:spawner/spawn/choose_mob_id/ # 周囲のEntity数を取得する function asset_manager:spawner/spawn/nearby_entities/get # 再帰的にMOBを召喚する - execute if score $NearbyEntities Temporary < $MaxNearbyEntities Temporary run function asset_manager:spawner/spawn/single + execute if score #NearbyEntities Temporary < #MaxNearbyEntities Temporary run function asset_manager:spawner/spawn/single # 召喚クールダウンを設定する (min + rng(0, max - min)) - scoreboard players operation $SpawnDelayBound Temporary = $MaxSpawnDelay Temporary - scoreboard players operation $SpawnDelayBound Temporary -= $MinSpawnDelay Temporary - execute unless score $SpawnDelayBound Temporary matches 0 store result score $NextDelay Temporary run function lib:random/ - execute unless score $SpawnDelayBound Temporary matches 0 run scoreboard players operation $NextDelay Temporary %= $SpawnDelayBound Temporary - execute if score $SpawnDelayBound Temporary matches 0 run scoreboard players set $NextDelay Temporary 0 - scoreboard players operation $NextDelay Temporary += $MinSpawnDelay Temporary - scoreboard players operation @s SpawnerCooldown = $NextDelay Temporary + scoreboard players operation #SpawnDelayBound Temporary = #MaxSpawnDelay Temporary + scoreboard players operation #SpawnDelayBound Temporary -= #MinSpawnDelay Temporary + execute unless score #SpawnDelayBound Temporary matches 0 store result score #NextDelay Temporary run function lib:random/ + execute unless score #SpawnDelayBound Temporary matches 0 run scoreboard players operation #NextDelay Temporary %= #SpawnDelayBound Temporary + execute if score #SpawnDelayBound Temporary matches 0 run scoreboard players set #NextDelay Temporary 0 + scoreboard players operation #NextDelay Temporary += #MinSpawnDelay Temporary + scoreboard players operation @s SpawnerCooldown = #NextDelay Temporary # リセット data remove storage asset:spawner NearbyEntitiesCache - scoreboard players reset $NearbyEntities Temporary - scoreboard players reset $SpawnDelayBound Temporary - scoreboard players reset $MobID Temporary - scoreboard players reset $SpawnPotentialsWeightSum Temporary - scoreboard players reset $NextDelay Temporary - scoreboard players reset $PosX Temporary - scoreboard players reset $PosY Temporary - scoreboard players reset $PosZ Temporary - scoreboard players reset $MinSpawnDelay Temporary - scoreboard players reset $MaxSpawnDelay Temporary - scoreboard players reset $SpawnRange Temporary - scoreboard players reset $SpawnCount Temporary - scoreboard players reset $MaxNearbyEntities Temporary \ No newline at end of file + scoreboard players reset #NearbyEntities Temporary + scoreboard players reset #SpawnDelayBound Temporary + scoreboard players reset #MobID Temporary + scoreboard players reset #SpawnPotentialsWeightSum Temporary + scoreboard players reset #NextDelay Temporary + scoreboard players reset #PosX Temporary + scoreboard players reset #PosY Temporary + scoreboard players reset #PosZ Temporary + scoreboard players reset #MinSpawnDelay Temporary + scoreboard players reset #MaxSpawnDelay Temporary + scoreboard players reset #SpawnRange Temporary + scoreboard players reset #SpawnCount Temporary + scoreboard players reset #MaxNearbyEntities Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/choose_mob_id/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/choose_mob_id/.mcfunction index 2785b8d82..7c0381aad 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/choose_mob_id/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/choose_mob_id/.mcfunction @@ -9,12 +9,12 @@ # 配列を壊す操作なのでClone data modify storage asset:spawner ClonedSpawnPotentials set from storage asset:spawner SpawnPotentials # Weightの総和よりも小さい乱数を生成 - execute store result score $TargetWeight Temporary run function lib:random/ - scoreboard players operation $TargetWeight Temporary %= $SpawnPotentialsWeightSum Temporary + execute store result score #TargetWeight Temporary run function lib:random/ + scoreboard players operation #TargetWeight Temporary %= #SpawnPotentialsWeightSum Temporary # TargetWeightが負の値になるまで減算しつつ要素を消す function asset_manager:spawner/spawn/choose_mob_id/subtract_for_each # 召喚するMobのIDを取得 - execute store result score $MobID Temporary run data get storage asset:spawner ClonedSpawnPotentials[-1].Id + execute store result score #MobID Temporary run data get storage asset:spawner ClonedSpawnPotentials[-1].Id # リセット - scoreboard players reset $TargetWeight Temporary + scoreboard players reset #TargetWeight Temporary data remove storage asset:spawner ClonedSpawnPotentials \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/choose_mob_id/subtract_for_each.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/choose_mob_id/subtract_for_each.mcfunction index b393e0c0e..f27ce5ad4 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/choose_mob_id/subtract_for_each.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/choose_mob_id/subtract_for_each.mcfunction @@ -6,13 +6,13 @@ #> temp # @private - #declare score_holder $Weight + #declare score_holder #Weight # Weightを取得してTargetWeightを減算 - execute store result score $Weight Temporary run data get storage asset:spawner ClonedSpawnPotentials[-1].Weight - scoreboard players operation $TargetWeight Temporary -= $Weight Temporary + execute store result score #Weight Temporary run data get storage asset:spawner ClonedSpawnPotentials[-1].Weight + scoreboard players operation #TargetWeight Temporary -= #Weight Temporary # リセット - scoreboard players reset $Weight Temporary + scoreboard players reset #Weight Temporary # TargetWeightが0以上なら再帰 - execute if score $TargetWeight Temporary matches 0.. run data remove storage asset:spawner ClonedSpawnPotentials[-1] - execute if score $TargetWeight Temporary matches 0.. if data storage asset:spawner ClonedSpawnPotentials[-1] run function asset_manager:spawner/spawn/choose_mob_id/subtract_for_each \ No newline at end of file + execute if score #TargetWeight Temporary matches 0.. run data remove storage asset:spawner ClonedSpawnPotentials[-1] + execute if score #TargetWeight Temporary matches 0.. if data storage asset:spawner ClonedSpawnPotentials[-1] run function asset_manager:spawner/spawn/choose_mob_id/subtract_for_each \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get.mcfunction index bfd3d18c0..ff4cc12a8 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get.mcfunction @@ -7,8 +7,8 @@ # asset_manager:spawner/spawn/single # キャッシュが存在する場合取得を試みる(失敗した場合は-1のまま) - scoreboard players set $NearbyEntities Temporary -1 + scoreboard players set #NearbyEntities Temporary -1 execute if data storage asset:spawner NearbyEntitiesCache[0] run function asset_manager:spawner/spawn/nearby_entities/try_get_from_cache/ # キャッシュに存在しない場合素直にdistanceを二分探索し取得する - execute if score $NearbyEntities Temporary matches -1 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/ \ No newline at end of file + execute if score #NearbyEntities Temporary matches -1 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/ \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/.mcfunction index 88bc94bb4..0d403a757 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/.mcfunction @@ -4,12 +4,12 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get -scoreboard players set $NearbyEntities Temporary 0 -execute if score $SpawnRange Temporary matches ..320 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-32 -execute if score $SpawnRange Temporary matches 330.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-64 +scoreboard players set #NearbyEntities Temporary 0 +execute if score #SpawnRange Temporary matches ..320 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-32 +execute if score #SpawnRange Temporary matches 330.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-64 # 結果をキャッシュへ代入 data modify storage asset:spawner NearbyEntitiesCache append value [-1,-1] - execute store result storage asset:spawner NearbyEntitiesCache[-1][0] int 1 run scoreboard players get $MobID Temporary - scoreboard players add $NearbyEntities Temporary 1 - execute store result storage asset:spawner NearbyEntitiesCache[-1][1] int 1 run scoreboard players get $NearbyEntities Temporary - scoreboard players remove $NearbyEntities Temporary 1 \ No newline at end of file + execute store result storage asset:spawner NearbyEntitiesCache[-1][0] int 1 run scoreboard players get #MobID Temporary + scoreboard players add #NearbyEntities Temporary 1 + execute store result storage asset:spawner NearbyEntitiesCache[-1][1] int 1 run scoreboard players get #NearbyEntities Temporary + scoreboard players remove #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-16.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-16.mcfunction index b27352a14..8c66be7ba 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-16.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-16.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-32 -execute if score $SpawnRange Temporary matches ..80 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-8 -execute if score $SpawnRange Temporary matches 90.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-16 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..80 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-8 +execute if score #SpawnRange Temporary matches 90.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-16 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-2.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-2.mcfunction index 7c8cbe4ad..e4bb24203 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-2.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-2.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-4 -execute if score $SpawnRange Temporary matches 10 as @e[scores={MobID=-2147483648..2147483647},distance=..1] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 20 as @e[scores={MobID=-2147483648..2147483647},distance=..2] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 10 as @e[scores={MobID=-2147483648..2147483647},distance=..1] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 20 as @e[scores={MobID=-2147483648..2147483647},distance=..2] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-32.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-32.mcfunction index c012e0807..1d1e02100 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-32.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-32.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/ -execute if score $SpawnRange Temporary matches ..160 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-16 -execute if score $SpawnRange Temporary matches 170.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-32 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..160 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-16 +execute if score #SpawnRange Temporary matches 170.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-32 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-4.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-4.mcfunction index 5316d4456..199360024 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-4.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-4.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-8 -execute if score $SpawnRange Temporary matches ..20 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-2 -execute if score $SpawnRange Temporary matches 30.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/3-4 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..20 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-2 +execute if score #SpawnRange Temporary matches 30.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/3-4 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-8.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-8.mcfunction index b223d8452..8787520ff 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-8.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/1-8.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-16 -execute if score $SpawnRange Temporary matches ..40 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-4 -execute if score $SpawnRange Temporary matches 50.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/5-8 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..40 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-4 +execute if score #SpawnRange Temporary matches 50.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/5-8 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/11-12.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/11-12.mcfunction index 92b0adca1..d8a694316 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/11-12.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/11-12.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-12 -execute if score $SpawnRange Temporary matches 110 as @e[scores={MobID=-2147483648..2147483647},distance=..11] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 120 as @e[scores={MobID=-2147483648..2147483647},distance=..12] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 110 as @e[scores={MobID=-2147483648..2147483647},distance=..11] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 120 as @e[scores={MobID=-2147483648..2147483647},distance=..12] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/13-14.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/13-14.mcfunction index 784ec9bce..accb39667 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/13-14.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/13-14.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/13-16 -execute if score $SpawnRange Temporary matches 130 as @e[scores={MobID=-2147483648..2147483647},distance=..13] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 140 as @e[scores={MobID=-2147483648..2147483647},distance=..14] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 130 as @e[scores={MobID=-2147483648..2147483647},distance=..13] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 140 as @e[scores={MobID=-2147483648..2147483647},distance=..14] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/13-16.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/13-16.mcfunction index 053841e2e..b49698bf1 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/13-16.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/13-16.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-16 -execute if score $SpawnRange Temporary matches ..140 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/13-14 -execute if score $SpawnRange Temporary matches 150.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/15-16 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..140 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/13-14 +execute if score #SpawnRange Temporary matches 150.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/15-16 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/15-16.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/15-16.mcfunction index 01d1b8196..67a8e0567 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/15-16.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/15-16.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/13-16 -execute if score $SpawnRange Temporary matches 150 as @e[scores={MobID=-2147483648..2147483647},distance=..15] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 160 as @e[scores={MobID=-2147483648..2147483647},distance=..16] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 150 as @e[scores={MobID=-2147483648..2147483647},distance=..15] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 160 as @e[scores={MobID=-2147483648..2147483647},distance=..16] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-18.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-18.mcfunction index 657da62f4..a24f77be2 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-18.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-18.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-20 -execute if score $SpawnRange Temporary matches 170 as @e[scores={MobID=-2147483648..2147483647},distance=..17] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 180 as @e[scores={MobID=-2147483648..2147483647},distance=..18] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 170 as @e[scores={MobID=-2147483648..2147483647},distance=..17] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 180 as @e[scores={MobID=-2147483648..2147483647},distance=..18] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-20.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-20.mcfunction index 8bac3dda1..ebf4aa302 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-20.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-20.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-24 -execute if score $SpawnRange Temporary matches ..180 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-18 -execute if score $SpawnRange Temporary matches 190.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/19-20 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..180 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-18 +execute if score #SpawnRange Temporary matches 190.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/19-20 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-24.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-24.mcfunction index 2aa392e0a..69214bc4c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-24.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-24.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-32 -execute if score $SpawnRange Temporary matches ..200 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-20 -execute if score $SpawnRange Temporary matches 210.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/21-24 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..200 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-20 +execute if score #SpawnRange Temporary matches 210.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/21-24 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-32.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-32.mcfunction index 8869ac034..eb60d979c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-32.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/17-32.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-32 -execute if score $SpawnRange Temporary matches ..240 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-24 -execute if score $SpawnRange Temporary matches 250.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-32 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..240 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-24 +execute if score #SpawnRange Temporary matches 250.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-32 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/19-20.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/19-20.mcfunction index 2c113d50e..ffb8bd76f 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/19-20.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/19-20.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-20 -execute if score $SpawnRange Temporary matches 190 as @e[scores={MobID=-2147483648..2147483647},distance=..19] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 200 as @e[scores={MobID=-2147483648..2147483647},distance=..20] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 190 as @e[scores={MobID=-2147483648..2147483647},distance=..19] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 200 as @e[scores={MobID=-2147483648..2147483647},distance=..20] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/21-22.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/21-22.mcfunction index fce30f480..ba754da76 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/21-22.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/21-22.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/21-24 -execute if score $SpawnRange Temporary matches 210 as @e[scores={MobID=-2147483648..2147483647},distance=..21] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 220 as @e[scores={MobID=-2147483648..2147483647},distance=..22] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 210 as @e[scores={MobID=-2147483648..2147483647},distance=..21] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 220 as @e[scores={MobID=-2147483648..2147483647},distance=..22] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/21-24.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/21-24.mcfunction index 34c89f88b..3157756ed 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/21-24.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/21-24.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-24 -execute if score $SpawnRange Temporary matches ..220 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/21-22 -execute if score $SpawnRange Temporary matches 230.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/23-24 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..220 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/21-22 +execute if score #SpawnRange Temporary matches 230.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/23-24 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/23-24.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/23-24.mcfunction index 62a85e521..638c60955 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/23-24.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/23-24.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/21-24 -execute if score $SpawnRange Temporary matches 230 as @e[scores={MobID=-2147483648..2147483647},distance=..23] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 240 as @e[scores={MobID=-2147483648..2147483647},distance=..24] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 230 as @e[scores={MobID=-2147483648..2147483647},distance=..23] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 240 as @e[scores={MobID=-2147483648..2147483647},distance=..24] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-26.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-26.mcfunction index de3bb0ebf..261302a01 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-26.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-26.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-28 -execute if score $SpawnRange Temporary matches 250 as @e[scores={MobID=-2147483648..2147483647},distance=..25] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 260 as @e[scores={MobID=-2147483648..2147483647},distance=..26] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 250 as @e[scores={MobID=-2147483648..2147483647},distance=..25] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 260 as @e[scores={MobID=-2147483648..2147483647},distance=..26] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-28.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-28.mcfunction index 6aef06e63..a451090ee 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-28.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-28.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-32 -execute if score $SpawnRange Temporary matches ..260 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-26 -execute if score $SpawnRange Temporary matches 270.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/27-28 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..260 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-26 +execute if score #SpawnRange Temporary matches 270.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/27-28 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-32.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-32.mcfunction index 4086c394d..6dd97b23e 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-32.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/25-32.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/17-32 -execute if score $SpawnRange Temporary matches ..280 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-28 -execute if score $SpawnRange Temporary matches 290.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/29-32 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..280 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-28 +execute if score #SpawnRange Temporary matches 290.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/29-32 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/27-28.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/27-28.mcfunction index 37e070ec7..b341e104d 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/27-28.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/27-28.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-28 -execute if score $SpawnRange Temporary matches 270 as @e[scores={MobID=-2147483648..2147483647},distance=..27] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 280 as @e[scores={MobID=-2147483648..2147483647},distance=..28] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 270 as @e[scores={MobID=-2147483648..2147483647},distance=..27] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 280 as @e[scores={MobID=-2147483648..2147483647},distance=..28] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/29-30.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/29-30.mcfunction index 470fe7884..bb93666f9 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/29-30.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/29-30.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/29-32 -execute if score $SpawnRange Temporary matches 290 as @e[scores={MobID=-2147483648..2147483647},distance=..29] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 300 as @e[scores={MobID=-2147483648..2147483647},distance=..30] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 290 as @e[scores={MobID=-2147483648..2147483647},distance=..29] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 300 as @e[scores={MobID=-2147483648..2147483647},distance=..30] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/29-32.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/29-32.mcfunction index b7a145958..613f25270 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/29-32.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/29-32.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/25-32 -execute if score $SpawnRange Temporary matches ..300 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/29-30 -execute if score $SpawnRange Temporary matches 310.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/31-32 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..300 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/29-30 +execute if score #SpawnRange Temporary matches 310.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/31-32 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/3-4.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/3-4.mcfunction index f081ba8cb..26e335b86 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/3-4.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/3-4.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-4 -execute if score $SpawnRange Temporary matches 30 as @e[scores={MobID=-2147483648..2147483647},distance=..3] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 40 as @e[scores={MobID=-2147483648..2147483647},distance=..4] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 30 as @e[scores={MobID=-2147483648..2147483647},distance=..3] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 40 as @e[scores={MobID=-2147483648..2147483647},distance=..4] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/31-32.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/31-32.mcfunction index 018f21c3f..a46ec4587 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/31-32.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/31-32.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/29-32 -execute if score $SpawnRange Temporary matches 310 as @e[scores={MobID=-2147483648..2147483647},distance=..31] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 320 as @e[scores={MobID=-2147483648..2147483647},distance=..32] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 310 as @e[scores={MobID=-2147483648..2147483647},distance=..31] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 320 as @e[scores={MobID=-2147483648..2147483647},distance=..32] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-34.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-34.mcfunction index 291e38584..ab872eb21 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-34.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-34.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-36 -execute if score $SpawnRange Temporary matches 330 as @e[scores={MobID=-2147483648..2147483647},distance=..33] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 340 as @e[scores={MobID=-2147483648..2147483647},distance=..34] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 330 as @e[scores={MobID=-2147483648..2147483647},distance=..33] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 340 as @e[scores={MobID=-2147483648..2147483647},distance=..34] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-36.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-36.mcfunction index a964c78a0..bfb38cd82 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-36.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-36.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-40 -execute if score $SpawnRange Temporary matches ..340 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-34 -execute if score $SpawnRange Temporary matches 350.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/35-36 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..340 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-34 +execute if score #SpawnRange Temporary matches 350.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/35-36 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-40.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-40.mcfunction index 2b749c8ae..3d996fe10 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-40.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-40.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-48 -execute if score $SpawnRange Temporary matches ..360 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-36 -execute if score $SpawnRange Temporary matches 370.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/37-40 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..360 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-36 +execute if score #SpawnRange Temporary matches 370.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/37-40 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-48.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-48.mcfunction index 8d1b10cbb..0cb1dfa4e 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-48.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-48.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-64 -execute if score $SpawnRange Temporary matches ..400 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-40 -execute if score $SpawnRange Temporary matches 410.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-48 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..400 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-40 +execute if score #SpawnRange Temporary matches 410.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-48 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-64.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-64.mcfunction index cedc52edc..e12dadadd 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-64.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/33-64.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/ -execute if score $SpawnRange Temporary matches ..480 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-48 -execute if score $SpawnRange Temporary matches 490.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-64 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..480 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-48 +execute if score #SpawnRange Temporary matches 490.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-64 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/35-36.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/35-36.mcfunction index 480368885..23b1c9d00 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/35-36.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/35-36.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-36 -execute if score $SpawnRange Temporary matches 350 as @e[scores={MobID=-2147483648..2147483647},distance=..35] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 360 as @e[scores={MobID=-2147483648..2147483647},distance=..36] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 350 as @e[scores={MobID=-2147483648..2147483647},distance=..35] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 360 as @e[scores={MobID=-2147483648..2147483647},distance=..36] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/37-38.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/37-38.mcfunction index 3816a571f..df8d2bed2 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/37-38.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/37-38.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/37-40 -execute if score $SpawnRange Temporary matches 370 as @e[scores={MobID=-2147483648..2147483647},distance=..37] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 380 as @e[scores={MobID=-2147483648..2147483647},distance=..38] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 370 as @e[scores={MobID=-2147483648..2147483647},distance=..37] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 380 as @e[scores={MobID=-2147483648..2147483647},distance=..38] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/37-40.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/37-40.mcfunction index 805a11bac..feefb844c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/37-40.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/37-40.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-40 -execute if score $SpawnRange Temporary matches ..380 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/37-38 -execute if score $SpawnRange Temporary matches 390.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/39-40 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..380 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/37-38 +execute if score #SpawnRange Temporary matches 390.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/39-40 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/39-40.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/39-40.mcfunction index 5bd3ffc0e..61d3567c3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/39-40.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/39-40.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/37-40 -execute if score $SpawnRange Temporary matches 390 as @e[scores={MobID=-2147483648..2147483647},distance=..39] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 400 as @e[scores={MobID=-2147483648..2147483647},distance=..40] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 390 as @e[scores={MobID=-2147483648..2147483647},distance=..39] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 400 as @e[scores={MobID=-2147483648..2147483647},distance=..40] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-42.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-42.mcfunction index 90bf883e4..0aa34dba5 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-42.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-42.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-44 -execute if score $SpawnRange Temporary matches 410 as @e[scores={MobID=-2147483648..2147483647},distance=..41] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 420 as @e[scores={MobID=-2147483648..2147483647},distance=..42] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 410 as @e[scores={MobID=-2147483648..2147483647},distance=..41] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 420 as @e[scores={MobID=-2147483648..2147483647},distance=..42] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-44.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-44.mcfunction index 54005ce76..f4d18f9d3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-44.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-44.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-48 -execute if score $SpawnRange Temporary matches ..420 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-42 -execute if score $SpawnRange Temporary matches 430.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/43-44 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..420 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-42 +execute if score #SpawnRange Temporary matches 430.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/43-44 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-48.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-48.mcfunction index ae616e0e6..a56bef76c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-48.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/41-48.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-48 -execute if score $SpawnRange Temporary matches ..440 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-44 -execute if score $SpawnRange Temporary matches 450.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/45-48 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..440 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-44 +execute if score #SpawnRange Temporary matches 450.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/45-48 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/43-44.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/43-44.mcfunction index a045813e1..7d38ee1c2 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/43-44.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/43-44.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-44 -execute if score $SpawnRange Temporary matches 430 as @e[scores={MobID=-2147483648..2147483647},distance=..43] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 440 as @e[scores={MobID=-2147483648..2147483647},distance=..44] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 430 as @e[scores={MobID=-2147483648..2147483647},distance=..43] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 440 as @e[scores={MobID=-2147483648..2147483647},distance=..44] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/45-46.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/45-46.mcfunction index 1ab15b7af..c7dde199f 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/45-46.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/45-46.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/45-48 -execute if score $SpawnRange Temporary matches 450 as @e[scores={MobID=-2147483648..2147483647},distance=..45] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 460 as @e[scores={MobID=-2147483648..2147483647},distance=..46] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 450 as @e[scores={MobID=-2147483648..2147483647},distance=..45] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 460 as @e[scores={MobID=-2147483648..2147483647},distance=..46] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/45-48.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/45-48.mcfunction index bcc56480a..5e62989bf 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/45-48.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/45-48.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/41-48 -execute if score $SpawnRange Temporary matches ..460 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/45-46 -execute if score $SpawnRange Temporary matches 470.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/47-48 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..460 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/45-46 +execute if score #SpawnRange Temporary matches 470.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/47-48 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/47-48.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/47-48.mcfunction index d02750f45..50a9c6eb5 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/47-48.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/47-48.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/45-48 -execute if score $SpawnRange Temporary matches 470 as @e[scores={MobID=-2147483648..2147483647},distance=..47] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 480 as @e[scores={MobID=-2147483648..2147483647},distance=..48] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 470 as @e[scores={MobID=-2147483648..2147483647},distance=..47] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 480 as @e[scores={MobID=-2147483648..2147483647},distance=..48] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-50.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-50.mcfunction index 384f0312c..7d97415a7 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-50.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-50.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-52 -execute if score $SpawnRange Temporary matches 490 as @e[scores={MobID=-2147483648..2147483647},distance=..49] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 500 as @e[scores={MobID=-2147483648..2147483647},distance=..50] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 490 as @e[scores={MobID=-2147483648..2147483647},distance=..49] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 500 as @e[scores={MobID=-2147483648..2147483647},distance=..50] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-52.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-52.mcfunction index 15acfd3c9..28062aec8 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-52.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-52.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-56 -execute if score $SpawnRange Temporary matches ..500 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-50 -execute if score $SpawnRange Temporary matches 510.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/51-52 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..500 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-50 +execute if score #SpawnRange Temporary matches 510.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/51-52 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-56.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-56.mcfunction index e33f45b01..72f510679 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-56.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-56.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-64 -execute if score $SpawnRange Temporary matches ..520 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-52 -execute if score $SpawnRange Temporary matches 530.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/53-56 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..520 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-52 +execute if score #SpawnRange Temporary matches 530.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/53-56 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-64.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-64.mcfunction index a973736cf..e6c1b840e 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-64.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/49-64.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/33-64 -execute if score $SpawnRange Temporary matches ..560 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-56 -execute if score $SpawnRange Temporary matches 570.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-64 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..560 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-56 +execute if score #SpawnRange Temporary matches 570.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-64 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/5-6.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/5-6.mcfunction index b7e242dd8..f6a2758b7 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/5-6.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/5-6.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/5-8 -execute if score $SpawnRange Temporary matches 50 as @e[scores={MobID=-2147483648..2147483647},distance=..5] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 60 as @e[scores={MobID=-2147483648..2147483647},distance=..6] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 50 as @e[scores={MobID=-2147483648..2147483647},distance=..5] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 60 as @e[scores={MobID=-2147483648..2147483647},distance=..6] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/5-8.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/5-8.mcfunction index ae3b3ab87..a6361f216 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/5-8.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/5-8.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-8 -execute if score $SpawnRange Temporary matches ..60 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/5-6 -execute if score $SpawnRange Temporary matches 70.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/7-8 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..60 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/5-6 +execute if score #SpawnRange Temporary matches 70.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/7-8 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/51-52.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/51-52.mcfunction index c5115b9b8..2dfcf0913 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/51-52.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/51-52.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-52 -execute if score $SpawnRange Temporary matches 510 as @e[scores={MobID=-2147483648..2147483647},distance=..51] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 520 as @e[scores={MobID=-2147483648..2147483647},distance=..52] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 510 as @e[scores={MobID=-2147483648..2147483647},distance=..51] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 520 as @e[scores={MobID=-2147483648..2147483647},distance=..52] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/53-54.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/53-54.mcfunction index ed88fcea4..2f21e6776 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/53-54.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/53-54.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/53-56 -execute if score $SpawnRange Temporary matches 530 as @e[scores={MobID=-2147483648..2147483647},distance=..53] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 540 as @e[scores={MobID=-2147483648..2147483647},distance=..54] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 530 as @e[scores={MobID=-2147483648..2147483647},distance=..53] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 540 as @e[scores={MobID=-2147483648..2147483647},distance=..54] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/53-56.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/53-56.mcfunction index 2c4c1cc45..2d59713d9 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/53-56.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/53-56.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-56 -execute if score $SpawnRange Temporary matches ..540 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/53-54 -execute if score $SpawnRange Temporary matches 550.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/55-56 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..540 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/53-54 +execute if score #SpawnRange Temporary matches 550.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/55-56 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/55-56.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/55-56.mcfunction index 08f956838..9c48b299d 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/55-56.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/55-56.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/53-56 -execute if score $SpawnRange Temporary matches 550 as @e[scores={MobID=-2147483648..2147483647},distance=..55] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 560 as @e[scores={MobID=-2147483648..2147483647},distance=..56] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 550 as @e[scores={MobID=-2147483648..2147483647},distance=..55] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 560 as @e[scores={MobID=-2147483648..2147483647},distance=..56] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-58.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-58.mcfunction index e4ceee25f..c046b9ea3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-58.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-58.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-60 -execute if score $SpawnRange Temporary matches 570 as @e[scores={MobID=-2147483648..2147483647},distance=..57] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 580 as @e[scores={MobID=-2147483648..2147483647},distance=..58] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 570 as @e[scores={MobID=-2147483648..2147483647},distance=..57] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 580 as @e[scores={MobID=-2147483648..2147483647},distance=..58] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-60.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-60.mcfunction index eca1ae9a1..06211e6d3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-60.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-60.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-64 -execute if score $SpawnRange Temporary matches ..580 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-58 -execute if score $SpawnRange Temporary matches 590.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/59-60 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..580 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-58 +execute if score #SpawnRange Temporary matches 590.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/59-60 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-64.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-64.mcfunction index 21e4f250e..0b0c43d69 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-64.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/57-64.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/49-64 -execute if score $SpawnRange Temporary matches ..600 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-60 -execute if score $SpawnRange Temporary matches 610.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/61-64 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..600 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-60 +execute if score #SpawnRange Temporary matches 610.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/61-64 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/59-60.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/59-60.mcfunction index 196562a36..793328ac3 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/59-60.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/59-60.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-60 -execute if score $SpawnRange Temporary matches 590 as @e[scores={MobID=-2147483648..2147483647},distance=..59] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 600 as @e[scores={MobID=-2147483648..2147483647},distance=..60] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 590 as @e[scores={MobID=-2147483648..2147483647},distance=..59] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 600 as @e[scores={MobID=-2147483648..2147483647},distance=..60] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/61-62.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/61-62.mcfunction index 31ef5a991..741019d4b 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/61-62.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/61-62.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/61-64 -execute if score $SpawnRange Temporary matches 610 as @e[scores={MobID=-2147483648..2147483647},distance=..61] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 620 as @e[scores={MobID=-2147483648..2147483647},distance=..62] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 610 as @e[scores={MobID=-2147483648..2147483647},distance=..61] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 620 as @e[scores={MobID=-2147483648..2147483647},distance=..62] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/61-64.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/61-64.mcfunction index 34a9e9ce5..683c98e18 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/61-64.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/61-64.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/57-64 -execute if score $SpawnRange Temporary matches ..620 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/61-62 -execute if score $SpawnRange Temporary matches 630.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/63-64 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..620 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/61-62 +execute if score #SpawnRange Temporary matches 630.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/63-64 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/63-64.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/63-64.mcfunction index 229884700..a8135ea7a 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/63-64.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/63-64.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/61-64 -execute if score $SpawnRange Temporary matches 630 as @e[scores={MobID=-2147483648..2147483647},distance=..63] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 640 as @e[scores={MobID=-2147483648..2147483647},distance=..64] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 630 as @e[scores={MobID=-2147483648..2147483647},distance=..63] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 640 as @e[scores={MobID=-2147483648..2147483647},distance=..64] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/7-8.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/7-8.mcfunction index a47ff125f..4d6d9080f 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/7-8.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/7-8.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/5-8 -execute if score $SpawnRange Temporary matches 70 as @e[scores={MobID=-2147483648..2147483647},distance=..7] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 80 as @e[scores={MobID=-2147483648..2147483647},distance=..8] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 70 as @e[scores={MobID=-2147483648..2147483647},distance=..7] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 80 as @e[scores={MobID=-2147483648..2147483647},distance=..8] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-10.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-10.mcfunction index b31b5940a..88eae7790 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-10.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-10.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-12 -execute if score $SpawnRange Temporary matches 90 as @e[scores={MobID=-2147483648..2147483647},distance=..9] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 -execute if score $SpawnRange Temporary matches 100 as @e[scores={MobID=-2147483648..2147483647},distance=..10] if score @s MobID = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 \ No newline at end of file +execute if score #SpawnRange Temporary matches 90 as @e[scores={MobID=-2147483648..2147483647},distance=..9] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 +execute if score #SpawnRange Temporary matches 100 as @e[scores={MobID=-2147483648..2147483647},distance=..10] if score @s MobID = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-12.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-12.mcfunction index 1129cb7b6..ced345d60 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-12.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-12.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-16 -execute if score $SpawnRange Temporary matches ..100 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-10 -execute if score $SpawnRange Temporary matches 110.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/11-12 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..100 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-10 +execute if score #SpawnRange Temporary matches 110.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/11-12 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-16.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-16.mcfunction index 005a89e49..0cf0765b4 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-16.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/get_from_selector/9-16.mcfunction @@ -4,5 +4,5 @@ # # @within function asset_manager:spawner/spawn/nearby_entities/get_from_selector/1-16 -execute if score $SpawnRange Temporary matches ..120 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-12 -execute if score $SpawnRange Temporary matches 130.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/13-16 \ No newline at end of file +execute if score #SpawnRange Temporary matches ..120 run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/9-12 +execute if score #SpawnRange Temporary matches 130.. run function asset_manager:spawner/spawn/nearby_entities/get_from_selector/13-16 \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/try_get_from_cache/find.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/try_get_from_cache/find.mcfunction index c826004c7..a092fc23d 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/try_get_from_cache/find.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/nearby_entities/try_get_from_cache/find.mcfunction @@ -8,18 +8,18 @@ #> KeyID # @private - #declare score_holder $KeyID + #declare score_holder #KeyID # キャッシュKeyを取得 - execute store result score $KeyID Temporary run data get storage asset:spawner NearbyEntitiesCache[-1][0] + execute store result score #KeyID Temporary run data get storage asset:spawner NearbyEntitiesCache[-1][0] # 該当するIDの場合はデータを取得し加算して返す - execute if score $KeyID Temporary = $MobID Temporary store result score $NearbyEntities Temporary run data get storage asset:spawner NearbyEntitiesCache[-1][1] - execute if score $KeyID Temporary = $MobID Temporary run scoreboard players add $NearbyEntities Temporary 1 - execute if score $KeyID Temporary = $MobID Temporary store result storage asset:spawner NearbyEntitiesCache[-1][1] int 1 run scoreboard players get $NearbyEntities Temporary - execute if score $KeyID Temporary = $MobID Temporary run scoreboard players remove $NearbyEntities Temporary 1 + execute if score #KeyID Temporary = #MobID Temporary store result score #NearbyEntities Temporary run data get storage asset:spawner NearbyEntitiesCache[-1][1] + execute if score #KeyID Temporary = #MobID Temporary run scoreboard players add #NearbyEntities Temporary 1 + execute if score #KeyID Temporary = #MobID Temporary store result storage asset:spawner NearbyEntitiesCache[-1][1] int 1 run scoreboard players get #NearbyEntities Temporary + execute if score #KeyID Temporary = #MobID Temporary run scoreboard players remove #NearbyEntities Temporary 1 # リセット - scoreboard players reset $KeyID Temporary + scoreboard players reset #KeyID Temporary # 見つかっていない かつ 要素がまだあるなら再帰 - execute if score $NearbyEntities Temporary matches -1 run data modify storage asset:spawner Temp append from storage asset:spawner NearbyEntitiesCache[-1] - execute if score $NearbyEntities Temporary matches -1 run data remove storage asset:spawner NearbyEntitiesCache[-1] - execute if score $NearbyEntities Temporary matches -1 if data storage asset:spawner NearbyEntitiesCache[-1] run function asset_manager:spawner/spawn/nearby_entities/try_get_from_cache/find \ No newline at end of file + execute if score #NearbyEntities Temporary matches -1 run data modify storage asset:spawner Temp append from storage asset:spawner NearbyEntitiesCache[-1] + execute if score #NearbyEntities Temporary matches -1 run data remove storage asset:spawner NearbyEntitiesCache[-1] + execute if score #NearbyEntities Temporary matches -1 if data storage asset:spawner NearbyEntitiesCache[-1] run function asset_manager:spawner/spawn/nearby_entities/try_get_from_cache/find \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/single.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/single.mcfunction index 5a8cc958b..e2ae6d54d 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/single.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/spawn/single.mcfunction @@ -1,6 +1,6 @@ #> asset_manager:spawner/spawn/single # -# 再帰的にMobを($SpawnCount)体召喚します +# 再帰的にMobを(#SpawnCount)体召喚します # # @within function # asset_manager:spawner/spawn/ @@ -9,21 +9,21 @@ # 座標 summon marker ~ ~ ~ {Tags:["SpawnMarker"]} data modify storage lib: Argument.Bounds set value [[-1d,-1d],[-1d,-1d],[-1d,-1d]] - execute store result storage lib: Argument.Bounds[][] double 0.0333333333 run scoreboard players get $SpawnRange Temporary + execute store result storage lib: Argument.Bounds[][] double 0.0333333333 run scoreboard players get #SpawnRange Temporary data modify storage lib: Argument.Bounds[1] set value [0d,3.0d] execute as @e[type=marker,tag=SpawnMarker,distance=..0.01] run function lib:spread_entity/ # 召喚 - execute store result storage api: Argument.ID int 1 run scoreboard players get $MobID Temporary + execute store result storage api: Argument.ID int 1 run scoreboard players get #MobID Temporary execute at @e[type=marker,tag=SpawnMarker,distance=..100] align xz positioned ~0.5 ~-1 ~0.5 if block ~ ~ ~ #lib:no_collision if block ~ ~0.9 ~ #lib:no_collision if block ~ ~1.8 ~ #lib:no_collision run particle poof ~ ~ ~ 0.3 0.3 0.3 0 10 normal execute at @e[type=marker,tag=SpawnMarker,distance=..100] align xz positioned ~0.5 ~-1 ~0.5 if block ~ ~ ~ #lib:no_collision if block ~ ~0.9 ~ #lib:no_collision if block ~ ~1.8 ~ #lib:no_collision run function api:mob/summon # リセット data remove storage api: Argument.ID kill @e[type=marker,tag=SpawnMarker,distance=..100] # 召喚数を1減らす - scoreboard players remove $SpawnCount Temporary 1 + scoreboard players remove #SpawnCount Temporary 1 # まだ召喚する必要があるなら召喚するMobをランダムに選択する - execute if score $SpawnCount Temporary matches 1.. run function asset_manager:spawner/spawn/choose_mob_id/ + execute if score #SpawnCount Temporary matches 1.. run function asset_manager:spawner/spawn/choose_mob_id/ # まだ召喚する必要があるなら周囲のEntity数を取得する - execute if score $SpawnCount Temporary matches 1.. run function asset_manager:spawner/spawn/nearby_entities/get + execute if score #SpawnCount Temporary matches 1.. run function asset_manager:spawner/spawn/nearby_entities/get # まだ召喚する必要があるなら再帰 - execute if score $SpawnCount Temporary matches 1.. if score $NearbyEntities Temporary < $MaxNearbyEntities Temporary run function asset_manager:spawner/spawn/single \ No newline at end of file + execute if score #SpawnCount Temporary matches 1.. if score #NearbyEntities Temporary < #MaxNearbyEntities Temporary run function asset_manager:spawner/spawn/single \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/subtract_hp/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/subtract_hp/.mcfunction index dc6ad5629..2af5e61c0 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/subtract_hp/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/subtract_hp/.mcfunction @@ -5,9 +5,9 @@ # @within function api:spawner/subtract_hp # TargetMobID取得 - execute store result score $TargetMobID Temporary run data get storage asset:context id + execute store result score #TargetMobID Temporary run data get storage asset:context id # そのMobを特定/処理する execute as @e[type=snowball,tag=Spawner,tag=!BreakSpawner,distance=..100,sort=nearest] run function asset_manager:spawner/subtract_hp/check_already_find # リセット - scoreboard players reset $TargetMobID Temporary + scoreboard players reset #TargetMobID Temporary data remove storage asset:spawner AlreadyFind \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/subtract_hp/check_id_foreach.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/subtract_hp/check_id_foreach.mcfunction index 8f9c3d70c..f196f0b37 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/subtract_hp/check_id_foreach.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/subtract_hp/check_id_foreach.mcfunction @@ -6,14 +6,14 @@ #> Temp # @private - #declare score_holder $SpawnMobID + #declare score_holder #SpawnMobID # 最後のMobIDを比較し一致する場合はスポナーの体力を減少させる - execute store result score $SpawnMobID Temporary run data get storage asset:spawner SpawnPotentials[-1].Id - execute store success storage asset:spawner AlreadyFind byte 1 if score $SpawnMobID Temporary = $TargetMobID Temporary + execute store result score #SpawnMobID Temporary run data get storage asset:spawner SpawnPotentials[-1].Id + execute store success storage asset:spawner AlreadyFind byte 1 if score #SpawnMobID Temporary = #TargetMobID Temporary execute if data storage asset:spawner {AlreadyFind:true} run function asset_manager:spawner/subtract_hp/subtract # リセット - scoreboard players reset $SpawnMobID Temporary + scoreboard players reset #SpawnMobID Temporary # 最後のMobIDを削除してまだ要素があるかつTargetCandidateが付いてないなら再帰 data remove storage asset:spawner SpawnPotentials[-1] execute unless data storage asset:spawner {AlreadyFind:true} if data storage asset:spawner SpawnPotentials[-1] run function asset_manager:spawner/subtract_hp/check_id_foreach \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/tick/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/tick/.mcfunction index 55e1701ce..34d989643 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/tick/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/tick/.mcfunction @@ -8,8 +8,8 @@ tag @s add this # プレイヤーがRequiredPlayerRangeの範囲内に居るかのチェック function oh_my_dat:please - execute store result score $RequiredPlayerRange Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.RequiredPlayerRange 10 - scoreboard players operation $RequiredPlayerRange Temporary *= $RequiredPlayerRange Temporary + execute store result score #RequiredPlayerRange Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.RequiredPlayerRange 10 + scoreboard players operation #RequiredPlayerRange Temporary *= #RequiredPlayerRange Temporary execute as @p[gamemode=!spectator,distance=..40] run function asset_manager:spawner/tick/is_near_player # this削除 tag @s remove this @@ -18,5 +18,5 @@ execute if entity @s[tag=Success] if score @s SpawnerCooldown matches ..-1 run function asset_manager:spawner/spawn/ # リセット tag @s remove Success - scoreboard players reset $RequiredPlayerRange Temporary + scoreboard players reset #RequiredPlayerRange Temporary scoreboard players reset @a Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/tick/6_distributed_interval.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/tick/6_distributed_interval.mcfunction index e7f65eb1f..6eee78554 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/tick/6_distributed_interval.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/tick/6_distributed_interval.mcfunction @@ -4,9 +4,9 @@ # # @within function core:tick/6_distributed_interval -execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 0 run function #asset:spawner/register/a -execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 1 run function #asset:spawner/register/b -execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 2 run function #asset:spawner/register/c -execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 3 run function #asset:spawner/register/d -execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 4 run function #asset:spawner/register/e -execute if data storage global {IsProduction:1b} if score $DistributeGroup Global matches 5 run function #asset:spawner/register/f \ No newline at end of file +execute if data storage global {IsProduction:1b} if score #DistributeGroup Global matches 0 run function #asset:spawner/register/a +execute if data storage global {IsProduction:1b} if score #DistributeGroup Global matches 1 run function #asset:spawner/register/b +execute if data storage global {IsProduction:1b} if score #DistributeGroup Global matches 2 run function #asset:spawner/register/c +execute if data storage global {IsProduction:1b} if score #DistributeGroup Global matches 3 run function #asset:spawner/register/d +execute if data storage global {IsProduction:1b} if score #DistributeGroup Global matches 4 run function #asset:spawner/register/e +execute if data storage global {IsProduction:1b} if score #DistributeGroup Global matches 5 run function #asset:spawner/register/f \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/spawner/tick/is_near_player.mcfunction b/TheSkyBlessing/data/asset_manager/functions/spawner/tick/is_near_player.mcfunction index a9362453b..5b654ebf4 100644 --- a/TheSkyBlessing/data/asset_manager/functions/spawner/tick/is_near_player.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/spawner/tick/is_near_player.mcfunction @@ -1,46 +1,46 @@ #> asset_manager:spawner/tick/is_near_player # -# プレイヤーが$RequiredPlayerRangeより近くに居るかチェックする +# プレイヤーが#RequiredPlayerRangeより近くに居るかチェックする # # @within function asset_manager:spawner/tick/ #> temp # @private - #declare score_holder $SpawnerX - #declare score_holder $SpawnerY - #declare score_holder $SpawnerZ - #declare score_holder $PlayerX - #declare score_holder $PlayerY - #declare score_holder $PlayerZ - #declare score_holder $SquaredDistance + #declare score_holder #SpawnerX + #declare score_holder #SpawnerY + #declare score_holder #SpawnerZ + #declare score_holder #PlayerX + #declare score_holder #PlayerY + #declare score_holder #PlayerZ + #declare score_holder #SquaredDistance # プレイヤーの座標データ取得 function api:data_get/pos - execute store result score $PlayerX Temporary run data get storage api: Pos[0] 10 - execute store result score $PlayerY Temporary run data get storage api: Pos[1] 10 - execute store result score $PlayerZ Temporary run data get storage api: Pos[2] 10 + execute store result score #PlayerX Temporary run data get storage api: Pos[0] 10 + execute store result score #PlayerY Temporary run data get storage api: Pos[1] 10 + execute store result score #PlayerZ Temporary run data get storage api: Pos[2] 10 # スポナーの座標データ取得 execute as @e[type=snowball,tag=this,distance=..0.01] run function oh_my_dat:please - execute store result score $SpawnerX Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[0] 10 - execute store result score $SpawnerY Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[1] 10 - execute store result score $SpawnerZ Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[2] 10 + execute store result score #SpawnerX Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[0] 10 + execute store result score #SpawnerY Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[1] 10 + execute store result score #SpawnerZ Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].SpawnerData.Pos[2] 10 # ユークリッド距離の二乗を計算する - scoreboard players operation $PlayerX Temporary -= $SpawnerX Temporary - scoreboard players operation $PlayerY Temporary -= $SpawnerY Temporary - scoreboard players operation $PlayerZ Temporary -= $SpawnerZ Temporary - scoreboard players operation $PlayerX Temporary *= $PlayerX Temporary - scoreboard players operation $PlayerY Temporary *= $PlayerY Temporary - scoreboard players operation $PlayerZ Temporary *= $PlayerZ Temporary - scoreboard players operation $SquaredDistance Temporary = $PlayerX Temporary - scoreboard players operation $SquaredDistance Temporary += $PlayerY Temporary - scoreboard players operation $SquaredDistance Temporary += $PlayerZ Temporary + scoreboard players operation #PlayerX Temporary -= #SpawnerX Temporary + scoreboard players operation #PlayerY Temporary -= #SpawnerY Temporary + scoreboard players operation #PlayerZ Temporary -= #SpawnerZ Temporary + scoreboard players operation #PlayerX Temporary *= #PlayerX Temporary + scoreboard players operation #PlayerY Temporary *= #PlayerY Temporary + scoreboard players operation #PlayerZ Temporary *= #PlayerZ Temporary + scoreboard players operation #SquaredDistance Temporary = #PlayerX Temporary + scoreboard players operation #SquaredDistance Temporary += #PlayerY Temporary + scoreboard players operation #SquaredDistance Temporary += #PlayerZ Temporary # プレイヤーにセット - execute if score $SquaredDistance Temporary <= $RequiredPlayerRange Temporary run tag @e[type=snowball,tag=this,distance=..0.01] add Success + execute if score #SquaredDistance Temporary <= #RequiredPlayerRange Temporary run tag @e[type=snowball,tag=this,distance=..0.01] add Success # リセット - scoreboard players reset $SpawnerX Temporary - scoreboard players reset $SpawnerY Temporary - scoreboard players reset $SpawnerZ Temporary - scoreboard players reset $PlayerX Temporary - scoreboard players reset $PlayerY Temporary - scoreboard players reset $PlayerZ Temporary - scoreboard players reset $SquaredDistance Temporary \ No newline at end of file + scoreboard players reset #SpawnerX Temporary + scoreboard players reset #SpawnerY Temporary + scoreboard players reset #SpawnerZ Temporary + scoreboard players reset #PlayerX Temporary + scoreboard players reset #PlayerY Temporary + scoreboard players reset #PlayerZ Temporary + scoreboard players reset #SquaredDistance Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction index b2fb4c935..705ec2db2 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/_index.d.mcfunction @@ -35,4 +35,4 @@ #> TeleporterExists # @within asset_manager:teleporter/update_activation_state/* - #declare score_holder $TeleporterExists \ No newline at end of file + #declare score_holder #TeleporterExists \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/.mcfunction index b73702a6b..cf695c8bf 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/tick/star_init/.mcfunction @@ -6,7 +6,7 @@ #> Val # @private - #declare score_holder $ActivateStarCount + #declare score_holder #ActivateStarCount # EntityStorageを再度取得する execute as @e[type=marker,tag=FromTeleporter,distance=..1,limit=1] run function oh_my_dat:please @@ -14,15 +14,15 @@ data modify storage asset:teleporter TargetGroupID set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.GroupID execute if data storage asset:teleporter TargetGroupID run function asset_manager:teleporter/tick/star_init/get_teleporters_from_group_id # 繋がってる星の個数のチェック (1つは自身のため、2つ以上のときに初めて繋がってると言える) - execute store result score $ActivateStarCount Temporary if data storage asset:teleporter FilteredTeleporters[].Data{ActivationState:"Activate"} + execute store result score #ActivateStarCount Temporary if data storage asset:teleporter FilteredTeleporters[].Data{ActivationState:"Activate"} # つながっている星があるのであれば初期化中タグを付与し、星データをプレイヤーに格納する - execute if score $ActivateStarCount Temporary matches 2.. run function oh_my_dat:please - execute if score $ActivateStarCount Temporary matches 2.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters set from storage asset:teleporter FilteredTeleporters - execute if score $ActivateStarCount Temporary matches 2.. run tag @s add TeleporterInitializing + execute if score #ActivateStarCount Temporary matches 2.. run function oh_my_dat:please + execute if score #ActivateStarCount Temporary matches 2.. run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Temp.Teleporters set from storage asset:teleporter FilteredTeleporters + execute if score #ActivateStarCount Temporary matches 2.. run tag @s add TeleporterInitializing # なければ初期化済タグを付与し、メッセージを出す - execute if score $ActivateStarCount Temporary matches ..1 run tag @s add TeleporterInitialized - execute if score $ActivateStarCount Temporary matches ..1 unless score @s TeleporterLogCD matches 0.. run tellraw @s {"text":"このテレポーターはどこにも繋がっていないようだ...","color":"light_purple"} - execute if score $ActivateStarCount Temporary matches ..1 unless score @s TeleporterLogCD matches 0.. run scoreboard players set @s TeleporterLogCD 60 + execute if score #ActivateStarCount Temporary matches ..1 run tag @s add TeleporterInitialized + execute if score #ActivateStarCount Temporary matches ..1 unless score @s TeleporterLogCD matches 0.. run tellraw @s {"text":"このテレポーターはどこにも繋がっていないようだ...","color":"light_purple"} + execute if score #ActivateStarCount Temporary matches ..1 unless score @s TeleporterLogCD matches 0.. run scoreboard players set @s TeleporterLogCD 60 # リセット - scoreboard players reset $ActivateStarCount Temporary + scoreboard players reset #ActivateStarCount Temporary data remove storage asset:teleporter FilteredTeleporters \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/.mcfunction index aabfe2b2a..c88888184 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/.mcfunction @@ -13,17 +13,17 @@ function asset_manager:teleporter/update_activation_state/try_get_storage_id_from_teleporter # テレポーターのEntityStorageを取得する - execute if score $TeleporterExists Temporary matches 1 run function oh_its_dat:please + execute if score #TeleporterExists Temporary matches 1 run function oh_its_dat:please # 状態を更新する - execute if score $TeleporterExists Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ActivationState set from storage api: Argument.ActivationState + execute if score #TeleporterExists Temporary matches 1 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].TeleporterData.ActivationState set from storage api: Argument.ActivationState # IDから対象テレポーターのマスタデータを取得する - execute if score $TeleporterExists Temporary matches 1 run function asset_manager:teleporter/update_activation_state/pop_master_data_from_teleporter_id + execute if score #TeleporterExists Temporary matches 1 run function asset_manager:teleporter/update_activation_state/pop_master_data_from_teleporter_id # 状態を更新する - execute if score $TeleporterExists Temporary matches 1 run data modify storage asset:teleporter TargetTeleporterData.Data.ActivationState set from storage api: Argument.ActivationState + execute if score #TeleporterExists Temporary matches 1 run data modify storage asset:teleporter TargetTeleporterData.Data.ActivationState set from storage api: Argument.ActivationState # 元に戻す - execute if score $TeleporterExists Temporary matches 1 run data modify storage asset:teleporter Teleporters append from storage asset:teleporter TargetTeleporterData + execute if score #TeleporterExists Temporary matches 1 run data modify storage asset:teleporter Teleporters append from storage asset:teleporter TargetTeleporterData # リセット - scoreboard players reset $TeleporterExists Temporary + scoreboard players reset #TeleporterExists Temporary data remove storage asset:teleporter TargetTeleporterData \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.mcfunction b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.mcfunction index 664c83b3b..45aa305c2 100644 --- a/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/teleporter/update_activation_state/try_get_storage_id_from_teleporter.mcfunction @@ -4,8 +4,8 @@ # # @input storage api: Argument.ID : int # @output score -# $ OhMyDatID -# $TeleporterExists Temporary : int @ 0..1 +# # OhMyDatID +# #TeleporterExists Temporary : int @ 0..1 # @within function asset_manager:teleporter/update_activation_state/ # セッション開く @@ -19,8 +19,8 @@ data modify storage lib: Array append from storage asset:teleporter TeleporterOMDMap[].OhMyDatID data modify storage lib: Masks set from storage lib: CompareResult function lib:array/mask_inverted - execute store result score $ OhMyDatID run data get storage lib: Array[0] + execute store result score # OhMyDatID run data get storage lib: Array[0] # EntityStorage取得 - execute store success score $TeleporterExists Temporary if data storage lib: Array[0] + execute store success score #TeleporterExists Temporary if data storage lib: Array[0] # リセット function lib:array/session/close \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/trader/_index.d.mcfunction b/TheSkyBlessing/data/asset_manager/functions/trader/_index.d.mcfunction index 5ce1513ad..36b66976a 100644 --- a/TheSkyBlessing/data/asset_manager/functions/trader/_index.d.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/trader/_index.d.mcfunction @@ -21,4 +21,4 @@ #> number of give # @within # asset_manager:trader/resolve_artifact/** - #declare score_holder $N \ No newline at end of file + #declare score_holder #N \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/.mcfunction b/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/.mcfunction index 0b353b956..b56730944 100644 --- a/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/.mcfunction @@ -11,5 +11,5 @@ # 再帰的に全部giveする function asset_manager:trader/resolve_artifact/foreach_artifact # リセット - scoreboard players reset $N Temporary + scoreboard players reset #N Temporary data remove storage asset:trader BoughtArtifacts \ No newline at end of file diff --git a/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/foreach_artifact.mcfunction b/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/foreach_artifact.mcfunction index dd5e22c65..23e1b458c 100644 --- a/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/foreach_artifact.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/foreach_artifact.mcfunction @@ -7,7 +7,7 @@ # asset_manager:trader/resolve_artifact/foreach_artifact # 末尾のIDを取り出してその神器をCount個giveする - execute store result score $N Temporary run data get storage asset:trader BoughtArtifacts[-1].Count + execute store result score #N Temporary run data get storage asset:trader BoughtArtifacts[-1].Count function asset_manager:trader/resolve_artifact/repeat_give # 末尾データ削除 diff --git a/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/repeat_give.mcfunction b/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/repeat_give.mcfunction index 22ffd3ce7..97c3503f6 100644 --- a/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/repeat_give.mcfunction +++ b/TheSkyBlessing/data/asset_manager/functions/trader/resolve_artifact/repeat_give.mcfunction @@ -11,6 +11,6 @@ function api:artifact/give/from_id # 減らす - scoreboard players remove $N Temporary 1 + scoreboard players remove #N Temporary 1 # まだgiveする必要があるなら再帰 - execute if score $N Temporary matches 1.. run function asset_manager:trader/resolve_artifact/repeat_give \ No newline at end of file + execute if score #N Temporary matches 1.. run function asset_manager:trader/resolve_artifact/repeat_give \ No newline at end of file diff --git a/TheSkyBlessing/data/core/functions/_index.d.mcfunction b/TheSkyBlessing/data/core/functions/_index.d.mcfunction index a062eed2e..f36fdaada 100644 --- a/TheSkyBlessing/data/core/functions/_index.d.mcfunction +++ b/TheSkyBlessing/data/core/functions/_index.d.mcfunction @@ -3,8 +3,8 @@ #> Global Vars # @public - #declare score_holder $PlayerCount - #declare score_holder $LoadTime + #declare score_holder #PlayerCount + #declare score_holder #LoadTime # TODO 上記のGlobal VarsをPrivateにしてAPIに移行する #> Global Vars - Private @@ -15,7 +15,7 @@ # world_manager:force_difficulty # predicate # api:global_vars/difficulty/** - #declare score_holder $Difficulty + #declare score_holder #Difficulty #> DeathTag # @public @@ -29,4 +29,4 @@ #> DistributedIntervalGroup # @within function **6_distributed_interval - #declare score_holder $DistributeGroup + #declare score_holder #DistributeGroup diff --git a/TheSkyBlessing/data/core/functions/define_const.mcfunction b/TheSkyBlessing/data/core/functions/define_const.mcfunction index 3148fd6f6..9493f66c5 100644 --- a/TheSkyBlessing/data/core/functions/define_const.mcfunction +++ b/TheSkyBlessing/data/core/functions/define_const.mcfunction @@ -4,483 +4,483 @@ # # @within function core:load_once -scoreboard players set $-100 Const -100 -scoreboard players set $-99 Const -99 -scoreboard players set $-98 Const -98 -scoreboard players set $-97 Const -97 -scoreboard players set $-96 Const -96 -scoreboard players set $-95 Const -95 -scoreboard players set $-94 Const -94 -scoreboard players set $-93 Const -93 -scoreboard players set $-92 Const -92 -scoreboard players set $-91 Const -91 -scoreboard players set $-90 Const -90 -scoreboard players set $-89 Const -89 -scoreboard players set $-88 Const -88 -scoreboard players set $-87 Const -87 -scoreboard players set $-86 Const -86 -scoreboard players set $-85 Const -85 -scoreboard players set $-84 Const -84 -scoreboard players set $-83 Const -83 -scoreboard players set $-82 Const -82 -scoreboard players set $-81 Const -81 -scoreboard players set $-80 Const -80 -scoreboard players set $-79 Const -79 -scoreboard players set $-78 Const -78 -scoreboard players set $-77 Const -77 -scoreboard players set $-76 Const -76 -scoreboard players set $-75 Const -75 -scoreboard players set $-74 Const -74 -scoreboard players set $-73 Const -73 -scoreboard players set $-72 Const -72 -scoreboard players set $-71 Const -71 -scoreboard players set $-70 Const -70 -scoreboard players set $-69 Const -69 -scoreboard players set $-68 Const -68 -scoreboard players set $-67 Const -67 -scoreboard players set $-66 Const -66 -scoreboard players set $-65 Const -65 -scoreboard players set $-64 Const -64 -scoreboard players set $-63 Const -63 -scoreboard players set $-62 Const -62 -scoreboard players set $-61 Const -61 -scoreboard players set $-60 Const -60 -scoreboard players set $-59 Const -59 -scoreboard players set $-58 Const -58 -scoreboard players set $-57 Const -57 -scoreboard players set $-56 Const -56 -scoreboard players set $-55 Const -55 -scoreboard players set $-54 Const -54 -scoreboard players set $-53 Const -53 -scoreboard players set $-52 Const -52 -scoreboard players set $-51 Const -51 -scoreboard players set $-50 Const -50 -scoreboard players set $-49 Const -49 -scoreboard players set $-48 Const -48 -scoreboard players set $-47 Const -47 -scoreboard players set $-46 Const -46 -scoreboard players set $-45 Const -45 -scoreboard players set $-44 Const -44 -scoreboard players set $-43 Const -43 -scoreboard players set $-42 Const -42 -scoreboard players set $-41 Const -41 -scoreboard players set $-40 Const -40 -scoreboard players set $-39 Const -39 -scoreboard players set $-38 Const -38 -scoreboard players set $-37 Const -37 -scoreboard players set $-36 Const -36 -scoreboard players set $-35 Const -35 -scoreboard players set $-34 Const -34 -scoreboard players set $-33 Const -33 -scoreboard players set $-32 Const -32 -scoreboard players set $-31 Const -31 -scoreboard players set $-30 Const -30 -scoreboard players set $-29 Const -29 -scoreboard players set $-28 Const -28 -scoreboard players set $-27 Const -27 -scoreboard players set $-26 Const -26 -scoreboard players set $-25 Const -25 -scoreboard players set $-24 Const -24 -scoreboard players set $-23 Const -23 -scoreboard players set $-22 Const -22 -scoreboard players set $-21 Const -21 -scoreboard players set $-20 Const -20 -scoreboard players set $-19 Const -19 -scoreboard players set $-18 Const -18 -scoreboard players set $-17 Const -17 -scoreboard players set $-16 Const -16 -scoreboard players set $-15 Const -15 -scoreboard players set $-14 Const -14 -scoreboard players set $-13 Const -13 -scoreboard players set $-12 Const -12 -scoreboard players set $-11 Const -11 -scoreboard players set $-10 Const -10 -scoreboard players set $-9 Const -9 -scoreboard players set $-8 Const -8 -scoreboard players set $-7 Const -7 -scoreboard players set $-6 Const -6 -scoreboard players set $-5 Const -5 -scoreboard players set $-4 Const -4 -scoreboard players set $-3 Const -3 -scoreboard players set $-2 Const -2 -scoreboard players set $-1 Const -1 -scoreboard players set $0 Const 0 -scoreboard players set $1 Const 1 -scoreboard players set $2 Const 2 -scoreboard players set $3 Const 3 -scoreboard players set $4 Const 4 -scoreboard players set $5 Const 5 -scoreboard players set $6 Const 6 -scoreboard players set $7 Const 7 -scoreboard players set $8 Const 8 -scoreboard players set $9 Const 9 -scoreboard players set $10 Const 10 -scoreboard players set $11 Const 11 -scoreboard players set $12 Const 12 -scoreboard players set $13 Const 13 -scoreboard players set $14 Const 14 -scoreboard players set $15 Const 15 -scoreboard players set $16 Const 16 -scoreboard players set $17 Const 17 -scoreboard players set $18 Const 18 -scoreboard players set $19 Const 19 -scoreboard players set $20 Const 20 -scoreboard players set $21 Const 21 -scoreboard players set $22 Const 22 -scoreboard players set $23 Const 23 -scoreboard players set $24 Const 24 -scoreboard players set $25 Const 25 -scoreboard players set $26 Const 26 -scoreboard players set $27 Const 27 -scoreboard players set $28 Const 28 -scoreboard players set $29 Const 29 -scoreboard players set $30 Const 30 -scoreboard players set $31 Const 31 -scoreboard players set $32 Const 32 -scoreboard players set $33 Const 33 -scoreboard players set $34 Const 34 -scoreboard players set $35 Const 35 -scoreboard players set $36 Const 36 -scoreboard players set $37 Const 37 -scoreboard players set $38 Const 38 -scoreboard players set $39 Const 39 -scoreboard players set $40 Const 40 -scoreboard players set $41 Const 41 -scoreboard players set $42 Const 42 -scoreboard players set $43 Const 43 -scoreboard players set $44 Const 44 -scoreboard players set $45 Const 45 -scoreboard players set $46 Const 46 -scoreboard players set $47 Const 47 -scoreboard players set $48 Const 48 -scoreboard players set $49 Const 49 -scoreboard players set $50 Const 50 -scoreboard players set $51 Const 51 -scoreboard players set $52 Const 52 -scoreboard players set $53 Const 53 -scoreboard players set $54 Const 54 -scoreboard players set $55 Const 55 -scoreboard players set $56 Const 56 -scoreboard players set $57 Const 57 -scoreboard players set $58 Const 58 -scoreboard players set $59 Const 59 -scoreboard players set $60 Const 60 -scoreboard players set $61 Const 61 -scoreboard players set $62 Const 62 -scoreboard players set $63 Const 63 -scoreboard players set $64 Const 64 -scoreboard players set $65 Const 65 -scoreboard players set $66 Const 66 -scoreboard players set $67 Const 67 -scoreboard players set $68 Const 68 -scoreboard players set $69 Const 69 -scoreboard players set $70 Const 70 -scoreboard players set $71 Const 71 -scoreboard players set $72 Const 72 -scoreboard players set $73 Const 73 -scoreboard players set $74 Const 74 -scoreboard players set $75 Const 75 -scoreboard players set $76 Const 76 -scoreboard players set $77 Const 77 -scoreboard players set $78 Const 78 -scoreboard players set $79 Const 79 -scoreboard players set $80 Const 80 -scoreboard players set $81 Const 81 -scoreboard players set $82 Const 82 -scoreboard players set $83 Const 83 -scoreboard players set $84 Const 84 -scoreboard players set $85 Const 85 -scoreboard players set $86 Const 86 -scoreboard players set $87 Const 87 -scoreboard players set $88 Const 88 -scoreboard players set $89 Const 89 -scoreboard players set $90 Const 90 -scoreboard players set $91 Const 91 -scoreboard players set $92 Const 92 -scoreboard players set $93 Const 93 -scoreboard players set $94 Const 94 -scoreboard players set $95 Const 95 -scoreboard players set $96 Const 96 -scoreboard players set $97 Const 97 -scoreboard players set $98 Const 98 -scoreboard players set $99 Const 99 -scoreboard players set $100 Const 100 -scoreboard players set $150 Const 150 -scoreboard players set $183 Const 183 -scoreboard players set $200 Const 200 -scoreboard players set $250 Const 250 -scoreboard players set $300 Const 300 -scoreboard players set $350 Const 350 -scoreboard players set $400 Const 400 -scoreboard players set $450 Const 450 -scoreboard players set $500 Const 500 -scoreboard players set $550 Const 550 -scoreboard players set $600 Const 600 -scoreboard players set $650 Const 650 -scoreboard players set $700 Const 700 -scoreboard players set $750 Const 750 -scoreboard players set $800 Const 800 -scoreboard players set $850 Const 850 -scoreboard players set $900 Const 900 -scoreboard players set $950 Const 950 -scoreboard players set $1000 Const 1000 -scoreboard players set $1500 Const 1500 -scoreboard players set $2000 Const 2000 -scoreboard players set $2500 Const 2500 -scoreboard players set $3000 Const 3000 -scoreboard players set $3500 Const 3500 -scoreboard players set $4000 Const 4000 -scoreboard players set $4500 Const 4500 -scoreboard players set $5000 Const 5000 -scoreboard players set $5500 Const 5500 -scoreboard players set $6000 Const 6000 -scoreboard players set $6500 Const 6500 -scoreboard players set $7000 Const 7000 -scoreboard players set $7500 Const 7500 -scoreboard players set $8000 Const 8000 -scoreboard players set $8500 Const 8500 -scoreboard players set $9000 Const 9000 -scoreboard players set $9500 Const 9500 -scoreboard players set $10000 Const 10000 -scoreboard players set $15000 Const 15000 -scoreboard players set $20000 Const 20000 -scoreboard players set $25000 Const 25000 -scoreboard players set $30000 Const 30000 -scoreboard players set $35000 Const 35000 -scoreboard players set $40000 Const 40000 -scoreboard players set $45000 Const 45000 -scoreboard players set $50000 Const 50000 -scoreboard players set $55000 Const 55000 -scoreboard players set $60000 Const 60000 -scoreboard players set $65000 Const 65000 -scoreboard players set $70000 Const 70000 -scoreboard players set $75000 Const 75000 -scoreboard players set $80000 Const 80000 -scoreboard players set $85000 Const 85000 -scoreboard players set $90000 Const 90000 -scoreboard players set $95000 Const 95000 -scoreboard players set $100000 Const 100000 -scoreboard players set $150000 Const 150000 -scoreboard players set $200000 Const 200000 -scoreboard players set $250000 Const 250000 -scoreboard players set $300000 Const 300000 -scoreboard players set $350000 Const 350000 -scoreboard players set $400000 Const 400000 -scoreboard players set $450000 Const 450000 -scoreboard players set $500000 Const 500000 -scoreboard players set $550000 Const 550000 -scoreboard players set $600000 Const 600000 -scoreboard players set $650000 Const 650000 -scoreboard players set $700000 Const 700000 -scoreboard players set $750000 Const 750000 -scoreboard players set $800000 Const 800000 -scoreboard players set $850000 Const 850000 -scoreboard players set $900000 Const 900000 -scoreboard players set $950000 Const 950000 -scoreboard players set $1000000 Const 1000000 -scoreboard players set $1500000 Const 1500000 -scoreboard players set $2000000 Const 2000000 -scoreboard players set $2500000 Const 2500000 -scoreboard players set $3000000 Const 3000000 -scoreboard players set $3500000 Const 3500000 -scoreboard players set $4000000 Const 4000000 -scoreboard players set $4500000 Const 4500000 -scoreboard players set $5000000 Const 5000000 -scoreboard players set $5500000 Const 5500000 -scoreboard players set $6000000 Const 6000000 -scoreboard players set $6500000 Const 6500000 -scoreboard players set $7000000 Const 7000000 -scoreboard players set $7500000 Const 7500000 -scoreboard players set $8000000 Const 8000000 -scoreboard players set $8500000 Const 8500000 -scoreboard players set $9000000 Const 9000000 -scoreboard players set $9500000 Const 9500000 -scoreboard players set $10000000 Const 10000000 -scoreboard players set $15000000 Const 15000000 -scoreboard players set $20000000 Const 20000000 -scoreboard players set $25000000 Const 25000000 -scoreboard players set $30000000 Const 30000000 -scoreboard players set $35000000 Const 35000000 -scoreboard players set $40000000 Const 40000000 -scoreboard players set $45000000 Const 45000000 -scoreboard players set $50000000 Const 50000000 -scoreboard players set $55000000 Const 55000000 -scoreboard players set $60000000 Const 60000000 -scoreboard players set $65000000 Const 65000000 -scoreboard players set $70000000 Const 70000000 -scoreboard players set $75000000 Const 75000000 -scoreboard players set $80000000 Const 80000000 -scoreboard players set $85000000 Const 85000000 -scoreboard players set $90000000 Const 90000000 -scoreboard players set $95000000 Const 95000000 -scoreboard players set $100000000 Const 100000000 -scoreboard players set $150000000 Const 150000000 -scoreboard players set $200000000 Const 200000000 -scoreboard players set $250000000 Const 250000000 -scoreboard players set $300000000 Const 300000000 -scoreboard players set $350000000 Const 350000000 -scoreboard players set $400000000 Const 400000000 -scoreboard players set $450000000 Const 450000000 -scoreboard players set $500000000 Const 500000000 -scoreboard players set $550000000 Const 550000000 -scoreboard players set $600000000 Const 600000000 -scoreboard players set $650000000 Const 650000000 -scoreboard players set $700000000 Const 700000000 -scoreboard players set $750000000 Const 750000000 -scoreboard players set $800000000 Const 800000000 -scoreboard players set $850000000 Const 850000000 -scoreboard players set $900000000 Const 900000000 -scoreboard players set $950000000 Const 950000000 -scoreboard players set $1000000000 Const 1000000000 -scoreboard players set $1500000000 Const 1500000000 -scoreboard players set $2000000000 Const 2000000000 +scoreboard players set #-100 Const -100 +scoreboard players set #-99 Const -99 +scoreboard players set #-98 Const -98 +scoreboard players set #-97 Const -97 +scoreboard players set #-96 Const -96 +scoreboard players set #-95 Const -95 +scoreboard players set #-94 Const -94 +scoreboard players set #-93 Const -93 +scoreboard players set #-92 Const -92 +scoreboard players set #-91 Const -91 +scoreboard players set #-90 Const -90 +scoreboard players set #-89 Const -89 +scoreboard players set #-88 Const -88 +scoreboard players set #-87 Const -87 +scoreboard players set #-86 Const -86 +scoreboard players set #-85 Const -85 +scoreboard players set #-84 Const -84 +scoreboard players set #-83 Const -83 +scoreboard players set #-82 Const -82 +scoreboard players set #-81 Const -81 +scoreboard players set #-80 Const -80 +scoreboard players set #-79 Const -79 +scoreboard players set #-78 Const -78 +scoreboard players set #-77 Const -77 +scoreboard players set #-76 Const -76 +scoreboard players set #-75 Const -75 +scoreboard players set #-74 Const -74 +scoreboard players set #-73 Const -73 +scoreboard players set #-72 Const -72 +scoreboard players set #-71 Const -71 +scoreboard players set #-70 Const -70 +scoreboard players set #-69 Const -69 +scoreboard players set #-68 Const -68 +scoreboard players set #-67 Const -67 +scoreboard players set #-66 Const -66 +scoreboard players set #-65 Const -65 +scoreboard players set #-64 Const -64 +scoreboard players set #-63 Const -63 +scoreboard players set #-62 Const -62 +scoreboard players set #-61 Const -61 +scoreboard players set #-60 Const -60 +scoreboard players set #-59 Const -59 +scoreboard players set #-58 Const -58 +scoreboard players set #-57 Const -57 +scoreboard players set #-56 Const -56 +scoreboard players set #-55 Const -55 +scoreboard players set #-54 Const -54 +scoreboard players set #-53 Const -53 +scoreboard players set #-52 Const -52 +scoreboard players set #-51 Const -51 +scoreboard players set #-50 Const -50 +scoreboard players set #-49 Const -49 +scoreboard players set #-48 Const -48 +scoreboard players set #-47 Const -47 +scoreboard players set #-46 Const -46 +scoreboard players set #-45 Const -45 +scoreboard players set #-44 Const -44 +scoreboard players set #-43 Const -43 +scoreboard players set #-42 Const -42 +scoreboard players set #-41 Const -41 +scoreboard players set #-40 Const -40 +scoreboard players set #-39 Const -39 +scoreboard players set #-38 Const -38 +scoreboard players set #-37 Const -37 +scoreboard players set #-36 Const -36 +scoreboard players set #-35 Const -35 +scoreboard players set #-34 Const -34 +scoreboard players set #-33 Const -33 +scoreboard players set #-32 Const -32 +scoreboard players set #-31 Const -31 +scoreboard players set #-30 Const -30 +scoreboard players set #-29 Const -29 +scoreboard players set #-28 Const -28 +scoreboard players set #-27 Const -27 +scoreboard players set #-26 Const -26 +scoreboard players set #-25 Const -25 +scoreboard players set #-24 Const -24 +scoreboard players set #-23 Const -23 +scoreboard players set #-22 Const -22 +scoreboard players set #-21 Const -21 +scoreboard players set #-20 Const -20 +scoreboard players set #-19 Const -19 +scoreboard players set #-18 Const -18 +scoreboard players set #-17 Const -17 +scoreboard players set #-16 Const -16 +scoreboard players set #-15 Const -15 +scoreboard players set #-14 Const -14 +scoreboard players set #-13 Const -13 +scoreboard players set #-12 Const -12 +scoreboard players set #-11 Const -11 +scoreboard players set #-10 Const -10 +scoreboard players set #-9 Const -9 +scoreboard players set #-8 Const -8 +scoreboard players set #-7 Const -7 +scoreboard players set #-6 Const -6 +scoreboard players set #-5 Const -5 +scoreboard players set #-4 Const -4 +scoreboard players set #-3 Const -3 +scoreboard players set #-2 Const -2 +scoreboard players set #-1 Const -1 +scoreboard players set #0 Const 0 +scoreboard players set #1 Const 1 +scoreboard players set #2 Const 2 +scoreboard players set #3 Const 3 +scoreboard players set #4 Const 4 +scoreboard players set #5 Const 5 +scoreboard players set #6 Const 6 +scoreboard players set #7 Const 7 +scoreboard players set #8 Const 8 +scoreboard players set #9 Const 9 +scoreboard players set #10 Const 10 +scoreboard players set #11 Const 11 +scoreboard players set #12 Const 12 +scoreboard players set #13 Const 13 +scoreboard players set #14 Const 14 +scoreboard players set #15 Const 15 +scoreboard players set #16 Const 16 +scoreboard players set #17 Const 17 +scoreboard players set #18 Const 18 +scoreboard players set #19 Const 19 +scoreboard players set #20 Const 20 +scoreboard players set #21 Const 21 +scoreboard players set #22 Const 22 +scoreboard players set #23 Const 23 +scoreboard players set #24 Const 24 +scoreboard players set #25 Const 25 +scoreboard players set #26 Const 26 +scoreboard players set #27 Const 27 +scoreboard players set #28 Const 28 +scoreboard players set #29 Const 29 +scoreboard players set #30 Const 30 +scoreboard players set #31 Const 31 +scoreboard players set #32 Const 32 +scoreboard players set #33 Const 33 +scoreboard players set #34 Const 34 +scoreboard players set #35 Const 35 +scoreboard players set #36 Const 36 +scoreboard players set #37 Const 37 +scoreboard players set #38 Const 38 +scoreboard players set #39 Const 39 +scoreboard players set #40 Const 40 +scoreboard players set #41 Const 41 +scoreboard players set #42 Const 42 +scoreboard players set #43 Const 43 +scoreboard players set #44 Const 44 +scoreboard players set #45 Const 45 +scoreboard players set #46 Const 46 +scoreboard players set #47 Const 47 +scoreboard players set #48 Const 48 +scoreboard players set #49 Const 49 +scoreboard players set #50 Const 50 +scoreboard players set #51 Const 51 +scoreboard players set #52 Const 52 +scoreboard players set #53 Const 53 +scoreboard players set #54 Const 54 +scoreboard players set #55 Const 55 +scoreboard players set #56 Const 56 +scoreboard players set #57 Const 57 +scoreboard players set #58 Const 58 +scoreboard players set #59 Const 59 +scoreboard players set #60 Const 60 +scoreboard players set #61 Const 61 +scoreboard players set #62 Const 62 +scoreboard players set #63 Const 63 +scoreboard players set #64 Const 64 +scoreboard players set #65 Const 65 +scoreboard players set #66 Const 66 +scoreboard players set #67 Const 67 +scoreboard players set #68 Const 68 +scoreboard players set #69 Const 69 +scoreboard players set #70 Const 70 +scoreboard players set #71 Const 71 +scoreboard players set #72 Const 72 +scoreboard players set #73 Const 73 +scoreboard players set #74 Const 74 +scoreboard players set #75 Const 75 +scoreboard players set #76 Const 76 +scoreboard players set #77 Const 77 +scoreboard players set #78 Const 78 +scoreboard players set #79 Const 79 +scoreboard players set #80 Const 80 +scoreboard players set #81 Const 81 +scoreboard players set #82 Const 82 +scoreboard players set #83 Const 83 +scoreboard players set #84 Const 84 +scoreboard players set #85 Const 85 +scoreboard players set #86 Const 86 +scoreboard players set #87 Const 87 +scoreboard players set #88 Const 88 +scoreboard players set #89 Const 89 +scoreboard players set #90 Const 90 +scoreboard players set #91 Const 91 +scoreboard players set #92 Const 92 +scoreboard players set #93 Const 93 +scoreboard players set #94 Const 94 +scoreboard players set #95 Const 95 +scoreboard players set #96 Const 96 +scoreboard players set #97 Const 97 +scoreboard players set #98 Const 98 +scoreboard players set #99 Const 99 +scoreboard players set #100 Const 100 +scoreboard players set #150 Const 150 +scoreboard players set #183 Const 183 +scoreboard players set #200 Const 200 +scoreboard players set #250 Const 250 +scoreboard players set #300 Const 300 +scoreboard players set #350 Const 350 +scoreboard players set #400 Const 400 +scoreboard players set #450 Const 450 +scoreboard players set #500 Const 500 +scoreboard players set #550 Const 550 +scoreboard players set #600 Const 600 +scoreboard players set #650 Const 650 +scoreboard players set #700 Const 700 +scoreboard players set #750 Const 750 +scoreboard players set #800 Const 800 +scoreboard players set #850 Const 850 +scoreboard players set #900 Const 900 +scoreboard players set #950 Const 950 +scoreboard players set #1000 Const 1000 +scoreboard players set #1500 Const 1500 +scoreboard players set #2000 Const 2000 +scoreboard players set #2500 Const 2500 +scoreboard players set #3000 Const 3000 +scoreboard players set #3500 Const 3500 +scoreboard players set #4000 Const 4000 +scoreboard players set #4500 Const 4500 +scoreboard players set #5000 Const 5000 +scoreboard players set #5500 Const 5500 +scoreboard players set #6000 Const 6000 +scoreboard players set #6500 Const 6500 +scoreboard players set #7000 Const 7000 +scoreboard players set #7500 Const 7500 +scoreboard players set #8000 Const 8000 +scoreboard players set #8500 Const 8500 +scoreboard players set #9000 Const 9000 +scoreboard players set #9500 Const 9500 +scoreboard players set #10000 Const 10000 +scoreboard players set #15000 Const 15000 +scoreboard players set #20000 Const 20000 +scoreboard players set #25000 Const 25000 +scoreboard players set #30000 Const 30000 +scoreboard players set #35000 Const 35000 +scoreboard players set #40000 Const 40000 +scoreboard players set #45000 Const 45000 +scoreboard players set #50000 Const 50000 +scoreboard players set #55000 Const 55000 +scoreboard players set #60000 Const 60000 +scoreboard players set #65000 Const 65000 +scoreboard players set #70000 Const 70000 +scoreboard players set #75000 Const 75000 +scoreboard players set #80000 Const 80000 +scoreboard players set #85000 Const 85000 +scoreboard players set #90000 Const 90000 +scoreboard players set #95000 Const 95000 +scoreboard players set #100000 Const 100000 +scoreboard players set #150000 Const 150000 +scoreboard players set #200000 Const 200000 +scoreboard players set #250000 Const 250000 +scoreboard players set #300000 Const 300000 +scoreboard players set #350000 Const 350000 +scoreboard players set #400000 Const 400000 +scoreboard players set #450000 Const 450000 +scoreboard players set #500000 Const 500000 +scoreboard players set #550000 Const 550000 +scoreboard players set #600000 Const 600000 +scoreboard players set #650000 Const 650000 +scoreboard players set #700000 Const 700000 +scoreboard players set #750000 Const 750000 +scoreboard players set #800000 Const 800000 +scoreboard players set #850000 Const 850000 +scoreboard players set #900000 Const 900000 +scoreboard players set #950000 Const 950000 +scoreboard players set #1000000 Const 1000000 +scoreboard players set #1500000 Const 1500000 +scoreboard players set #2000000 Const 2000000 +scoreboard players set #2500000 Const 2500000 +scoreboard players set #3000000 Const 3000000 +scoreboard players set #3500000 Const 3500000 +scoreboard players set #4000000 Const 4000000 +scoreboard players set #4500000 Const 4500000 +scoreboard players set #5000000 Const 5000000 +scoreboard players set #5500000 Const 5500000 +scoreboard players set #6000000 Const 6000000 +scoreboard players set #6500000 Const 6500000 +scoreboard players set #7000000 Const 7000000 +scoreboard players set #7500000 Const 7500000 +scoreboard players set #8000000 Const 8000000 +scoreboard players set #8500000 Const 8500000 +scoreboard players set #9000000 Const 9000000 +scoreboard players set #9500000 Const 9500000 +scoreboard players set #10000000 Const 10000000 +scoreboard players set #15000000 Const 15000000 +scoreboard players set #20000000 Const 20000000 +scoreboard players set #25000000 Const 25000000 +scoreboard players set #30000000 Const 30000000 +scoreboard players set #35000000 Const 35000000 +scoreboard players set #40000000 Const 40000000 +scoreboard players set #45000000 Const 45000000 +scoreboard players set #50000000 Const 50000000 +scoreboard players set #55000000 Const 55000000 +scoreboard players set #60000000 Const 60000000 +scoreboard players set #65000000 Const 65000000 +scoreboard players set #70000000 Const 70000000 +scoreboard players set #75000000 Const 75000000 +scoreboard players set #80000000 Const 80000000 +scoreboard players set #85000000 Const 85000000 +scoreboard players set #90000000 Const 90000000 +scoreboard players set #95000000 Const 95000000 +scoreboard players set #100000000 Const 100000000 +scoreboard players set #150000000 Const 150000000 +scoreboard players set #200000000 Const 200000000 +scoreboard players set #250000000 Const 250000000 +scoreboard players set #300000000 Const 300000000 +scoreboard players set #350000000 Const 350000000 +scoreboard players set #400000000 Const 400000000 +scoreboard players set #450000000 Const 450000000 +scoreboard players set #500000000 Const 500000000 +scoreboard players set #550000000 Const 550000000 +scoreboard players set #600000000 Const 600000000 +scoreboard players set #650000000 Const 650000000 +scoreboard players set #700000000 Const 700000000 +scoreboard players set #750000000 Const 750000000 +scoreboard players set #800000000 Const 800000000 +scoreboard players set #850000000 Const 850000000 +scoreboard players set #900000000 Const 900000000 +scoreboard players set #950000000 Const 950000000 +scoreboard players set #1000000000 Const 1000000000 +scoreboard players set #1500000000 Const 1500000000 +scoreboard players set #2000000000 Const 2000000000 #回転周り -scoreboard players set $90 Const 90 -scoreboard players set $180 Const 180 -scoreboard players set $270 Const 270 -scoreboard players set $360 Const 360 -scoreboard players set $90*1 Const 90 -scoreboard players set $180*1 Const 180 -scoreboard players set $270*1 Const 270 -scoreboard players set $360*1 Const 360 -scoreboard players set $90*10 Const 900 -scoreboard players set $180*10 Const 1800 -scoreboard players set $270*10 Const 2700 -scoreboard players set $360*10 Const 3600 -scoreboard players set $90*100 Const 9000 -scoreboard players set $180*100 Const 18000 -scoreboard players set $270*100 Const 27000 -scoreboard players set $360*100 Const 36000 -scoreboard players set $90*1000 Const 90000 -scoreboard players set $180*1000 Const 180000 -scoreboard players set $270*1000 Const 270000 -scoreboard players set $360*1000 Const 360000 -scoreboard players set $90*10000 Const 900000 -scoreboard players set $180*10000 Const 1800000 -scoreboard players set $270*10000 Const 2700000 -scoreboard players set $360*10000 Const 3600000 -scoreboard players set $90*100000 Const 9000000 -scoreboard players set $180*100000 Const 18000000 -scoreboard players set $270*100000 Const 27000000 -scoreboard players set $360*100000 Const 36000000 -scoreboard players set $90*1000000 Const 90000000 -scoreboard players set $180*1000000 Const 180000000 -scoreboard players set $270*1000000 Const 270000000 -scoreboard players set $360*1000000 Const 360000000 +scoreboard players set #90 Const 90 +scoreboard players set #180 Const 180 +scoreboard players set #270 Const 270 +scoreboard players set #360 Const 360 +scoreboard players set #90*1 Const 90 +scoreboard players set #180*1 Const 180 +scoreboard players set #270*1 Const 270 +scoreboard players set #360*1 Const 360 +scoreboard players set #90*10 Const 900 +scoreboard players set #180*10 Const 1800 +scoreboard players set #270*10 Const 2700 +scoreboard players set #360*10 Const 3600 +scoreboard players set #90*100 Const 9000 +scoreboard players set #180*100 Const 18000 +scoreboard players set #270*100 Const 27000 +scoreboard players set #360*100 Const 36000 +scoreboard players set #90*1000 Const 90000 +scoreboard players set #180*1000 Const 180000 +scoreboard players set #270*1000 Const 270000 +scoreboard players set #360*1000 Const 360000 +scoreboard players set #90*10000 Const 900000 +scoreboard players set #180*10000 Const 1800000 +scoreboard players set #270*10000 Const 2700000 +scoreboard players set #360*10000 Const 3600000 +scoreboard players set #90*100000 Const 9000000 +scoreboard players set #180*100000 Const 18000000 +scoreboard players set #270*100000 Const 27000000 +scoreboard players set #360*100000 Const 36000000 +scoreboard players set #90*1000000 Const 90000000 +scoreboard players set #180*1000000 Const 180000000 +scoreboard players set #270*1000000 Const 270000000 +scoreboard players set #360*1000000 Const 360000000 #bit周り -scoreboard players set $2^1 Const 2 -scoreboard players set $2^2 Const 4 -scoreboard players set $2^3 Const 8 -scoreboard players set $2^4 Const 16 -scoreboard players set $2^5 Const 32 -scoreboard players set $2^6 Const 64 -scoreboard players set $2^7 Const 128 -scoreboard players set $2^8 Const 256 -scoreboard players set $2^9 Const 512 -scoreboard players set $2^10 Const 1024 -scoreboard players set $2^11 Const 2048 -scoreboard players set $2^12 Const 4096 -scoreboard players set $2^13 Const 8192 -scoreboard players set $2^14 Const 16384 -scoreboard players set $2^15 Const 32768 -scoreboard players set $2^16 Const 65536 -scoreboard players set $2^17 Const 131072 -scoreboard players set $2^18 Const 262144 -scoreboard players set $2^19 Const 524288 -scoreboard players set $2^20 Const 1048576 -scoreboard players set $2^21 Const 2097152 -scoreboard players set $2^22 Const 4194304 -scoreboard players set $2^23 Const 8388608 -scoreboard players set $2^24 Const 16777216 -scoreboard players set $2^25 Const 33554432 -scoreboard players set $2^26 Const 67108864 -scoreboard players set $2^27 Const 134217728 -scoreboard players set $2^28 Const 268435456 -scoreboard players set $2^29 Const 536870912 -scoreboard players set $2^30 Const 1073741824 +scoreboard players set #2^1 Const 2 +scoreboard players set #2^2 Const 4 +scoreboard players set #2^3 Const 8 +scoreboard players set #2^4 Const 16 +scoreboard players set #2^5 Const 32 +scoreboard players set #2^6 Const 64 +scoreboard players set #2^7 Const 128 +scoreboard players set #2^8 Const 256 +scoreboard players set #2^9 Const 512 +scoreboard players set #2^10 Const 1024 +scoreboard players set #2^11 Const 2048 +scoreboard players set #2^12 Const 4096 +scoreboard players set #2^13 Const 8192 +scoreboard players set #2^14 Const 16384 +scoreboard players set #2^15 Const 32768 +scoreboard players set #2^16 Const 65536 +scoreboard players set #2^17 Const 131072 +scoreboard players set #2^18 Const 262144 +scoreboard players set #2^19 Const 524288 +scoreboard players set #2^20 Const 1048576 +scoreboard players set #2^21 Const 2097152 +scoreboard players set #2^22 Const 4194304 +scoreboard players set #2^23 Const 8388608 +scoreboard players set #2^24 Const 16777216 +scoreboard players set #2^25 Const 33554432 +scoreboard players set #2^26 Const 67108864 +scoreboard players set #2^27 Const 134217728 +scoreboard players set #2^28 Const 268435456 +scoreboard players set #2^29 Const 536870912 +scoreboard players set #2^30 Const 1073741824 -scoreboard players set $1 Const 1 -scoreboard players set $3 Const 3 -scoreboard players set $7 Const 7 -scoreboard players set $15 Const 15 -scoreboard players set $31 Const 31 -scoreboard players set $63 Const 63 -scoreboard players set $127 Const 127 -scoreboard players set $255 Const 255 -scoreboard players set $511 Const 511 -scoreboard players set $1023 Const 1023 -scoreboard players set $2047 Const 2047 -scoreboard players set $4095 Const 4095 -scoreboard players set $8191 Const 8191 -scoreboard players set $16383 Const 16383 -scoreboard players set $32767 Const 32767 -scoreboard players set $65535 Const 65535 -scoreboard players set $131071 Const 131071 -scoreboard players set $262143 Const 262143 -scoreboard players set $524287 Const 524287 -scoreboard players set $1048575 Const 1048575 -scoreboard players set $2097151 Const 2097151 -scoreboard players set $4194303 Const 4194303 -scoreboard players set $8388607 Const 8388607 -scoreboard players set $16777215 Const 16777215 -scoreboard players set $33554431 Const 33554431 -scoreboard players set $67108863 Const 67108863 -scoreboard players set $134217727 Const 134217727 -scoreboard players set $268435455 Const 268435455 -scoreboard players set $536870911 Const 536870911 -scoreboard players set $1073741823 Const 1073741823 +scoreboard players set #1 Const 1 +scoreboard players set #3 Const 3 +scoreboard players set #7 Const 7 +scoreboard players set #15 Const 15 +scoreboard players set #31 Const 31 +scoreboard players set #63 Const 63 +scoreboard players set #127 Const 127 +scoreboard players set #255 Const 255 +scoreboard players set #511 Const 511 +scoreboard players set #1023 Const 1023 +scoreboard players set #2047 Const 2047 +scoreboard players set #4095 Const 4095 +scoreboard players set #8191 Const 8191 +scoreboard players set #16383 Const 16383 +scoreboard players set #32767 Const 32767 +scoreboard players set #65535 Const 65535 +scoreboard players set #131071 Const 131071 +scoreboard players set #262143 Const 262143 +scoreboard players set #524287 Const 524287 +scoreboard players set #1048575 Const 1048575 +scoreboard players set #2097151 Const 2097151 +scoreboard players set #4194303 Const 4194303 +scoreboard players set #8388607 Const 8388607 +scoreboard players set #16777215 Const 16777215 +scoreboard players set #33554431 Const 33554431 +scoreboard players set #67108863 Const 67108863 +scoreboard players set #134217727 Const 134217727 +scoreboard players set #268435455 Const 268435455 +scoreboard players set #536870911 Const 536870911 +scoreboard players set #1073741823 Const 1073741823 -scoreboard players set $2 Const 2 -scoreboard players set $4 Const 4 -scoreboard players set $8 Const 8 -scoreboard players set $16 Const 16 -scoreboard players set $32 Const 32 -scoreboard players set $64 Const 64 -scoreboard players set $128 Const 128 -scoreboard players set $256 Const 256 -scoreboard players set $512 Const 512 -scoreboard players set $1024 Const 1024 -scoreboard players set $2048 Const 2048 -scoreboard players set $4096 Const 4096 -scoreboard players set $8192 Const 8192 -scoreboard players set $16384 Const 16384 -scoreboard players set $32768 Const 32768 -scoreboard players set $65536 Const 65536 -scoreboard players set $131072 Const 131072 -scoreboard players set $262144 Const 262144 -scoreboard players set $524288 Const 524288 -scoreboard players set $1048576 Const 1048576 -scoreboard players set $2097152 Const 2097152 -scoreboard players set $4194304 Const 4194304 -scoreboard players set $8388608 Const 8388608 -scoreboard players set $16777216 Const 16777216 -scoreboard players set $33554432 Const 33554432 -scoreboard players set $67108864 Const 67108864 -scoreboard players set $134217728 Const 134217728 -scoreboard players set $268435456 Const 268435456 -scoreboard players set $536870912 Const 536870912 -scoreboard players set $1073741824 Const 1073741824 +scoreboard players set #2 Const 2 +scoreboard players set #4 Const 4 +scoreboard players set #8 Const 8 +scoreboard players set #16 Const 16 +scoreboard players set #32 Const 32 +scoreboard players set #64 Const 64 +scoreboard players set #128 Const 128 +scoreboard players set #256 Const 256 +scoreboard players set #512 Const 512 +scoreboard players set #1024 Const 1024 +scoreboard players set #2048 Const 2048 +scoreboard players set #4096 Const 4096 +scoreboard players set #8192 Const 8192 +scoreboard players set #16384 Const 16384 +scoreboard players set #32768 Const 32768 +scoreboard players set #65536 Const 65536 +scoreboard players set #131072 Const 131072 +scoreboard players set #262144 Const 262144 +scoreboard players set #524288 Const 524288 +scoreboard players set #1048576 Const 1048576 +scoreboard players set #2097152 Const 2097152 +scoreboard players set #4194304 Const 4194304 +scoreboard players set #8388608 Const 8388608 +scoreboard players set #16777216 Const 16777216 +scoreboard players set #33554432 Const 33554432 +scoreboard players set #67108864 Const 67108864 +scoreboard players set #134217728 Const 134217728 +scoreboard players set #268435456 Const 268435456 +scoreboard players set #536870912 Const 536870912 +scoreboard players set #1073741824 Const 1073741824 #その他定数 -scoreboard players set $31743 Const 31743 +scoreboard players set #31743 Const 31743 -scoreboard players set $byte.min Const -256 -scoreboard players set $byte.max Const 255 -scoreboard players set $short.min Const -32768 -scoreboard players set $short.max Const 32767 -scoreboard players set $int.min Const -2147483648 -scoreboard players set $int.max Const 2147483647 -scoreboard players set $min Const -2147483648 -scoreboard players set $max Const 2147483647 +scoreboard players set #byte.min Const -256 +scoreboard players set #byte.max Const 255 +scoreboard players set #short.min Const -32768 +scoreboard players set #short.max Const 32767 +scoreboard players set #int.min Const -2147483648 +scoreboard players set #int.max Const 2147483647 +scoreboard players set #min Const -2147483648 +scoreboard players set #max Const 2147483647 -scoreboard players set $-256 Const -256 -scoreboard players set $255 Const 255 -scoreboard players set $-32768 Const -32768 -scoreboard players set $32767 Const 32767 -scoreboard players set $-2147483648 Const -2147483648 -scoreboard players set $2147483647 Const 2147483647 -scoreboard players set $-2147483648 Const -2147483648 -scoreboard players set $2147483647 Const 2147483647 \ No newline at end of file +scoreboard players set #-256 Const -256 +scoreboard players set #255 Const 255 +scoreboard players set #-32768 Const -32768 +scoreboard players set #32767 Const 32767 +scoreboard players set #-2147483648 Const -2147483648 +scoreboard players set #2147483647 Const 2147483647 +scoreboard players set #-2147483648 Const -2147483648 +scoreboard players set #2147483647 Const 2147483647 \ No newline at end of file diff --git a/TheSkyBlessing/data/core/functions/handler/first_join.mcfunction b/TheSkyBlessing/data/core/functions/handler/first_join.mcfunction index 1998204f7..fcd0abd3d 100644 --- a/TheSkyBlessing/data/core/functions/handler/first_join.mcfunction +++ b/TheSkyBlessing/data/core/functions/handler/first_join.mcfunction @@ -6,11 +6,11 @@ #> UserIDのIndex # @private - #declare score_holder $UserIDIndex + #declare score_holder #UserIDIndex # 固有ユーザーID - scoreboard players add $UserIDIndex Global 1 - scoreboard players operation @s UserID = $UserIDIndex Global + scoreboard players add #UserIDIndex Global 1 + scoreboard players operation @s UserID = #UserIDIndex Global # お友達(概念) tag @s add Friend # 無信仰にする diff --git a/TheSkyBlessing/data/core/functions/load_once.mcfunction b/TheSkyBlessing/data/core/functions/load_once.mcfunction index 843876738..f0b7afe1a 100644 --- a/TheSkyBlessing/data/core/functions/load_once.mcfunction +++ b/TheSkyBlessing/data/core/functions/load_once.mcfunction @@ -107,8 +107,8 @@ team modify NoCollision collisionRule never # @private #declare tag Random summon minecraft:area_effect_cloud ~ ~ ~ {Age:-2147483648,Duration:-1,WaitTime:-2147483648,Tags:["Random"]} - execute store result score $Random.Base Global run data get entity @e[tag=Random,limit=1] UUID[1] - execute store result score $Random.Carry Global run data get entity @e[tag=Random,limit=1] UUID[3] + execute store result score #Random.Base Global run data get entity @e[tag=Random,limit=1] UUID[1] + execute store result score #Random.Carry Global run data get entity @e[tag=Random,limit=1] UUID[3] kill @e[tag=Random,limit=1] #> 定数類用スコアボード **変更厳禁** @@ -308,14 +308,14 @@ team modify NoCollision collisionRule never # core:handler/first_join # player_manager:bonus/** # asset:artifact/0002.blessing/trigger/** - #declare score_holder $MaxHealth - #declare score_holder $MaxMP - #declare score_holder $AttackBonus - #declare score_holder $DefenseBonus - scoreboard players set $MaxHealth Global 200000 - scoreboard players set $MaxMP Global 100 - scoreboard players set $AttackBonus Global 0 - scoreboard players set $DefenseBonus Global 0 + #declare score_holder #MaxHealth + #declare score_holder #MaxMP + #declare score_holder #AttackBonus + #declare score_holder #DefenseBonus + scoreboard players set #MaxHealth Global 200000 + scoreboard players set #MaxMP Global 100 + scoreboard players set #AttackBonus Global 0 + scoreboard players set #DefenseBonus Global 0 #> WorldManager用スコアボード - ChunkLoadProtect # @within diff --git a/TheSkyBlessing/data/core/functions/migration/v0.1.2/.mcfunction b/TheSkyBlessing/data/core/functions/migration/v0.1.2/.mcfunction index 13890c9d8..527cd3429 100644 --- a/TheSkyBlessing/data/core/functions/migration/v0.1.2/.mcfunction +++ b/TheSkyBlessing/data/core/functions/migration/v0.1.2/.mcfunction @@ -14,4 +14,4 @@ #> from: ec624d1852620d3c7549df1cac0d0f9448cf6763 # @private #declare objective MobHealthMax - scoreboard players operation * MobHealthMax /= $100 Const \ No newline at end of file + scoreboard players operation * MobHealthMax /= #100 Const \ No newline at end of file diff --git a/TheSkyBlessing/data/core/functions/patcher/load_once.mcfunction b/TheSkyBlessing/data/core/functions/patcher/load_once.mcfunction index 949f04a8c..6dbc65f7b 100644 --- a/TheSkyBlessing/data/core/functions/patcher/load_once.mcfunction +++ b/TheSkyBlessing/data/core/functions/patcher/load_once.mcfunction @@ -16,8 +16,8 @@ # @private #declare objective AttackEvent scoreboard objectives remove AttackEvent - scoreboard players reset $MaxHealth Global - scoreboard players reset $MaxMP Global + scoreboard players reset #MaxHealth Global + scoreboard players reset #MaxMP Global #> ベクトル用等のシステム内汎用Entityのエイリアスの登録とsummon summon marker 0.0 0.0 0.0 {UUID:[I;0,0,0,0]} @@ -25,7 +25,7 @@ #> スコアボード類 #> 常に値が設定される変数用スコアボード - scoreboard players set $Difficulty Global 2 + scoreboard players set #Difficulty Global 2 #> AssetManager: Mob -Public # @public @@ -73,14 +73,14 @@ # core:patcher/load_once # core:handler/first_join # asset:artifact/0002.blessing/trigger/** - #declare score_holder $BonusHealth - #declare score_holder $BonusMP - #declare score_holder $AttackBonus - #declare score_holder $DefenseBonus - scoreboard players set $BonusHealth Global 0 - scoreboard players set $BonusMP Global 0 - scoreboard players set $AttackBonus Global 0 - scoreboard players set $DefenseBonus Global 0 + #declare score_holder #BonusHealth + #declare score_holder #BonusMP + #declare score_holder #AttackBonus + #declare score_holder #DefenseBonus + scoreboard players set #BonusHealth Global 0 + scoreboard players set #BonusMP Global 0 + scoreboard players set #AttackBonus Global 0 + scoreboard players set #DefenseBonus Global 0 #> 各Asset側のロード処理 function #asset:artifact/load diff --git a/TheSkyBlessing/data/core/functions/tick/.mcfunction b/TheSkyBlessing/data/core/functions/tick/.mcfunction index 5f33ee566..f01a6534a 100644 --- a/TheSkyBlessing/data/core/functions/tick/.mcfunction +++ b/TheSkyBlessing/data/core/functions/tick/.mcfunction @@ -8,15 +8,15 @@ #> Val # @private - #declare score_holder $4tInterval + #declare score_holder #4tInterval # デバッグ用TickRate操作システム - execute if data storage global {IsProduction:0b} if score $AwaitTime Global matches -2147483648..2147483647 run function debug:tps/watch + execute if data storage global {IsProduction:0b} if score #AwaitTime Global matches -2147483648..2147483647 run function debug:tps/watch # 現在の時間をglobalに代入する execute store result storage global Time int 1 run time query gametime # プレイヤー数をGlobalオブジェクトに設定する - execute store result score $PlayerCount Global if entity @a + execute store result score #PlayerCount Global if entity @a # 難易度 function world_manager:force_difficulty @@ -25,9 +25,9 @@ execute as @a at @s run function core:tick/player/pre # 4tick毎のワールド側処理 - scoreboard players add $4tInterval Global 1 - scoreboard players operation $4tInterval Global %= $4 Const - execute if score $4tInterval Global matches 0 run function core:tick/4_interval + scoreboard players add #4tInterval Global 1 + scoreboard players operation #4tInterval Global %= #4 Const + execute if score #4tInterval Global matches 0 run function core:tick/4_interval # 6tick分散ワールド処理 function core:tick/6_distributed_interval diff --git a/TheSkyBlessing/data/core/functions/tick/6_distributed_interval.mcfunction b/TheSkyBlessing/data/core/functions/tick/6_distributed_interval.mcfunction index 0e24bd19e..97beacb7f 100644 --- a/TheSkyBlessing/data/core/functions/tick/6_distributed_interval.mcfunction +++ b/TheSkyBlessing/data/core/functions/tick/6_distributed_interval.mcfunction @@ -9,5 +9,5 @@ # 次のtickのグループを決める - scoreboard players add $DistributeGroup Global 1 - scoreboard players operation $DistributeGroup Global %= $6 Const \ No newline at end of file + scoreboard players add #DistributeGroup Global 1 + scoreboard players operation #DistributeGroup Global %= #6 Const \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/stopwatch.stop.mcfunction b/TheSkyBlessing/data/debug/functions/stopwatch.stop.mcfunction index dc1f4c03f..318705da3 100644 --- a/TheSkyBlessing/data/debug/functions/stopwatch.stop.mcfunction +++ b/TheSkyBlessing/data/debug/functions/stopwatch.stop.mcfunction @@ -5,7 +5,7 @@ # @debug # @api -execute in the_nether store result score $MilliSecond Temporary run worldborder get +execute in the_nether store result score #MilliSecond Temporary run worldborder get execute in the_nether run worldborder set 59999968 -tellraw @a [{"text":"処理速度: "},{"score":{"objective":"Temporary","name":"$MilliSecond"}},{"text":"ms"}] -scoreboard players reset $MilliSecond Temporary \ No newline at end of file +tellraw @a [{"text":"処理速度: "},{"score":{"objective":"Temporary","name":"#MilliSecond"}},{"text":"ms"}] +scoreboard players reset #MilliSecond Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/1.mcfunction b/TheSkyBlessing/data/debug/functions/tps/1.mcfunction index 60832d675..dd204827a 100644 --- a/TheSkyBlessing/data/debug/functions/tps/1.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/1.mcfunction @@ -6,4 +6,4 @@ # @private function debug:tps/init -scoreboard players set $AwaitTime Global 1000 \ No newline at end of file +scoreboard players set #AwaitTime Global 1000 \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/10.mcfunction b/TheSkyBlessing/data/debug/functions/tps/10.mcfunction index 8dfb513bd..cdd488e13 100644 --- a/TheSkyBlessing/data/debug/functions/tps/10.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/10.mcfunction @@ -6,4 +6,4 @@ # @private function debug:tps/init -scoreboard players set $AwaitTime Global 100 \ No newline at end of file +scoreboard players set #AwaitTime Global 100 \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/2.mcfunction b/TheSkyBlessing/data/debug/functions/tps/2.mcfunction index 42eb112c3..c8fd205f8 100644 --- a/TheSkyBlessing/data/debug/functions/tps/2.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/2.mcfunction @@ -6,4 +6,4 @@ # @private function debug:tps/init -scoreboard players set $AwaitTime Global 500 \ No newline at end of file +scoreboard players set #AwaitTime Global 500 \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/3.mcfunction b/TheSkyBlessing/data/debug/functions/tps/3.mcfunction index de4ef7366..4c70d2707 100644 --- a/TheSkyBlessing/data/debug/functions/tps/3.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/3.mcfunction @@ -6,4 +6,4 @@ # @private function debug:tps/init -scoreboard players set $AwaitTime Global 333 \ No newline at end of file +scoreboard players set #AwaitTime Global 333 \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/4.mcfunction b/TheSkyBlessing/data/debug/functions/tps/4.mcfunction index 12602655f..d6cc2d7a2 100644 --- a/TheSkyBlessing/data/debug/functions/tps/4.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/4.mcfunction @@ -6,4 +6,4 @@ # @private function debug:tps/init -scoreboard players set $AwaitTime Global 250 \ No newline at end of file +scoreboard players set #AwaitTime Global 250 \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/5.mcfunction b/TheSkyBlessing/data/debug/functions/tps/5.mcfunction index 072109d3e..4b70df651 100644 --- a/TheSkyBlessing/data/debug/functions/tps/5.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/5.mcfunction @@ -6,4 +6,4 @@ # @private function debug:tps/init -scoreboard players set $AwaitTime Global 200 \ No newline at end of file +scoreboard players set #AwaitTime Global 200 \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/_index.d.mcfunction b/TheSkyBlessing/data/debug/functions/tps/_index.d.mcfunction index 21b993231..c1eb6b5fc 100644 --- a/TheSkyBlessing/data/debug/functions/tps/_index.d.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/_index.d.mcfunction @@ -5,4 +5,4 @@ # @within # core:tick/ # debug:tps/** - #declare score_holder $AwaitTime \ No newline at end of file + #declare score_holder #AwaitTime \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/reset.mcfunction b/TheSkyBlessing/data/debug/functions/tps/reset.mcfunction index ae0a786e4..adf78e66f 100644 --- a/TheSkyBlessing/data/debug/functions/tps/reset.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/reset.mcfunction @@ -5,4 +5,4 @@ # @user # @private -scoreboard players reset $AwaitTime Global \ No newline at end of file +scoreboard players reset #AwaitTime Global \ No newline at end of file diff --git a/TheSkyBlessing/data/debug/functions/tps/watch.mcfunction b/TheSkyBlessing/data/debug/functions/tps/watch.mcfunction index 31789adc4..a12011a68 100644 --- a/TheSkyBlessing/data/debug/functions/tps/watch.mcfunction +++ b/TheSkyBlessing/data/debug/functions/tps/watch.mcfunction @@ -6,11 +6,11 @@ #> # @private - #declare score_holder $MilliSecond + #declare score_holder #MilliSecond -execute store result score $MilliSecond Temporary in the_end run worldborder get +execute store result score #MilliSecond Temporary in the_end run worldborder get -execute if score $AwaitTime Global <= $MilliSecond Temporary run function debug:tps/init -execute if score $AwaitTime Global <= $MilliSecond Temporary as @a at @s run playsound entity.experience_orb.pickup master @s ~ ~ ~ 0.05 2 +execute if score #AwaitTime Global <= #MilliSecond Temporary run function debug:tps/init +execute if score #AwaitTime Global <= #MilliSecond Temporary as @a at @s run playsound entity.experience_orb.pickup master @s ~ ~ ~ 0.05 2 -execute if score $AwaitTime Global > $MilliSecond Temporary run function debug:tps/watch \ No newline at end of file +execute if score #AwaitTime Global > #MilliSecond Temporary run function debug:tps/watch \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/_index.d.mcfunction b/TheSkyBlessing/data/lib/functions/array/_index.d.mcfunction index e99db2e4b..5248029a0 100644 --- a/TheSkyBlessing/data/lib/functions/array/_index.d.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/_index.d.mcfunction @@ -3,29 +3,29 @@ #> # @within function lib:array/** - #declare score_holder $Index - #declare score_holder $ListSize - #declare score_holder $Argument.Index + #declare score_holder #Index + #declare score_holder #ListSize + #declare score_holder #Argument.Index #> Picks処理用 # @within function # lib:array/picks # lib:array/core/picks - #declare score_holder $Prev - #declare score_holder $Cur + #declare score_holder #Prev + #declare score_holder #Cur #> Compare処理用 # @within function lib:array/**compare* - #declare score_holder $Temp + #declare score_holder #Temp #> sum処理用 # @within function lib:array/**sum - #declare score_holder $isNumeric + #declare score_holder #isNumeric #> 算術処理用 # @within function # lib:array/**math/* - #declare score_holder $Sum - #declare score_holder $Mul - #declare score_holder $Temp - #declare score_holder $Temp2 \ No newline at end of file + #declare score_holder #Sum + #declare score_holder #Mul + #declare score_holder #Temp + #declare score_holder #Temp2 \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/compare.mcfunction b/TheSkyBlessing/data/lib/functions/array/compare.mcfunction index 350d0389d..d54e09a9c 100644 --- a/TheSkyBlessing/data/lib/functions/array/compare.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/compare.mcfunction @@ -29,4 +29,4 @@ # リセット data remove storage lib: Array - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/compare_single.mcfunction b/TheSkyBlessing/data/lib/functions/array/compare_single.mcfunction index 058119987..27f0402a9 100644 --- a/TheSkyBlessing/data/lib/functions/array/compare_single.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/compare_single.mcfunction @@ -30,4 +30,4 @@ data remove storage lib: Array data remove storage lib: CopiedArray data remove storage lib: CompareTarget - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/core/compare.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/compare.mcfunction index 8d04e0555..23cd93897 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/compare.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/compare.mcfunction @@ -4,8 +4,8 @@ # 比較/結果代入 data modify storage lib: Array append value {_:{_:-1b}} - execute store success score $Temp Temporary run data modify storage lib: ArrayA[-1] set from storage lib: ArrayB[-1] - execute store success storage lib: Array[-1]._._ byte 1 if score $Temp Temporary matches 0 + execute store success score #Temp Temporary run data modify storage lib: ArrayA[-1] set from storage lib: ArrayB[-1] + execute store success storage lib: Array[-1]._._ byte 1 if score #Temp Temporary matches 0 # 末尾削除 data remove storage lib: ArrayA[-1] data remove storage lib: ArrayB[-1] diff --git a/TheSkyBlessing/data/lib/functions/array/core/compare_single.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/compare_single.mcfunction index 4baa9966b..285ecdc3e 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/compare_single.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/compare_single.mcfunction @@ -4,8 +4,8 @@ # 比較/結果代入 data modify storage lib: Array append value {_:{_:-1b}} - execute store success score $Temp Temporary run data modify storage lib: CopiedArray[-1] set from storage lib: CompareTarget - execute store success storage lib: Array[-1]._._ byte 1 if score $Temp Temporary matches 0 + execute store success score #Temp Temporary run data modify storage lib: CopiedArray[-1] set from storage lib: CompareTarget + execute store success storage lib: Array[-1]._._ byte 1 if score #Temp Temporary matches 0 # 末尾削除 data remove storage lib: CopiedArray[-1] # 要素がまだあるなら再帰 diff --git a/TheSkyBlessing/data/lib/functions/array/core/math/add.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/math/add.mcfunction index d66961b37..124e57b80 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/math/add.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/math/add.mcfunction @@ -5,10 +5,10 @@ # 加算 data modify storage lib: Array append value -1d - execute store result score $Temp Temporary run data get storage lib: ArrayA[-1] 1000 - execute store result score $Temp2 Temporary run data get storage lib: ArrayB[-1] 1000 - scoreboard players operation $Temp Temporary += $Temp2 Temporary - execute store result storage lib: Array[-1] double 0.001 run scoreboard players get $Temp Temporary + execute store result score #Temp Temporary run data get storage lib: ArrayA[-1] 1000 + execute store result score #Temp2 Temporary run data get storage lib: ArrayB[-1] 1000 + scoreboard players operation #Temp Temporary += #Temp2 Temporary + execute store result storage lib: Array[-1] double 0.001 run scoreboard players get #Temp Temporary # 末尾削除 data remove storage lib: ArrayA[-1] data remove storage lib: ArrayB[-1] diff --git a/TheSkyBlessing/data/lib/functions/array/core/math/scalar_multiply.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/math/scalar_multiply.mcfunction index 30e27c932..ff0a2fac6 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/math/scalar_multiply.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/math/scalar_multiply.mcfunction @@ -5,9 +5,9 @@ # 計算/結果代入 data modify storage lib: Array append value -1d - execute store result score $Temp Temporary run data get storage lib: CopiedArray[-1] 100 - scoreboard players operation $Temp Temporary *= $Mul Temporary - execute store result storage lib: Array[-1] double 0.0001 run scoreboard players get $Temp Temporary + execute store result score #Temp Temporary run data get storage lib: CopiedArray[-1] 100 + scoreboard players operation #Temp Temporary *= #Mul Temporary + execute store result storage lib: Array[-1] double 0.0001 run scoreboard players get #Temp Temporary # 末尾削除 data remove storage lib: CopiedArray[-1] diff --git a/TheSkyBlessing/data/lib/functions/array/core/math/sqr.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/math/sqr.mcfunction index 69d0b36c1..8bb298ef5 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/math/sqr.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/math/sqr.mcfunction @@ -5,9 +5,9 @@ # 計算/結果代入 data modify storage lib: Array append value -1d - execute store result score $Temp Temporary run data get storage lib: CopiedArray[-1] 100 - scoreboard players operation $Temp Temporary *= $Temp Temporary - execute store result storage lib: Array[-1] double 0.0001 run scoreboard players get $Temp Temporary + execute store result score #Temp Temporary run data get storage lib: CopiedArray[-1] 100 + scoreboard players operation #Temp Temporary *= #Temp Temporary + execute store result storage lib: Array[-1] double 0.0001 run scoreboard players get #Temp Temporary # 末尾削除 data remove storage lib: CopiedArray[-1] diff --git a/TheSkyBlessing/data/lib/functions/array/core/math/sub.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/math/sub.mcfunction index 3ef1453d1..b578ed532 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/math/sub.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/math/sub.mcfunction @@ -5,10 +5,10 @@ # 加算 data modify storage lib: Array append value -1d - execute store result score $Temp Temporary run data get storage lib: ArrayA[-1] 1000 - execute store result score $Temp2 Temporary run data get storage lib: ArrayB[-1] 1000 - scoreboard players operation $Temp Temporary -= $Temp2 Temporary - execute store result storage lib: Array[-1] double 0.001 run scoreboard players get $Temp Temporary + execute store result score #Temp Temporary run data get storage lib: ArrayA[-1] 1000 + execute store result score #Temp2 Temporary run data get storage lib: ArrayB[-1] 1000 + scoreboard players operation #Temp Temporary -= #Temp2 Temporary + execute store result storage lib: Array[-1] double 0.001 run scoreboard players get #Temp Temporary # 末尾削除 data remove storage lib: ArrayA[-1] data remove storage lib: ArrayB[-1] diff --git a/TheSkyBlessing/data/lib/functions/array/core/math/sum.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/math/sum.mcfunction index 13d543018..12f134486 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/math/sum.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/math/sum.mcfunction @@ -2,9 +2,9 @@ # @within function lib:array/**sum # 取得/計算 - execute store success score $isNumeric Temporary store result score $Temp Temporary run data get storage lib: Array[-1] 100 - execute if score $isNumeric Temporary matches 0 store result score $Temp Temporary run data get storage lib: Array[-1] - scoreboard players operation $Sum Temporary += $Temp Temporary + execute store success score #isNumeric Temporary store result score #Temp Temporary run data get storage lib: Array[-1] 100 + execute if score #isNumeric Temporary matches 0 store result score #Temp Temporary run data get storage lib: Array[-1] + scoreboard players operation #Sum Temporary += #Temp Temporary # 末尾削除 data remove storage lib: Array[-1] # 要素がまだあるなら再帰 diff --git a/TheSkyBlessing/data/lib/functions/array/core/move.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/move.mcfunction index 149392ac7..c47cd29bd 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/move.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/move.mcfunction @@ -1,7 +1,7 @@ #> lib:array/core/move # @within function lib:array/** -scoreboard players remove $Index Temporary 1 +scoreboard players remove #Index Temporary 1 data modify storage lib: Cache append from storage lib: Array[-1] data remove storage lib: Array[-1] -execute if score $Index Temporary matches 1.. run function lib:array/core/move \ No newline at end of file +execute if score #Index Temporary matches 1.. run function lib:array/core/move \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/core/packing_chest.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/packing_chest.mcfunction index d3dc5ce99..67b22890e 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/packing_chest.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/packing_chest.mcfunction @@ -10,7 +10,7 @@ data modify storage lib: Package append from storage lib: Array[-1] data remove storage lib: Array[-1] # Slotの設定 - execute store result storage lib: Package[-1].Slot byte 1 run scoreboard players get $Index Temporary + execute store result storage lib: Package[-1].Slot byte 1 run scoreboard players get #Index Temporary # ループ処理 - scoreboard players add $Index Temporary 1 - execute if score $Index Temporary < $27 Const if data storage lib: Array[0] run function lib:array/core/packing_chest \ No newline at end of file + scoreboard players add #Index Temporary 1 + execute if score #Index Temporary < #27 Const if data storage lib: Array[0] run function lib:array/core/packing_chest \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/core/picks.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/picks.mcfunction index 1603b2e4b..78e9f04ef 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/picks.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/picks.mcfunction @@ -7,17 +7,17 @@ # lib:array/core/picks # 前の添字と今の添字を取得する - execute store result score $Index Temporary run data get storage lib: Picks[-1] - execute store result score $Cur Temporary run data get storage lib: Picks[-2] + execute store result score #Index Temporary run data get storage lib: Picks[-1] + execute store result score #Cur Temporary run data get storage lib: Picks[-2] # 前の添字を削除する data remove storage lib: Picks[-1] # 前の添字と今の添字から動かすべき距離を算出する - scoreboard players operation $Index Temporary -= $Cur Temporary - scoreboard players remove $Index Temporary 1 + scoreboard players operation #Index Temporary -= #Cur Temporary + scoreboard players remove #Index Temporary 1 # その分だけ動かす - execute if score $Index Temporary matches 1.. run function lib:array/core/move + execute if score #Index Temporary matches 1.. run function lib:array/core/move # 最後の要素をElementsに移す - execute if score $Index Temporary matches 0.. run data modify storage lib: Elements append from storage lib: Array[-1] - execute if score $Index Temporary matches 0.. run data remove storage lib: Array[-1] + execute if score #Index Temporary matches 0.. run data modify storage lib: Elements append from storage lib: Array[-1] + execute if score #Index Temporary matches 0.. run data remove storage lib: Array[-1] # 添字が二つ以上残ってるなら繰り返す execute if data storage lib: Picks[-2] run function lib:array/core/picks \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/core/reverse.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/reverse.mcfunction index 420323a1c..5644df5bd 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/reverse.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/reverse.mcfunction @@ -1,8 +1,8 @@ #> lib:array/core/reverse # @within function lib:array/** -execute store result score $Index Temporary if data storage lib: Array[] +execute store result score #Index Temporary if data storage lib: Array[] function lib:array/core/move data modify storage lib: Array set from storage lib: Cache data remove storage lib: Cache -scoreboard players reset $Index Temporary \ No newline at end of file +scoreboard players reset #Index Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/core/shuffle.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/shuffle.mcfunction index 42e20332f..77738a6a1 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/shuffle.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/shuffle.mcfunction @@ -1,12 +1,12 @@ #> lib:array/core/shuffle # @within function lib:array/** -execute store result score $Index Lib run function lib:random/ -scoreboard players operation $Index Lib %= $ListSize Lib -execute if score $Index Lib matches 1.. run function lib:array/core/move +execute store result score #Index Lib run function lib:random/ +scoreboard players operation #Index Lib %= #ListSize Lib +execute if score #Index Lib matches 1.. run function lib:array/core/move data modify storage lib: ArrayO append from storage lib: Array[-1] data remove storage lib: Array[-1] data modify storage lib: Array append from storage lib: Cache[] data remove storage lib: Cache -scoreboard players remove $ListSize Lib 1 -execute if score $ListSize Lib matches 1.. run function lib:array/core/shuffle \ No newline at end of file +scoreboard players remove #ListSize Lib 1 +execute if score #ListSize Lib matches 1.. run function lib:array/core/shuffle \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/core/sum.mcfunction b/TheSkyBlessing/data/lib/functions/array/core/sum.mcfunction index 4a7fe94dd..448628a22 100644 --- a/TheSkyBlessing/data/lib/functions/array/core/sum.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/core/sum.mcfunction @@ -2,8 +2,8 @@ # @within function lib:array/**sum # 取得/計算 - execute store result score $Temp Temporary run data get storage lib: Array[-1] - scoreboard players operation $Sum Temporary += $Temp Temporary + execute store result score #Temp Temporary run data get storage lib: Array[-1] + scoreboard players operation #Sum Temporary += #Temp Temporary # 末尾削除 data remove storage lib: Array[-1] # 要素がまだあるなら再帰 diff --git a/TheSkyBlessing/data/lib/functions/array/math/add.mcfunction b/TheSkyBlessing/data/lib/functions/array/math/add.mcfunction index 637f9156c..3b88ea911 100644 --- a/TheSkyBlessing/data/lib/functions/array/math/add.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/math/add.mcfunction @@ -29,5 +29,5 @@ # リセット data remove storage lib: Array - scoreboard players reset $Temp Temporary - scoreboard players reset $Temp2 Temporary \ No newline at end of file + scoreboard players reset #Temp Temporary + scoreboard players reset #Temp2 Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/math/scalar_multiply.mcfunction b/TheSkyBlessing/data/lib/functions/array/math/scalar_multiply.mcfunction index 4fa1ce118..d395ded2a 100644 --- a/TheSkyBlessing/data/lib/functions/array/math/scalar_multiply.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/math/scalar_multiply.mcfunction @@ -15,7 +15,7 @@ execute if data storage lib: {ArrayLibSessionOpened:false} run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"lib:array/のセッションが開かれずに利用されています。","color":"white"}] # Mulを取得する - execute store result score $Mul Temporary run data get storage lib: Mul 100 + execute store result score #Mul Temporary run data get storage lib: Mul 100 # 移行する data modify storage lib: CopiedArray set from storage lib: Array @@ -32,5 +32,5 @@ data remove storage lib: Array data remove storage lib: CopiedArray data remove storage lib: Mul - scoreboard players reset $Mul Temporary - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Mul Temporary + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/math/sqr.mcfunction b/TheSkyBlessing/data/lib/functions/array/math/sqr.mcfunction index 53e93faf1..a049fdd85 100644 --- a/TheSkyBlessing/data/lib/functions/array/math/sqr.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/math/sqr.mcfunction @@ -26,5 +26,5 @@ # リセット data remove storage lib: Array data remove storage lib: CopiedArray - scoreboard players reset $Mul Temporary - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Mul Temporary + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/math/sub.mcfunction b/TheSkyBlessing/data/lib/functions/array/math/sub.mcfunction index a2833d595..b929e9eff 100644 --- a/TheSkyBlessing/data/lib/functions/array/math/sub.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/math/sub.mcfunction @@ -29,5 +29,5 @@ # リセット data remove storage lib: Array - scoreboard players reset $Temp Temporary - scoreboard players reset $Temp2 Temporary \ No newline at end of file + scoreboard players reset #Temp Temporary + scoreboard players reset #Temp2 Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/math/sum.mcfunction b/TheSkyBlessing/data/lib/functions/array/math/sum.mcfunction index 63f99ba01..95c9eb04b 100644 --- a/TheSkyBlessing/data/lib/functions/array/math/sum.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/math/sum.mcfunction @@ -18,13 +18,13 @@ execute if data storage lib: {ArrayLibSessionOpened:false} run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"lib:array/のセッションが開かれずに利用されています。","color":"white"}] # 初期化 - scoreboard players set $Sum Temporary 0 + scoreboard players set #Sum Temporary 0 # 総和を計算する function lib:array/core/math/sum # 総和をSumResultに突っ込む - execute if score $isNumeric Temporary matches 0 store result storage lib: SumResult int 1.00 run scoreboard players get $Sum Temporary - execute if score $isNumeric Temporary matches 1 store result storage lib: SumResult double 0.01 run scoreboard players get $Sum Temporary + execute if score #isNumeric Temporary matches 0 store result storage lib: SumResult int 1.00 run scoreboard players get #Sum Temporary + execute if score #isNumeric Temporary matches 1 store result storage lib: SumResult double 0.01 run scoreboard players get #Sum Temporary # リセット - scoreboard players reset $Sum Temporary - scoreboard players reset $Temp Temporary - scoreboard players reset $isNumeric Temporary \ No newline at end of file + scoreboard players reset #Sum Temporary + scoreboard players reset #Temp Temporary + scoreboard players reset #isNumeric Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/move.mcfunction b/TheSkyBlessing/data/lib/functions/array/move.mcfunction index f080070d4..3c3dd110b 100644 --- a/TheSkyBlessing/data/lib/functions/array/move.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/move.mcfunction @@ -6,7 +6,7 @@ # T extends any # storage lib: Array: [T] @ N # 操作する配列データ -# score $Argument.Index Lib +# score #Argument.Index Lib # 目的の要素のindex # @output storage lib: # Array: [T] @ (N - Index) @@ -19,11 +19,11 @@ execute if data storage lib: {ArrayLibSessionOpened:false} run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"lib:array/のセッションが開かれずに利用されています。","color":"white"}] # 動かす回数を算出する - execute store result score $Index Temporary if data storage lib: Array[] - scoreboard players remove $Index Temporary 1 - scoreboard players operation $Index Temporary -= $Argument.Index Lib + execute store result score #Index Temporary if data storage lib: Array[] + scoreboard players remove #Index Temporary 1 + scoreboard players operation #Index Temporary -= #Argument.Index Lib # 再帰的に動かす - execute if score $Index Temporary matches 1.. run function lib:array/core/move + execute if score #Index Temporary matches 1.. run function lib:array/core/move # リセット - scoreboard players reset $Index Temporary \ No newline at end of file + scoreboard players reset #Index Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/packing_chest.mcfunction b/TheSkyBlessing/data/lib/functions/array/packing_chest.mcfunction index 4c1ffbce9..fc017857b 100644 --- a/TheSkyBlessing/data/lib/functions/array/packing_chest.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/packing_chest.mcfunction @@ -17,8 +17,8 @@ execute if data storage lib: {ArrayLibSessionOpened:false} run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"lib:array/のセッションが開かれずに利用されています。","color":"white"}] # 初期化 - scoreboard players set $Index Temporary 0 + scoreboard players set #Index Temporary 0 # 箱詰め function lib:array/core/packing_chest # リセット - scoreboard players reset $Index Temporary \ No newline at end of file + scoreboard players reset #Index Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/picks.mcfunction b/TheSkyBlessing/data/lib/functions/array/picks.mcfunction index 62a765a9d..86e391f5b 100644 --- a/TheSkyBlessing/data/lib/functions/array/picks.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/picks.mcfunction @@ -48,6 +48,6 @@ # リセット data remove storage lib: Picks data remove storage lib: ArrayTemp - scoreboard players reset $Prev Temporary - scoreboard players reset $Cur Temporary - scoreboard players reset $ListSize Temporary \ No newline at end of file + scoreboard players reset #Prev Temporary + scoreboard players reset #Cur Temporary + scoreboard players reset #ListSize Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/array/shuffle.mcfunction b/TheSkyBlessing/data/lib/functions/array/shuffle.mcfunction index 3bf4dc3f3..de0f617c5 100644 --- a/TheSkyBlessing/data/lib/functions/array/shuffle.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/shuffle.mcfunction @@ -15,7 +15,7 @@ execute if data storage lib: {ArrayLibSessionOpened:false} run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"lib:array/のセッションが開かれずに利用されています。","color":"white"}] # 配列サイズを取得 - execute store result score $ListSize Lib if data storage lib: Array[] + execute store result score #ListSize Lib if data storage lib: Array[] # 初期化 data modify storage lib: ArrayO set value [] # 再帰的にシャッフル diff --git a/TheSkyBlessing/data/lib/functions/array/sum.mcfunction b/TheSkyBlessing/data/lib/functions/array/sum.mcfunction index b03edab13..b270364e6 100644 --- a/TheSkyBlessing/data/lib/functions/array/sum.mcfunction +++ b/TheSkyBlessing/data/lib/functions/array/sum.mcfunction @@ -14,11 +14,11 @@ execute if data storage lib: {ArrayLibSessionOpened:false} run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"lib:array/のセッションが開かれずに利用されています。","color":"white"}] # 初期化 - scoreboard players set $Sum Temporary 0 + scoreboard players set #Sum Temporary 0 # 総和を計算する function lib:array/core/sum # 総和をSumResultに突っ込む - execute store result storage lib: SumResult int 1 run scoreboard players get $Sum Temporary + execute store result storage lib: SumResult int 1 run scoreboard players get #Sum Temporary # リセット - scoreboard players reset $Sum Temporary - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Sum Temporary + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/.mcfunction b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/.mcfunction index a09b13ff9..f51d7cd2f 100644 --- a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/.mcfunction +++ b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/.mcfunction @@ -6,7 +6,7 @@ # storage lib: Argument.BitArray: list(bit) # bit配列 # @output -# score $Return.Number Lib +# score #Return.Number Lib # 変換後の値 # @api diff --git a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/_index.d.mcfunction b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/_index.d.mcfunction index 328bd7fad..f2455c2c6 100644 --- a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/_index.d.mcfunction +++ b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/_index.d.mcfunction @@ -3,5 +3,5 @@ #> Temp # @within function lib:bit_array_to_integer/** - #declare score_holder $Return.Number - #declare score_holder $bit \ No newline at end of file + #declare score_holder #Return.Number + #declare score_holder #bit \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/main.mcfunction b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/main.mcfunction index cb216f96b..fa4ce29dd 100644 --- a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/main.mcfunction +++ b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/main.mcfunction @@ -5,7 +5,7 @@ # @within function lib:bit_array_to_integer/ # 初期化 - scoreboard players set $Return.Number Lib 0 + scoreboard players set #Return.Number Lib 0 # セッション開ける function lib:array/session/open # 反転 @@ -15,4 +15,4 @@ function lib:bit_array_to_integer/core/recursive # リセット function lib:array/session/close - scoreboard players reset $bit Temporary \ No newline at end of file + scoreboard players reset #bit Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/recursive.mcfunction b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/recursive.mcfunction index 091b50940..cc5707edf 100644 --- a/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/recursive.mcfunction +++ b/TheSkyBlessing/data/lib/functions/bit_array_to_integer/core/recursive.mcfunction @@ -4,8 +4,8 @@ # # @within function lib:bit_array_to_integer/core/* -execute store result score $bit Temporary run data get storage lib: Array[-1] +execute store result score #bit Temporary run data get storage lib: Array[-1] data remove storage lib: Array[-1] -scoreboard players operation $Return.Number Lib += $Return.Number Lib -execute if score $bit Temporary matches 1 run scoreboard players add $Return.Number Lib 1 +scoreboard players operation #Return.Number Lib += #Return.Number Lib +execute if score #bit Temporary matches 1 run scoreboard players add #Return.Number Lib 1 execute if data storage lib: Array[] run function lib:bit_array_to_integer/core/recursive \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/_index.d.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/_index.d.mcfunction index 679d64e50..dc599ea24 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/_index.d.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/_index.d.mcfunction @@ -3,18 +3,18 @@ #> Temp # @within lib:forward_spreader/** - #declare score_holder $CircleRandomizerMode - #declare score_holder $Distance - #declare score_holder $Diameter - #declare score_holder $YawSin - #declare score_holder $YawCos - #declare score_holder $PitchSin - #declare score_holder $PitchCos - #declare score_holder $Radius - #declare score_holder $Radius^2 - #declare score_holder $VecX - #declare score_holder $VecY - #declare score_holder $VecZ - #declare score_holder $X - #declare score_holder $Y - #declare score_holder $Z \ No newline at end of file + #declare score_holder #CircleRandomizerMode + #declare score_holder #Distance + #declare score_holder #Diameter + #declare score_holder #YawSin + #declare score_holder #YawCos + #declare score_holder #PitchSin + #declare score_holder #PitchCos + #declare score_holder #Radius + #declare score_holder #Radius^2 + #declare score_holder #VecX + #declare score_holder #VecY + #declare score_holder #VecZ + #declare score_holder #X + #declare score_holder #Y + #declare score_holder #Z \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/circle.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/circle.mcfunction index 6ecdb711f..2a3329ecc 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/circle.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/circle.mcfunction @@ -11,6 +11,6 @@ # Argument.Spread : float # @public -scoreboard players set $CircleRandomizerMode Temporary 1 +scoreboard players set #CircleRandomizerMode Temporary 1 function lib:forward_spreader/core/ -scoreboard players reset $CircleRandomizerMode Temporary \ No newline at end of file +scoreboard players reset #CircleRandomizerMode Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/core/.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/core/.mcfunction index 878eb865f..b0dbb045a 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/core/.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/core/.mcfunction @@ -7,33 +7,33 @@ # 実行座標に汎用EntityをTP execute in overworld run tp 0-0-0-0-0 0.0 0.0 0.0 ~ ~ # 必要な実行座標のデータを取得 -# N/A => Rotation[], ($Distance, $Diameter) - execute store result score $Distance Temporary run data get storage lib: Argument.Distance 10000 - execute store result score $Diameter Temporary run data get storage lib: Argument.Spread 10000 +# N/A => Rotation[], (#Distance, #Diameter) + execute store result score #Distance Temporary run data get storage lib: Argument.Distance 10000 + execute store result score #Diameter Temporary run data get storage lib: Argument.Spread 10000 data modify storage lib: Rotation set from entity 0-0-0-0-0 Rotation # オーバーフロー警告 - execute if score $Diameter Temporary matches 46340.. run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"Spreadの絶対値が4.6340を上回っています。オーバーフローで正常に動作しない為、値を縮小してください。","color":"white"}] - execute if score $Diameter Temporary matches ..-46340 run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"Spreadの絶対値が4.6340を上回っています。オーバーフローで正常に動作しない為、値を縮小してください。","color":"white"}] + execute if score #Diameter Temporary matches 46340.. run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"Spreadの絶対値が4.6340を上回っています。オーバーフローで正常に動作しない為、値を縮小してください。","color":"white"}] + execute if score #Diameter Temporary matches ..-46340 run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"Spreadの絶対値が4.6340を上回っています。オーバーフローで正常に動作しない為、値を縮小してください。","color":"white"}] # 実行座標のデータからベクトルを取得する -# Rotation[] => ($YawSin, $YawCos, $PitchSin, $PitchCos) +# Rotation[] => (#YawSin, #YawCos, #PitchSin, #PitchCos) function lib:forward_spreader/core/yaw function lib:forward_spreader/core/pitch # 処理の下準備 -# ($Distance, $Diameter) => ($Radius, $Radius^2) +# (#Distance, #Diameter) => (#Radius, #Radius^2) function lib:forward_spreader/core/pre_randomizer # 拡散範囲に収まるランダムなベクトルを生成する -# ($Diameter, $Radius, $Radius^2, $Distance) => ($VecX, $VecY, $VecZ) +# (#Diameter, #Radius, #Radius^2, #Distance) => (#VecX, #VecY, #VecZ) function lib:forward_spreader/core/randomizer - scoreboard players operation $VecZ Temporary = $Distance Temporary + scoreboard players operation #VecZ Temporary = #Distance Temporary # 計算 -# ($YawSin, $YawCos, $PitchSin, $PitchCos, $VecX, $VecY, $VecX) => ($X, $Y, $Z) +# (#YawSin, #YawCos, #PitchSin, #PitchCos, #VecX, #VecY, #VecX) => (#X, #Y, #Z) function lib:forward_spreader/core/calc # 適用 function lib:forward_spreader/core/fetch # リセット - scoreboard players reset $X Temporary - scoreboard players reset $Y Temporary - scoreboard players reset $Z Temporary + scoreboard players reset #X Temporary + scoreboard players reset #Y Temporary + scoreboard players reset #Z Temporary data remove storage lib: Argument.Distance data remove storage lib: Argument.Spread data remove storage lib: Rotation \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/core/calc.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/core/calc.mcfunction index a0dbfd9ae..624202ead 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/core/calc.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/core/calc.mcfunction @@ -6,47 +6,47 @@ #> Temporary # @private - #declare score_holder $Temp + #declare score_holder #Temp # Y` = Y * cos(pitch) - Z * sin(pitch) - scoreboard players operation $Y Temporary = $VecY Temporary - scoreboard players operation $Y Temporary *= $PitchCos Temporary - scoreboard players operation $Temp Temporary = $VecZ Temporary - scoreboard players operation $Temp Temporary *= $PitchSin Temporary - scoreboard players operation $Y Temporary -= $Temp Temporary + scoreboard players operation #Y Temporary = #VecY Temporary + scoreboard players operation #Y Temporary *= #PitchCos Temporary + scoreboard players operation #Temp Temporary = #VecZ Temporary + scoreboard players operation #Temp Temporary *= #PitchSin Temporary + scoreboard players operation #Y Temporary -= #Temp Temporary # Z` = Y * sin(pitch) + Z * cos(pitch) - scoreboard players operation $Z Temporary = $VecY Temporary - scoreboard players operation $Z Temporary *= $PitchSin Temporary - scoreboard players operation $Temp Temporary = $VecZ Temporary - scoreboard players operation $Temp Temporary *= $PitchCos Temporary - scoreboard players operation $Z Temporary += $Temp Temporary - scoreboard players operation $Z Temporary /= $10000 Const + scoreboard players operation #Z Temporary = #VecY Temporary + scoreboard players operation #Z Temporary *= #PitchSin Temporary + scoreboard players operation #Temp Temporary = #VecZ Temporary + scoreboard players operation #Temp Temporary *= #PitchCos Temporary + scoreboard players operation #Z Temporary += #Temp Temporary + scoreboard players operation #Z Temporary /= #10000 Const # X` = X * cos(yaw) + Z` * sin(yaw) - scoreboard players operation $X Temporary = $VecX Temporary - scoreboard players operation $X Temporary *= $YawCos Temporary - scoreboard players operation $Temp Temporary = $Z Temporary - scoreboard players operation $Temp Temporary *= $YawSin Temporary - scoreboard players operation $X Temporary += $Temp Temporary + scoreboard players operation #X Temporary = #VecX Temporary + scoreboard players operation #X Temporary *= #YawCos Temporary + scoreboard players operation #Temp Temporary = #Z Temporary + scoreboard players operation #Temp Temporary *= #YawSin Temporary + scoreboard players operation #X Temporary += #Temp Temporary # Z` = Z` * cos(yaw) - X * sin(yaw) - scoreboard players operation $Z Temporary *= $YawCos Temporary - scoreboard players operation $Temp Temporary = $VecX Temporary - scoreboard players operation $Temp Temporary *= $YawSin Temporary - scoreboard players operation $Z Temporary -= $Temp Temporary + scoreboard players operation #Z Temporary *= #YawCos Temporary + scoreboard players operation #Temp Temporary = #VecX Temporary + scoreboard players operation #Temp Temporary *= #YawSin Temporary + scoreboard players operation #Z Temporary -= #Temp Temporary # 係数が乗算で膨れ上がってるので除算 - scoreboard players operation $X Temporary /= $10000 Const - scoreboard players operation $Y Temporary /= $10000 Const - scoreboard players operation $Z Temporary /= $10000 Const + scoreboard players operation #X Temporary /= #10000 Const + scoreboard players operation #Y Temporary /= #10000 Const + scoreboard players operation #Z Temporary /= #10000 Const # リセット - scoreboard players reset $Temp Temporary - scoreboard players reset $CircleRandomizerMode Temporary - scoreboard players reset $Distance Temporary - scoreboard players reset $Diameter Temporary - scoreboard players reset $YawSin Temporary - scoreboard players reset $YawCos Temporary - scoreboard players reset $PitchSin Temporary - scoreboard players reset $PitchCos Temporary - scoreboard players reset $Radius Temporary - scoreboard players reset $Radius^2 Temporary - scoreboard players reset $VecX Temporary - scoreboard players reset $VecY Temporary - scoreboard players reset $VecZ Temporary \ No newline at end of file + scoreboard players reset #Temp Temporary + scoreboard players reset #CircleRandomizerMode Temporary + scoreboard players reset #Distance Temporary + scoreboard players reset #Diameter Temporary + scoreboard players reset #YawSin Temporary + scoreboard players reset #YawCos Temporary + scoreboard players reset #PitchSin Temporary + scoreboard players reset #PitchCos Temporary + scoreboard players reset #Radius Temporary + scoreboard players reset #Radius^2 Temporary + scoreboard players reset #VecX Temporary + scoreboard players reset #VecY Temporary + scoreboard players reset #VecZ Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/core/check_distance.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/core/check_distance.mcfunction index 2a84c1690..e2c74e316 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/core/check_distance.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/core/check_distance.mcfunction @@ -6,19 +6,19 @@ #> Temporary # @private - #declare score_holder $Temp - #declare score_holder $Temp2 + #declare score_holder #Temp + #declare score_holder #Temp2 # while ((x^2+y^2) > r^2) randomizer - scoreboard players operation $Temp Temporary = $VecX Temporary - scoreboard players operation $Temp Temporary *= $VecX Temporary + scoreboard players operation #Temp Temporary = #VecX Temporary + scoreboard players operation #Temp Temporary *= #VecX Temporary - scoreboard players operation $Temp2 Temporary = $VecY Temporary - scoreboard players operation $Temp2 Temporary *= $VecY Temporary + scoreboard players operation #Temp2 Temporary = #VecY Temporary + scoreboard players operation #Temp2 Temporary *= #VecY Temporary - scoreboard players operation $Temp Temporary += $Temp2 Temporary + scoreboard players operation #Temp Temporary += #Temp2 Temporary - execute if score $Temp Temporary > $Radius^2 Temporary run function lib:forward_spreader/core/randomizer + execute if score #Temp Temporary > #Radius^2 Temporary run function lib:forward_spreader/core/randomizer # リセット - scoreboard players reset $Temp Temporary - scoreboard players reset $Temp2 Temporary \ No newline at end of file + scoreboard players reset #Temp Temporary + scoreboard players reset #Temp2 Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/core/fetch.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/core/fetch.mcfunction index a78c79c55..a4ce5a482 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/core/fetch.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/core/fetch.mcfunction @@ -6,26 +6,26 @@ #> Temporary # @private - #declare score_holder $PosX - #declare score_holder $PosY - #declare score_holder $PosZ + #declare score_holder #PosX + #declare score_holder #PosY + #declare score_holder #PosZ # 汎用EntityのPosを取得 data modify storage lib: Pos set from entity @s Pos - execute store result score $PosX Temporary run data get storage lib: Pos[0] 10000 - execute store result score $PosY Temporary run data get storage lib: Pos[1] 10000 - execute store result score $PosZ Temporary run data get storage lib: Pos[2] 10000 + execute store result score #PosX Temporary run data get storage lib: Pos[0] 10000 + execute store result score #PosY Temporary run data get storage lib: Pos[1] 10000 + execute store result score #PosZ Temporary run data get storage lib: Pos[2] 10000 # ベクトルを加算 - scoreboard players operation $PosX Temporary += $X Temporary - scoreboard players operation $PosY Temporary += $Y Temporary - scoreboard players operation $PosZ Temporary += $Z Temporary + scoreboard players operation #PosX Temporary += #X Temporary + scoreboard players operation #PosY Temporary += #Y Temporary + scoreboard players operation #PosZ Temporary += #Z Temporary # 戻す - execute store result storage lib: Pos[0] double 0.0001 run scoreboard players get $PosX Temporary - execute store result storage lib: Pos[1] double 0.0001 run scoreboard players get $PosY Temporary - execute store result storage lib: Pos[2] double 0.0001 run scoreboard players get $PosZ Temporary + execute store result storage lib: Pos[0] double 0.0001 run scoreboard players get #PosX Temporary + execute store result storage lib: Pos[1] double 0.0001 run scoreboard players get #PosY Temporary + execute store result storage lib: Pos[2] double 0.0001 run scoreboard players get #PosZ Temporary data modify entity @s Pos set from storage lib: Pos # リセット - scoreboard players reset $PosX Temporary - scoreboard players reset $PosY Temporary - scoreboard players reset $PosZ Temporary + scoreboard players reset #PosX Temporary + scoreboard players reset #PosY Temporary + scoreboard players reset #PosZ Temporary data remove storage lib: Pos \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/core/pitch.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/core/pitch.mcfunction index 8daf10adf..73722acac 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/core/pitch.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/core/pitch.mcfunction @@ -11,7 +11,7 @@ execute as 0-0-0-0-0 at @s run tp @s ^ ^ ^1 # pitchのsin/cosを取得 data modify storage lib: Pos set from entity 0-0-0-0-0 Pos - execute store result score $PitchSin Temporary run data get storage lib: Pos[0] -10000 - execute store result score $PitchCos Temporary run data get storage lib: Pos[2] 10000 + execute store result score #PitchSin Temporary run data get storage lib: Pos[0] -10000 + execute store result score #PitchCos Temporary run data get storage lib: Pos[2] 10000 # リセット data remove storage lib: Pos \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/core/pre_randomizer.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/core/pre_randomizer.mcfunction index ba2e99021..6cbf9a1c1 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/core/pre_randomizer.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/core/pre_randomizer.mcfunction @@ -5,8 +5,8 @@ # @within function lib:forward_spreader/core/ # 半径を求める - scoreboard players operation $Radius Temporary = $Diameter Temporary - scoreboard players operation $Radius Temporary /= $2 Const + scoreboard players operation #Radius Temporary = #Diameter Temporary + scoreboard players operation #Radius Temporary /= #2 Const # 半径の二乗を求める - scoreboard players operation $Radius^2 Temporary = $Radius Temporary - scoreboard players operation $Radius^2 Temporary *= $Radius Temporary \ No newline at end of file + scoreboard players operation #Radius^2 Temporary = #Radius Temporary + scoreboard players operation #Radius^2 Temporary *= #Radius Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/core/randomizer.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/core/randomizer.mcfunction index 529afb337..740510f7e 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/core/randomizer.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/core/randomizer.mcfunction @@ -6,12 +6,12 @@ # lib:forward_spreader/core/ # lib:forward_spreader/core/check_distance -execute store result score $VecX Temporary run function lib:random/ -scoreboard players operation $VecX Temporary %= $Diameter Temporary -scoreboard players operation $VecX Temporary -= $Radius Temporary +execute store result score #VecX Temporary run function lib:random/ +scoreboard players operation #VecX Temporary %= #Diameter Temporary +scoreboard players operation #VecX Temporary -= #Radius Temporary -execute store result score $VecY Temporary run function lib:random/ -scoreboard players operation $VecY Temporary %= $Diameter Temporary -scoreboard players operation $VecY Temporary -= $Radius Temporary +execute store result score #VecY Temporary run function lib:random/ +scoreboard players operation #VecY Temporary %= #Diameter Temporary +scoreboard players operation #VecY Temporary -= #Radius Temporary -execute if score $CircleRandomizerMode Temporary matches 1 run function lib:forward_spreader/core/check_distance \ No newline at end of file +execute if score #CircleRandomizerMode Temporary matches 1 run function lib:forward_spreader/core/check_distance \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/forward_spreader/core/yaw.mcfunction b/TheSkyBlessing/data/lib/functions/forward_spreader/core/yaw.mcfunction index 501d1c2f3..744f250f0 100644 --- a/TheSkyBlessing/data/lib/functions/forward_spreader/core/yaw.mcfunction +++ b/TheSkyBlessing/data/lib/functions/forward_spreader/core/yaw.mcfunction @@ -11,7 +11,7 @@ execute as 0-0-0-0-0 at @s run tp @s ^ ^ ^1 # yawのsin/cosを取得 data modify storage lib: Pos set from entity 0-0-0-0-0 Pos - execute store result score $YawSin Temporary run data get storage lib: Pos[0] 10000 - execute store result score $YawCos Temporary run data get storage lib: Pos[2] 10000 + execute store result score #YawSin Temporary run data get storage lib: Pos[0] 10000 + execute store result score #YawCos Temporary run data get storage lib: Pos[2] 10000 # リセット data remove storage lib: Pos \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/integer_to_bit_array/.mcfunction b/TheSkyBlessing/data/lib/functions/integer_to_bit_array/.mcfunction index a20ba8010..335b2af6e 100644 --- a/TheSkyBlessing/data/lib/functions/integer_to_bit_array/.mcfunction +++ b/TheSkyBlessing/data/lib/functions/integer_to_bit_array/.mcfunction @@ -3,7 +3,7 @@ # スコアをbit配列に変換します # # @input -# score $Argument.Number Lib +# score #Argument.Number Lib # 変換する値 # @output # storage lib: Return.Array: list(bit) @@ -11,6 +11,6 @@ # @api # 引数チェック - execute unless score $Argument.Number Lib matches -2147483648..2147483647 run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません","color":"white"},{"text":" $Argument.Integer","color":"red"}] + execute unless score #Argument.Number Lib matches -2147483648..2147483647 run tellraw @a [{"storage":"global","nbt":"Prefix.ERROR"},{"text":"引数が足りません","color":"white"},{"text":" #Argument.Integer","color":"red"}] # 実行 - execute if score $Argument.Number Lib matches -2147483648..2147483647 run function lib:integer_to_bit_array/core/main \ No newline at end of file + execute if score #Argument.Number Lib matches -2147483648..2147483647 run function lib:integer_to_bit_array/core/main \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/integer_to_bit_array/_index.d.mcfunction b/TheSkyBlessing/data/lib/functions/integer_to_bit_array/_index.d.mcfunction index 73ddb8f66..95df41f44 100644 --- a/TheSkyBlessing/data/lib/functions/integer_to_bit_array/_index.d.mcfunction +++ b/TheSkyBlessing/data/lib/functions/integer_to_bit_array/_index.d.mcfunction @@ -3,5 +3,5 @@ #> Temp # @within function lib:integer_to_bit_array/** - #declare score_holder $Argument.Number - #declare score_holder $i \ No newline at end of file + #declare score_holder #Argument.Number + #declare score_holder #i \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/integer_to_bit_array/core/main.mcfunction b/TheSkyBlessing/data/lib/functions/integer_to_bit_array/core/main.mcfunction index d4da6b0f3..e22b58783 100644 --- a/TheSkyBlessing/data/lib/functions/integer_to_bit_array/core/main.mcfunction +++ b/TheSkyBlessing/data/lib/functions/integer_to_bit_array/core/main.mcfunction @@ -5,6 +5,6 @@ # @within function lib:integer_to_bit_array/ data modify storage lib: Return.Array set value [] -scoreboard players set $i Temporary 0 +scoreboard players set #i Temporary 0 function lib:integer_to_bit_array/core/recursive -scoreboard players reset $i Temporary \ No newline at end of file +scoreboard players reset #i Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/integer_to_bit_array/core/recursive.mcfunction b/TheSkyBlessing/data/lib/functions/integer_to_bit_array/core/recursive.mcfunction index a27b88268..b687ca8d2 100644 --- a/TheSkyBlessing/data/lib/functions/integer_to_bit_array/core/recursive.mcfunction +++ b/TheSkyBlessing/data/lib/functions/integer_to_bit_array/core/recursive.mcfunction @@ -4,8 +4,8 @@ # # @within function lib:integer_to_bit_array/core/* -execute if score $Argument.Number Temporary matches 00.. run data modify storage lib: Return.Array append value 0 -execute if score $Argument.Number Temporary matches ..-1 run data modify storage lib: Return.Array append value 1 -scoreboard players operation $Argument.Number Temporary += $Argument.Number Temporary -scoreboard players add $i Temporary 1 -execute if score $i Temporary < $32 Const run function lib:integer_to_bit_array/core/recursive \ No newline at end of file +execute if score #Argument.Number Temporary matches 00.. run data modify storage lib: Return.Array append value 0 +execute if score #Argument.Number Temporary matches ..-1 run data modify storage lib: Return.Array append value 1 +scoreboard players operation #Argument.Number Temporary += #Argument.Number Temporary +scoreboard players add #i Temporary 1 +execute if score #i Temporary < #32 Const run function lib:integer_to_bit_array/core/recursive \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/common/die/fire.mcfunction b/TheSkyBlessing/data/lib/functions/message/common/die/fire.mcfunction index 0c48ce1b0..85b941d7a 100644 --- a/TheSkyBlessing/data/lib/functions/message/common/die/fire.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/common/die/fire.mcfunction @@ -6,11 +6,11 @@ #> Random # @private - #declare score_holder $Random + #declare score_holder #Random -execute store result score $Random Temporary run function lib:random/ -scoreboard players operation $Random Temporary %= $3 Const +execute store result score #Random Temporary run function lib:random/ +scoreboard players operation #Random Temporary %= #3 Const -execute if score $Random Temporary matches 0 run tellraw @a [{"translate": "%2$sによって%1$sは燃え尽き真っ白になった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 1 run tellraw @a [{"translate": "%2$sは%1$sを消し炭にした。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 2 run tellraw @a [{"translate": "%1$sは%2$sによってロウソクとしてその生涯を終えた。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file +execute if score #Random Temporary matches 0 run tellraw @a [{"translate": "%2#sによって%1#sは燃え尽き真っ白になった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 1 run tellraw @a [{"translate": "%2#sは%1#sを消し炭にした。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 2 run tellraw @a [{"translate": "%1#sは%2#sによってロウソクとしてその生涯を終えた。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/common/die/magic.mcfunction b/TheSkyBlessing/data/lib/functions/message/common/die/magic.mcfunction index 77b31bcd7..da1f0dfb8 100644 --- a/TheSkyBlessing/data/lib/functions/message/common/die/magic.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/common/die/magic.mcfunction @@ -6,11 +6,11 @@ #> Random # @private - #declare score_holder $Random + #declare score_holder #Random -execute store result score $Random Temporary run function lib:random/ -scoreboard players operation $Random Temporary %= $3 Const +execute store result score #Random Temporary run function lib:random/ +scoreboard players operation #Random Temporary %= #3 Const -execute if score $Random Temporary matches 0 run tellraw @a [{"translate": "%1$sは%2$sによって跡形もなく消し飛ばされた。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 1 run tellraw @a [{"translate": "%1$sは%2$sの魔力に飲まれ死んだ。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 2 run tellraw @a [{"translate": "%1$sは%2$sの魔力衝撃によって幽体離脱を経験した。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file +execute if score #Random Temporary matches 0 run tellraw @a [{"translate": "%1#sは%2#sによって跡形もなく消し飛ばされた。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 1 run tellraw @a [{"translate": "%1#sは%2#sの魔力に飲まれ死んだ。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 2 run tellraw @a [{"translate": "%1#sは%2#sの魔力衝撃によって幽体離脱を経験した。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/common/die/physical.mcfunction b/TheSkyBlessing/data/lib/functions/message/common/die/physical.mcfunction index 7bf98b0bb..62a53268b 100644 --- a/TheSkyBlessing/data/lib/functions/message/common/die/physical.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/common/die/physical.mcfunction @@ -6,12 +6,12 @@ #> Random # @private - #declare score_holder $Random + #declare score_holder #Random -execute store result score $Random Temporary run function lib:random/ -scoreboard players operation $Random Temporary %= $100 Const +execute store result score #Random Temporary run function lib:random/ +scoreboard players operation #Random Temporary %= #100 Const -execute if score $Random Temporary matches 00 run tellraw @a [{"translate": "%2$sの物理的要因によって、%1$sは生命活動の停止を確認... 死んだのだ","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 01..33 run tellraw @a [{"translate": "%1$sは%2$sによって身体を見るも無残な姿と化した。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 34..66 run tellraw @a [{"translate": "%1$sは%2$sに切り裂かれた。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 67..99 run tellraw @a [{"translate": "%1$sは%2$sによって床のシミとなった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file +execute if score #Random Temporary matches 00 run tellraw @a [{"translate": "%2#sの物理的要因によって、%1#sは生命活動の停止を確認... 死んだのだ","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 01..33 run tellraw @a [{"translate": "%1#sは%2#sによって身体を見るも無残な姿と化した。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 34..66 run tellraw @a [{"translate": "%1#sは%2#sに切り裂かれた。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 67..99 run tellraw @a [{"translate": "%1#sは%2#sによって床のシミとなった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/common/die/thunder.mcfunction b/TheSkyBlessing/data/lib/functions/message/common/die/thunder.mcfunction index 8acb87776..2ab67c35c 100644 --- a/TheSkyBlessing/data/lib/functions/message/common/die/thunder.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/common/die/thunder.mcfunction @@ -6,12 +6,12 @@ #> Random # @private - #declare score_holder $Random + #declare score_holder #Random -execute store result score $Random Temporary run function lib:random/ -scoreboard players operation $Random Temporary %= $3 Const +execute store result score #Random Temporary run function lib:random/ +scoreboard players operation #Random Temporary %= #3 Const -execute if score $Random Temporary matches 0 run tellraw @a [{"translate": "%1$sは%2$sによって電撃に撃たれ目の前が真っ暗になった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 1 run tellraw @a [{"translate": "%2$sによって%1$sの身体はシビレ、心停止した。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 2 run tellraw @a [{"translate": "%2$sによってその時%1$sに電流が走る。・・・ひらめきはなかった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file +execute if score #Random Temporary matches 0 run tellraw @a [{"translate": "%1#sは%2#sによって電撃に撃たれ目の前が真っ暗になった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 1 run tellraw @a [{"translate": "%2#sによって%1#sの身体はシビレ、心停止した。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 2 run tellraw @a [{"translate": "%2#sによってその時%1#sに電流が走る。・・・ひらめきはなかった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/common/die/unknown.mcfunction b/TheSkyBlessing/data/lib/functions/message/common/die/unknown.mcfunction index ee0ef02bf..8458830e5 100644 --- a/TheSkyBlessing/data/lib/functions/message/common/die/unknown.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/common/die/unknown.mcfunction @@ -4,4 +4,4 @@ # # @within function lib:score_to_health_wrapper/core/show_common_death_message -tellraw @a [{"translate": "%1$sは未知の力によってその命を終えた","with":[{"selector":"@s"}]}] \ No newline at end of file +tellraw @a [{"translate": "%1#sは未知の力によってその命を終えた","with":[{"selector":"@s"}]}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/common/die/water.mcfunction b/TheSkyBlessing/data/lib/functions/message/common/die/water.mcfunction index dba923ef3..eb6eede8b 100644 --- a/TheSkyBlessing/data/lib/functions/message/common/die/water.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/common/die/water.mcfunction @@ -6,11 +6,11 @@ #> Random # @private - #declare score_holder $Random + #declare score_holder #Random -execute store result score $Random Temporary run function lib:random/ -scoreboard players operation $Random Temporary %= $3 Const +execute store result score #Random Temporary run function lib:random/ +scoreboard players operation #Random Temporary %= #3 Const -execute if score $Random Temporary matches 0 run tellraw @a [{"translate": "%1$sは%2$sによって真っ青になった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 1 run tellraw @a [{"translate": "%1$sは%2$sによって冷たくなった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] -execute if score $Random Temporary matches 2 run tellraw @a [{"translate": "%2$sによって%1$sはふやけてしまった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file +execute if score #Random Temporary matches 0 run tellraw @a [{"translate": "%1#sは%2#sによって真っ青になった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 1 run tellraw @a [{"translate": "%1#sは%2#sによって冷たくなった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] +execute if score #Random Temporary matches 2 run tellraw @a [{"translate": "%2#sによって%1#sはふやけてしまった。","with":[{"selector":"@s"},{"nbt":"Return.AttackerName","storage":"lib:","interpret":true}]}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/tutorial/goal.mcfunction b/TheSkyBlessing/data/lib/functions/message/tutorial/goal.mcfunction index b7a0d7bae..7ccc6aaa8 100644 --- a/TheSkyBlessing/data/lib/functions/message/tutorial/goal.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/tutorial/goal.mcfunction @@ -5,5 +5,5 @@ # # @within function world_manager:area/01-01.tutorial-goal -execute if score $PlayerCount Global matches ..1 run tellraw @s [{"text":"◆ 目標について\n","color":"light_purple"},{"text":"あなたの目標はただ一つ。この世界の","color":"white"},{"text":"全てを浄化","bold":true,"color":"light_purple"},{"text":"することです。","color":"white"}] -execute if score $PlayerCount Global matches 2.. run tellraw @s [{"text":"◆ 目標について\n","color":"light_purple"},{"text":"あなたたちの目標はただ一つ。この世界の","color":"white"},{"text":"全てを浄化","bold":true,"color":"light_purple"},{"text":"することです。","color":"white"}] \ No newline at end of file +execute if score #PlayerCount Global matches ..1 run tellraw @s [{"text":"◆ 目標について\n","color":"light_purple"},{"text":"あなたの目標はただ一つ。この世界の","color":"white"},{"text":"全てを浄化","bold":true,"color":"light_purple"},{"text":"することです。","color":"white"}] +execute if score #PlayerCount Global matches 2.. run tellraw @s [{"text":"◆ 目標について\n","color":"light_purple"},{"text":"あなたたちの目標はただ一つ。この世界の","color":"white"},{"text":"全てを浄化","bold":true,"color":"light_purple"},{"text":"することです。","color":"white"}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/tutorial/island.mcfunction b/TheSkyBlessing/data/lib/functions/message/tutorial/island.mcfunction index 84d4a1831..b1fe34c80 100644 --- a/TheSkyBlessing/data/lib/functions/message/tutorial/island.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/tutorial/island.mcfunction @@ -7,5 +7,5 @@ # # @within function world_manager:area/01-02.tutorial-island -execute if score $PlayerCount Global matches ..1 run tellraw @s [{"text":"◆ 島について\n","color":"light_purple"},{"text":"この世界に存在する多くの島には呪われた神器が置かれており、島全体が呪われています。\nその呪われた島々を浄化することがあなたの目標です。\n浄化には、呪われた神器の周囲で","color":"white"},{"text":"動かずに","underlined": true,"color":"white"},{"text":"スニークをし続ける必要があります。","color":"white"}] -execute if score $PlayerCount Global matches 2.. run tellraw @s [{"text":"◆ 島について\n","color":"light_purple"},{"text":"この世界に存在する多くの島には呪われた神器が置かれており、島全体が呪われています。\nその呪われた島々を浄化することがあなたたちの目標です。\n浄化には、呪われた神器の周囲で","color":"white"},{"text":"動かずに","underlined": true,"color":"white"},{"text":"スニークをし続ける必要があります。","color":"white"}] \ No newline at end of file +execute if score #PlayerCount Global matches ..1 run tellraw @s [{"text":"◆ 島について\n","color":"light_purple"},{"text":"この世界に存在する多くの島には呪われた神器が置かれており、島全体が呪われています。\nその呪われた島々を浄化することがあなたの目標です。\n浄化には、呪われた神器の周囲で","color":"white"},{"text":"動かずに","underlined": true,"color":"white"},{"text":"スニークをし続ける必要があります。","color":"white"}] +execute if score #PlayerCount Global matches 2.. run tellraw @s [{"text":"◆ 島について\n","color":"light_purple"},{"text":"この世界に存在する多くの島には呪われた神器が置かれており、島全体が呪われています。\nその呪われた島々を浄化することがあなたたちの目標です。\n浄化には、呪われた神器の周囲で","color":"white"},{"text":"動かずに","underlined": true,"color":"white"},{"text":"スニークをし続ける必要があります。","color":"white"}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/tutorial/lost_items.mcfunction b/TheSkyBlessing/data/lib/functions/message/tutorial/lost_items.mcfunction index 5d05175a0..2bf86efbb 100644 --- a/TheSkyBlessing/data/lib/functions/message/tutorial/lost_items.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/tutorial/lost_items.mcfunction @@ -7,5 +7,5 @@ # # @within function world_manager:area/01-06.tutorial-lost_items -execute if score $PlayerCount Global matches ..1 run tellraw @s [{"text":"◆ 失ったアイテムについて\n","color":"light_purple"},{"text":"あなたの死亡時、所持していたアイテムはドロップする代わりに信仰する神によって全て保管されます。\n保管されたアイテムは島を浄化することで全て神殿に返還されます。\n島の浄化に苦戦する場合は信仰する神に対して慈悲を乞うのもありでしょう。","color":"white"}] -execute if score $PlayerCount Global matches 2.. run tellraw @s [{"text":"◆ 失ったアイテムについて\n","color":"light_purple"},{"text":"あなたたちの死亡時、所持していたアイテムはドロップする代わりに信仰する神によって全て保管されます。\n保管されたアイテムは島を浄化することで全て神殿に返還されます。\n島の浄化に苦戦する場合は信仰する神に対して慈悲を乞うのもありでしょう。","color":"white"}] \ No newline at end of file +execute if score #PlayerCount Global matches ..1 run tellraw @s [{"text":"◆ 失ったアイテムについて\n","color":"light_purple"},{"text":"あなたの死亡時、所持していたアイテムはドロップする代わりに信仰する神によって全て保管されます。\n保管されたアイテムは島を浄化することで全て神殿に返還されます。\n島の浄化に苦戦する場合は信仰する神に対して慈悲を乞うのもありでしょう。","color":"white"}] +execute if score #PlayerCount Global matches 2.. run tellraw @s [{"text":"◆ 失ったアイテムについて\n","color":"light_purple"},{"text":"あなたたちの死亡時、所持していたアイテムはドロップする代わりに信仰する神によって全て保管されます。\n保管されたアイテムは島を浄化することで全て神殿に返還されます。\n島の浄化に苦戦する場合は信仰する神に対して慈悲を乞うのもありでしょう。","color":"white"}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/message/tutorial/religion.mcfunction b/TheSkyBlessing/data/lib/functions/message/tutorial/religion.mcfunction index 699ef207f..3ea38d00c 100644 --- a/TheSkyBlessing/data/lib/functions/message/tutorial/religion.mcfunction +++ b/TheSkyBlessing/data/lib/functions/message/tutorial/religion.mcfunction @@ -6,5 +6,5 @@ # # @within function world_manager:area/01-04.tutorial-religion -execute if score $PlayerCount Global matches ..1 run tellraw @s [{"text":"◆ 信仰について\n","color":"light_purple"},{"text":"あなたは信仰する神を5柱の中から自由に選ぶことができ、様々な恩恵を受けることが出来ます。\nもちろん改宗することも可能ですが、非常に冒涜的な行為であることに注意してください。","color":"white"}] -execute if score $PlayerCount Global matches 2.. run tellraw @s [{"text":"◆ 信仰について\n","color":"light_purple"},{"text":"あなたたちは信仰する神を5柱の中から自由に選ぶことができ、様々な恩恵を受けることが出来ます。\nもちろん改宗することも可能ですが、非常に冒涜的な行為であることに注意してください。","color":"white"}] \ No newline at end of file +execute if score #PlayerCount Global matches ..1 run tellraw @s [{"text":"◆ 信仰について\n","color":"light_purple"},{"text":"あなたは信仰する神を5柱の中から自由に選ぶことができ、様々な恩恵を受けることが出来ます。\nもちろん改宗することも可能ですが、非常に冒涜的な行為であることに注意してください。","color":"white"}] +execute if score #PlayerCount Global matches 2.. run tellraw @s [{"text":"◆ 信仰について\n","color":"light_purple"},{"text":"あなたたちは信仰する神を5柱の中から自由に選ぶことができ、様々な恩恵を受けることが出来ます。\nもちろん改宗することも可能ですが、非常に冒涜的な行為であることに注意してください。","color":"white"}] \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/motion/_index.d.mcfunction b/TheSkyBlessing/data/lib/functions/motion/_index.d.mcfunction index a1ca5142a..0efe78f73 100644 --- a/TheSkyBlessing/data/lib/functions/motion/_index.d.mcfunction +++ b/TheSkyBlessing/data/lib/functions/motion/_index.d.mcfunction @@ -3,5 +3,5 @@ #> Val # @within function lib:motion/core/* - #declare score_holder $VectorMagnitude - #declare score_holder $KnockbackResist \ No newline at end of file + #declare score_holder #VectorMagnitude + #declare score_holder #KnockbackResist \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/motion/core/.mcfunction b/TheSkyBlessing/data/lib/functions/motion/core/.mcfunction index ffd6c482c..e4e89d0db 100644 --- a/TheSkyBlessing/data/lib/functions/motion/core/.mcfunction +++ b/TheSkyBlessing/data/lib/functions/motion/core/.mcfunction @@ -6,19 +6,19 @@ #> private # @private - #declare score_holder $VectorMagnitude - #declare score_holder $KnockbackResist + #declare score_holder #VectorMagnitude + #declare score_holder #KnockbackResist # 必要なデータ取得 - execute store result score $VectorMagnitude Temporary run data get storage lib: Argument.VectorMagnitude 100 + execute store result score #VectorMagnitude Temporary run data get storage lib: Argument.VectorMagnitude 100 # ノックバック耐性を計算する - execute if data storage lib: Argument{KnockbackResist:1b} store result score $KnockbackResist Temporary run attribute @s generic.knockback_resistance get 100 - execute if data storage lib: Argument{KnockbackResist:1b} if score $KnockbackResist Temporary matches 1.. run function lib:motion/core/knockback_resistance + execute if data storage lib: Argument{KnockbackResist:1b} store result score #KnockbackResist Temporary run attribute @s generic.knockback_resistance get 100 + execute if data storage lib: Argument{KnockbackResist:1b} if score #KnockbackResist Temporary matches 1.. run function lib:motion/core/knockback_resistance # 適用 - execute unless score $VectorMagnitude Temporary matches 0 run function lib:motion/core/apply + execute unless score #VectorMagnitude Temporary matches 0 run function lib:motion/core/apply # リセット - scoreboard players reset $KnockbackResist - scoreboard players reset $VectorMagnitude \ No newline at end of file + scoreboard players reset #KnockbackResist + scoreboard players reset #VectorMagnitude \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/motion/core/apply.mcfunction b/TheSkyBlessing/data/lib/functions/motion/core/apply.mcfunction index 5d01f1293..1dc773cd2 100644 --- a/TheSkyBlessing/data/lib/functions/motion/core/apply.mcfunction +++ b/TheSkyBlessing/data/lib/functions/motion/core/apply.mcfunction @@ -6,31 +6,31 @@ #> Val # @private - #declare score_holder $VectorX - #declare score_holder $VectorY - #declare score_holder $VectorZ + #declare score_holder #VectorX + #declare score_holder #VectorY + #declare score_holder #VectorZ # 初期化として視点を自分にあわせる & ^ ^ ^1を取得 execute in overworld positioned 0.0 0.0 0.0 run tp 0-0-0-0-0 ^ ^ ^1 # 演算処理 data modify storage lib: Pos set from entity 0-0-0-0-0 Pos - execute store result score $VectorX Temporary run data get storage lib: Pos[0] 1000 - execute store result score $VectorY Temporary run data get storage lib: Pos[1] 1000 - execute store result score $VectorZ Temporary run data get storage lib: Pos[2] 1000 + execute store result score #VectorX Temporary run data get storage lib: Pos[0] 1000 + execute store result score #VectorY Temporary run data get storage lib: Pos[1] 1000 + execute store result score #VectorZ Temporary run data get storage lib: Pos[2] 1000 - scoreboard players operation $VectorX Temporary *= $VectorMagnitude Temporary - scoreboard players operation $VectorY Temporary *= $VectorMagnitude Temporary - scoreboard players operation $VectorZ Temporary *= $VectorMagnitude Temporary + scoreboard players operation #VectorX Temporary *= #VectorMagnitude Temporary + scoreboard players operation #VectorY Temporary *= #VectorMagnitude Temporary + scoreboard players operation #VectorZ Temporary *= #VectorMagnitude Temporary # 適用 - execute store result storage lib: Pos[0] double 0.00001 run scoreboard players get $VectorX Temporary - execute store result storage lib: Pos[1] double 0.00001 run scoreboard players get $VectorY Temporary - execute store result storage lib: Pos[2] double 0.00001 run scoreboard players get $VectorZ Temporary + execute store result storage lib: Pos[0] double 0.00001 run scoreboard players get #VectorX Temporary + execute store result storage lib: Pos[1] double 0.00001 run scoreboard players get #VectorY Temporary + execute store result storage lib: Pos[2] double 0.00001 run scoreboard players get #VectorZ Temporary data modify entity @s Motion set from storage lib: Pos # リセット - scoreboard players reset $VectorX Temporary - scoreboard players reset $VectorY Temporary - scoreboard players reset $VectorZ Temporary + scoreboard players reset #VectorX Temporary + scoreboard players reset #VectorY Temporary + scoreboard players reset #VectorZ Temporary data remove storage lib: Pos \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/motion/core/knockback_resistance.mcfunction b/TheSkyBlessing/data/lib/functions/motion/core/knockback_resistance.mcfunction index c2e91c9a9..58091990a 100644 --- a/TheSkyBlessing/data/lib/functions/motion/core/knockback_resistance.mcfunction +++ b/TheSkyBlessing/data/lib/functions/motion/core/knockback_resistance.mcfunction @@ -6,16 +6,16 @@ #> private # @private - #declare score_holder $Calc + #declare score_holder #Calc # 100からノックバック耐性を引いた値を出す - scoreboard players set $Calc Temporary 100 - scoreboard players operation $Calc Temporary -= $KnockbackResist Temporary - scoreboard players operation $Calc Temporary >< $KnockbackResist Temporary -# $VectorMagnitudeの数値ととノックバック耐性をかける - scoreboard players operation $VectorMagnitude Temporary *= $KnockbackResist Temporary + scoreboard players set #Calc Temporary 100 + scoreboard players operation #Calc Temporary -= #KnockbackResist Temporary + scoreboard players operation #Calc Temporary >< #KnockbackResist Temporary +# #VectorMagnitudeの数値ととノックバック耐性をかける + scoreboard players operation #VectorMagnitude Temporary *= #KnockbackResist Temporary # 100で割る - scoreboard players operation $VectorMagnitude Temporary /= $100 Const + scoreboard players operation #VectorMagnitude Temporary /= #100 Const # 計算用スコアホルダーをリセット - scoreboard players reset $Calc \ No newline at end of file + scoreboard players reset #Calc \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/mp/fluctuation.mcfunction b/TheSkyBlessing/data/lib/functions/mp/fluctuation.mcfunction index 34289e5ed..8f4add123 100644 --- a/TheSkyBlessing/data/lib/functions/mp/fluctuation.mcfunction +++ b/TheSkyBlessing/data/lib/functions/mp/fluctuation.mcfunction @@ -5,16 +5,16 @@ # @deprecated change to `api:mp/fluctuation` # @input # as player -# score $Fluctuation Argument +# score #Fluctuation Argument # storage lib: Argument.DisableLog?: boolean # @api #> temp # @private - #declare score_holder $Fluctuation + #declare score_holder #Fluctuation -execute store result storage api: Argument.Fluctuation int 1 run scoreboard players get $Fluctuation Lib +execute store result storage api: Argument.Fluctuation int 1 run scoreboard players get #Fluctuation Lib data modify storage api: Argument.DisableLog set from storage lib: Argument.DisableLog function api:mp/fluctuation data remove storage lib: Argument.DisableLog -scoreboard players reset $Fluctuation Lib \ No newline at end of file +scoreboard players reset #Fluctuation Lib \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/mp/set.mcfunction b/TheSkyBlessing/data/lib/functions/mp/set.mcfunction index 7ce099706..d47b62b6a 100644 --- a/TheSkyBlessing/data/lib/functions/mp/set.mcfunction +++ b/TheSkyBlessing/data/lib/functions/mp/set.mcfunction @@ -5,13 +5,13 @@ # @deprecated change to `api:mp/set` # @input # as player -# score $Set Argument +# score #Set Argument # @api #> temp # @private - #declare score_holder $Set + #declare score_holder #Set -execute store result storage api: Argument.MP int 1 run scoreboard players get $Set Lib +execute store result storage api: Argument.MP int 1 run scoreboard players get #Set Lib function api:mp/set -scoreboard players reset $Set Lib \ No newline at end of file +scoreboard players reset #Set Lib \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/random/.mcfunction b/TheSkyBlessing/data/lib/functions/random/.mcfunction index 81f8115eb..d7ccd9f53 100644 --- a/TheSkyBlessing/data/lib/functions/random/.mcfunction +++ b/TheSkyBlessing/data/lib/functions/random/.mcfunction @@ -5,10 +5,10 @@ # @output result score uShort # @api -scoreboard players operation $Random.Base Global *= $31743 Const -scoreboard players operation $Random.Base Global += $Random.Carry Global -scoreboard players operation $Random.Carry Global = $Random.Base Global -scoreboard players operation $Random.Carry Global /= $65536 Const -scoreboard players operation $Random.Base Global %= $65536 Const +scoreboard players operation #Random.Base Global *= #31743 Const +scoreboard players operation #Random.Base Global += #Random.Carry Global +scoreboard players operation #Random.Carry Global = #Random.Base Global +scoreboard players operation #Random.Carry Global /= #65536 Const +scoreboard players operation #Random.Base Global %= #65536 Const -return run scoreboard players get $Random.Base Global \ No newline at end of file +return run scoreboard players get #Random.Base Global \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/random/_index.d.mcfunction b/TheSkyBlessing/data/lib/functions/random/_index.d.mcfunction index 7f939455a..26899d80c 100644 --- a/TheSkyBlessing/data/lib/functions/random/_index.d.mcfunction +++ b/TheSkyBlessing/data/lib/functions/random/_index.d.mcfunction @@ -5,5 +5,5 @@ # @within function # lib:random/* # core:load_once - #declare score_holder $Random.Base - #declare score_holder $Random.Carry \ No newline at end of file + #declare score_holder #Random.Base + #declare score_holder #Random.Carry \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/core/show_custom_death_message.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/core/show_custom_death_message.mcfunction index 4c25220d6..113901123 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/core/show_custom_death_message.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/core/show_custom_death_message.mcfunction @@ -6,13 +6,13 @@ #> ListLength # @private - #declare score_holder $Length - #declare score_holder $Argument.Index + #declare score_holder #Length + #declare score_holder #Argument.Index # 乱数取得&範囲設定 - execute store result score $Argument.Index Lib run function lib:random/ - execute store result score $Length Temporary if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.DeathMessage[] - scoreboard players operation $Argument.Index Lib %= $Length Temporary + execute store result score #Argument.Index Lib run function lib:random/ + execute store result score #Length Temporary if data storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.DeathMessage[] + scoreboard players operation #Argument.Index Lib %= #Length Temporary # 配列操作 function lib:array/session/open data modify storage lib: Array set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.DeathMessage @@ -21,4 +21,4 @@ tellraw @a {"storage":"lib:","nbt":"Array[-1]","interpret": true} # リセット function lib:array/session/close - scoreboard players reset $Length Temporary \ No newline at end of file + scoreboard players reset #Length Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/core/store_attack_info.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/core/store_attack_info.mcfunction index 2236cbb97..8cb5e9086 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/core/store_attack_info.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/core/store_attack_info.mcfunction @@ -6,12 +6,12 @@ #> ThisTag # @private - #declare score_holder $LatestAttacker + #declare score_holder #LatestAttacker # 攻撃者名を記録する function oh_my_dat:please - execute store result score $LatestAttacker Temporary run data get storage api: Argument.Attacker - execute at @s as @e[type=!player,distance=..150] if score @s MobUUID = $LatestAttacker Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.Name set from entity @s CustomName + execute store result score #LatestAttacker Temporary run data get storage api: Argument.Attacker + execute at @s as @e[type=!player,distance=..150] if score @s MobUUID = #LatestAttacker Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.Name set from entity @s CustomName # 攻撃属性をEnumとして保存する data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.Type set value 0 execute if data storage api: Argument{ElementType:"Fire"} run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.Type set value 1 @@ -23,4 +23,4 @@ data remove storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.DeathMessage data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.DeathMessage set from storage api: Argument.DeathMessage # リセット - scoreboard players reset $LatestAttacker Temporary \ No newline at end of file + scoreboard players reset #LatestAttacker Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/fluctuation.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/fluctuation.mcfunction index 8bc632a9f..8037f9222 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/fluctuation.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/fluctuation.mcfunction @@ -14,15 +14,15 @@ #> temp # @private - #declare score_holder $Fluctuation + #declare score_holder #Fluctuation # 取得 - execute store result score $Fluctuation Lib run data get storage api: Argument.Fluctuation 100 + execute store result score #Fluctuation Lib run data get storage api: Argument.Fluctuation 100 # 増減 - scoreboard players operation @s ScoreToHPFluc += $Fluctuation Lib + scoreboard players operation @s ScoreToHPFluc += #Fluctuation Lib # 攻撃情報を記録する - execute if score $Fluctuation Lib matches ..-1 run function lib:score_to_health_wrapper/core/store_attack_info + execute if score #Fluctuation Lib matches ..-1 run function lib:score_to_health_wrapper/core/store_attack_info # ログ表示 execute at @s run function lib:status_log/show_health # リセット - scoreboard players reset $Fluctuation Lib \ No newline at end of file + scoreboard players reset #Fluctuation Lib \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/set.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/set.mcfunction index 085b3e99f..5b0b25aeb 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/set.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_health_wrapper/set.mcfunction @@ -6,20 +6,20 @@ # # @input # as player -# score $Set Argument +# score #Set Argument # storage lib: Argument.DeathMessage? : TextComponent || TextComponent[] # @api #> temp # @private - #declare score_holder $Set + #declare score_holder #Set # セット - scoreboard players operation @s ScoreToHealth = $Set Lib + scoreboard players operation @s ScoreToHealth = #Set Lib function oh_my_dat:please data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.Type set value 0 data remove storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.DeathMessage data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LatestAttackInfo.DeathMessage set from storage lib: Argument.DeathMessage # リセット - scoreboard players reset $Set Lib + scoreboard players reset #Set Lib # data remove storage lib: Argument.DeathMessage \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/.mcfunction index 73cb3d4c6..43aab2e5a 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/.mcfunction @@ -4,10 +4,10 @@ # # @input # as entity -# score $Move Lib 前進させたい距離(m)の10000倍 +# score #Move Lib 前進させたい距離(m)の10000倍 # @public # 二分探索してTP function lib:score_to_move/core/30 # リセット - scoreboard players reset $Move Lib \ No newline at end of file + scoreboard players reset #Move Lib \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/_index.d.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/_index.d.mcfunction index 865ff36e7..e377248c4 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/_index.d.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/_index.d.mcfunction @@ -3,4 +3,4 @@ #> temp # @within lib:score_to_move/** - #declare score_holder $Move \ No newline at end of file + #declare score_holder #Move \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/0.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/0.mcfunction index ab065e357..d6e54108e 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/0.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/0.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/1 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run tp @s ~ ~ ~ -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0001 run tp @s ~ ~ ~ \ No newline at end of file +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run tp @s ~ ~ ~ +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0001 run tp @s ~ ~ ~ \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/1.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/1.mcfunction index 807e6ef96..ca323f2d1 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/1.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/1.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/2 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/0 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0002 run function lib:score_to_move/core/0 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/0 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0002 run function lib:score_to_move/core/0 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/10.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/10.mcfunction index e3eb95e26..28d5530be 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/10.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/10.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/11 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/9 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.2048 run function lib:score_to_move/core/9 \ No newline at end of file +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/9 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.2048 run function lib:score_to_move/core/9 \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/11.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/11.mcfunction index 3858abfd3..fb961e16d 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/11.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/11.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/12 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/10 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.2048 run function lib:score_to_move/core/10 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/10 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.2048 run function lib:score_to_move/core/10 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/12.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/12.mcfunction index e09b0b62f..6919c0f4c 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/12.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/12.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/13 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/11 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.4096 run function lib:score_to_move/core/11 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/11 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.4096 run function lib:score_to_move/core/11 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/13.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/13.mcfunction index f11b9d362..95cf1296a 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/13.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/13.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/14 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/12 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.8192 run function lib:score_to_move/core/12 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/12 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.8192 run function lib:score_to_move/core/12 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/14.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/14.mcfunction index b0cf694c4..a4ed2e192 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/14.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/14.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/15 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/13 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^1.6384 run function lib:score_to_move/core/13 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/13 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^1.6384 run function lib:score_to_move/core/13 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/15.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/15.mcfunction index 40d240329..3911fee1c 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/15.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/15.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/16 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/14 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^3.2768 run function lib:score_to_move/core/14 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/14 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^3.2768 run function lib:score_to_move/core/14 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/16.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/16.mcfunction index 0d9ae161d..2f4a2f317 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/16.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/16.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/17 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/15 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^6.5536 run function lib:score_to_move/core/15 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/15 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^6.5536 run function lib:score_to_move/core/15 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/17.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/17.mcfunction index 387e6e7eb..bcc127a05 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/17.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/17.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/18 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/16 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^13.1072 run function lib:score_to_move/core/16 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/16 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^13.1072 run function lib:score_to_move/core/16 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/18.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/18.mcfunction index 4bf12f9b2..7a2b5a659 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/18.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/18.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/19 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/17 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^26.2144 run function lib:score_to_move/core/17 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/17 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^26.2144 run function lib:score_to_move/core/17 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/19.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/19.mcfunction index 4114be1f0..5cf0ef054 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/19.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/19.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/20 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/18 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^52.4288 run function lib:score_to_move/core/18 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/18 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^52.4288 run function lib:score_to_move/core/18 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/2.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/2.mcfunction index 6b93129ae..f0f4652a1 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/2.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/2.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/3 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/1 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0004 run function lib:score_to_move/core/1 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/1 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0004 run function lib:score_to_move/core/1 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/20.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/20.mcfunction index 60c71328a..e87be8e42 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/20.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/20.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/21 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/19 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^104.8576 run function lib:score_to_move/core/19 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/19 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^104.8576 run function lib:score_to_move/core/19 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/21.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/21.mcfunction index 835b26dd3..86c74c8b5 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/21.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/21.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/22 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/20 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^209.7152 run function lib:score_to_move/core/20 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/20 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^209.7152 run function lib:score_to_move/core/20 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/22.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/22.mcfunction index 9760eb195..795d6636c 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/22.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/22.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/23 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/21 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^419.4304 run function lib:score_to_move/core/21 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/21 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^419.4304 run function lib:score_to_move/core/21 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/23.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/23.mcfunction index cc4a2821f..b96c68802 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/23.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/23.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/24 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/22 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^838.8608 run function lib:score_to_move/core/22 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/22 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^838.8608 run function lib:score_to_move/core/22 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/24.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/24.mcfunction index d62c7e7ab..a1ad47370 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/24.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/24.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/25 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/23 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^1677.7216 run function lib:score_to_move/core/23 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/23 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^1677.7216 run function lib:score_to_move/core/23 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/25.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/25.mcfunction index 92c122b32..90ec53dda 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/25.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/25.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/26 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/24 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^3355.4432 run function lib:score_to_move/core/24 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/24 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^3355.4432 run function lib:score_to_move/core/24 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/26.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/26.mcfunction index 05e46cfa3..b0b308a7e 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/26.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/26.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/27 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/25 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^6710.8864 run function lib:score_to_move/core/25 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/25 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^6710.8864 run function lib:score_to_move/core/25 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/27.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/27.mcfunction index 5ae7d98e6..1679cb0c2 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/27.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/27.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/28 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/26 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^13421.7728 run function lib:score_to_move/core/26 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/26 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^13421.7728 run function lib:score_to_move/core/26 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/28.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/28.mcfunction index 7a9c09dcb..ef8495bc5 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/28.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/28.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/29 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/27 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^26843.5456 run function lib:score_to_move/core/27 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/27 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^26843.5456 run function lib:score_to_move/core/27 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/29.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/29.mcfunction index 7aab96e71..24921e762 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/29.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/29.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/30 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/28 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^53687.0912 run function lib:score_to_move/core/28 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/28 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^53687.0912 run function lib:score_to_move/core/28 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/3.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/3.mcfunction index d33b4b0c5..3efa86334 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/3.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/3.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/4 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/2 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0008 run function lib:score_to_move/core/2 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/2 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0008 run function lib:score_to_move/core/2 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/30.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/30.mcfunction index 91913072e..5bb218ffc 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/30.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/30.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/ -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/29 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^107374.1824 run function lib:score_to_move/core/29 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/29 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^107374.1824 run function lib:score_to_move/core/29 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/4.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/4.mcfunction index a59192694..835793aef 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/4.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/4.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/5 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/3 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0016 run function lib:score_to_move/core/3 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/3 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0016 run function lib:score_to_move/core/3 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/5.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/5.mcfunction index c464caf37..fe1e6f53e 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/5.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/5.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/6 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/4 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0032 run function lib:score_to_move/core/4 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/4 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0032 run function lib:score_to_move/core/4 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/6.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/6.mcfunction index 68c87bb5a..d13152b6c 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/6.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/6.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/7 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/5 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0064 run function lib:score_to_move/core/5 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/5 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0064 run function lib:score_to_move/core/5 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/7.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/7.mcfunction index 27f4807c6..10bb5d823 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/7.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/7.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/8 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/6 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0128 run function lib:score_to_move/core/6 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/6 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0128 run function lib:score_to_move/core/6 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/8.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/8.mcfunction index e273e8435..476f33b3b 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/8.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/8.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/9 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/7 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0256 run function lib:score_to_move/core/7 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/7 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0256 run function lib:score_to_move/core/7 diff --git a/TheSkyBlessing/data/lib/functions/score_to_move/core/9.mcfunction b/TheSkyBlessing/data/lib/functions/score_to_move/core/9.mcfunction index 11c1f43a4..144853ce4 100644 --- a/TheSkyBlessing/data/lib/functions/score_to_move/core/9.mcfunction +++ b/TheSkyBlessing/data/lib/functions/score_to_move/core/9.mcfunction @@ -4,6 +4,6 @@ # # @within lib:score_to_move/core/10 -scoreboard players operation $Move Lib += $Move Lib -execute if score $Move Lib matches 0.. run function lib:score_to_move/core/8 -execute if score $Move Lib matches ..-1 positioned ^ ^ ^0.0512 run function lib:score_to_move/core/8 +scoreboard players operation #Move Lib += #Move Lib +execute if score #Move Lib matches 0.. run function lib:score_to_move/core/8 +execute if score #Move Lib matches ..-1 positioned ^ ^ ^0.0512 run function lib:score_to_move/core/8 diff --git a/TheSkyBlessing/data/lib/functions/spread_entity/core/teleport.mcfunction b/TheSkyBlessing/data/lib/functions/spread_entity/core/teleport.mcfunction index 172fccd63..90825c652 100644 --- a/TheSkyBlessing/data/lib/functions/spread_entity/core/teleport.mcfunction +++ b/TheSkyBlessing/data/lib/functions/spread_entity/core/teleport.mcfunction @@ -6,79 +6,79 @@ #> Pos # @private - #declare score_holder $BoundsX- - #declare score_holder $BoundsX+ - #declare score_holder $BoundsY- - #declare score_holder $BoundsY+ - #declare score_holder $BoundsZ- - #declare score_holder $BoundsZ+ - #declare score_holder $PosX - #declare score_holder $PosY - #declare score_holder $PosZ - #declare score_holder $SubX - #declare score_holder $SubY - #declare score_holder $SubZ - #declare score_holder $AddX - #declare score_holder $AddY - #declare score_holder $AddZ + #declare score_holder #BoundsX- + #declare score_holder #BoundsX+ + #declare score_holder #BoundsY- + #declare score_holder #BoundsY+ + #declare score_holder #BoundsZ- + #declare score_holder #BoundsZ+ + #declare score_holder #PosX + #declare score_holder #PosY + #declare score_holder #PosZ + #declare score_holder #SubX + #declare score_holder #SubY + #declare score_holder #SubZ + #declare score_holder #AddX + #declare score_holder #AddY + #declare score_holder #AddZ # Pos取得 - execute store result score $PosX Temporary run data get storage api: Pos[0] 100 - execute store result score $PosY Temporary run data get storage api: Pos[1] 100 - execute store result score $PosZ Temporary run data get storage api: Pos[2] 100 + execute store result score #PosX Temporary run data get storage api: Pos[0] 100 + execute store result score #PosY Temporary run data get storage api: Pos[1] 100 + execute store result score #PosZ Temporary run data get storage api: Pos[2] 100 # 範囲取得 - execute store result score $BoundsX- Temporary run data get storage lib: Argument.Bounds[0][0] 100 - execute store result score $BoundsX+ Temporary run data get storage lib: Argument.Bounds[0][1] 100 - execute store result score $BoundsY- Temporary run data get storage lib: Argument.Bounds[1][0] 100 - execute store result score $BoundsY+ Temporary run data get storage lib: Argument.Bounds[1][1] 100 - execute store result score $BoundsZ- Temporary run data get storage lib: Argument.Bounds[2][0] 100 - execute store result score $BoundsZ+ Temporary run data get storage lib: Argument.Bounds[2][1] 100 + execute store result score #BoundsX- Temporary run data get storage lib: Argument.Bounds[0][0] 100 + execute store result score #BoundsX+ Temporary run data get storage lib: Argument.Bounds[0][1] 100 + execute store result score #BoundsY- Temporary run data get storage lib: Argument.Bounds[1][0] 100 + execute store result score #BoundsY+ Temporary run data get storage lib: Argument.Bounds[1][1] 100 + execute store result score #BoundsZ- Temporary run data get storage lib: Argument.Bounds[2][0] 100 + execute store result score #BoundsZ+ Temporary run data get storage lib: Argument.Bounds[2][1] 100 # X- - execute store result score $SubX Temporary run function lib:random/ - scoreboard players operation $SubX Temporary %= $BoundsX- Temporary - execute unless score $BoundsX- Temporary matches 0 run scoreboard players operation $PosX Temporary -= $SubX Temporary + execute store result score #SubX Temporary run function lib:random/ + scoreboard players operation #SubX Temporary %= #BoundsX- Temporary + execute unless score #BoundsX- Temporary matches 0 run scoreboard players operation #PosX Temporary -= #SubX Temporary # X+ - execute store result score $AddX Temporary run function lib:random/ - scoreboard players operation $AddX Temporary %= $BoundsX+ Temporary - execute unless score $BoundsX+ Temporary matches 0 run scoreboard players operation $PosX Temporary += $AddX Temporary + execute store result score #AddX Temporary run function lib:random/ + scoreboard players operation #AddX Temporary %= #BoundsX+ Temporary + execute unless score #BoundsX+ Temporary matches 0 run scoreboard players operation #PosX Temporary += #AddX Temporary # Y- - execute store result score $SubY Temporary run function lib:random/ - scoreboard players operation $SubY Temporary %= $BoundsY- Temporary - execute unless score $BoundsY- Temporary matches 0 run scoreboard players operation $PosY Temporary -= $SubY Temporary + execute store result score #SubY Temporary run function lib:random/ + scoreboard players operation #SubY Temporary %= #BoundsY- Temporary + execute unless score #BoundsY- Temporary matches 0 run scoreboard players operation #PosY Temporary -= #SubY Temporary # Y+ - execute store result score $AddY Temporary run function lib:random/ - scoreboard players operation $AddY Temporary %= $BoundsY+ Temporary - execute unless score $BoundsY+ Temporary matches 0 run scoreboard players operation $PosY Temporary += $AddY Temporary + execute store result score #AddY Temporary run function lib:random/ + scoreboard players operation #AddY Temporary %= #BoundsY+ Temporary + execute unless score #BoundsY+ Temporary matches 0 run scoreboard players operation #PosY Temporary += #AddY Temporary # Z- - execute store result score $SubZ Temporary run function lib:random/ - scoreboard players operation $SubZ Temporary %= $BoundsZ- Temporary - execute unless score $BoundsZ- Temporary matches 0 run scoreboard players operation $PosZ Temporary -= $SubZ Temporary + execute store result score #SubZ Temporary run function lib:random/ + scoreboard players operation #SubZ Temporary %= #BoundsZ- Temporary + execute unless score #BoundsZ- Temporary matches 0 run scoreboard players operation #PosZ Temporary -= #SubZ Temporary # Z+ - execute store result score $AddZ Temporary run function lib:random/ - scoreboard players operation $AddZ Temporary %= $BoundsZ+ Temporary - execute unless score $BoundsZ+ Temporary matches 0 run scoreboard players operation $PosZ Temporary += $AddZ Temporary + execute store result score #AddZ Temporary run function lib:random/ + scoreboard players operation #AddZ Temporary %= #BoundsZ+ Temporary + execute unless score #BoundsZ+ Temporary matches 0 run scoreboard players operation #PosZ Temporary += #AddZ Temporary # Posをセット data modify storage lib: Pos set value [0d,0d,0d] - execute store result storage lib: Pos[0] double 0.01 run scoreboard players get $PosX Temporary - execute store result storage lib: Pos[1] double 0.01 run scoreboard players get $PosY Temporary - execute store result storage lib: Pos[2] double 0.01 run scoreboard players get $PosZ Temporary + execute store result storage lib: Pos[0] double 0.01 run scoreboard players get #PosX Temporary + execute store result storage lib: Pos[1] double 0.01 run scoreboard players get #PosY Temporary + execute store result storage lib: Pos[2] double 0.01 run scoreboard players get #PosZ Temporary data modify entity @s Pos set from storage lib: Pos # リセット data remove storage api: Pos data remove storage lib: Pos data remove storage lib: Argument.Bounds - scoreboard players reset $BoundsX- Temporary - scoreboard players reset $BoundsX+ Temporary - scoreboard players reset $BoundsY- Temporary - scoreboard players reset $BoundsY+ Temporary - scoreboard players reset $BoundsZ- Temporary - scoreboard players reset $BoundsZ+ Temporary - scoreboard players reset $PosX Temporary - scoreboard players reset $PosY Temporary - scoreboard players reset $PosZ Temporary - scoreboard players reset $SubX Temporary - scoreboard players reset $SubY Temporary - scoreboard players reset $SubZ Temporary - scoreboard players reset $AddX Temporary - scoreboard players reset $AddY Temporary - scoreboard players reset $AddZ Temporary \ No newline at end of file + scoreboard players reset #BoundsX- Temporary + scoreboard players reset #BoundsX+ Temporary + scoreboard players reset #BoundsY- Temporary + scoreboard players reset #BoundsY+ Temporary + scoreboard players reset #BoundsZ- Temporary + scoreboard players reset #BoundsZ+ Temporary + scoreboard players reset #PosX Temporary + scoreboard players reset #PosY Temporary + scoreboard players reset #PosZ Temporary + scoreboard players reset #SubX Temporary + scoreboard players reset #SubY Temporary + scoreboard players reset #SubZ Temporary + scoreboard players reset #AddX Temporary + scoreboard players reset #AddY Temporary + scoreboard players reset #AddZ Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/status_log/_index.d.mcfunction b/TheSkyBlessing/data/lib/functions/status_log/_index.d.mcfunction index b61d9e4ed..5cee58f48 100644 --- a/TheSkyBlessing/data/lib/functions/status_log/_index.d.mcfunction +++ b/TheSkyBlessing/data/lib/functions/status_log/_index.d.mcfunction @@ -9,6 +9,6 @@ #> 計算用 # @within lib:status_log/** - #declare score_holder $Frac - #declare score_holder $Int - #declare score_holder $Fluctuation \ No newline at end of file + #declare score_holder #Frac + #declare score_holder #Int + #declare score_holder #Fluctuation \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/status_log/show_health.mcfunction b/TheSkyBlessing/data/lib/functions/status_log/show_health.mcfunction index a52b25c9b..15f05a42d 100644 --- a/TheSkyBlessing/data/lib/functions/status_log/show_health.mcfunction +++ b/TheSkyBlessing/data/lib/functions/status_log/show_health.mcfunction @@ -10,21 +10,21 @@ #> For Init # @private - #declare score_holder $Fluctuation + #declare score_holder #Fluctuation #declare tag LogAECInit - #declare score_holder $isNegative + #declare score_holder #isNegative #declare tag SummonPosStand # 負数の場合の処理 // 0未満では無く、0以下なのは0の表記を赤くするため。 - execute store success score $isNegative Temporary if score $Fluctuation Lib matches ..0 - execute if score $isNegative Temporary matches 1 run scoreboard players operation $Fluctuation Lib *= $-1 Const + execute store success score #isNegative Temporary if score #Fluctuation Lib matches ..0 + execute if score #isNegative Temporary matches 1 run scoreboard players operation #Fluctuation Lib *= #-1 Const # 少数部を取り出す - scoreboard players operation $Frac Temporary = $Fluctuation Lib - scoreboard players operation $Frac Temporary /= $10 Const - scoreboard players operation $Frac Temporary %= $10 Const + scoreboard players operation #Frac Temporary = #Fluctuation Lib + scoreboard players operation #Frac Temporary /= #10 Const + scoreboard players operation #Frac Temporary %= #10 Const # 値は100倍されたもの - scoreboard players operation $Int Temporary = $Fluctuation Lib - scoreboard players operation $Int Temporary /= $100 Const + scoreboard players operation #Int Temporary = #Fluctuation Lib + scoreboard players operation #Int Temporary /= #100 Const # 設置位置用AEC execute anchored eyes positioned ^ ^ ^ run summon armor_stand ~ ~ ~ {Marker:1b,Silent:1b,Small:1b,Invisible:1b,Tags:["SummonPosStand"]} @@ -34,15 +34,15 @@ # 描画用AEC execute anchored eyes positioned ^ ^ ^ at @e[type=armor_stand,tag=SummonPosStand,distance=..1.5,limit=1] run summon armor_stand ~ ~ ~ {Marker:1b,Small:1b,Silent:1b,Invisible:1b,Tags:["LogAEC", "LogAECInit","Object"],CustomName:'""',CustomNameVisible:1b} # 表示文字列生成 - execute if score $isNegative Temporary matches 0 run loot replace block 10000 0 10000 container.0 loot lib:status_log/heal - execute if score $isNegative Temporary matches 1 run loot replace block 10000 0 10000 container.0 loot lib:status_log/damage + execute if score #isNegative Temporary matches 0 run loot replace block 10000 0 10000 container.0 loot lib:status_log/heal + execute if score #isNegative Temporary matches 1 run loot replace block 10000 0 10000 container.0 loot lib:status_log/damage # 文字列描画 execute anchored eyes positioned ^ ^ ^ run data modify entity @e[type=armor_stand,tag=LogAECInit,distance=..1.5,limit=1] CustomName set from block 10000 0 10000 Items[0].tag.display.Name # タグ削除 execute anchored eyes positioned ^ ^ ^ run tag @e[type=armor_stand,tag=LogAECInit,distance=..1.5,limit=1] remove LogAECInit # リセット execute anchored eyes positioned ^ ^ ^ run kill @e[type=armor_stand,tag=SummonPosStand,distance=..1.5,limit=1] - scoreboard players reset $Fluctuation Lib - scoreboard players reset $Frac Temporary - scoreboard players reset $Int Temporary - scoreboard players reset $isNegative Temporary \ No newline at end of file + scoreboard players reset #Fluctuation Lib + scoreboard players reset #Frac Temporary + scoreboard players reset #Int Temporary + scoreboard players reset #isNegative Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/functions/status_log/show_mp.mcfunction b/TheSkyBlessing/data/lib/functions/status_log/show_mp.mcfunction index baa6ae834..698bf58a7 100644 --- a/TheSkyBlessing/data/lib/functions/status_log/show_mp.mcfunction +++ b/TheSkyBlessing/data/lib/functions/status_log/show_mp.mcfunction @@ -24,4 +24,4 @@ execute anchored eyes positioned ^ ^ ^ run tag @e[type=armor_stand,tag=LogAECInit,distance=..1.5,limit=1] remove LogAECInit # リセット execute anchored eyes positioned ^ ^ ^ run kill @e[type=armor_stand,tag=SummonPosStand,distance=..1.5,limit=1] - scoreboard players reset $Fluctuation Lib \ No newline at end of file + scoreboard players reset #Fluctuation Lib \ No newline at end of file diff --git a/TheSkyBlessing/data/lib/loot_tables/status_log/damage.json b/TheSkyBlessing/data/lib/loot_tables/status_log/damage.json index ac4bcb0ff..cd2efc6e7 100644 --- a/TheSkyBlessing/data/lib/loot_tables/status_log/damage.json +++ b/TheSkyBlessing/data/lib/loot_tables/status_log/damage.json @@ -19,7 +19,7 @@ { "score": { "objective": "Temporary", - "name": "$Int" + "name": "#Int" }, "color": "white", "font": "damage" @@ -32,7 +32,7 @@ { "score": { "objective": "Temporary", - "name": "$Frac" + "name": "#Frac" }, "color": "white", "font": "damage" diff --git a/TheSkyBlessing/data/lib/loot_tables/status_log/heal.json b/TheSkyBlessing/data/lib/loot_tables/status_log/heal.json index 74b26192f..78487b80d 100644 --- a/TheSkyBlessing/data/lib/loot_tables/status_log/heal.json +++ b/TheSkyBlessing/data/lib/loot_tables/status_log/heal.json @@ -19,7 +19,7 @@ { "score": { "objective": "Temporary", - "name": "$Int" + "name": "#Int" }, "color": "white", "font":"health" @@ -32,7 +32,7 @@ { "score": { "objective": "Temporary", - "name": "$Frac" + "name": "#Frac" }, "color": "white", "font":"health" diff --git a/TheSkyBlessing/data/lib/loot_tables/status_log/mp.json b/TheSkyBlessing/data/lib/loot_tables/status_log/mp.json index 8c85505ab..a72c164d8 100644 --- a/TheSkyBlessing/data/lib/loot_tables/status_log/mp.json +++ b/TheSkyBlessing/data/lib/loot_tables/status_log/mp.json @@ -19,7 +19,7 @@ { "score": { "objective": "Lib", - "name": "$Fluctuation" + "name": "#Fluctuation" }, "color": "white", "font": "magic" diff --git a/TheSkyBlessing/data/mob_manager/functions/_index.d.mcfunction b/TheSkyBlessing/data/mob_manager/functions/_index.d.mcfunction index bb4183484..a5682684d 100644 --- a/TheSkyBlessing/data/mob_manager/functions/_index.d.mcfunction +++ b/TheSkyBlessing/data/mob_manager/functions/_index.d.mcfunction @@ -21,7 +21,7 @@ # @within function # mob_manager:init/ # asset_manager:island/dispel/boss/summon - #declare score_holder $FlagIndex + #declare score_holder #FlagIndex #> FindFlag # @within * diff --git a/TheSkyBlessing/data/mob_manager/functions/entity_finder/attacked_entity/_index.d.mcfunction b/TheSkyBlessing/data/mob_manager/functions/entity_finder/attacked_entity/_index.d.mcfunction index c2fb8dfe7..918e7b482 100644 --- a/TheSkyBlessing/data/mob_manager/functions/entity_finder/attacked_entity/_index.d.mcfunction +++ b/TheSkyBlessing/data/mob_manager/functions/entity_finder/attacked_entity/_index.d.mcfunction @@ -13,7 +13,7 @@ #> フラグ # @within function mob_manager:entity_finder/attacked_entity/** #declare storage mob_manager:attacked_entity - #declare score_holder $AttackedEntityIndex + #declare score_holder #AttackedEntityIndex #> lib:damage/からの攻撃検出用 # @within function diff --git a/TheSkyBlessing/data/mob_manager/functions/entity_finder/attacking_entity/_index.d.mcfunction b/TheSkyBlessing/data/mob_manager/functions/entity_finder/attacking_entity/_index.d.mcfunction index d3f318f65..62b389087 100644 --- a/TheSkyBlessing/data/mob_manager/functions/entity_finder/attacking_entity/_index.d.mcfunction +++ b/TheSkyBlessing/data/mob_manager/functions/entity_finder/attacking_entity/_index.d.mcfunction @@ -12,7 +12,7 @@ #> フラグ # @within function mob_manager:entity_finder/attacking_entity/** #declare storage mob_manager:attacking_entity - #declare score_holder $AttackingEntityIndex + #declare score_holder #AttackingEntityIndex #> lib:damage/からの攻撃検出用 # @within function diff --git a/TheSkyBlessing/data/mob_manager/functions/init/add_flag.mcfunction b/TheSkyBlessing/data/mob_manager/functions/init/add_flag.mcfunction index caf9f45d7..daafc435b 100644 --- a/TheSkyBlessing/data/mob_manager/functions/init/add_flag.mcfunction +++ b/TheSkyBlessing/data/mob_manager/functions/init/add_flag.mcfunction @@ -6,66 +6,66 @@ #> Private # @private - #declare score_holder $CloneFlagIndex + #declare score_holder #CloneFlagIndex # グローバルインデックス増加 - scoreboard players add $FlagIndex Global 1 - scoreboard players operation $FlagIndex Global %= $2^15 Const - execute if score $FlagIndex Global matches 0 run scoreboard players add $FlagIndex Global 1 + scoreboard players add #FlagIndex Global 1 + scoreboard players operation #FlagIndex Global %= #2^15 Const + execute if score #FlagIndex Global matches 0 run scoreboard players add #FlagIndex Global 1 # 直接UUIDとして突っ込む - scoreboard players operation @s MobUUID = $FlagIndex Global + scoreboard players operation @s MobUUID = #FlagIndex Global # Clone - scoreboard players operation $CloneFlagIndex Temporary = $FlagIndex Global + scoreboard players operation #CloneFlagIndex Temporary = #FlagIndex Global # FlagIndex << 16 - scoreboard players operation $CloneFlagIndex Temporary *= $2^16 Const + scoreboard players operation #CloneFlagIndex Temporary *= #2^16 Const # オーバーフローしてたらtag追加 - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag0.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag0.1 + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag0.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag0.1 # 0になるまでやる - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag1.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag1.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag2.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag2.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag3.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag3.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag4.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag4.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag5.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag5.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag6.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag6.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag7.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag7.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag8.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag8.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag9.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag9.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag10.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag10.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag11.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag11.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag12.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag12.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag13.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag13.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag14.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag14.1 - scoreboard players operation $CloneFlagIndex Temporary *= $2 Const - execute if score $CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag15.0 - execute if score $CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag15.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag1.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag1.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag2.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag2.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag3.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag3.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag4.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag4.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag5.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag5.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag6.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag6.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag7.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag7.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag8.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag8.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag9.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag9.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag10.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag10.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag11.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag11.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag12.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag12.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag13.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag13.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag14.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag14.1 + scoreboard players operation #CloneFlagIndex Temporary *= #2 Const + execute if score #CloneFlagIndex Temporary matches 00.. run tag @s add FindFlag15.0 + execute if score #CloneFlagIndex Temporary matches ..-1 run tag @s add FindFlag15.1 # リセット - scoreboard players reset $CloneFlagIndex Temporary \ No newline at end of file + scoreboard players reset #CloneFlagIndex Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/mob_manager/functions/init/modify_health.mcfunction b/TheSkyBlessing/data/mob_manager/functions/init/modify_health.mcfunction index c6a02e853..f7e8be776 100644 --- a/TheSkyBlessing/data/mob_manager/functions/init/modify_health.mcfunction +++ b/TheSkyBlessing/data/mob_manager/functions/init/modify_health.mcfunction @@ -8,7 +8,7 @@ execute store result score @s MobHealthMax run attribute @s generic.max_health get 1 # 付近雑魚のHPマルチ補正をかける execute if entity @s[tag=Enemy] run function mob_manager:init/multiplay_multiplier/normal - execute if entity @s[tag=!Enemy] run scoreboard players operation @s MobHealthMax *= $100 Const + execute if entity @s[tag=!Enemy] run scoreboard players operation @s MobHealthMax *= #100 Const # 現在体力を設定する scoreboard players operation @s MobHealth = @s MobHealthMax # 体力を引き上げて無敵にする diff --git a/TheSkyBlessing/data/mob_manager/functions/init/multiplay_multiplier/angel.mcfunction b/TheSkyBlessing/data/mob_manager/functions/init/multiplay_multiplier/angel.mcfunction index ecc30b543..de9e686e5 100644 --- a/TheSkyBlessing/data/mob_manager/functions/init/multiplay_multiplier/angel.mcfunction +++ b/TheSkyBlessing/data/mob_manager/functions/init/multiplay_multiplier/angel.mcfunction @@ -8,22 +8,22 @@ #> Val # @private - #declare score_holder $NearbyPlayerCount - #declare score_holder $MultiplayMultiplierBase - #declare score_holder $MultiplayMultiplier + #declare score_holder #NearbyPlayerCount + #declare score_holder #MultiplayMultiplierBase + #declare score_holder #MultiplayMultiplier # ベース倍率 0.60(e2) - scoreboard players set $MultiplayMultiplierBase Temporary 60 + scoreboard players set #MultiplayMultiplierBase Temporary 60 # マルチ補正倍率 0.40(e2) - scoreboard players set $MultiplayMultiplier Temporary 40 + scoreboard players set #MultiplayMultiplier Temporary 40 # マルチ補正倍率の計算 0.20(e2) * N(e0) + 0.80(e1) - scoreboard players operation $MultiplayMultiplier Temporary *= $PlayerCount Global - scoreboard players operation $MultiplayMultiplier Temporary += $MultiplayMultiplierBase Temporary + scoreboard players operation #MultiplayMultiplier Temporary *= #PlayerCount Global + scoreboard players operation #MultiplayMultiplier Temporary += #MultiplayMultiplierBase Temporary # マルチ補正倍率の保存 - scoreboard players operation @s MobMaxHealthMultiplier = $MultiplayMultiplier Temporary + scoreboard players operation @s MobMaxHealthMultiplier = #MultiplayMultiplier Temporary # マルチ補正の適用 (e2) - scoreboard players operation @s MobHealthMax *= $MultiplayMultiplier Temporary + scoreboard players operation @s MobHealthMax *= #MultiplayMultiplier Temporary # リセット - scoreboard players reset $NearbyPlayerCount Temporary - scoreboard players reset $MultiplayMultiplier Temporary - scoreboard players reset $MultiplayMultiplierBase Temporary \ No newline at end of file + scoreboard players reset #NearbyPlayerCount Temporary + scoreboard players reset #MultiplayMultiplier Temporary + scoreboard players reset #MultiplayMultiplierBase Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/mob_manager/functions/init/multiplay_multiplier/normal.mcfunction b/TheSkyBlessing/data/mob_manager/functions/init/multiplay_multiplier/normal.mcfunction index c84e08237..27686b152 100644 --- a/TheSkyBlessing/data/mob_manager/functions/init/multiplay_multiplier/normal.mcfunction +++ b/TheSkyBlessing/data/mob_manager/functions/init/multiplay_multiplier/normal.mcfunction @@ -10,24 +10,24 @@ #> Val # @private - #declare score_holder $NearbyPlayerCount - #declare score_holder $MultiplayMultiplierBase - #declare score_holder $MultiplayMultiplier + #declare score_holder #NearbyPlayerCount + #declare score_holder #MultiplayMultiplierBase + #declare score_holder #MultiplayMultiplier # 周囲のプレイヤー数を取得する (e0) - execute at @s store result score $NearbyPlayerCount Temporary if entity @a[distance=..75] + execute at @s store result score #NearbyPlayerCount Temporary if entity @a[distance=..75] # ベース倍率 0.80(e2) - scoreboard players set $MultiplayMultiplierBase Temporary 80 + scoreboard players set #MultiplayMultiplierBase Temporary 80 # マルチ補正倍率 0.20(e2) - scoreboard players set $MultiplayMultiplier Temporary 20 + scoreboard players set #MultiplayMultiplier Temporary 20 # マルチ補正倍率の計算 0.20(e2) * N(e0) + 0.80(e2) - scoreboard players operation $MultiplayMultiplier Temporary *= $NearbyPlayerCount Temporary - scoreboard players operation $MultiplayMultiplier Temporary += $MultiplayMultiplierBase Temporary + scoreboard players operation #MultiplayMultiplier Temporary *= #NearbyPlayerCount Temporary + scoreboard players operation #MultiplayMultiplier Temporary += #MultiplayMultiplierBase Temporary # マルチ補正倍率の保存 - scoreboard players operation @s MobMaxHealthMultiplier = $MultiplayMultiplier Temporary + scoreboard players operation @s MobMaxHealthMultiplier = #MultiplayMultiplier Temporary # マルチ補正の適用 (e2) - scoreboard players operation @s MobHealthMax *= $MultiplayMultiplier Temporary + scoreboard players operation @s MobHealthMax *= #MultiplayMultiplier Temporary # リセット - scoreboard players reset $NearbyPlayerCount Temporary - scoreboard players reset $MultiplayMultiplier Temporary - scoreboard players reset $MultiplayMultiplierBase Temporary \ No newline at end of file + scoreboard players reset #NearbyPlayerCount Temporary + scoreboard players reset #MultiplayMultiplier Temporary + scoreboard players reset #MultiplayMultiplierBase Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/god/mercy/offering/set_next.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/mercy/offering/set_next.mcfunction index 7bacf443d..3237ab218 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/mercy/offering/set_next.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/mercy/offering/set_next.mcfunction @@ -8,36 +8,36 @@ #> Length # @private - #declare score_holder $CandidatesLength - #declare score_holder $Argument.Index - #declare score_holder $Min - #declare score_holder $Diff - #declare score_holder $Count + #declare score_holder #CandidatesLength + #declare score_holder #Argument.Index + #declare score_holder #Min + #declare score_holder #Diff + #declare score_holder #Count # セッション開ける function lib:array/session/open # 供物リスト data modify storage lib: Array set from storage player_manager:god TargetOfferingData.Items # 候補リストの長さを取得 - execute store result score $CandidatesLength Temporary if data storage lib: Array[] + 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 + 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 player_manager:god TargetOfferingData.Next.Item set from storage lib: Array[-1].Item data modify storage player_manager:god TargetOfferingData.Next.Name set from storage lib: Array[-1].Name # 個数の範囲を算出する - execute store result score $Min Temporary run data get storage lib: Array[-1].Amount[0] - execute store result score $Diff Temporary run data get storage lib: Array[-1].Amount[1] - scoreboard players operation $Diff Temporary -= $Min Temporary - scoreboard players add $Diff Temporary 1 + execute store result score #Min Temporary run data get storage lib: Array[-1].Amount[0] + execute store result score #Diff Temporary run data get storage lib: Array[-1].Amount[1] + scoreboard players operation #Diff Temporary -= #Min Temporary + scoreboard players add #Diff Temporary 1 # 個数をランダムに設定する - execute store result score $Count Temporary run function lib:random/ - scoreboard players operation $Count Temporary %= $Diff Temporary - scoreboard players operation $Count Temporary += $Min Temporary - execute store result storage player_manager:god TargetOfferingData.Next.Amount int 1 run scoreboard players get $Count Temporary + execute store result score #Count Temporary run function lib:random/ + scoreboard players operation #Count Temporary %= #Diff Temporary + scoreboard players operation #Count Temporary += #Min Temporary + execute store result storage player_manager:god TargetOfferingData.Next.Amount int 1 run scoreboard players get #Count Temporary # セット execute if score @s InSubArea matches 10 run data modify storage player_manager:god OfferingData.Flora set from storage player_manager:god TargetOfferingData execute if score @s InSubArea matches 11 run data modify storage player_manager:god OfferingData.Nyaptov set from storage player_manager:god TargetOfferingData @@ -46,7 +46,7 @@ execute if score @s InSubArea matches 14 run data modify storage player_manager:god OfferingData.Wi-ki set from storage player_manager:god TargetOfferingData # リセット function lib:array/session/close - scoreboard players reset $CandidatesLength Temporary - scoreboard players reset $Count Temporary - scoreboard players reset $Diff Temporary - scoreboard players reset $Min Temporary \ No newline at end of file + scoreboard players reset #CandidatesLength Temporary + scoreboard players reset #Count Temporary + scoreboard players reset #Diff Temporary + scoreboard players reset #Min Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/god/mercy/on_mercy/check.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/mercy/on_mercy/check.mcfunction index 62312cab5..5a0b285a4 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/mercy/on_mercy/check.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/mercy/on_mercy/check.mcfunction @@ -6,8 +6,8 @@ #> 返り値 # @private - #declare score_holder $Amount - #declare score_holder $Return.Amount + #declare score_holder #Amount + #declare score_holder #Return.Amount # 供物データを取得 function player_manager:god/mercy/offering/get @@ -16,9 +16,9 @@ data modify storage api: Argument.Amount set value 0 function api:inventory/clear # 個数チェック - execute store result score $Amount Temporary run data get storage player_manager:god TargetOfferingData.Next.Amount - execute unless score $Amount Temporary <= $Return.Amount Lib run function player_manager:god/mercy/offering/send_require_message - execute if score $Amount Temporary <= $Return.Amount Lib run function player_manager:god/mercy/mercy + execute store result score #Amount Temporary run data get storage player_manager:god TargetOfferingData.Next.Amount + execute unless score #Amount Temporary <= #Return.Amount Lib run function player_manager:god/mercy/offering/send_require_message + execute if score #Amount Temporary <= #Return.Amount Lib run function player_manager:god/mercy/mercy # リセット - scoreboard players reset $Amount - scoreboard players reset $Return.Amount \ No newline at end of file + scoreboard players reset #Amount + scoreboard players reset #Return.Amount \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/god/nyaptov/passive.mcfunction b/TheSkyBlessing/data/player_manager/functions/god/nyaptov/passive.mcfunction index 52f07b3ff..1fe426683 100644 --- a/TheSkyBlessing/data/player_manager/functions/god/nyaptov/passive.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/god/nyaptov/passive.mcfunction @@ -6,7 +6,7 @@ #> 落下距離 # @private - #declare score_holder $FallDistance + #declare score_holder #FallDistance #declare tag SlowFalling # 着地チェック @@ -14,13 +14,13 @@ execute if entity @s[tag=SlowFalling] if data storage api: {OnGround:1b} run tag @s remove SlowFalling # 25m落下チェック execute unless entity @s[tag=SlowFalling] run function api:data_get/fall_distance - execute unless entity @s[tag=SlowFalling] store result score $FallDistance Temporary run data get storage api: FallDistance - execute unless entity @s[tag=SlowFalling] if entity @s[tag=Nyaptov.FlyingElytra] run scoreboard players reset $FallDistance Temporary - execute unless entity @s[tag=SlowFalling] if score $FallDistance Temporary matches 25.. run tp @s @s - execute unless entity @s[tag=SlowFalling] if score $FallDistance Temporary matches 25.. run particle cloud ~ ~ ~ 0.3 0.2 0.3 0 10 normal - execute unless entity @s[tag=SlowFalling] if score $FallDistance Temporary matches 25.. run tag @s add SlowFalling + execute unless entity @s[tag=SlowFalling] store result score #FallDistance Temporary run data get storage api: FallDistance + execute unless entity @s[tag=SlowFalling] if entity @s[tag=Nyaptov.FlyingElytra] run scoreboard players reset #FallDistance Temporary + execute unless entity @s[tag=SlowFalling] if score #FallDistance Temporary matches 25.. run tp @s @s + execute unless entity @s[tag=SlowFalling] if score #FallDistance Temporary matches 25.. run particle cloud ~ ~ ~ 0.3 0.2 0.3 0 10 normal + execute unless entity @s[tag=SlowFalling] if score #FallDistance Temporary matches 25.. run tag @s add SlowFalling # SlowFallingタグが付与されているなら効果を付与 execute if entity @s[tag=SlowFalling] run summon area_effect_cloud ~ ~ ~ {Duration:6,Age:4,effects:[{id:"slow_falling",amplifier:0b,duration:5,show_particles:0b}]} # リセット - scoreboard players reset $FallDistance Temporary + scoreboard players reset #FallDistance Temporary tag @s[tag=Nyaptov.FlyingElytra] remove Nyaptov.FlyingElytra \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/lost_item/_index.d.mcfunction b/TheSkyBlessing/data/player_manager/functions/lost_item/_index.d.mcfunction index fe3f3c798..e4ba0fc40 100644 --- a/TheSkyBlessing/data/player_manager/functions/lost_item/_index.d.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/lost_item/_index.d.mcfunction @@ -12,7 +12,7 @@ # player_manager:lost_item/give_all/packing.minecart # player_manager:lost_item/give_all/packing.chest # player_manager:lost_item/give_all/packing.item - #declare score_holder $i + #declare score_holder #i #> Minecart -> Chest Tag # @within function @@ -22,6 +22,6 @@ #> Temp # @within function player_manager:lost_item/give_part/* - #declare score_holder $GiveCount - #declare score_holder $ListLength - #declare score_holder $Index \ No newline at end of file + #declare score_holder #GiveCount + #declare score_holder #ListLength + #declare score_holder #Index \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/minecart.summon.mcfunction b/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/minecart.summon.mcfunction index 4e15788e2..2b84ec051 100644 --- a/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/minecart.summon.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/minecart.summon.mcfunction @@ -11,9 +11,9 @@ #declare tag EmptyItems # チェストロッコに追加する処理 - scoreboard players set $i Temporary 0 + scoreboard players set #i Temporary 0 function player_manager:lost_item/give_all/packing.minecart - scoreboard players reset $i Temporary + scoreboard players reset #i Temporary # シャルカー -> チェスト summon chest_minecart ~ ~ ~ {Invulnerable:1b,Silent:1b,Tags:["LostItemChest","EmptyItems"],Items:[]} data modify entity @e[type=chest_minecart,tag=EmptyItems,distance=0,limit=1] Items set from storage player_manager:lost_item MinecartItems diff --git a/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/packing.minecart.mcfunction b/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/packing.minecart.mcfunction index a1d539aef..4ead0ef0a 100644 --- a/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/packing.minecart.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/packing.minecart.mcfunction @@ -10,7 +10,7 @@ data modify storage player_manager:lost_item MinecartItems append from storage player_manager:lost_item Chests[-1] data remove storage player_manager:lost_item Chests[-1] # Slotの設定 - execute store result storage player_manager:lost_item MinecartItems[-1].Slot byte 1 run scoreboard players get $i Temporary + execute store result storage player_manager:lost_item MinecartItems[-1].Slot byte 1 run scoreboard players get #i Temporary # ループ処理 - scoreboard players add $i Temporary 1 - execute if score $i Temporary < $27 Const if data storage player_manager:lost_item Chests[-1] run function player_manager:lost_item/give_all/packing.minecart \ No newline at end of file + scoreboard players add #i Temporary 1 + execute if score #i Temporary < #27 Const if data storage player_manager:lost_item Chests[-1] run function player_manager:lost_item/give_all/packing.minecart \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/packing.user.mcfunction b/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/packing.user.mcfunction index a2ecab571..446abf0eb 100644 --- a/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/packing.user.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/lost_item/give_all/packing.user.mcfunction @@ -7,7 +7,7 @@ # player_manager:lost_item/give_all/packing.user # IDSetの取り出し - execute store result score $ OhMyDatID run data get storage oh_my_dat: IDSet[-1] + execute store result score # OhMyDatID run data get storage oh_my_dat: IDSet[-1] data remove storage oh_my_dat: IDSet[-1] # セッション開ける function lib:array/session/open diff --git a/TheSkyBlessing/data/player_manager/functions/lost_item/give_part/.mcfunction b/TheSkyBlessing/data/player_manager/functions/lost_item/give_part/.mcfunction index c802fff09..6ce66bbab 100644 --- a/TheSkyBlessing/data/player_manager/functions/lost_item/give_part/.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/lost_item/give_part/.mcfunction @@ -12,7 +12,7 @@ data modify storage lib: Array set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].LostItems # 返却するスロット数だけ乱数を生成する data modify storage lib: Picks set value [] - execute store result score $ListLength Temporary if data storage lib: Array[] + execute store result score #ListLength Temporary if data storage lib: Array[] function player_manager:lost_item/give_part/generate_index # 添字配列を元にアイテムを取得する function lib:array/picks @@ -24,6 +24,6 @@ function player_manager:lost_item/give_part/falling_item # リセット function lib:array/session/close - scoreboard players reset $GiveCount Temporary - scoreboard players reset $ListLength Temporary - scoreboard players reset $Index Temporary \ No newline at end of file + scoreboard players reset #GiveCount Temporary + scoreboard players reset #ListLength Temporary + scoreboard players reset #Index Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/lost_item/give_part/generate_index.mcfunction b/TheSkyBlessing/data/player_manager/functions/lost_item/give_part/generate_index.mcfunction index 87bcb14b1..85f05913a 100644 --- a/TheSkyBlessing/data/player_manager/functions/lost_item/give_part/generate_index.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/lost_item/give_part/generate_index.mcfunction @@ -7,13 +7,13 @@ # player_manager:lost_item/give_part/generate_index # 乱数生成 - execute store result score $Index Temporary run function lib:random/ + execute store result score #Index Temporary run function lib:random/ # 配列範囲に剰余算 - scoreboard players operation $Index Temporary %= $ListLength Temporary + scoreboard players operation #Index Temporary %= #ListLength Temporary # 添字配列に追加 data modify storage lib: Picks append value -1 - execute store result storage lib: Picks[-1] int 1 run scoreboard players get $Index Temporary + execute store result storage lib: Picks[-1] int 1 run scoreboard players get #Index Temporary # GiveCountを減らす - scoreboard players remove $GiveCount Temporary 1 + scoreboard players remove #GiveCount Temporary 1 # GiveCountが残ってるなら繰り返す - execute if score $GiveCount Temporary matches 1.. run function player_manager:lost_item/give_part/generate_index \ No newline at end of file + execute if score #GiveCount Temporary matches 1.. run function player_manager:lost_item/give_part/generate_index \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/mp/_index.d.mcfunction b/TheSkyBlessing/data/player_manager/functions/mp/_index.d.mcfunction index 32402fafc..eaafe40dd 100644 --- a/TheSkyBlessing/data/player_manager/functions/mp/_index.d.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/mp/_index.d.mcfunction @@ -3,4 +3,4 @@ #> PlayerManager # @within function player_manager:mp/viewer/** - #declare score_holder $NowLvP + #declare score_holder #NowLvP diff --git a/TheSkyBlessing/data/player_manager/functions/mp/regen/do.mcfunction b/TheSkyBlessing/data/player_manager/functions/mp/regen/do.mcfunction index 03b45ff57..40c02ecf2 100644 --- a/TheSkyBlessing/data/player_manager/functions/mp/regen/do.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/mp/regen/do.mcfunction @@ -6,34 +6,34 @@ #> Temp # @private - #declare score_holder $isNegative - #declare score_holder $Fluctuation - #declare score_holder $AmountFloat + #declare score_holder #isNegative + #declare score_holder #Fluctuation + #declare score_holder #AmountFloat # UserStorage呼び出し function oh_my_dat:please # 回復量計算 - execute store result score $Fluctuation Lib run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.MPRegen 10 - scoreboard players operation $Fluctuation Lib *= @s MPMax - scoreboard players operation $Fluctuation Lib /= $100 Const + execute store result score #Fluctuation Lib run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Modifiers.MPRegen 10 + scoreboard players operation #Fluctuation Lib *= @s MPMax + scoreboard players operation #Fluctuation Lib /= #100 Const # 負数を強制する - execute store success score $isNegative Temporary if score $Fluctuation Lib matches ..-1 - execute if score $isNegative Temporary matches 1 run scoreboard players operation $Fluctuation Lib *= $-1 Const + execute store success score #isNegative Temporary if score #Fluctuation Lib matches ..-1 + execute if score #isNegative Temporary matches 1 run scoreboard players operation #Fluctuation Lib *= #-1 Const # MP回復量を整数部と少数部に分離する - # $AmountFloatにコピー - scoreboard players operation $AmountFloat Temporary = $Fluctuation Lib + # #AmountFloatにコピー + scoreboard players operation #AmountFloat Temporary = #Fluctuation Lib # 10で除算 - scoreboard players operation $Fluctuation Lib /= $10 Const + scoreboard players operation #Fluctuation Lib /= #10 Const # 10で剰余算 - scoreboard players operation $AmountFloat Temporary %= $10 Const + scoreboard players operation #AmountFloat Temporary %= #10 Const # 負数なら戻す - execute if score $isNegative Temporary matches 1 run scoreboard players operation $Fluctuation Lib *= $-1 Const - execute if score $isNegative Temporary matches 1 run scoreboard players operation $AmountFloat Lib *= $-1 Const + execute if score #isNegative Temporary matches 1 run scoreboard players operation #Fluctuation Lib *= #-1 Const + execute if score #isNegative Temporary matches 1 run scoreboard players operation #AmountFloat Lib *= #-1 Const # 小数点の桁あがりチェック - scoreboard players operation @s MPFloat += $AmountFloat Temporary - execute if score @s MPFloat matches 10.. run scoreboard players add $Fluctuation Lib 1 + scoreboard players operation @s MPFloat += #AmountFloat Temporary + execute if score @s MPFloat matches 10.. run scoreboard players add #Fluctuation Lib 1 execute if score @s MPFloat matches 10.. run scoreboard players remove @s MPFloat 10 - execute if score @s MPFloat matches ..-1 run scoreboard players remove $Fluctuation Lib 1 + execute if score @s MPFloat matches ..-1 run scoreboard players remove #Fluctuation Lib 1 execute if score @s MPFloat matches ..-1 run scoreboard players add @s MPFloat 10 # 表示を無効化する data modify storage lib: Argument.DisableLog set value true @@ -42,5 +42,5 @@ # クールダウンリセット scoreboard players set @s MPRegenCooldown 0 # リセット - scoreboard players reset $AmountFloat Temporary - scoreboard players reset $isNegative Temporary \ No newline at end of file + scoreboard players reset #AmountFloat Temporary + scoreboard players reset #isNegative Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/mp/viewer/adjust_xpbar.mcfunction b/TheSkyBlessing/data/player_manager/functions/mp/viewer/adjust_xpbar.mcfunction index 2a2090cb8..2bb5aa0e4 100644 --- a/TheSkyBlessing/data/player_manager/functions/mp/viewer/adjust_xpbar.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/mp/viewer/adjust_xpbar.mcfunction @@ -6,57 +6,57 @@ #> private # @private - #declare score_holder $NowMP + #declare score_holder #NowMP #初期化 //40levelは最大が201pointであることを利用して100%までを表現する xp set @s 40 levels xp set @s 0 points - scoreboard players operation $NowMP Temporary = @s MP + scoreboard players operation #NowMP Temporary = @s MP # pointを設定 - scoreboard players operation $NowLvP Temporary *= $2^24 Const - scoreboard players operation $NowLvP Temporary *= $2 Const - execute if score $NowLvP Temporary matches ..-1 run xp add @s 128 points - scoreboard players operation $NowLvP Temporary *= $2 Const - execute if score $NowLvP Temporary matches ..-1 run xp add @s 64 points - scoreboard players operation $NowLvP Temporary *= $2 Const - execute if score $NowLvP Temporary matches ..-1 run xp add @s 32 points - scoreboard players operation $NowLvP Temporary *= $2 Const - execute if score $NowLvP Temporary matches ..-1 run xp add @s 16 points - scoreboard players operation $NowLvP Temporary *= $2 Const - execute if score $NowLvP Temporary matches ..-1 run xp add @s 8 points - scoreboard players operation $NowLvP Temporary *= $2 Const - execute if score $NowLvP Temporary matches ..-1 run xp add @s 4 points - scoreboard players operation $NowLvP Temporary *= $2 Const - execute if score $NowLvP Temporary matches ..-1 run xp add @s 2 points - scoreboard players operation $NowLvP Temporary *= $2 Const - execute if score $NowLvP Temporary matches ..-1 run xp add @s 1 points + scoreboard players operation #NowLvP Temporary *= #2^24 Const + scoreboard players operation #NowLvP Temporary *= #2 Const + execute if score #NowLvP Temporary matches ..-1 run xp add @s 128 points + scoreboard players operation #NowLvP Temporary *= #2 Const + execute if score #NowLvP Temporary matches ..-1 run xp add @s 64 points + scoreboard players operation #NowLvP Temporary *= #2 Const + execute if score #NowLvP Temporary matches ..-1 run xp add @s 32 points + scoreboard players operation #NowLvP Temporary *= #2 Const + execute if score #NowLvP Temporary matches ..-1 run xp add @s 16 points + scoreboard players operation #NowLvP Temporary *= #2 Const + execute if score #NowLvP Temporary matches ..-1 run xp add @s 8 points + scoreboard players operation #NowLvP Temporary *= #2 Const + execute if score #NowLvP Temporary matches ..-1 run xp add @s 4 points + scoreboard players operation #NowLvP Temporary *= #2 Const + execute if score #NowLvP Temporary matches ..-1 run xp add @s 2 points + scoreboard players operation #NowLvP Temporary *= #2 Const + execute if score #NowLvP Temporary matches ..-1 run xp add @s 1 points # levelを設定 xp set @s 0 levels - scoreboard players operation $NowMP Temporary *= $2^20 Const - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 1024 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 512 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 256 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 128 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 64 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 32 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 16 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 8 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 4 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 2 levels - scoreboard players operation $NowMP Temporary *= $2 Const - execute if score $NowMP Temporary matches ..-1 run xp add @s 1 levels + scoreboard players operation #NowMP Temporary *= #2^20 Const + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 1024 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 512 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 256 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 128 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 64 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 32 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 16 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 8 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 4 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 2 levels + scoreboard players operation #NowMP Temporary *= #2 Const + execute if score #NowMP Temporary matches ..-1 run xp add @s 1 levels # リセット - scoreboard players reset $NowMP Temporary \ No newline at end of file + scoreboard players reset #NowMP Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/mp/viewer/check_xpbar.mcfunction b/TheSkyBlessing/data/player_manager/functions/mp/viewer/check_xpbar.mcfunction index c083af91e..5e1fc5e6e 100644 --- a/TheSkyBlessing/data/player_manager/functions/mp/viewer/check_xpbar.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/mp/viewer/check_xpbar.mcfunction @@ -6,25 +6,25 @@ #> private # @private - #declare score_holder $Lv - #declare score_holder $LvP + #declare score_holder #Lv + #declare score_holder #LvP #declare tag Success # 取得 - execute store result score $Lv Temporary run xp query @s levels + execute store result score #Lv Temporary run xp query @s levels function api:data_get/xp_p - execute store result score $LvP Temporary run data get storage api: XpP 1000 - execute unless score $LvP Temporary matches 0 run scoreboard players add $LvP Temporary 10 - scoreboard players operation $LvP Temporary /= $10 Const + execute store result score #LvP Temporary run data get storage api: XpP 1000 + execute unless score #LvP Temporary matches 0 run scoreboard players add #LvP Temporary 10 + scoreboard players operation #LvP Temporary /= #10 Const # 現在の%を計算 - scoreboard players operation $NowLvP Temporary = @s MP - scoreboard players operation $NowLvP Temporary *= $100 Const - scoreboard players operation $NowLvP Temporary /= @s MPMax + scoreboard players operation #NowLvP Temporary = @s MP + scoreboard players operation #NowLvP Temporary *= #100 Const + scoreboard players operation #NowLvP Temporary /= @s MPMax # ずれている場合再調整 - execute if score @s MP = $Lv Temporary if score $NowLvP Temporary = $LvP Temporary run tag @s add Success + execute if score @s MP = #Lv Temporary if score #NowLvP Temporary = #LvP Temporary run tag @s add Success execute if entity @s[tag=!Success] run function player_manager:mp/viewer/adjust_xpbar # リセット tag @s remove Success - scoreboard players reset $Lv Temporary - scoreboard players reset $LvP Temporary - scoreboard players reset $NowLvP Temporary \ No newline at end of file + scoreboard players reset #Lv Temporary + scoreboard players reset #LvP Temporary + scoreboard players reset #NowLvP Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/pos_fix_and_calc_diff.mcfunction b/TheSkyBlessing/data/player_manager/functions/pos_fix_and_calc_diff.mcfunction index 26eff20f6..2fe4cfd1b 100644 --- a/TheSkyBlessing/data/player_manager/functions/pos_fix_and_calc_diff.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/pos_fix_and_calc_diff.mcfunction @@ -6,16 +6,16 @@ #> Val # @private - #declare score_holder $Prv.SquaredMagnitude - #declare score_holder $Cur.SquaredMagnitude - #declare score_holder $Temp + #declare score_holder #Prv.SquaredMagnitude + #declare score_holder #Cur.SquaredMagnitude + #declare score_holder #Temp #declare storage player_manager:pos_fix # 現tickの座標を取得する (PlayerStorage呼び出しも含む) function api:data_get/pos # function oh_my_dat:please # 1tick前のベクトルの大きさの二乗を取得する - execute store result score $Prv.SquaredMagnitude Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiffSquaredMagnitude + execute store result score #Prv.SquaredMagnitude Temporary run data get storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiffSquaredMagnitude # セッションを開く function lib:array/session/open @@ -32,21 +32,21 @@ data modify storage lib: Array set from storage lib: SqrResult function lib:array/math/sum - execute store result score $Cur.SquaredMagnitude Temporary run data get storage lib: SumResult 100 + execute store result score #Cur.SquaredMagnitude Temporary run data get storage lib: SumResult 100 # スコア推移 scoreboard players reset @s[scores={PosPacketLossDetectAfterTick=2}] PosPacketLossDetectAfterTick scoreboard players add @s[scores={PosPacketLossDetectAfterTick=0..}] PosPacketLossDetectAfterTick 1 # 前tickの差分が十分な状態(0.05m/tick,1m/sec)でDiffが急に0になったらおそらくPosのパケロスが発生してるので、Posを前tickのPosとDiffから予測する - execute if score $Prv.SquaredMagnitude Temporary matches 50.. if score $Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run scoreboard players set @s PosPacketLossDetectAfterTick 0 - execute if score $Prv.SquaredMagnitude Temporary matches 50.. if score $Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage lib: ArrayA set from storage api: Pos - execute if score $Prv.SquaredMagnitude Temporary matches 50.. if score $Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage lib: ArrayB set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiff - execute if score $Prv.SquaredMagnitude Temporary matches 50.. if score $Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run function lib:array/math/add - execute if score $Prv.SquaredMagnitude Temporary matches 50.. if score $Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Pos.Data set from storage lib: AddResult - execute if score $Prv.SquaredMagnitude Temporary matches 50.. if score $Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage api: Pos set from storage lib: AddResult + execute if score #Prv.SquaredMagnitude Temporary matches 50.. if score #Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run scoreboard players set @s PosPacketLossDetectAfterTick 0 + execute if score #Prv.SquaredMagnitude Temporary matches 50.. if score #Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage lib: ArrayA set from storage api: Pos + execute if score #Prv.SquaredMagnitude Temporary matches 50.. if score #Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage lib: ArrayB set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiff + execute if score #Prv.SquaredMagnitude Temporary matches 50.. if score #Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run function lib:array/math/add + execute if score #Prv.SquaredMagnitude Temporary matches 50.. if score #Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].DataCache.Pos.Data set from storage lib: AddResult + execute if score #Prv.SquaredMagnitude Temporary matches 50.. if score #Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage api: Pos set from storage lib: AddResult # パケロスが検出されていたらDiffとCurSquaredMagnitudeを古いもので上書きする(即ち、更新が発生しなくなる) - execute if score $Prv.SquaredMagnitude Temporary matches 50.. if score $Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage player_manager:pos_fix PosDiff set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiff - execute if score $Prv.SquaredMagnitude Temporary matches 50.. if score $Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run scoreboard players operation $Cur.SquaredMagnitude Temporary = $Prv.SquaredMagnitude Temporary + execute if score #Prv.SquaredMagnitude Temporary matches 50.. if score #Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run data modify storage player_manager:pos_fix PosDiff set from storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiff + execute if score #Prv.SquaredMagnitude Temporary matches 50.. if score #Cur.SquaredMagnitude Temporary matches ..15 unless score @s PosPacketLossDetectAfterTick matches 2 run scoreboard players operation #Cur.SquaredMagnitude Temporary = #Prv.SquaredMagnitude Temporary # 止まってから20tick目に座標の補正がかかるのでそのtickに限っては無視する execute if score @s PlayerStopTime matches 19 run data modify storage player_manager:pos_fix PosDiff set value [0d,0d,0d] @@ -62,10 +62,10 @@ # 次tickにデータ渡す data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPos set from storage api: Pos data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiff set from storage player_manager:pos_fix PosDiff - execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiffSquaredMagnitude int 1 run scoreboard players get $Cur.SquaredMagnitude Temporary + execute store result storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].PlayerPosDiffSquaredMagnitude int 1 run scoreboard players get #Cur.SquaredMagnitude Temporary # リセット function lib:array/session/close data remove storage player_manager:pos_fix PosDiff - scoreboard players reset $Prv.SquaredMagnitude Temporary - scoreboard players reset $Cur.SquaredMagnitude Temporary - scoreboard players reset $Temp Temporary \ No newline at end of file + scoreboard players reset #Prv.SquaredMagnitude Temporary + scoreboard players reset #Cur.SquaredMagnitude Temporary + scoreboard players reset #Temp Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/set_team_and_per_health.mcfunction b/TheSkyBlessing/data/player_manager/functions/set_team_and_per_health.mcfunction index ec8abaaf8..d543bc405 100644 --- a/TheSkyBlessing/data/player_manager/functions/set_team_and_per_health.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/set_team_and_per_health.mcfunction @@ -6,41 +6,41 @@ #> Temp # @private - #declare score_holder $Health - #declare score_holder $MaxHealth + #declare score_holder #Health + #declare score_holder #MaxHealth # 体力コピー - scoreboard players operation $Health Temporary = @s Health - scoreboard players operation $Health Temporary *= $1000 Const + scoreboard players operation #Health Temporary = @s Health + scoreboard players operation #Health Temporary *= #1000 Const # 最大体力取得 - execute store result score $MaxHealth Temporary run attribute @s generic.max_health get 10 + execute store result score #MaxHealth Temporary run attribute @s generic.max_health get 10 # 割合を計算する - scoreboard players operation $Health Temporary /= $MaxHealth Temporary + scoreboard players operation #Health Temporary /= #MaxHealth Temporary # 割合をもとにチーム振り分け - execute if score $Health Temporary matches 00..34 if entity @s[tag=Believe.None] run team join None.LowHP - execute if score $Health Temporary matches 35..79 if entity @s[tag=Believe.None] run team join None.MedHP - execute if score $Health Temporary matches 80.. if entity @s[tag=Believe.None] run team join None.HighHP - execute if score $Health Temporary matches 00..34 if entity @s[tag=Believe.Flora] run team join Flora.LowHP - execute if score $Health Temporary matches 35..79 if entity @s[tag=Believe.Flora] run team join Flora.MedHP - execute if score $Health Temporary matches 80.. if entity @s[tag=Believe.Flora] run team join Flora.HighHP - execute if score $Health Temporary matches 00..34 if entity @s[tag=Believe.Urban] run team join Urban.LowHP - execute if score $Health Temporary matches 35..79 if entity @s[tag=Believe.Urban] run team join Urban.MedHP - execute if score $Health Temporary matches 80.. if entity @s[tag=Believe.Urban] run team join Urban.HighHP - execute if score $Health Temporary matches 00..34 if entity @s[tag=Believe.Nyaptov] run team join Nyaptov.LowHP - execute if score $Health Temporary matches 35..79 if entity @s[tag=Believe.Nyaptov] run team join Nyaptov.MedHP - execute if score $Health Temporary matches 80.. if entity @s[tag=Believe.Nyaptov] run team join Nyaptov.HighHP - execute if score $Health Temporary matches 00..34 if entity @s[tag=Believe.Wi-ki] run team join Wi-ki.LowHP - execute if score $Health Temporary matches 35..79 if entity @s[tag=Believe.Wi-ki] run team join Wi-ki.MedHP - execute if score $Health Temporary matches 80.. if entity @s[tag=Believe.Wi-ki] run team join Wi-ki.HighHP - execute if score $Health Temporary matches 00..34 if entity @s[tag=Believe.Rumor] run team join Rumor.LowHP - execute if score $Health Temporary matches 35..79 if entity @s[tag=Believe.Rumor] run team join Rumor.MedHP - execute if score $Health Temporary matches 80.. if entity @s[tag=Believe.Rumor] run team join Rumor.HighHP + execute if score #Health Temporary matches 00..34 if entity @s[tag=Believe.None] run team join None.LowHP + execute if score #Health Temporary matches 35..79 if entity @s[tag=Believe.None] run team join None.MedHP + execute if score #Health Temporary matches 80.. if entity @s[tag=Believe.None] run team join None.HighHP + execute if score #Health Temporary matches 00..34 if entity @s[tag=Believe.Flora] run team join Flora.LowHP + execute if score #Health Temporary matches 35..79 if entity @s[tag=Believe.Flora] run team join Flora.MedHP + execute if score #Health Temporary matches 80.. if entity @s[tag=Believe.Flora] run team join Flora.HighHP + execute if score #Health Temporary matches 00..34 if entity @s[tag=Believe.Urban] run team join Urban.LowHP + execute if score #Health Temporary matches 35..79 if entity @s[tag=Believe.Urban] run team join Urban.MedHP + execute if score #Health Temporary matches 80.. if entity @s[tag=Believe.Urban] run team join Urban.HighHP + execute if score #Health Temporary matches 00..34 if entity @s[tag=Believe.Nyaptov] run team join Nyaptov.LowHP + execute if score #Health Temporary matches 35..79 if entity @s[tag=Believe.Nyaptov] run team join Nyaptov.MedHP + execute if score #Health Temporary matches 80.. if entity @s[tag=Believe.Nyaptov] run team join Nyaptov.HighHP + execute if score #Health Temporary matches 00..34 if entity @s[tag=Believe.Wi-ki] run team join Wi-ki.LowHP + execute if score #Health Temporary matches 35..79 if entity @s[tag=Believe.Wi-ki] run team join Wi-ki.MedHP + execute if score #Health Temporary matches 80.. if entity @s[tag=Believe.Wi-ki] run team join Wi-ki.HighHP + execute if score #Health Temporary matches 00..34 if entity @s[tag=Believe.Rumor] run team join Rumor.LowHP + execute if score #Health Temporary matches 35..79 if entity @s[tag=Believe.Rumor] run team join Rumor.MedHP + execute if score #Health Temporary matches 80.. if entity @s[tag=Believe.Rumor] run team join Rumor.HighHP # 割合を100分率から20分率にする - scoreboard players operation $Health Temporary /= $5 Const + scoreboard players operation #Health Temporary /= #5 Const # 割合を割合体力表示用スコアに代入 - scoreboard players operation @s PerHealth = $Health Temporary + scoreboard players operation @s PerHealth = #Health Temporary # リセット - scoreboard players reset $Health Temporary - scoreboard players reset $MaxHealth Temporary \ No newline at end of file + scoreboard players reset #Health Temporary + scoreboard players reset #MaxHealth Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/vanilla_attack/calculate.mcfunction b/TheSkyBlessing/data/player_manager/functions/vanilla_attack/calculate.mcfunction index 0d8969fc9..dc5a5bd48 100644 --- a/TheSkyBlessing/data/player_manager/functions/vanilla_attack/calculate.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/vanilla_attack/calculate.mcfunction @@ -6,16 +6,16 @@ #> private # @private - #declare score_holder $Damage + #declare score_holder #Damage # スコアを計算 - scoreboard players operation $Damage Temporary = @p[tag=this] AttackEvent - scoreboard players operation $Damage Temporary *= $10 Const - scoreboard players operation @s MobHealth -= $Damage Temporary + scoreboard players operation #Damage Temporary = @p[tag=this] AttackEvent + scoreboard players operation #Damage Temporary *= #10 Const + scoreboard players operation @s MobHealth -= #Damage Temporary execute if score @s MobHealth matches ..0 run tag @p[tag=this] add Killer execute if score @s MobHealth matches ..0 as @p[tag=Killer] run advancement grant @s only core:handler/killed execute if score @s MobHealth matches ..0 run damage @s 9999 minecraft:player_attack by @p[tag=Killer] execute if score @s MobHealth matches ..0 run kill @s # リセット - scoreboard players reset $Damage Temporary \ No newline at end of file + scoreboard players reset #Damage Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/player_manager/functions/vanilla_attack/show_log.mcfunction b/TheSkyBlessing/data/player_manager/functions/vanilla_attack/show_log.mcfunction index 3b831156d..05f78f506 100644 --- a/TheSkyBlessing/data/player_manager/functions/vanilla_attack/show_log.mcfunction +++ b/TheSkyBlessing/data/player_manager/functions/vanilla_attack/show_log.mcfunction @@ -5,7 +5,7 @@ # @within function core:handler/attack # ダメージを表示形式に変換する - scoreboard players operation $Fluctuation Lib = @s AttackEvent - scoreboard players operation $Fluctuation Lib *= $-10 Const + scoreboard players operation #Fluctuation Lib = @s AttackEvent + scoreboard players operation #Fluctuation Lib *= #-10 Const # 攻撃した敵の座標で表示する execute as @e[tag=AttackedEntity] if score @s AttackedEntity = @p[tag=this] UserID at @s run function lib:status_log/show_health \ No newline at end of file diff --git a/TheSkyBlessing/data/rom/functions/_index.d.mcfunction b/TheSkyBlessing/data/rom/functions/_index.d.mcfunction index ca6d3be7e..9d89328a8 100644 --- a/TheSkyBlessing/data/rom/functions/_index.d.mcfunction +++ b/TheSkyBlessing/data/rom/functions/_index.d.mcfunction @@ -14,5 +14,5 @@ # @within function # api:rom/please # rom:** - #declare score_holder $LatestProvidedAddress - #declare score_holder $Address \ No newline at end of file + #declare score_holder #LatestProvidedAddress + #declare score_holder #Address \ No newline at end of file diff --git a/TheSkyBlessing/data/rom/functions/provide.mcfunction b/TheSkyBlessing/data/rom/functions/provide.mcfunction index 2ccd49182..e55b6ae5a 100644 --- a/TheSkyBlessing/data/rom/functions/provide.mcfunction +++ b/TheSkyBlessing/data/rom/functions/provide.mcfunction @@ -7,10 +7,10 @@ #> Val # @private - #declare score_holder $Address + #declare score_holder #Address # IDを取得する - execute store result score $Address Temporary run data get storage api: Argument.Address + execute store result score #Address Temporary run data get storage api: Argument.Address # リセット data remove storage rom: _[-4][-4][-4][-4][-4][-4][-4][6] @@ -46,74 +46,74 @@ # 2^30 = 1,073,741,824 # シフト1 - scoreboard players operation $Address Temporary *= $65536 Const + scoreboard players operation #Address Temporary *= #65536 Const # 上位2bitを元にオフセット要素を末尾追加する - execute if score $Address Temporary matches 1073741824.. run data modify storage rom: _ append from storage rom: OneEmptyLists[] - execute if score $Address Temporary matches ..-1073741825 run data modify storage rom: _ append from storage rom: TwoEmptyLists[] - execute if score $Address Temporary matches -1073741824..-1 run data modify storage rom: _ append from storage rom: ThreeEmptyLists[] + execute if score #Address Temporary matches 1073741824.. run data modify storage rom: _ append from storage rom: OneEmptyLists[] + execute if score #Address Temporary matches ..-1073741825 run data modify storage rom: _ append from storage rom: TwoEmptyLists[] + execute if score #Address Temporary matches -1073741824..-1 run data modify storage rom: _ append from storage rom: ThreeEmptyLists[] # チェック2 execute unless data storage rom: _[-4][0] run data modify storage rom: _[-4] set from storage rom: Initial[0] # シフト2 - scoreboard players operation $Address Temporary *= $4 Const + scoreboard players operation #Address Temporary *= #4 Const # 上位2bitを元にオフセット要素を末尾追加する - execute if score $Address Temporary matches 1073741824.. run data modify storage rom: _[-4] append from storage rom: OneEmptyLists[] - execute if score $Address Temporary matches ..-1073741825 run data modify storage rom: _[-4] append from storage rom: TwoEmptyLists[] - execute if score $Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4] append from storage rom: ThreeEmptyLists[] + execute if score #Address Temporary matches 1073741824.. run data modify storage rom: _[-4] append from storage rom: OneEmptyLists[] + execute if score #Address Temporary matches ..-1073741825 run data modify storage rom: _[-4] append from storage rom: TwoEmptyLists[] + execute if score #Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4] append from storage rom: ThreeEmptyLists[] # チェック3 execute unless data storage rom: _[-4][-4][0] run data modify storage rom: _[-4][-4] set from storage rom: Initial[0][0] # シフト3 - scoreboard players operation $Address Temporary *= $4 Const + scoreboard players operation #Address Temporary *= #4 Const # 上位2bitを元にオフセット要素を末尾追加する - execute if score $Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4] append from storage rom: OneEmptyLists[] - execute if score $Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4] append from storage rom: TwoEmptyLists[] - execute if score $Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4] append from storage rom: ThreeEmptyLists[] + execute if score #Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4] append from storage rom: OneEmptyLists[] + execute if score #Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4] append from storage rom: TwoEmptyLists[] + execute if score #Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4] append from storage rom: ThreeEmptyLists[] # チェック4 execute unless data storage rom: _[-4][-4][-4][0] run data modify storage rom: _[-4][-4][-4] set from storage rom: Initial[0][0][0] # シフト4 - scoreboard players operation $Address Temporary *= $4 Const + scoreboard players operation #Address Temporary *= #4 Const # 上位2bitを元にオフセット要素を末尾追加する - execute if score $Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4] append from storage rom: OneEmptyLists[] - execute if score $Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4] append from storage rom: TwoEmptyLists[] - execute if score $Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4] append from storage rom: ThreeEmptyLists[] + execute if score #Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4] append from storage rom: OneEmptyLists[] + execute if score #Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4] append from storage rom: TwoEmptyLists[] + execute if score #Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4] append from storage rom: ThreeEmptyLists[] # チェック5 execute unless data storage rom: _[-4][-4][-4][-4][0] run data modify storage rom: _[-4][-4][-4][-4] set from storage rom: Initial[0][0][0][0] # シフト5 - scoreboard players operation $Address Temporary *= $4 Const + scoreboard players operation #Address Temporary *= #4 Const # 上位2bitを元にオフセット要素を末尾追加する - execute if score $Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4][-4] append from storage rom: OneEmptyLists[] - execute if score $Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4][-4] append from storage rom: TwoEmptyLists[] - execute if score $Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4][-4] append from storage rom: ThreeEmptyLists[] + execute if score #Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4][-4] append from storage rom: OneEmptyLists[] + execute if score #Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4][-4] append from storage rom: TwoEmptyLists[] + execute if score #Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4][-4] append from storage rom: ThreeEmptyLists[] # チェック6 execute unless data storage rom: _[-4][-4][-4][-4][-4][0] run data modify storage rom: _[-4][-4][-4][-4][-4] set from storage rom: Initial[0][0][0][0][0] # シフト6 - scoreboard players operation $Address Temporary *= $4 Const + scoreboard players operation #Address Temporary *= #4 Const # 上位2bitを元にオフセット要素を末尾追加する - execute if score $Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4][-4][-4] append from storage rom: OneEmptyLists[] - execute if score $Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4][-4][-4] append from storage rom: TwoEmptyLists[] - execute if score $Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4][-4][-4] append from storage rom: ThreeEmptyLists[] + execute if score #Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4][-4][-4] append from storage rom: OneEmptyLists[] + execute if score #Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4][-4][-4] append from storage rom: TwoEmptyLists[] + execute if score #Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4][-4][-4] append from storage rom: ThreeEmptyLists[] # チェック7 execute unless data storage rom: _[-4][-4][-4][-4][-4][-4][0] run data modify storage rom: _[-4][-4][-4][-4][-4][-4] set from storage rom: Initial[0][0][0][0][0][0] # シフト7 - scoreboard players operation $Address Temporary *= $4 Const + scoreboard players operation #Address Temporary *= #4 Const # 上位2bitを元にオフセット要素を末尾追加する - execute if score $Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4][-4][-4][-4] append from storage rom: OneEmptyLists[] - execute if score $Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4][-4][-4][-4] append from storage rom: TwoEmptyLists[] - execute if score $Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4][-4][-4][-4] append from storage rom: ThreeEmptyLists[] + execute if score #Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4][-4][-4][-4] append from storage rom: OneEmptyLists[] + execute if score #Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4][-4][-4][-4] append from storage rom: TwoEmptyLists[] + execute if score #Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4][-4][-4][-4] append from storage rom: ThreeEmptyLists[] # チェック8 execute unless data storage rom: _[-4][-4][-4][-4][-4][-4][-4][0] run data modify storage rom: _[-4][-4][-4][-4][-4][-4][-4] set from storage rom: Initial[0][0][0][0][0][0][0] # シフト8 - scoreboard players operation $Address Temporary *= $4 Const + scoreboard players operation #Address Temporary *= #4 Const # 上位2bitを元にオフセット要素を末尾追加する - execute if score $Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4][-4][-4][-4][-4] append from storage rom: OneEmptyMaps[] - execute if score $Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4][-4][-4][-4][-4] append from storage rom: TwoEmptyMaps[] - execute if score $Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4][-4][-4][-4][-4] append from storage rom: ThreeEmptyMaps[] + execute if score #Address Temporary matches 1073741824.. run data modify storage rom: _[-4][-4][-4][-4][-4][-4][-4] append from storage rom: OneEmptyMaps[] + execute if score #Address Temporary matches ..-1073741825 run data modify storage rom: _[-4][-4][-4][-4][-4][-4][-4] append from storage rom: TwoEmptyMaps[] + execute if score #Address Temporary matches -1073741824..-1 run data modify storage rom: _[-4][-4][-4][-4][-4][-4][-4] append from storage rom: ThreeEmptyMaps[] # リセット - scoreboard players reset $Address Temporary \ No newline at end of file + scoreboard players reset #Address Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/.mcfunction index 92d743276..af78a6ff4 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/.mcfunction @@ -5,16 +5,16 @@ # @within function core:tick/player/ # 次のエリア情報をリセット - scoreboard players set $NextInArea Temporary -1 - scoreboard players set $NextInSubArea Temporary -1 + scoreboard players set #NextInArea Temporary -1 + scoreboard players set #NextInSubArea Temporary -1 # 各エリア処理 execute if predicate world_manager:area/01.god_boundaries run function world_manager:area/01.god_boundaries/ execute if predicate world_manager:area/02.islands run function world_manager:area/02.islands/ execute if predicate world_manager:area/03.nether run function world_manager:area/03.nether/ execute if predicate world_manager:area/04.end run function world_manager:area/04.end/ # 次のエリア情報を戻す - scoreboard players operation @s InArea = $NextInArea Temporary - scoreboard players operation @s InSubArea = $NextInSubArea Temporary + scoreboard players operation @s InArea = #NextInArea Temporary + scoreboard players operation @s InSubArea = #NextInSubArea Temporary # リセット - scoreboard players reset $NextInArea Temporary - scoreboard players reset $NextInSubArea Temporary \ No newline at end of file + scoreboard players reset #NextInArea Temporary + scoreboard players reset #NextInSubArea Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-01.tutorial-goal.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-01.tutorial-goal.mcfunction index c14d34c84..333eb3e70 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-01.tutorial-goal.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-01.tutorial-goal.mcfunction @@ -9,7 +9,7 @@ #declare tag TutorialFlag1 # エリアセット - scoreboard players set $NextInSubArea Temporary 01 + scoreboard players set #NextInSubArea Temporary 01 # メッセージ execute unless entity @s[tag=TutorialFlag1] run function lib:message/tutorial/goal # 二度と表示されなくする diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-02.tutorial-island.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-02.tutorial-island.mcfunction index 6f341c3e5..a6303c3f8 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-02.tutorial-island.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-02.tutorial-island.mcfunction @@ -9,7 +9,7 @@ #declare tag TutorialFlag2 # エリアセット - scoreboard players set $NextInSubArea Temporary 02 + scoreboard players set #NextInSubArea Temporary 02 # メッセージ execute unless entity @s[tag=TutorialFlag2] run function lib:message/tutorial/island # 二度と表示されなくする diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-03.tutorial-artifact.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-03.tutorial-artifact.mcfunction index 6122ca41a..d3d8da0ef 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-03.tutorial-artifact.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-03.tutorial-artifact.mcfunction @@ -9,7 +9,7 @@ #declare tag TutorialFlag3 # エリアセット - scoreboard players set $NextInSubArea Temporary 03 + scoreboard players set #NextInSubArea Temporary 03 # メッセージ execute unless entity @s[tag=TutorialFlag3] run function lib:message/tutorial/artifact # 二度と表示されなくする diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-04.tutorial-religion.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-04.tutorial-religion.mcfunction index 67daefd81..d4f57d145 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-04.tutorial-religion.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-04.tutorial-religion.mcfunction @@ -9,7 +9,7 @@ #declare tag TutorialFlag4 # エリアセット - scoreboard players set $NextInSubArea Temporary 04 + scoreboard players set #NextInSubArea Temporary 04 # メッセージ execute unless entity @s[tag=TutorialFlag4] run function lib:message/tutorial/religion # 二度と表示されなくする diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-05.tutorial-spawner.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-05.tutorial-spawner.mcfunction index 1dc11a56b..5228de1dc 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-05.tutorial-spawner.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-05.tutorial-spawner.mcfunction @@ -9,7 +9,7 @@ #declare tag TutorialFlag5 # エリアセット - scoreboard players set $NextInSubArea Temporary 05 + scoreboard players set #NextInSubArea Temporary 05 # メッセージ execute unless entity @s[tag=TutorialFlag5] run function lib:message/tutorial/spawner # 二度と表示されなくする diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-06.tutorial-lost_items.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-06.tutorial-lost_items.mcfunction index 4e909bd60..566689416 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-06.tutorial-lost_items.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-06.tutorial-lost_items.mcfunction @@ -9,7 +9,7 @@ #declare tag TutorialFlag6 # エリアセット - scoreboard players set $NextInSubArea Temporary 06 + scoreboard players set #NextInSubArea Temporary 06 # メッセージ execute unless entity @s[tag=TutorialFlag6] run function lib:message/tutorial/lost_items # 二度と表示されなくする diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-07.tutorial-recommend.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-07.tutorial-recommend.mcfunction index 1ccbd3d65..1f177645a 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-07.tutorial-recommend.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-07.tutorial-recommend.mcfunction @@ -9,7 +9,7 @@ #declare tag TutorialFlag7 # エリアセット - scoreboard players set $NextInSubArea Temporary 07 + scoreboard players set #NextInSubArea Temporary 07 # メッセージ execute unless entity @s[tag=TutorialFlag7] run function lib:message/tutorial/recommend # 盲目 diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-08.tutorial-tp_point.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-08.tutorial-tp_point.mcfunction index 57a41aa4b..fc5d432d2 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-08.tutorial-tp_point.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-08.tutorial-tp_point.mcfunction @@ -9,7 +9,7 @@ #declare tag TutorialFlag8 # エリアセット - scoreboard players set $NextInSubArea Temporary 08 + scoreboard players set #NextInSubArea Temporary 08 # 盲目を1秒にする effect clear @s blindness effect give @s blindness 1 0 true diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-10.flora_temple.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-10.flora_temple.mcfunction index ba4141677..a9c17d2f3 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-10.flora_temple.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-10.flora_temple.mcfunction @@ -5,6 +5,6 @@ # @within function world_manager:area/01.god_boundaries/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 10 + scoreboard players set #NextInSubArea Temporary 10 # 神殿の処理 execute unless score @s InSubArea matches 10 run function player_manager:god/flora/in_temple \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-11.nyaptov_temple.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-11.nyaptov_temple.mcfunction index 9506fed1e..ba7dc5138 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-11.nyaptov_temple.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-11.nyaptov_temple.mcfunction @@ -5,6 +5,6 @@ # @within function world_manager:area/01.god_boundaries/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 11 + scoreboard players set #NextInSubArea Temporary 11 # 神殿の処理 execute unless score @s InSubArea matches 11 run function player_manager:god/nyaptov/in_temple \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-12.rumor_temple.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-12.rumor_temple.mcfunction index 9643f54e0..0b733e778 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-12.rumor_temple.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-12.rumor_temple.mcfunction @@ -5,6 +5,6 @@ # @within function world_manager:area/01.god_boundaries/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 12 + scoreboard players set #NextInSubArea Temporary 12 # 神殿の処理 execute unless score @s InSubArea matches 12 run function player_manager:god/rumor/in_temple \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-13.urban_temple.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-13.urban_temple.mcfunction index 0924971f2..074485027 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-13.urban_temple.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-13.urban_temple.mcfunction @@ -5,6 +5,6 @@ # @within function world_manager:area/01.god_boundaries/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 13 + scoreboard players set #NextInSubArea Temporary 13 # 神殿の処理 execute unless score @s InSubArea matches 13 run function player_manager:god/urban/in_temple \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-14.wi-ki_temple.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-14.wi-ki_temple.mcfunction index 3cfed4800..febfa6a21 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-14.wi-ki_temple.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-14.wi-ki_temple.mcfunction @@ -5,6 +5,6 @@ # @within function world_manager:area/01.god_boundaries/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 14 + scoreboard players set #NextInSubArea Temporary 14 # 神殿の処理 execute unless score @s InSubArea matches 14 run function player_manager:god/wi-ki/in_temple \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-30.gate_island-lower.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-30.gate_island-lower.mcfunction index 325d1ebf2..d4c54a0df 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-30.gate_island-lower.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-30.gate_island-lower.mcfunction @@ -5,6 +5,6 @@ # @within function world_manager:area/01.god_boundaries/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 30 + scoreboard players set #NextInSubArea Temporary 30 # 復帰エフェクト effect give @s levitation 1 7 true \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-98-world-spawn-higher.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-98-world-spawn-higher.mcfunction index ec948c69f..05eb4eaf7 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-98-world-spawn-higher.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-98-world-spawn-higher.mcfunction @@ -5,7 +5,7 @@ # @within function world_manager:area/01.god_boundaries/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 98 + scoreboard players set #NextInSubArea Temporary 98 # 問答無用で初期リスへ飛ばす spawnpoint @s 4093 165 -468 270 tp @s 4093 165 -468 \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/01-99.world-spawn.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01-99.world-spawn.mcfunction index 5d581a2c9..45236a706 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01-99.world-spawn.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01-99.world-spawn.mcfunction @@ -5,7 +5,7 @@ # @within function world_manager:area/01.god_boundaries/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 99 + scoreboard players set #NextInSubArea Temporary 99 # チュートリアル完了済フラグが付いていたらTPする execute if entity @s[tag=TutorialEnded] run tp 23.5 3.5 24.5 # 初期スポーンだと方向指定が効かないので無理やり回転させる diff --git a/TheSkyBlessing/data/world_manager/functions/area/01.god_boundaries/.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/01.god_boundaries/.mcfunction index d67baf435..bfe2aff53 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/01.god_boundaries/.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/01.god_boundaries/.mcfunction @@ -5,7 +5,7 @@ # @within function world_manager:area/ # エリアセット - scoreboard players set $NextInArea Temporary 01 + scoreboard players set #NextInArea Temporary 01 # エリア入場の処理 execute unless score @s InArea matches 01 run function world_manager:area/01.god_boundaries/on_entered # エリア内存在時の処理 diff --git a/TheSkyBlessing/data/world_manager/functions/area/02-01.shard_processor.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/02-01.shard_processor.mcfunction index c04b84d23..6b2035269 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/02-01.shard_processor.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/02-01.shard_processor.mcfunction @@ -6,4 +6,4 @@ # エリアセット - scoreboard players set $NextInSubArea Temporary 01 \ No newline at end of file + scoreboard players set #NextInSubArea Temporary 01 \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/02.islands/.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/02.islands/.mcfunction index fe696b37b..a24c4b1db 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/02.islands/.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/02.islands/.mcfunction @@ -5,7 +5,7 @@ # @within function world_manager:area/ # エリアセット - scoreboard players set $NextInArea Temporary 02 + scoreboard players set #NextInArea Temporary 02 # エリア入場の処理 execute unless score @s InArea matches 02 run function world_manager:area/02.islands/on_entered # エリア内存在時の処理 diff --git a/TheSkyBlessing/data/world_manager/functions/area/03.nether/.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/03.nether/.mcfunction index d72babbc9..9fe022e20 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/03.nether/.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/03.nether/.mcfunction @@ -5,7 +5,7 @@ # @within function world_manager:area/ # エリアセット - scoreboard players set $NextInArea Temporary 03 + scoreboard players set #NextInArea Temporary 03 # エリア入場の処理 execute unless score @s InArea matches 03 run function world_manager:area/03.nether/on_entered # エリア内存在時の処理 diff --git a/TheSkyBlessing/data/world_manager/functions/area/04-01.end_mansion_void.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/04-01.end_mansion_void.mcfunction index 4a22feade..19ff0d38d 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/04-01.end_mansion_void.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/04-01.end_mansion_void.mcfunction @@ -5,7 +5,7 @@ # @within function world_manager:area/04.end/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 01 + scoreboard players set #NextInSubArea Temporary 01 # 神殿の処理 - execute unless score @s InSubArea matches 01 run scoreboard players set $Set Lib 0 + execute unless score @s InSubArea matches 01 run scoreboard players set #Set Lib 0 execute unless score @s InSubArea matches 01 run function lib:score_to_health_wrapper/set \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/04-02.end_forgotten_star_lower.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/04-02.end_forgotten_star_lower.mcfunction index 00f5d8331..af10cd8e9 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/04-02.end_forgotten_star_lower.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/04-02.end_forgotten_star_lower.mcfunction @@ -5,7 +5,7 @@ # @within function world_manager:area/04.end/on_tick # エリアセット - scoreboard players set $NextInSubArea Temporary 02 + scoreboard players set #NextInSubArea Temporary 02 # 神殿の処理 - execute if block ~ ~-0.2 ~ barrier run scoreboard players set $Set Lib 0 + execute if block ~ ~-0.2 ~ barrier run scoreboard players set #Set Lib 0 execute if block ~ ~-0.2 ~ barrier run function lib:score_to_health_wrapper/set \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/area/04-03.end_forgotten_star_higher.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/04-03.end_forgotten_star_higher.mcfunction index ddcb830b1..331226a4f 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/04-03.end_forgotten_star_higher.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/04-03.end_forgotten_star_higher.mcfunction @@ -9,7 +9,7 @@ #declare tag InLava # エリアセット - scoreboard players set $NextInSubArea Temporary 02 + scoreboard players set #NextInSubArea Temporary 02 # 溶岩に入ったら死ぬほど痛いダメージを与える execute if block ~0.3 ~0.0 ~0.3 lava run tag @s add InLava @@ -25,8 +25,8 @@ data modify storage lib: Argument.AttackType set value "Magic" data modify storage lib: Argument.FixedDamage set value true # デスログ - data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは溶岩の温度を甘く見ていた","with":[{"selector":"@s"}]}]' - data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1$sは溶けた","with":[{"selector":"@s"}]}]' + data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1#sは溶岩の温度を甘く見ていた","with":[{"selector":"@s"}]}]' + data modify storage lib: Argument.DeathMessage append value '[{"translate": "%1#sは溶けた","with":[{"selector":"@s"}]}]' # ダメージ (スペクテイターだろうがダメージを食らうようにする) execute if entity @s[gamemode=!creative,tag=InLava] run function lib:damage/ function lib:damage/reset diff --git a/TheSkyBlessing/data/world_manager/functions/area/04.end/.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/04.end/.mcfunction index d467ee1cf..89351c641 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/04.end/.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/04.end/.mcfunction @@ -5,7 +5,7 @@ # @within function world_manager:area/ # エリアセット - scoreboard players set $NextInArea Temporary 04 + scoreboard players set #NextInArea Temporary 04 # エリア入場の処理 execute unless score @s InArea matches 04 run function world_manager:area/04.end/on_entered # エリア内存在時の処理 diff --git a/TheSkyBlessing/data/world_manager/functions/area/_index.d.mcfunction b/TheSkyBlessing/data/world_manager/functions/area/_index.d.mcfunction index 38a1e26be..dcbf14074 100644 --- a/TheSkyBlessing/data/world_manager/functions/area/_index.d.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/area/_index.d.mcfunction @@ -3,8 +3,8 @@ #> Next # @within world_manager:area/** - #declare score_holder $NextInArea - #declare score_holder $NextInSubArea + #declare score_holder #NextInArea + #declare score_holder #NextInSubArea #> GodBoundaries Declares # @within world_manager:area/01-* diff --git a/TheSkyBlessing/data/world_manager/functions/chunk_io_protect/check_dimension.mcfunction b/TheSkyBlessing/data/world_manager/functions/chunk_io_protect/check_dimension.mcfunction index 6a0488a60..df563ae52 100644 --- a/TheSkyBlessing/data/world_manager/functions/chunk_io_protect/check_dimension.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/chunk_io_protect/check_dimension.mcfunction @@ -6,15 +6,15 @@ #> Val # @private - #declare score_holder $isDimensionChanged + #declare score_holder #isDimensionChanged # ディメンションを取得する function api:data_get/dimension # EntityStorageを呼び出す function oh_my_dat:please # 1tick前のデータと比較しつつ、データを退避する - execute store success score $isDimensionChanged Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Stash.Dimension set from storage api: Dimension + execute store success score #isDimensionChanged Temporary run data modify storage oh_my_dat: _[-4][-4][-4][-4][-4][-4][-4][-4].Stash.Dimension set from storage api: Dimension # ディメンションが変わっている場合はタグを付与する - execute if score $isDimensionChanged Temporary matches 1 run tag @s add IsNeedsUpdate + execute if score #isDimensionChanged Temporary matches 1 run tag @s add IsNeedsUpdate # リセット - scoreboard players reset $isDimensionChanged Temporary \ No newline at end of file + scoreboard players reset #isDimensionChanged Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/chunk_io_protect/check_move.mcfunction b/TheSkyBlessing/data/world_manager/functions/chunk_io_protect/check_move.mcfunction index bfa574948..44646050b 100644 --- a/TheSkyBlessing/data/world_manager/functions/chunk_io_protect/check_move.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/chunk_io_protect/check_move.mcfunction @@ -6,28 +6,28 @@ #> Val # @private - #declare score_holder $X e1 - #declare score_holder $Y e1 - #declare score_holder $Z e1 - #declare score_holder $SquaredDistance e2 + #declare score_holder #X e1 + #declare score_holder #Y e1 + #declare score_holder #Z e1 + #declare score_holder #SquaredDistance e2 # プレイヤーのベクトルを取得する function api:player_vector/get - execute store result score $X Temporary run data get storage api: Return.Vector[0] 10 - execute store result score $Y Temporary run data get storage api: Return.Vector[1] 10 - execute store result score $Z Temporary run data get storage api: Return.Vector[2] 10 + execute store result score #X Temporary run data get storage api: Return.Vector[0] 10 + execute store result score #Y Temporary run data get storage api: Return.Vector[1] 10 + execute store result score #Z Temporary run data get storage api: Return.Vector[2] 10 # 各成分を二乗する e1 -> e2 - scoreboard players operation $X Temporary *= $X Temporary - scoreboard players operation $Y Temporary *= $Y Temporary - scoreboard players operation $Z Temporary *= $Z Temporary + scoreboard players operation #X Temporary *= #X Temporary + scoreboard players operation #Y Temporary *= #Y Temporary + scoreboard players operation #Z Temporary *= #Z Temporary # 距離の二乗を計算する - scoreboard players operation $SquaredDistance Temporary = $X Temporary - scoreboard players operation $SquaredDistance Temporary += $Y Temporary - scoreboard players operation $SquaredDistance Temporary += $Z Temporary + scoreboard players operation #SquaredDistance Temporary = #X Temporary + scoreboard players operation #SquaredDistance Temporary += #Y Temporary + scoreboard players operation #SquaredDistance Temporary += #Z Temporary # 約4.5m/t(90m/s)以上で動いている場合はタグを付与する (4.5^2 ≒ 2000 (e2)) - execute if score $SquaredDistance Temporary > $2000 Const run tag @s add IsNeedsUpdate + execute if score #SquaredDistance Temporary > #2000 Const run tag @s add IsNeedsUpdate # リセット - scoreboard players reset $X Temporary - scoreboard players reset $Y Temporary - scoreboard players reset $Z Temporary - scoreboard players reset $SquaredDistance Temporary \ No newline at end of file + scoreboard players reset #X Temporary + scoreboard players reset #Y Temporary + scoreboard players reset #Z Temporary + scoreboard players reset #SquaredDistance Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/force_difficulty.mcfunction b/TheSkyBlessing/data/world_manager/functions/force_difficulty.mcfunction index 2df71e56c..41d0f1fbd 100644 --- a/TheSkyBlessing/data/world_manager/functions/force_difficulty.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/force_difficulty.mcfunction @@ -5,8 +5,8 @@ # @within function core:tick/ # 難易度を取得する - execute store result score $Difficulty Global run difficulty + execute store result score #Difficulty Global run difficulty # ピースフルの場合の変更処理 - execute if score $Difficulty Global matches 0 run tellraw @a [{"storage":"global","nbt":"Prefix.FAILED"},{"text":"難易度をピースフルにすることは出来ません。"}] - execute if score $Difficulty Global matches 0 run tellraw @a [{"storage":"global","nbt":"Prefix.FAILED"},{"text":"難易度はイージーに変更されました。"}] - execute if score $Difficulty Global matches 0 run difficulty easy + execute if score #Difficulty Global matches 0 run tellraw @a [{"storage":"global","nbt":"Prefix.FAILED"},{"text":"難易度をピースフルにすることは出来ません。"}] + execute if score #Difficulty Global matches 0 run tellraw @a [{"storage":"global","nbt":"Prefix.FAILED"},{"text":"難易度はイージーに変更されました。"}] + execute if score #Difficulty Global matches 0 run difficulty easy diff --git a/TheSkyBlessing/data/world_manager/functions/gimmick/shard_processor/process/.mcfunction b/TheSkyBlessing/data/world_manager/functions/gimmick/shard_processor/process/.mcfunction index 1360511db..2d0101994 100644 --- a/TheSkyBlessing/data/world_manager/functions/gimmick/shard_processor/process/.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/gimmick/shard_processor/process/.mcfunction @@ -6,25 +6,25 @@ #> # @private - #declare score_holder $Rotation + #declare score_holder #Rotation # 回す - execute store result score $Rotation Temporary run data get storage world_manager:gimmick FrameData.ItemRotation - scoreboard players add $Rotation Temporary 1 - execute store result entity @s ItemRotation byte 1 run scoreboard players get $Rotation Temporary + execute store result score #Rotation Temporary run data get storage world_manager:gimmick FrameData.ItemRotation + scoreboard players add #Rotation Temporary 1 + execute store result entity @s ItemRotation byte 1 run scoreboard players get #Rotation Temporary # VFX - execute if score $Rotation Temporary matches 1 run playsound minecraft:block.piston.extend block @a ~ ~ ~ 1.5 1.5 - execute if score $Rotation Temporary matches 1 run playsound minecraft:block.stone_button.click_on block @a ~ ~ ~ 1.5 2 - execute if score $Rotation Temporary matches 3 run playsound minecraft:block.stone_button.click_on block @a ~ ~ ~ 1.5 2 - execute if score $Rotation Temporary matches 5 run playsound minecraft:block.stone_button.click_on block @a ~ ~ ~ 1.5 2 + execute if score #Rotation Temporary matches 1 run playsound minecraft:block.piston.extend block @a ~ ~ ~ 1.5 1.5 + execute if score #Rotation Temporary matches 1 run playsound minecraft:block.stone_button.click_on block @a ~ ~ ~ 1.5 2 + execute if score #Rotation Temporary matches 3 run playsound minecraft:block.stone_button.click_on block @a ~ ~ ~ 1.5 2 + execute if score #Rotation Temporary matches 5 run playsound minecraft:block.stone_button.click_on block @a ~ ~ ~ 1.5 2 - execute if score $Rotation Temporary matches 1 run data modify entity @s Item.tag.CustomModelData set value 20122 - execute if score $Rotation Temporary matches 1 run data modify entity @s Item.tag.display.Name set value '{"text":"#","font":"invisible_bg"}' + execute if score #Rotation Temporary matches 1 run data modify entity @s Item.tag.CustomModelData set value 20122 + execute if score #Rotation Temporary matches 1 run data modify entity @s Item.tag.display.Name set value '{"text":"#","font":"invisible_bg"}' execute positioned ~-0.5 ~-0.5 ~ as @e[type=armor_stand,tag=ShardProcessorModel,distance=..0.04,limit=1] run function world_manager:gimmick/shard_processor/process/model_modifier # 8で回転されないようにFixedをつける - execute if score $Rotation Temporary matches 7 run data modify entity @s Fixed set value 1b + execute if score #Rotation Temporary matches 7 run data modify entity @s Fixed set value 1b # 8以上で壊す - execute if score $Rotation Temporary matches 8.. run function world_manager:gimmick/shard_processor/process/complete + execute if score #Rotation Temporary matches 8.. run function world_manager:gimmick/shard_processor/process/complete # リセット - scoreboard players reset $Rotation Temporary \ No newline at end of file + scoreboard players reset #Rotation Temporary \ No newline at end of file diff --git a/TheSkyBlessing/data/world_manager/functions/gimmick/shard_processor/process/model_modifier.mcfunction b/TheSkyBlessing/data/world_manager/functions/gimmick/shard_processor/process/model_modifier.mcfunction index c5d552682..8062f56b0 100644 --- a/TheSkyBlessing/data/world_manager/functions/gimmick/shard_processor/process/model_modifier.mcfunction +++ b/TheSkyBlessing/data/world_manager/functions/gimmick/shard_processor/process/model_modifier.mcfunction @@ -4,10 +4,10 @@ # # @within function world_manager:gimmick/shard_processor/process/ -execute if score $Rotation Temporary matches 1 run item replace entity @s armor.head with stick{CustomModelData:20115} -execute if score $Rotation Temporary matches 2 run item replace entity @s armor.head with stick{CustomModelData:20116} -execute if score $Rotation Temporary matches 3 run item replace entity @s armor.head with stick{CustomModelData:20117} -execute if score $Rotation Temporary matches 4 run item replace entity @s armor.head with stick{CustomModelData:20118} -execute if score $Rotation Temporary matches 5 run item replace entity @s armor.head with stick{CustomModelData:20119} -execute if score $Rotation Temporary matches 6 run item replace entity @s armor.head with stick{CustomModelData:20120} -execute if score $Rotation Temporary matches 7 run item replace entity @s armor.head with stick{CustomModelData:20121} \ No newline at end of file +execute if score #Rotation Temporary matches 1 run item replace entity @s armor.head with stick{CustomModelData:20115} +execute if score #Rotation Temporary matches 2 run item replace entity @s armor.head with stick{CustomModelData:20116} +execute if score #Rotation Temporary matches 3 run item replace entity @s armor.head with stick{CustomModelData:20117} +execute if score #Rotation Temporary matches 4 run item replace entity @s armor.head with stick{CustomModelData:20118} +execute if score #Rotation Temporary matches 5 run item replace entity @s armor.head with stick{CustomModelData:20119} +execute if score #Rotation Temporary matches 6 run item replace entity @s armor.head with stick{CustomModelData:20120} +execute if score #Rotation Temporary matches 7 run item replace entity @s armor.head with stick{CustomModelData:20121} \ No newline at end of file