فهرست منبع

在 3、5 轮只刷分

LTCatt 5 سال پیش
والد
کامیت
8f232bcc24

+ 4 - 2
data/item/functions/bonus_item/gameparty/auto/blue.mcfunction

@@ -1,7 +1,9 @@
 # 生成蓝色品质的物品实体
 
-execute if score $round mem matches ..4 run loot spawn ~ ~ ~ loot item:gameparty/normal/blue
-execute if score $round mem matches 5 run loot spawn ~ ~ ~ loot item:gameparty/last/blue
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/blue
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/blue
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/blue
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/blue
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

+ 4 - 2
data/item/functions/bonus_item/gameparty/auto/green.mcfunction

@@ -1,7 +1,9 @@
 # 生成绿色品质的物品实体
 
-execute if score $round mem matches ..4 run loot spawn ~ ~ ~ loot item:gameparty/normal/green
-execute if score $round mem matches 5 run loot spawn ~ ~ ~ loot item:gameparty/last/green
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/green
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/green
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/green
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/green
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

+ 4 - 2
data/item/functions/bonus_item/gameparty/auto/purple.mcfunction

@@ -1,7 +1,9 @@
 # 生成紫色品质的物品实体
 
-execute if score $round mem matches ..4 run loot spawn ~ ~ ~ loot item:gameparty/normal/purple
-execute if score $round mem matches 5 run loot spawn ~ ~ ~ loot item:gameparty/last/purple
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/purple
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/purple
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/purple
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/purple
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

+ 4 - 2
data/item/functions/bonus_item/gameparty/auto/white.mcfunction

@@ -1,7 +1,9 @@
 # 生成白色品质的物品实体
 
-execute if score $round mem matches ..4 run loot spawn ~ ~ ~ loot item:gameparty/normal/white
-execute if score $round mem matches 5 run loot spawn ~ ~ ~ loot item:gameparty/last/white
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/white
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/white
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/white
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/white
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

+ 4 - 2
data/item/functions/bonus_item/gameparty/random.mcfunction

@@ -1,4 +1,6 @@
 # 根据轮数生成对应的物品
 
-execute if score $round mem matches ..4 run function item:bonus_item/gameparty/normal/random
-execute if score $round mem matches 5 run function item:bonus_item/gameparty/last/random
+execute if score $round mem matches ..2 run function item:bonus_item/gameparty/normal/random
+execute if score $round mem matches 3 run function item:bonus_item/gameparty/score/random
+execute if score $round mem matches 4 run function item:bonus_item/gameparty/normal/random
+execute if score $round mem matches 5.. run function item:bonus_item/gameparty/score/random

+ 1 - 1
data/item/functions/bonus_item/gameparty/last/blue.mcfunction → data/item/functions/bonus_item/gameparty/score/blue.mcfunction

@@ -1,6 +1,6 @@
 # 生成蓝色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/last/blue
+loot spawn ~ ~ ~ loot item:gameparty/score/blue
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

+ 1 - 1
data/item/functions/bonus_item/gameparty/last/green.mcfunction → data/item/functions/bonus_item/gameparty/score/green.mcfunction

@@ -1,6 +1,6 @@
 # 生成绿色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/last/green
+loot spawn ~ ~ ~ loot item:gameparty/score/green
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

+ 1 - 1
data/item/functions/bonus_item/gameparty/last/purple.mcfunction → data/item/functions/bonus_item/gameparty/score/purple.mcfunction

@@ -1,6 +1,6 @@
 # 生成紫色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/last/purple
+loot spawn ~ ~ ~ loot item:gameparty/score/purple
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

+ 4 - 4
data/item/functions/bonus_item/gameparty/last/random.mcfunction → data/item/functions/bonus_item/gameparty/score/random.mcfunction

@@ -7,10 +7,10 @@ function lib:random
 scoreboard players operation #quality mem = $random mem
 
 # 根据品质生成不同的物品
-execute if score #quality mem matches ..24 run function item:bonus_item/gameparty/last/white
+execute if score #quality mem matches ..24 run function item:bonus_item/gameparty/score/white
 # 绿色:35%
-execute if score #quality mem matches 25..59 run function item:bonus_item/gameparty/last/green
+execute if score #quality mem matches 25..59 run function item:bonus_item/gameparty/score/green
 # 蓝色:25%
-execute if score #quality mem matches 60..84 run function item:bonus_item/gameparty/last/blue
+execute if score #quality mem matches 60..84 run function item:bonus_item/gameparty/score/blue
 # 紫色:15%
-execute if score #quality mem matches 85.. run function item:bonus_item/gameparty/last/purple
+execute if score #quality mem matches 85.. run function item:bonus_item/gameparty/score/purple

+ 1 - 1
data/item/functions/bonus_item/gameparty/last/white.mcfunction → data/item/functions/bonus_item/gameparty/score/white.mcfunction

@@ -1,6 +1,6 @@
 # 生成白色品质的物品实体
 
-loot spawn ~ ~ ~ loot item:gameparty/last/white
+loot spawn ~ ~ ~ loot item:gameparty/score/white
 summon item ~ ~ ~ {Tags:["new_item"],Age:-32768,PickupDelay:0,NoGravity:1,Invulnerable:1,CustomNameVisible:1,Glowing:1,Motion:[0,0,0],Item:{id:"gold_nugget",Count:1}}
 data modify entity @e[tag=new_item,limit=1] Item set from entity @e[limit=1,type=item,sort=nearest,tag=!new_item] Item
 kill @e[limit=1,type=item,sort=nearest,tag=!new_item]

+ 0 - 1
data/item/functions/shop/buy_pig.mcfunction

@@ -11,6 +11,5 @@ execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":
 execute as @s[tag=canbuy] run function item:shop/special_pig
 scoreboard players remove @s[tag=canbuy] gold 1
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error
-execute as @s[tag=canbuy] at @s run function lib:sounds/levelup
 execute as @s[tag=canbuy] run function item:shop/refresh_gold
 tag @s remove canbuy

+ 0 - 0
data/item/loot_tables/gameparty/last/blue.json → data/item/loot_tables/gameparty/score/blue.json


+ 0 - 0
data/item/loot_tables/gameparty/last/green.json → data/item/loot_tables/gameparty/score/green.json


+ 0 - 0
data/item/loot_tables/gameparty/last/purple.json → data/item/loot_tables/gameparty/score/purple.json


+ 0 - 0
data/item/loot_tables/gameparty/last/white.json → data/item/loot_tables/gameparty/score/white.json


+ 1 - 1
data/ltw/functions/main/player_enter.mcfunction

@@ -28,4 +28,4 @@ function lib:bossbar/show
 # FIXME: <! 重要> [010] 如果有人没领取奖励,可以一直站在上面,在奖励领取阶段结束时再拿到一次
 # FIXME: 准备倒计时与 Tooltip 降低不一致
 # FIXME: 修复 钻石风暴 spreadplayers 无效
-# FIXME: <! 重要> [HIM] 修复死亡判定可能失效
+# FIXME: [HIM] 死亡复活后可能会捡到已经在地上待了很久的 “老物品”