Bläddra i källkod

更多杂项更改……完成了刺客的修改

龙腾猫跃 3 år sedan
förälder
incheckning
2d07954337

+ 2 - 2
data/item/functions/shop/document.txt

@@ -16,11 +16,11 @@
 + 铁靴子
 + 钻石靴子
 + 下界合金靴子
-\
+
 破损的钓鱼竿(5)
 + 5% 耐久度(8)
 + 饵钓 II
-+ 10% 耐久度(14)
++ 5% 耐久度(11)
 
 单发弓(1)
 + 1 耐久度(2)

+ 1 - 1
data/item/functions/shop/refresh_equip.mcfunction

@@ -44,4 +44,4 @@ clear @s fishing_rod
 give @s[scores={shop_07_fish=1}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"gray"}'},Damage:60}
 give @s[scores={shop_07_fish=2}] fishing_rod{display:{Name:'{"text":"钓鱼竿","italic":false,"color":"gray"}'},Damage:57}
 give @s[scores={shop_07_fish=3}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:57,Enchantments:[{id:"minecraft:lure",lvl:2s}]}
-give @s[scores={shop_07_fish=4}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:51,Enchantments:[{id:"minecraft:lure",lvl:2s}]}
+give @s[scores={shop_07_fish=4}] fishing_rod{display:{Name:'{"text":"<饵钓 II> 钓鱼竿","italic":false,"color":"white"}'},Damage:54,Enchantments:[{id:"minecraft:lure",lvl:2s}]}

+ 10 - 1
data/lib/functions/effect/floating.mcfunction

@@ -2,9 +2,18 @@
 # 钻石:起飞
 
 scoreboard players remove @a effect_floating 1
+scoreboard players remove @e[type=creeper] effect_floating 1
+
 execute as @a[gamemode=!spectator,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run effect give @s levitation 1 13
 execute as @a[gamemode=!spectator,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run effect give @s speed 1 0 true
 execute as @a[gamemode=!spectator,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run effect give @s slow_falling 1 0 true
 execute as @a[gamemode=!spectator,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run function lib:sounds/teleport
 execute as @a[gamemode=!spectator,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run scoreboard players set @s effect_floating 5
-effect clear @a[scores={effect_floating=0}] levitation
+
+execute as @e[type=creeper,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run effect give @s levitation 1 13
+execute as @e[type=creeper,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run effect give @s speed 1 0 true
+execute as @e[type=creeper,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run effect give @s slow_falling 1 0 true
+execute as @e[type=creeper,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run function lib:sounds/teleport
+execute as @e[type=creeper,scores={effect_floating=..-2}] at @s if block ~ ~-1 ~ diamond_block run scoreboard players set @s effect_floating 5
+
+effect clear @e[scores={effect_floating=0}] levitation

+ 19 - 0
data/mini/functions/ass/game/new_item.mcfunction

@@ -0,0 +1,19 @@
+tellraw @a ["\n",{"text": ">> ","color":"aqua","bold": true},{"text": "新的奖励物资已在空中部署!\n","color":"aqua"}]
+playsound minecraft:entity.player.levelup player @a 0 1000000 0 1000000 2
+scoreboard players set $new_item_cd mem 0
+
+# 随机选择生成组
+scoreboard players set $random_min mem 0
+scoreboard players set $random_max mem 3
+function lib:random
+
+# 生成物资
+execute if score $random mem matches 0 positioned 1023.5 21 7009.5 run function item:bonus_item/gameparty/auto/low
+execute if score $random mem matches 0 positioned 1008.5 21 7024.5 run function item:bonus_item/gameparty/auto/low
+execute if score $random mem matches 1 positioned 1008.5 21 7009.5 run function item:bonus_item/gameparty/auto/low
+execute if score $random mem matches 1 positioned 1023.5 21 7024.5 run function item:bonus_item/gameparty/auto/low
+execute if score $random mem matches 2 positioned 1007.0 21 7016.5 run function item:bonus_item/gameparty/auto/low
+execute if score $random mem matches 2 positioned 1025.0 21 7017.5 run function item:bonus_item/gameparty/auto/low
+execute if score $random mem matches 3 positioned 1016.5 21 7026.0 run function item:bonus_item/gameparty/auto/low
+execute if score $random mem matches 3 positioned 1015.5 21 7008.0 run function item:bonus_item/gameparty/auto/low
+execute as @e[tag=bonus_item] run data modify entity @s NoGravity set value 0b

+ 2 - 1
data/mini/functions/ass/game_init.mcfunction

@@ -3,6 +3,7 @@ forceload add 1000 7000 1032 7032
 
 scoreboard players set $countdown_fast mem 0
 scoreboard players set $show_score mem 0
+scoreboard players set $new_item_cd mem 0
 scoreboard players set $survival mem 0
 
 # 生成地图
@@ -17,4 +18,4 @@ team modify playing collisionRule always
 team modify playing deathMessageVisibility always
 gamerule naturalRegeneration false
 
-schedule function mini:ass/game_init2 10t replace
+schedule function mini:ass/game_init2 15t replace

+ 7 - 0
data/mini/functions/ass/tick1.mcfunction

@@ -0,0 +1,7 @@
+# 调整物品:仅在纵向速度 < -0.015 且 y > 10 时,才将 NoGravity 设置为 false
+execute as @e[tag=bonus_item] store result score @s temp run data get entity @s Motion[1] 1000
+execute as @e[tag=bonus_item] if entity @s[x=1000,y=10,z=7000,dx=100,dy=100,dz=100,scores={temp=-15..}] run data merge entity @s {NoGravity:0b}
+execute as @e[tag=bonus_item] unless entity @s[x=1000,y=10,z=7000,dx=100,dy=100,dz=100,scores={temp=-15..}] run data merge entity @s {NoGravity:1b}
+
+# 清理苦力怕爆炸的效果云
+kill @e[type=minecraft:area_effect_cloud,nbt={WaitTime:10}]

+ 26 - 0
data/mini/functions/ass/tick20.mcfunction

@@ -11,3 +11,29 @@ execute if score $countdown mem matches ..0 run effect give @a[team=playing] wit
 # 回复生命值
 execute if score $countdown mem matches 1.. if score $foursec mem matches 1 if score $foursec mem matches 1 run effect give @a[team=playing] regeneration 1 10 true
 execute if score $countdown mem matches 1.. if score $foursec mem matches 1 run schedule function mini:ass/game/clear_effect 1t replace
+
+# -----------------------
+#   物品生成
+# -----------------------
+
+# 判断是否符合刷出新物品的条件:0 为可以,其他为不可以
+scoreboard players set #new_item mem 0
+
+# 当前场地上没有物品
+execute if entity @e[tag=bonus_item,x=1000,y=0,z=7000,dx=100,dy=1000,dz=100] run scoreboard players set #new_item mem 1
+
+# 没有进入即死
+execute if score $countdown mem matches ..1 run scoreboard players set #new_item mem 1
+
+# 如果没有物品,则计算冷却
+execute if score #new_item mem matches 0 run scoreboard players add $new_item_cd mem 1
+# 已经超过 15s 冷却时间
+execute if score $new_item_cd mem matches ..14 run scoreboard players set #new_item mem 1
+
+# 存活玩家数($player_alive)>= 3
+execute if score $player_alive mem matches ..2 run scoreboard players set #new_item mem 1
+# 死亡玩家数($player_finish)<= 2
+execute if score $player_finish mem matches 3.. run scoreboard players set #new_item mem 1
+
+# 如果上述条件均满足,则刷出新物品
+execute if score #new_item mem matches 0 run function mini:ass/game/new_item

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

@@ -21,4 +21,4 @@ team modify playing collisionRule always
 team modify playing deathMessageVisibility never
 gamerule naturalRegeneration true
 
-schedule function mini:colormatch/game_init2 12t replace
+schedule function mini:colormatch/game_init2 15t replace

+ 1 - 1
data/mini/functions/colormatch/tick20.mcfunction

@@ -2,7 +2,7 @@
 scoreboard players set #new_item mem 0
 
 # 当前场地上没有物品
-execute if entity @e[tag=bonus_item] run scoreboard players set #new_item mem 1
+execute if entity @e[tag=bonus_item,x=1000,y=0,z=4000,dx=100,dy=1000,dz=100] run scoreboard players set #new_item mem 1
 
 # 如果没有物品,则计算冷却
 execute if score #new_item mem matches 0 run scoreboard players add $new_item_cd mem 1

+ 1 - 1
data/mini/functions/hotpm/game_init.mcfunction

@@ -18,4 +18,4 @@ setblock 1000 4 3000 air
 setblock 1000 4 3000 minecraft:structure_block[mode=load]{metadata:"",mirror:"NONE",ignoreEntities:1b,powered:0b,seed:0L,rotation:"NONE",posX:0,mode:"LOAD",posY:1,sizeX:32,posZ:0,integrity:1.0f,showair:0b,name:"mini:hp",sizeY:15,sizeZ:30,showboundingbox:0b}
 setblock 1000 5 3000 minecraft:redstone_block
 
-schedule function mini:hotpm/game_init2 10t replace
+schedule function mini:hotpm/game_init2 15t replace

+ 1 - 1
data/mini/functions/hotpm/tick20.mcfunction

@@ -2,7 +2,7 @@
 scoreboard players set #new_item mem 0
 
 # 当前场地上没有物品
-execute if entity @e[tag=bonus_item] run scoreboard players set #new_item mem 1
+execute if entity @e[tag=bonus_item,x=1000,y=0,z=3000,dx=100,dy=1000,dz=100] run scoreboard players set #new_item mem 1
 
 # 如果没有物品,则计算冷却
 execute if score #new_item mem matches 0 run scoreboard players add $new_item_cd mem 1

+ 1 - 1
data/mini/functions/iron/game_init.mcfunction

@@ -28,4 +28,4 @@ gamerule doTileDrops true
 gamerule doEntityDrops true
 gamerule doMobLoot true
 
-schedule function mini:iron/game_init2 10t append
+schedule function mini:iron/game_init2 15t replace

+ 2 - 1
data/mini/functions/main/tick1.mcfunction

@@ -1,4 +1,5 @@
 execute if score $mini_type mem matches 2 run function mini:tntrun/tick1
 execute if score $mini_type mem matches 3 run function mini:hotpm/tick1
 execute if score $mini_type mem matches 4 run function mini:colormatch/tick1
-execute if score $mini_type mem matches 5 run function mini:phantom/tick1
+execute if score $mini_type mem matches 5 run function mini:phantom/tick1
+execute if score $mini_type mem matches 201 run function mini:ass/tick1

+ 1 - 1
data/mini/functions/tntrun/game_init.mcfunction

@@ -38,4 +38,4 @@ team modify playing friendlyFire true
 team modify playing collisionRule always
 team modify playing deathMessageVisibility never
 
-schedule function mini:tntrun/game_init2 10t replace
+schedule function mini:tntrun/game_init2 15t replace

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

@@ -28,4 +28,4 @@ gamerule doTileDrops true
 gamerule doEntityDrops true
 gamerule doMobLoot true
 
-schedule function mini:trade/game_init2 10t append
+schedule function mini:trade/game_init2 15t replace