💥 緩衝体力をバニラのものに変更

ProjectTSB · Sep 16, 2024 · e4c7c4d · e4c7c4d
1 parent b70349d
commit e4c7c4d
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 193 deletions.
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/.mcfunction
@@ -4,6 +4,6 @@
 #
 # @within function core:tick/player/
 
-execute if score @s PlayerAbsorption matches 1.. run function player_manager:absorption/construct_message
-execute unless score @s PlayerAbsorption matches 1.. run effect clear @s absorption
 execute unless score @s PlayerAbsorption matches 1.. run scoreboard players set @s PlayerAbsorption 0
+execute store result storage player_manager:absorption Set.Value int 0.01 run scoreboard players get @s PlayerAbsorption
+function player_manager:absorption/set.m with storage player_manager:absorption Set
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/_index.d.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/_index.d.mcfunction
@@ -6,20 +6,4 @@
 
 #> private
 # @within player_manager:absorption/**
-    #declare score_holder $MaxHealth
-    #declare score_holder $MaxHealthHeartCount
-    #declare score_holder $MaxHealthOdd
-    #declare score_holder $AbsorptionHeartCount
-    #declare score_holder $AbsorptionOdd
-    #declare score_holder $AllHeartCount
-    #declare score_holder $MaxHealthTopRowHeartCount
-    #declare score_holder $VanillaAbsorptionLevel
-    #declare score_holder $SinkLevel
-    #declare score_holder $TrimHeartStart
-    #declare score_holder $TrimHeartEnd
-    #declare score_holder $LeftOffset
-    #declare score_holder $RightOffset
-# @within
-#   player_manager:absorption/**
-#   player_manager:actionbar/**
     #declare storage player_manager:absorption
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/append_heart.m.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/append_heart.m.mcfunction
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/append_left_offset.m.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/append_left_offset.m.mcfunction
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/append_right_offset.m.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/append_right_offset.m.mcfunction
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/construct_message.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/construct_message.mcfunction
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/effect.m.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/effect.m.mcfunction
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/set.m.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/set.m.mcfunction
@@ -0,0 +1,9 @@
+#> player_manager:absorption/set.m
+#
+#
+#
+# @within function player_manager:absorption/
+
+$attribute @s generic.max_absorption base set $(Value)
+effect give @s absorption 1 255 true
+effect clear @s absorption
diff --git a/TheSkyBlessing/data/player_manager/functions/absorption/trim_heart.m.mcfunction b/TheSkyBlessing/data/player_manager/functions/absorption/trim_heart.m.mcfunction
diff --git a/TheSkyBlessing/data/player_manager/functions/actionbar/.mcfunction b/TheSkyBlessing/data/player_manager/functions/actionbar/.mcfunction
@@ -5,14 +5,11 @@
 # @within function core:tick/player/
 
 # 出力
-    # survivalかadventure ( Absorption, MiniBar, MainBar )
-        title @s[gamemode=!creative,gamemode=!spectator] actionbar [{"text":""},{"storage":"player_manager:absorption","nbt":"AbsorptionMessage[]","interpret": true,"separator":""},{"storage":"asset:artifact","nbt":"MiniBarsMessage[]","interpret":true,"separator":""},{"storage":"asset:artifact","nbt":"MainBarMessage[]","interpret":true,"separator":""}]
-    # spectator ( MainBar )
+    # ( MainBar )
         title @s[gamemode=spectator] actionbar [{"text":""},{"storage":"asset:artifact","nbt":"MainBarMessage[]","interpret":true,"separator":""}]
-    # creative ( MiniBar, MainBar )
-        title @s[gamemode=creative] actionbar [{"text":""},{"storage":"asset:artifact","nbt":"MiniBarsMessage[]","interpret":true,"separator":""},{"storage":"asset:artifact","nbt":"MainBarMessage[]","interpret":true,"separator":""}]
+    # ( MiniBar, MainBar )
+        title @s[gamemode=!spectator] actionbar [{"text":""},{"storage":"asset:artifact","nbt":"MiniBarsMessage[]","interpret":true,"separator":""},{"storage":"asset:artifact","nbt":"MainBarMessage[]","interpret":true,"separator":""}]
 
 # リセット
-    data remove storage player_manager:absorption AbsorptionMessage
     data remove storage asset:artifact MiniBarsMessage
     data remove storage asset:artifact MainBarMessage