Merge branch 'master' into dev/haiiro_artifact1297

Author: haiiro2gou

.github/workflows/datapack-linter.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.vscode/settings.json

@@ -1857,7 +1857,7 @@
                 },
                 {
                     "name": "id",
-                    "question": "ObjectのID",
+                    "question": "MobのID",
                     "pattern": "[1-9][0-9]*",
                     "patternErrorMessage": "数値のみが許されるよ"
                 }

Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/3.main.mcfunction

@@ -14,7 +14,7 @@
     playsound minecraft:entity.ender_eye.death player @a ~ ~ ~ 2 1
 
 # 敵のステータス表示処理
-    execute unless entity @s[x_rotation=75..90] as @e[type=#lib:living,type=!player,tag=01.Target,distance=..30,limit=1] run function asset:artifact/0001.book_of_all-seeing/trigger/see_enemy/
+    execute unless entity @s[x_rotation=75..90] as @e[type=#lib:living_without_player,tag=01.Target,distance=..30,limit=1] run function asset:artifact/0001.book_of_all-seeing/trigger/see_enemy/
     execute unless entity @s[x_rotation=75..90] as @p[tag=01.Target,distance=..30,limit=1] run function asset:artifact/0001.book_of_all-seeing/trigger/see_player/
 
 # 自身のステータス表示処理

Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/find_target_entity.mcfunction

@@ -15,4 +15,4 @@
 
 execute positioned ~-0.8 ~-0.8 ~-0.8 as @e[type=#lib:living,tag=!this,dx=0,dy=0,dz=0] unless entity @s[type=!player,tag=!Enemy] positioned ~0.6 ~0.6 ~0.6 if entity @s[dx=0,dy=0,dz=0] run tag @s add 01.Target
 
-execute unless entity @e[type=#lib:living,tag=01.Target,distance=..2] positioned ^ ^ ^0.15 if entity @s[distance=..30] if block ~ ~ ~ #lib:no_collision run function asset:artifact/0001.book_of_all-seeing/trigger/find_target_entity
+execute unless entity @e[type=#lib:living,tag=01.Target,distance=..2] positioned ^ ^ ^0.15 if entity @s[distance=..30] if block ~ ~ ~ #lib:no_collision/ run function asset:artifact/0001.book_of_all-seeing/trigger/find_target_entity

Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_enemy/get_defense_info.mcfunction

@@ -6,7 +6,7 @@
 
 #> Val
 # @private
-#declare score_holder $Defense
+    #declare score_holder $Defense
 
 # 取得
     execute store result score $Defense Temporary run data get storage asset:temp 01.Def 100

Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/.mcfunction

@@ -21,7 +21,7 @@
 
     function api:modifier/heal/get
     function api:modifier/receive_heal/get
-    function api:modifier/mp_regen/get
+    function api:modifier/mp_heal/get
     function api:modifier/fall_resistance/get
 
 # 表示用に諸々データ処理
@@ -45,7 +45,7 @@
 
     function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"Heal",IsReverse:false}
     function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"ReceiveHeal",IsReverse:false}
-    function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"MPRegen",IsReverse:false}
+    function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"MPHeal",IsReverse:false}
     function asset:artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m {Type:"FallResistance",IsReverse:true}
 
     function asset:artifact/0001.book_of_all-seeing/trigger/common/construct_effect_messages/
@@ -60,6 +60,6 @@
     tellraw @p[tag=this] [{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.None","interpret":true},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.Defense.Magic.None","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Fire","interpret":true},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.Defense.Magic.Fire","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Water","interpret":true},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.Defense.Magic.Water","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Magic","interpret":true},{"storage":"global","nbt":"Icon.FrameWhite","interpret":true},{"storage":"global","nbt":"Icon.Attack.Thunder","interpret":true},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.Defense.Magic.Thunder","interpret":true,"font":"default"}]
     tellraw @p[tag=this] {"text":"","extra":[{"text":"\u0002","font":"space"},{"text":"◆"},{"text":"\u0002","font":"space"},{"text":"その他補正"}]}
     tellraw @p[tag=this] [{"text":"与回復量"},{"text":"\u0005","font":"space"},{"storage":"asset:temp","nbt":"01.Heal","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"text":"被回復量"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.ReceiveHeal","interpret":true,"font":"default"}]
-    tellraw @p[tag=this] [{"text":"MP回復量\uE004"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.MPRegen","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"text":"落下耐性"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.FallResistance","interpret":true,"font":"default"}]
+    tellraw @p[tag=this] [{"text":"MP回復量\uE004"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.MPHeal","interpret":true,"font":"default"},{"text":"\u0002","font":"space"},{"text":"|","font":"default"},{"text":"\u0002","font":"space"},{"text":"落下耐性"},{"text":"\u0002","font":"space"},{"storage":"asset:temp","nbt":"01.FallResistance","interpret":true,"font":"default"}]
     tellraw @p[tag=this] {"text":"","extra":[{"text":"\u0002","font":"space"},{"text":"◆"},{"text":"\u0002","font":"space"},{"text":"エフェクト"}]}
     tellraw @p[tag=this] {"storage":"asset:temp","nbt":"01.EffectMessages[]","interpret":true,"separator":"\n"}

Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/calc/element_none.m.mcfunction

@@ -41,3 +41,4 @@
 # リセット
     scoreboard players reset $Modifier Temporary
     scoreboard players reset $Type1 Temporary
+    scoreboard players reset $Decimal Temporary

Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/calc/element_some.m.mcfunction

@@ -47,3 +47,4 @@
     scoreboard players reset $Modifier Temporary
     scoreboard players reset $Type1 Temporary
     scoreboard players reset $Type2 Temporary
+    scoreboard players reset $Decimal Temporary

Asset/data/asset/functions/artifact/0001.book_of_all-seeing/trigger/see_player/calc/other_modifier.m.mcfunction

@@ -27,3 +27,7 @@
     execute if score $Modifier Temporary matches 1.. run function asset:artifact/0001.book_of_all-seeing/trigger/see_player/value_to_per/plus.m with storage asset:temp 01
     execute if score $Modifier Temporary matches 0 run function asset:artifact/0001.book_of_all-seeing/trigger/see_player/value_to_per/neutral.m with storage asset:temp 01
     execute if score $Modifier Temporary matches ..-1 run function asset:artifact/0001.book_of_all-seeing/trigger/see_player/value_to_per/minus.m with storage asset:temp 01
+
+# リセット
+    scoreboard players reset $Modifier Temporary
+    scoreboard players reset $Decimal Temporary

Asset/data/asset/functions/artifact/0003.humanity/trigger/3.main.mcfunction

@@ -14,8 +14,8 @@
     execute if predicate lib:random_pass_per/10 run scoreboard players set @s Temporary 1
 
 # 演出 共通
-    title @a times 20 20 20
-    particle portal ~ ~ ~ 0 0 0 2 250 force @a
+    title @s times 20 20 20
+    particle portal ~ ~ ~ 0 0 0 2 250 force @s
 
 # 処理
     execute if score @s Temporary matches 0 run function asset:artifact/0003.humanity/trigger/heal