From 60092f34400f36f8bec252752342cb1d0b643011 Mon Sep 17 00:00:00 2001 From: Ponpon Date: Mon, 22 Apr 2024 10:41:57 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=8A=E3=83=AA=E3=83=95=E3=83=AC?= =?UTF-8?q?=E3=83=83=E3=82=B7=E3=83=A5=20=E5=8A=B9=E6=9E=9C=E5=BC=B7?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../act/black_mage/mana_refresh/act0.mcfunction | 12 ++++++------ .../mana_refresh/mp_acceleration.mcfunction | 5 +++++ data/skill/functions/data/black_mage.mcfunction | 6 +++--- data/skill/functions/practice/success.mcfunction | 4 +++- 4 files changed, 17 insertions(+), 10 deletions(-) create mode 100644 data/skill/functions/act/black_mage/mana_refresh/mp_acceleration.mcfunction diff --git a/data/skill/functions/act/black_mage/mana_refresh/act0.mcfunction b/data/skill/functions/act/black_mage/mana_refresh/act0.mcfunction index a0cf2e45db..e04a5fcbdd 100644 --- a/data/skill/functions/act/black_mage/mana_refresh/act0.mcfunction +++ b/data/skill/functions/act/black_mage/mana_refresh/act0.mcfunction @@ -1,12 +1,12 @@ ### マナリフレッシュ発動 -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 if score _ Level matches 1 run scoreboard players set _ ManaRefresh 602 +execute if score _ Level matches 2 run scoreboard players set _ ManaRefresh 902 +execute if score _ Level matches 3 run scoreboard players set _ ManaRefresh 603 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.. if score _ Level matches 1 run scoreboard players set _ ManaRefresh 202 +execute if score @s SneakTime matches 1.. if score _ Level matches 2 run scoreboard players set _ ManaRefresh 302 +execute if score @s SneakTime matches 1.. if score _ Level matches 3 run scoreboard players set _ ManaRefresh 203 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/black_mage/mana_refresh/mp_acceleration.mcfunction b/data/skill/functions/act/black_mage/mana_refresh/mp_acceleration.mcfunction new file mode 100644 index 0000000000..dc558a2dd1 --- /dev/null +++ b/data/skill/functions/act/black_mage/mana_refresh/mp_acceleration.mcfunction @@ -0,0 +1,5 @@ + +# MP回復速度が最遅なら加速スタート +execute if score @s MPAcceleration matches ..-1 run scoreboard players set @s MPAcceleration 0 +# MP回復速度が加速中なら維持 +# execute if score @s MPAcceleration matches 1.. run \ No newline at end of file diff --git a/data/skill/functions/data/black_mage.mcfunction b/data/skill/functions/data/black_mage.mcfunction index 0a42b66511..c985b2c33d 100644 --- a/data/skill/functions/data/black_mage.mcfunction +++ b/data/skill/functions/data/black_mage.mcfunction @@ -12,9 +12,9 @@ data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon: data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"ダークスワンプⅢ",Name:"ダークスワンプ",Level:3,ChangeSkill:1499,AcquireLevel:{Min:999,Max:100},MP:80,Interval:100,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 1499"}}',Lore:['[{"translate":"暗黒の沼を生み出し、近づく者を引きずり込む。","color":"white","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','{"translate":"沼が与えたダメージを自身のMPに変換する。","color":"white","italic":false}'],LoreCount:6,Damage:{Dark:120}} data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"マジックシールド",Name:"マジックシールド",Level:1,ChangeSkill:525,AcquireLevel:{Min:25,Max:998},MP:50,Interval:40,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 525"}}',Lore:['{"translate":"次に受けたダメージを無効化する。","color":"white","italic":false}'],LoreCount:4} data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"マジックシールドⅡ",Name:"マジックシールド",Level:2,ChangeSkill:1499,AcquireLevel:{Min:999,Max:100},MP:50,Interval:40,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 1499"}}',Lore:['{"translate":"次に受けたダメージを無効化する。","color":"white","italic":false}'],LoreCount:4} -data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"マナリフレッシュ",Name:"マナリフレッシュ",Level:1,ChangeSkill:520,AcquireLevel:{Min:20,Max:39},MP:40,Interval:40,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 520"}}',Lore:['[{"translate":"MP回復量を倍増する。","color":"white","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','[{"translate":"+スニーク: ","color":"yellow","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','{"translate":"周囲のプレイヤーのMP回復量を倍増する。","color":"white","italic":false}'],LoreCount:6} -data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"マナリフレッシュⅡ",Name:"マナリフレッシュ",Level:2,ChangeSkill:540,AcquireLevel:{Min:40,Max:998},MP:40,Interval:40,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 540"}}',Lore:['[{"translate":"MP回復量を倍増する。","color":"white","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','[{"translate":"+スニーク: ","color":"yellow","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','{"translate":"周囲のプレイヤーのMP回復量を倍増する。","color":"white","italic":false}'],LoreCount:6} -data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"マナリフレッシュⅢ",Name:"マナリフレッシュ",Level:3,ChangeSkill:1499,AcquireLevel:{Min:999,Max:100},MP:40,Interval:40,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 1499"}}',Lore:['[{"translate":"MP回復量を倍増する。","color":"white","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','[{"translate":"+スニーク: ","color":"yellow","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','{"translate":"周囲のプレイヤーのMP回復量を倍増する。","color":"white","italic":false}'],LoreCount:6} +data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"マナリフレッシュ",Name:"マナリフレッシュ",Level:1,ChangeSkill:520,AcquireLevel:{Min:20,Max:39},MP:40,Interval:100,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 520"}}',Lore:['[{"translate":"MP回復量を3倍増する。","color":"white","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','[{"translate":"+スニーク: ","color":"yellow","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','{"translate":"周囲のプレイヤーのMP回復量を3倍増する。","color":"white","italic":false}'],LoreCount:6} +data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"マナリフレッシュⅡ",Name:"マナリフレッシュ",Level:2,ChangeSkill:540,AcquireLevel:{Min:40,Max:998},MP:40,Interval:100,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 540"}}',Lore:['[{"translate":"MP回復量を3倍増する。","color":"white","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','[{"translate":"+スニーク: ","color":"yellow","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','{"translate":"周囲のプレイヤーのMP回復量を3倍増する。","color":"white","italic":false}'],LoreCount:6} +data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"マナリフレッシュⅢ",Name:"マナリフレッシュ",Level:3,ChangeSkill:1499,AcquireLevel:{Min:999,Max:100},MP:40,Interval:100,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 1499"}}',Lore:['[{"translate":"MP回復量を3倍増する。","color":"white","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','[{"translate":"+スニーク: ","color":"yellow","italic":false},{"storage":"skill:","nbt":"NewLine","interpret":true}]','{"translate":"周囲のプレイヤーのMP回復量を3倍増する。","color":"white","italic":false}'],LoreCount:6} data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"グロウ",Name:"グロウ",Level:1,ChangeSkill:518,AcquireLevel:{Min:18,Max:998},MP:60,Interval:10,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 518"}}',Lore:['{"translate":"周囲の作物を急成長させる。","color":"white","italic":false}'],LoreCount:4} data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"グロウⅡ",Name:"グロウ",Level:2,ChangeSkill:1499,AcquireLevel:{Min:999,Max:100},MP:60,Interval:10,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 1499"}}',Lore:['{"translate":"周囲の作物を急成長させる。","color":"white","italic":false}'],LoreCount:4} data modify storage skill: Data.BlackMage append value {Job:"黒魔導士",Icon:"B",Skill:"ジン・スピリット",Name:"ジン・スピリット",Level:1,ChangeSkill:517,AcquireLevel:{Min:17,Max:36},MP:40,Interval:100,Trigger:"人参棒を使用",ClickEvent:'{"storage":"skill:","nbt":"Skill.Skill","clickEvent":{"action":"run_command","value":"/trigger ChangeSkill set 517"}}',Lore:['{"translate":"ダメージを受けた敵からHPを吸収するトーテムを設置する。","color":"white","italic":false}'],LoreCount:4} diff --git a/data/skill/functions/practice/success.mcfunction b/data/skill/functions/practice/success.mcfunction index b39fbebc73..6b2c025404 100644 --- a/data/skill/functions/practice/success.mcfunction +++ b/data/skill/functions/practice/success.mcfunction @@ -14,7 +14,9 @@ function skill:practice/act/ execute if data storage skill: {Success:true} run scoreboard players operation @s MP -= _ MP #スキルを使ったらMP回復速度を落とす -execute if data storage skill: {Success:true} if score _ MP matches 1.. run scoreboard players set @s MPAcceleration -600 +execute if data storage skill: {Success:true} unless data storage skill: Skill{Name:"マナリフレッシュ"} if score _ MP matches 1.. run scoreboard players set @s MPAcceleration -600 +# マナリフレッシュ +execute if data storage skill: Skill{Name:"マナリフレッシュ"} if score _ MP matches 1.. run function skill:act/black_mage/mana_refresh/mp_acceleration #怪しい粉補正 execute unless data storage skill: {Success:true} if score @s SuspiciousPowderTime matches 1.. run function skill:act/common/suspicious_powder/use_skill1