[暫定] スニーク系スキルスニーク時効果を1/3へ減少

TUSB · Apr 21, 2024 · cbaaf36 · cbaaf36
1 parent 49bd502
commit cbaaf36
Show file tree

Hide file tree

Showing 11 changed files with 49 additions and 22 deletions.
diff --git a/data/skill/functions/act/black_mage/blitz_manover/act0.mcfunction b/data/skill/functions/act/black_mage/blitz_manover/act0.mcfunction
@@ -5,5 +5,7 @@
 execute if score _ Level matches 1 run scoreboard players set _ BlitzManover 100
 execute if score _ Level matches 2 run scoreboard players set _ BlitzManover 1200
 
-execute unless score @s SneakTime matches 2 run function skill:act/black_mage/blitz_manover/apply
-execute if score @s SneakTime matches 2 as @a[distance=..15] run function skill:act/black_mage/blitz_manover/apply
+function skill:act/black_mage/blitz_manover/apply
+execute if score @s SneakTime matches 2 if score _ Level matches 1 run scoreboard players set _ BlitzManover 33
+execute if score @s SneakTime matches 2 if score _ Level matches 2 run scoreboard players set _ BlitzManover 1066
+execute if score @s SneakTime matches 2 as @a[distance=0.1..15] run function skill:act/black_mage/blitz_manover/apply
diff --git a/data/skill/functions/act/black_mage/mana_refresh/act0.mcfunction b/data/skill/functions/act/black_mage/mana_refresh/act0.mcfunction
@@ -5,5 +5,8 @@ execute if score _ Level matches 1 run scoreboard players set _ ManaRefresh 601
 execute if score _ Level matches 2 run scoreboard players set _ ManaRefresh 901
 execute if score _ Level matches 3 run scoreboard players set _ ManaRefresh 602
 
-execute unless score @s SneakTime matches 1.. as @s run function skill:act/black_mage/mana_refresh/apply
-execute if score @s SneakTime matches 1.. as @a[distance=..15] at @s run function skill:act/black_mage/mana_refresh/apply
+function skill:act/black_mage/mana_refresh/apply
+execute if score @s SneakTime matches 1.. if score _ Level matches 1 run scoreboard players set _ ManaRefresh 201
+execute if score @s SneakTime matches 1.. if score _ Level matches 2 run scoreboard players set _ ManaRefresh 301
+execute if score @s SneakTime matches 1.. if score _ Level matches 3 run scoreboard players set _ ManaRefresh 202
+execute if score @s SneakTime matches 1.. as @a[distance=0.1..15] at @s run function skill:act/black_mage/mana_refresh/apply
diff --git a/data/skill/functions/act/hunter/piercing_aim/act0.mcfunction b/data/skill/functions/act/hunter/piercing_aim/act0.mcfunction
@@ -6,5 +6,7 @@
 execute if score _ Level matches 1 run scoreboard players set _ _ 25
 execute if score _ Level matches 2 run scoreboard players set _ _ 40
 ###適用
-execute unless score @s SneakTime matches 1.. run function skill:act/hunter/piercing_aim/act1
-execute if score @s SneakTime matches 1.. as @a[distance=..16] run function skill:act/hunter/piercing_aim/act1
+function skill:act/hunter/piercing_aim/act1
+execute if score @s SneakTime matches 1.. run scoreboard players set _ Calc 3
+execute if score @s SneakTime matches 1.. run scoreboard players operation _ _ /= _ Calc
+execute if score @s SneakTime matches 1.. as @a[distance=0.1..16] run function skill:act/hunter/piercing_aim/act1
diff --git a/data/skill/functions/act/knight/iron_will/act0.mcfunction b/data/skill/functions/act/knight/iron_will/act0.mcfunction
@@ -5,8 +5,10 @@ execute if score _ Level matches 1 run scoreboard players set _ IronWill 100
 execute if score _ Level matches 2 run scoreboard players set _ IronWill 400
 execute if score _ Level matches 3 run scoreboard players set _ IronWill 800
 
-execute unless score @s SneakTime matches 1.. run scoreboard players operation @s IronWill = _ IronWill
-execute if score @s SneakTime matches 1.. as @a[distance=..15] run scoreboard players operation @s IronWill = _ IronWill
+scoreboard players set _ _ 3
+scoreboard players operation @s IronWill = _ IronWill
+execute if score @s SneakTime matches 1.. as @a[distance=0.1..15] run scoreboard players operation @s IronWill = _ IronWill
+execute if score @s SneakTime matches 1.. as @a[distance=0.1..15] run scoreboard players operation @s IronWill /= _ _
 
 execute unless score @s SneakTime matches 1.. run tellraw @s [{"translate":"%1$sに%2$sの効果！","color":"green","with":[{"selector":"@s"},{"translate":"アイアンウィル","color":"white","hoverEvent":{"action":"show_text","value":{"translate":"ノックバックしなくなる。","color":"white"}}}]}]
 execute if score @s SneakTime matches 1.. run tellraw @a[distance=..15] [{"translate":"%1$sに%2$sの効果！","color":"green","with":[{"selector":"@a[distance=..15]"},{"translate":"アイアンウィル","color":"white","hoverEvent":{"action":"show_text","value":{"translate":"ノックバックしなくなる。","color":"white"}}}]}]

diff --git a/data/skill/functions/act/knight/phalanx/act0.mcfunction b/data/skill/functions/act/knight/phalanx/act0.mcfunction
@@ -1,5 +1,5 @@
 
 ### ファランクス発動
 
-execute unless score @s SneakTime matches 1.. as @s run function skill:act/knight/phalanx/apply
-execute if score @s SneakTime matches 1.. as @a[distance=..15] run function skill:act/knight/phalanx/apply
+function skill:act/knight/phalanx/apply
+execute if score @s SneakTime matches 1.. as @a[distance=0.1..15] run function skill:act/knight/phalanx/apply
diff --git a/data/skill/functions/act/knight/phalanx/apply1.mcfunction b/data/skill/functions/act/knight/phalanx/apply1.mcfunction
@@ -0,0 +1,9 @@
+
+### ファランクス適用
+
+execute if score _ Level matches 1 run effect give @s minecraft:resistance 60 1
+execute if score _ Level matches 2 run effect give @s minecraft:resistance 60 2
+execute if score _ Level matches 3..4 run effect give @s minecraft:resistance 60 3
+execute if score _ Level matches 4 run effect give @s minecraft:absorption 60 19
+
+function makeup:skill/act/knight/phalanx/apply
diff --git a/data/skill/functions/act/ninja/kaishaku/act0.mcfunction b/data/skill/functions/act/ninja/kaishaku/act0.mcfunction
@@ -5,8 +5,8 @@
 scoreboard players set _ _ 500
 execute if score _ Level matches 2 run scoreboard players set _ _ 11000
 
-execute unless score @s SneakTime matches 1.. run scoreboard players operation @s Kaishaku = _ _
-execute if score @s SneakTime matches 1.. run scoreboard players operation @a[distance=..16] Kaishaku = _ _
+scoreboard players operation @s Kaishaku = _ _
+execute if score @s SneakTime matches 1.. run function skill:act/ninja/kaishaku/act1
 
 execute unless score @s SneakTime matches 1.. run tellraw @s [{"translate":"%1$sに%2$sの効果！","color":"green","with":[{"selector":"@s"},{"translate":"介錯","color":"white","hoverEvent":{"action":"show_text","value":{"translate":"敵を倒した際に、敵が爆発四散するようになる。","color":"white"}}}]}]
 execute if score @s SneakTime matches 1.. run tellraw @a[distance=..16] [{"translate":"%1$sに%2$sの効果！","color":"green","with":[{"selector":"@a[distance=..16]"},{"translate":"介錯","color":"white","hoverEvent":{"action":"show_text","value":{"translate":"敵を倒した際に、敵が爆発四散するようになる。","color":"white"}}}]}]

diff --git a/data/skill/functions/act/ninja/kaishaku/act1.mcfunction b/data/skill/functions/act/ninja/kaishaku/act1.mcfunction
@@ -0,0 +1,6 @@
+
+#Level2のときは1000tick + 10000で区別
+scoreboard players set _ _ 167
+execute if score _ Level matches 2 run scoreboard players set _ _ 10333
+
+scoreboard players operation @a[distance=0.1..16] Kaishaku = _ _
diff --git a/data/skill/functions/act/ninja/yokake/act0.mcfunction b/data/skill/functions/act/ninja/yokake/act0.mcfunction
@@ -19,5 +19,6 @@ execute if score _ _ matches 01000..11000 run scoreboard players set _ Calc 1
 execute if score _ Level matches 2 run scoreboard players add _ Calc 1
 execute if score _ Level matches 3 run scoreboard players add _ Calc 2
 
-execute unless score @s SneakTime matches 1.. run function skill:act/ninja/yokake/fork
-execute if score @s SneakTime matches 1.. as @a[distance=..15] at @s run function skill:act/ninja/yokake/fork
+function skill:act/ninja/yokake/fork
+execute if score @s SneakTime matches 1.. run scoreboard players remove _ Calc 1
+execute if score @s SneakTime matches 1.. as @a[distance=0.1..15] at @s run function skill:act/ninja/yokake/fork
diff --git a/data/skill/functions/act/white_mage/clear/act0.mcfunction b/data/skill/functions/act/white_mage/clear/act0.mcfunction
@@ -2,12 +2,12 @@
 ### キアリク発動
 ##############################
 
-execute if score _ Level matches 1 unless score @s SneakTime matches 1.. run function skill:act/white_mage/clear/cure/level2
-execute if score _ Level matches 2 unless score @s SneakTime matches 1.. run function skill:act/white_mage/clear/cure/level3
-execute if score _ Level matches 3 unless score @s SneakTime matches 1.. run function skill:act/white_mage/clear/cure/level5
+execute if score _ Level matches 1 run function skill:act/white_mage/clear/cure/level2
+execute if score _ Level matches 2 run function skill:act/white_mage/clear/cure/level3
+execute if score _ Level matches 3 run function skill:act/white_mage/clear/cure/level5
 
-execute if score _ Level matches 1 if score @s SneakTime matches 1.. as @a[distance=..15] at @s run function skill:act/white_mage/clear/cure/level2
-execute if score _ Level matches 2 if score @s SneakTime matches 1.. as @a[distance=..15] at @s run function skill:act/white_mage/clear/cure/level3
-execute if score _ Level matches 3 if score @s SneakTime matches 1.. as @a[distance=..15] at @s run function skill:act/white_mage/clear/cure/level5
+execute if score _ Level matches 1 if score @s SneakTime matches 1.. as @a[distance=0.1..15] at @s run function skill:act/white_mage/clear/cure/level1
+execute if score _ Level matches 2 if score @s SneakTime matches 1.. as @a[distance=0.1..15] at @s run function skill:act/white_mage/clear/cure/level2
+execute if score _ Level matches 3 if score @s SneakTime matches 1.. as @a[distance=0.1..15] at @s run function skill:act/white_mage/clear/cure/level4
 #演出
 function makeup:skill/act/white_mage/clear/act0
diff --git a/data/skill/functions/act/white_mage/cure/act0.mcfunction b/data/skill/functions/act/white_mage/cure/act0.mcfunction
@@ -8,5 +8,7 @@ execute if score _ Level matches 3 run scoreboard players set _ _ 40
 execute if score _ Level matches 4 run scoreboard players set _ _ 60
 execute if score _ Level matches 5 run scoreboard players set _ _ 90
 
-execute unless score @s SneakTime matches 1.. run function skill:act/white_mage/cure/apply
-execute if score @s SneakTime matches 1.. as @a[distance=..15] at @s run function skill:act/white_mage/cure/apply
+function skill:act/white_mage/cure/apply
+execute if score @s SneakTime matches 1.. run scoreboard players set _ Calc 3
+execute if score @s SneakTime matches 1.. run scoreboard players operation _ _ /= _ Calc
+execute if score @s SneakTime matches 1.. as @a[distance=0.1..15] at @s run function skill:act/white_mage/cure/apply