マクロでリスト数によって分岐する処理消した

ProjectTSB · Jan 7, 2025 · d4aecb5 · d4aecb5
1 parent fc5d92d
commit d4aecb5
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 43 deletions.
diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/base_move/element_select/.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/base_move/element_select/.mcfunction
@@ -21,9 +21,7 @@
     # ストレージの要素数を取得
         execute store result storage asset:context this.Element.Count int 1 run data get storage asset:context this.Element.List
     # 取得した要素数を使ってランダムに属性を選ぶ
-        execute unless data storage asset:context this.Element{Count:1} run function asset:mob/1004.tultaria/tick/base_move/element_select/roll.m with storage asset:context this.Element
-    # 要素数１個しかないとき
-        execute if data storage asset:context this.Element{Count:1} run function asset:mob/1004.tultaria/tick/base_move/element_select/only_one_element with storage asset:context this.Element
+        function asset:mob/1004.tultaria/tick/base_move/element_select/roll.m with storage asset:context this.Element
 
 # 技の数は全属性で一定なので！
     data modify storage asset:context this.Skill.List set value [0,1,2]

diff --git a/...set/functions/mob/1004.tultaria/tick/base_move/element_select/only_one_element.mcfunction b/...set/functions/mob/1004.tultaria/tick/base_move/element_select/only_one_element.mcfunction
diff --git a/Asset/data/asset/functions/mob/1004.tultaria/tick/base_move/skill_select/.mcfunction b/Asset/data/asset/functions/mob/1004.tultaria/tick/base_move/skill_select/.mcfunction
@@ -23,6 +23,4 @@
     # ストレージの要素数を取得
         execute store result storage asset:context this.Skill.Count int 1 run data get storage asset:context this.Skill.List
     # 取得した要素数を使ってランダムに技を選ぶ
-        execute unless data storage asset:context this.Skill{Count:1} run function asset:mob/1004.tultaria/tick/base_move/skill_select/roll.m with storage asset:context this.Skill
-    # 要素数１個しかないとき
-        execute if data storage asset:context this.Skill{Count:1} run function asset:mob/1004.tultaria/tick/base_move/skill_select/only_one_skill
+        function asset:mob/1004.tultaria/tick/base_move/skill_select/roll.m with storage asset:context this.Skill
diff --git a/...a/asset/functions/mob/1004.tultaria/tick/base_move/skill_select/only_one_skill.mcfunction b/...a/asset/functions/mob/1004.tultaria/tick/base_move/skill_select/only_one_skill.mcfunction