ソースを参照

give_effect 独立

LTCatt 5 年 前
親
コミット
39281f4e32

+ 1 - 0
data/mini/functions/colormatch/game_init.mcfunction

@@ -27,3 +27,4 @@ team modify playing friendlyFire true
 team modify playing collisionRule always
 team modify playing collisionRule always
 team modify playing deathMessageVisibility never
 team modify playing deathMessageVisibility never
 gamerule fallDamage false
 gamerule fallDamage false
+gamerule naturalRegeneration true

+ 5 - 0
data/mini/functions/colormatch/give_effect.mcfunction

@@ -0,0 +1,5 @@
+# 状态效果
+effect clear @s
+effect give @s saturation 1000000 0 true
+effect give @s night_vision 1000000 0 true
+effect give @s resistance 1000000 4 true

+ 2 - 6
data/mini/functions/colormatch/player_enter.mcfunction

@@ -3,12 +3,8 @@ function lib:sounds/music/mini_fast
 title @s clear
 title @s clear
 title @s actionbar ""
 title @s actionbar ""
 
 
-# 状态效果
-effect clear @s
-effect give @s saturation 1000000 0 true
-gamerule naturalRegeneration true
-effect give @s night_vision 1000000 0 true
-effect give @s resistance 1000000 4 true
+# 给予状态效果
+function mini:colormatch/give_effect
 
 
 # 设置玩家生命
 # 设置玩家生命
 scoreboard players set @s[team=playing,tag=!rejoining] mini_heart 3
 scoreboard players set @s[team=playing,tag=!rejoining] mini_heart 3

+ 2 - 9
data/mini/functions/diamond/game/respawn.mcfunction

@@ -1,13 +1,6 @@
 
 
-# 状态效果
-effect clear @s
-effect give @s saturation 1000000 0 true
-effect give @s night_vision 1000000 0 true
-effect give @s haste 1000000 1 true
-effect give @s slow_falling 4
-effect give @s weakness 5 10 true
-effect give @s resistance 5 10 true
-gamerule naturalRegeneration false
+# 给予状态效果
+function mini:diamond/give_effect
 
 
 # 传送玩家
 # 传送玩家
 tp @s[team=playing] 1016 280 5016
 tp @s[team=playing] 1016 280 5016

+ 1 - 0
data/mini/functions/diamond/game_init.mcfunction

@@ -32,3 +32,4 @@ gamerule keepInventory true
 gamerule doTileDrops true
 gamerule doTileDrops true
 gamerule doEntityDrops true
 gamerule doEntityDrops true
 gamerule doMobLoot true
 gamerule doMobLoot true
+gamerule naturalRegeneration false

+ 8 - 0
data/mini/functions/diamond/give_effect.mcfunction

@@ -0,0 +1,8 @@
+# 状态效果
+effect clear @s
+effect give @s saturation 1000000 0 true
+effect give @s night_vision 1000000 0 true
+effect give @s haste 1000000 1 true
+effect give @s slow_falling 4
+effect give @s weakness 5 10 true
+effect give @s resistance 5 10 true

+ 6 - 0
data/mini/functions/hotpm/give_effect.mcfunction

@@ -0,0 +1,6 @@
+
+# 状态效果
+effect clear @s
+effect give @s saturation 1000000 0 true
+effect give @s night_vision 1000000 0 true
+effect give @s resistance 1000000 4 true

+ 3 - 6
data/mini/functions/hotpm/player_enter.mcfunction

@@ -3,16 +3,13 @@ function lib:sounds/music/mini_middle
 title @s clear
 title @s clear
 title @s actionbar ""
 title @s actionbar ""
 
 
-# 状态效果
-effect clear @s
-effect give @s saturation 1000000 0 true
-gamerule naturalRegeneration true
-effect give @s night_vision 1000000 0 true
-effect give @s resistance 1000000 4 true
+# 给予状态效果
+function mini:hotpm/give_effect
 
 
 # 设置玩家生命
 # 设置玩家生命
 scoreboard players set @s[team=playing,tag=!rejoining] mini_heart 3
 scoreboard players set @s[team=playing,tag=!rejoining] mini_heart 3
 function mini:main/player_max_health
 function mini:main/player_max_health
+gamerule naturalRegeneration true
 
 
 # 清理 Tag
 # 清理 Tag
 tag @s remove pm_holding
 tag @s remove pm_holding

+ 7 - 0
data/mini/functions/main/give_effect.mcfunction

@@ -0,0 +1,7 @@
+execute if score $mini_type mem matches 1 run function mini:parkour/give_effect
+execute if score $mini_type mem matches 2 run function mini:tntrun/give_effect
+execute if score $mini_type mem matches 3 run function mini:hotpm/give_effect
+execute if score $mini_type mem matches 4 run function mini:colormatch/give_effect
+execute if score $mini_type mem matches 5 run function mini:phantom/give_effect
+execute if score $mini_type mem matches 6 run function mini:diamond/give_effect
+execute if score $mini_type mem matches 8 run function mini:trade/give_effect

+ 5 - 0
data/mini/functions/parkour/give_effect.mcfunction

@@ -0,0 +1,5 @@
+
+# 状态效果
+effect clear @s
+effect give @s saturation 1000000 0 true
+effect give @s resistance 1000000 4 true

+ 3 - 5
data/mini/functions/parkour/player_enter.mcfunction

@@ -3,14 +3,12 @@ function lib:sounds/music/mini_middle
 title @s clear
 title @s clear
 title @s actionbar ""
 title @s actionbar ""
 
 
-# 状态效果
-effect clear @s
-effect give @s saturation 1000000 0 true
-gamerule naturalRegeneration true
-effect give @s resistance 1000000 4 true
+# 给予状态效果
+function mini:parkour/give_effect
 
 
 # 设置玩家生命
 # 设置玩家生命
 attribute @s generic.max_health base set 20
 attribute @s generic.max_health base set 20
+gamerule naturalRegeneration true
 
 
 # 计分板重置
 # 计分板重置
 scoreboard players reset @s treasure
 scoreboard players reset @s treasure

+ 5 - 0
data/mini/functions/phantom/give_effect.mcfunction

@@ -0,0 +1,5 @@
+
+# 状态效果
+effect clear @s
+effect give @s saturation 1000000 0 true
+effect give @s instant_health 10 0 true

+ 3 - 5
data/mini/functions/phantom/player_enter.mcfunction

@@ -3,14 +3,12 @@ function lib:sounds/music/mini_slow
 title @s clear
 title @s clear
 title @s actionbar ""
 title @s actionbar ""
 
 
-# 状态效果
-effect clear @s
-effect give @s saturation 1000000 0 true
-effect give @s instant_health 10 0 true
-gamerule naturalRegeneration false
+# 给予状态效果
+function mini:phantom/give_effect
 
 
 # 设置玩家生命
 # 设置玩家生命
 attribute @s generic.max_health base set 20
 attribute @s generic.max_health base set 20
+gamerule naturalRegeneration false
 
 
 # 计分板重置
 # 计分板重置
 scoreboard players reset @s kill_phantom
 scoreboard players reset @s kill_phantom

+ 6 - 0
data/mini/functions/tntrun/give_effect.mcfunction

@@ -0,0 +1,6 @@
+
+# 状态效果
+effect clear @s
+effect give @s saturation 1000000 0 true
+effect give @s resistance 1000000 4 true
+effect give @s night_vision 1000000 0 true

+ 3 - 6
data/mini/functions/tntrun/player_enter.mcfunction

@@ -3,15 +3,12 @@ function lib:sounds/music/mini_fast
 title @s clear
 title @s clear
 title @s actionbar ""
 title @s actionbar ""
 
 
-# 状态效果
-effect clear @s
-effect give @s saturation 1000000 0 true
-effect give @s resistance 1000000 4 true
-effect give @s night_vision 1000000 0 true
-gamerule naturalRegeneration true
+# 给予状态效果
+function mini:tntrun/give_effect
 
 
 # 设置玩家生命
 # 设置玩家生命
 attribute @s generic.max_health base set 20
 attribute @s generic.max_health base set 20
+gamerule naturalRegeneration true
 
 
 # 传送玩家
 # 传送玩家
 spreadplayers 1019.5 2020.5 2 2 false @s[team=playing,tag=!rejoining]
 spreadplayers 1019.5 2020.5 2 2 false @s[team=playing,tag=!rejoining]

+ 2 - 9
data/mini/functions/trade/game/respawn.mcfunction

@@ -1,13 +1,6 @@
 
 
-# 状态效果
-effect clear @s
-effect give @s saturation 1000000 0 true
-effect give @s night_vision 1000000 0 true
-effect give @s haste 1000000 1 true
-effect give @s slow_falling 4
-effect give @s weakness 5 10 true
-effect give @s resistance 5 10 true
-gamerule naturalRegeneration false
+# 给予状态效果
+function mini:trade/give_effect
 
 
 # 传送玩家
 # 传送玩家
 tp @s[team=playing] 1016 280 5016
 tp @s[team=playing] 1016 280 5016

+ 1 - 0
data/mini/functions/trade/game_init.mcfunction

@@ -26,6 +26,7 @@ team modify playing deathMessageVisibility always
 gamerule fallDamage false
 gamerule fallDamage false
 gamerule fireDamage true
 gamerule fireDamage true
 gamerule drowningDamage true
 gamerule drowningDamage true
+gamerule naturalRegeneration false
 
 
 # Gamerule 调整
 # Gamerule 调整
 gamerule doLimitedCrafting false
 gamerule doLimitedCrafting false

+ 9 - 0
data/mini/functions/trade/give_effect.mcfunction

@@ -0,0 +1,9 @@
+
+# 状态效果
+effect clear @s
+effect give @s saturation 1000000 0 true
+effect give @s night_vision 1000000 0 true
+effect give @s haste 1000000 1 true
+effect give @s slow_falling 4
+effect give @s weakness 5 10 true
+effect give @s resistance 5 10 true