Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

サヨナラ発動時にバフエフェクトを付与 #714

Merged
merged 10 commits into from
Feb 21, 2025
Merged

サヨナラ発動時にバフエフェクトを付与 #714

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
855ab62
GH-703 Add おあっと！進捗追加
NePonpon Feb 13, 2025
ec97be3
GH-703 Add めり込み死亡処理でチュートリアル進捗達成を追加
NePonpon Feb 13, 2025
5e499b5
GH-703 Modify ブロック名を翻訳キーへ変更
NePonpon Feb 15, 2025
bf99f5e
GH-702 Modify チュートリアルの文章を加筆修正
yabane Feb 21, 2025
c9bc90d
Merge branch 'update/v13-2-5-alpha2' into fix/tutrial-click-event
NePonpon Feb 21, 2025
c70eb30
GH-702 Modify チュートリアルの文章を加筆修正2
yabane Feb 21, 2025
f6122ef
Merge branch 'fix/tutrial-click-event' of https://github.com/TUSB/The…
yabane Feb 21, 2025
55e2bbd
GH-683 サヨナラのレイズ発動時にバフエフェクトを付与
yabane Feb 21, 2025
927412b
NO-ISSUE fix 耐性エフェクトの値を修正
yabane Feb 21, 2025
c2de74f
Merge branch 'update/v13-2-5-alpha2' into feature/sayonara-buff-effect
NePonpon Feb 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions data/player/functions/rise/.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ execute if entity @s[tag=HasRestoreItems,tag=!Raise] in area:control_area run fu
execute if entity @s[tag=HasRestoreItems,tag=Raise] run function skill:act/common/restore_item/restore/cancel
### レイズ処理
execute if entity @s[tag=Raise] at @s run function skill:act/white_mage/araise/raise_check
### サヨナラ処理
execute if entity @s[tag=Sayonara] run function skill:act/ninja/sayonara/rise

## フラグリセット
scoreboard players reset @s Hunger
1 change: 1 addition & 0 deletions data/skill/functions/act/ninja/sayonara/death.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ function makeup:skill/act/ninja/sayonara/death

###レイズ付与
execute if score @s MP matches 100.. run tag @s add Raise
execute if score @s MP matches 100.. run tag @s add Sayonara

### ダメージ
execute if score _ Level matches 1 run data modify storage skill: Damage set from storage skill: Data.Ninja[{Name:"サヨナラ",Level:1}].Damage
Expand Down
7 changes: 7 additions & 0 deletions data/skill/functions/act/ninja/sayonara/rise.mcfunction
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
#> skill:act/ninja/sayonara/rise
# @within player:rise/
###生き返り後バフエフェクト処理

effect give @s minecraft:strength 30 9
effect give @s minecraft:resistance 5 4
tag @s remove Sayonara