各种杂项调整

data/ltw/advancements/blood/iron1.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · α "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 15 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 10 块铁锭\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/blood/iron2.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · β "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 25 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 20 块铁锭\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/blood/iron3.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · γ "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 35 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 30 块铁锭\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/blood/iron4.json

@@ -8,7 +8,7 @@
         "text": "铁血大亨 · Ω "
       },
       "description": [
-        {"text": "【钢铁狂潮】拥有 50 块铁锭\n", "color":"gray"},
+        {"text": "【钢铁狂潮】拥有 45 块铁锭\n", "color":"gray"},
         {"text": "究极隐藏挑战！","color":"dark_gray","italic": true}
       ],
       "frame": "challenge",

data/ltw/advancements/vs/emerald1.json

@@ -8,7 +8,7 @@
         "text": "商业奇迹 · α "
       },
       "description": [
-        {"text": "【贸易专家】持有 8 个绿宝石\n", "color":"gray"},
+        {"text": "【贸易专家】持有 7 个绿宝石\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "1 绿宝石","color":"white"}
       ],

data/ltw/advancements/vs/emerald2.json

@@ -8,7 +8,7 @@
         "text": "商业奇迹 · β "
       },
       "description": [
-        {"text": "【贸易专家】完成获得 2 积分的交易\n", "color":"gray"},
+        {"text": "【贸易专家】完成获得 4 积分的交易\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/ltw/advancements/vs/emerald3.json

@@ -8,7 +8,7 @@
         "text": "商业奇迹 · γ "
       },
       "description": [
-        {"text": "【贸易专家】清空整个交易列表\n", "color":"gray"},
+        {"text": "【贸易专家】完成所有获取绿宝石的交易\n", "color":"gray"},
         {"text": "奖励: ","color":"green"},
         {"text": "2 绿宝石","color":"white"}
       ],

data/mini/functions/iron/game_start.mcfunction

@@ -1,12 +1,12 @@
 gamerule doDaylightCycle true
-scoreboard players set $countdown mem 240
+scoreboard players set $countdown mem 300
 
 # HUD
 scoreboard objectives setdisplay list total_score_disp
 scoreboard objectives setdisplay belowName iron_count
 scoreboard objectives setdisplay sidebar iron_disp
 scoreboard players set $bossbar_color mem 4
-scoreboard players set $countdown_max mem 240
+scoreboard players set $countdown_max mem 300
 scoreboard players set $bossbar_type mem 2
 function lib:bossbar/show
 bossbar set mini:red name "剩余时间"

data/mini/functions/iron/tick20.mcfunction

@@ -25,7 +25,7 @@ execute if score $foursec mem matches 1 run effect give @a[team=playing] regener
 execute if score $foursec mem matches 1 run schedule function mini:iron/game/clear_effect 1t replace
 
 # 给予进度
-advancement grant @a[team=playing,scores={iron_count=15..}] only ltw:blood/iron1
-advancement grant @a[team=playing,scores={iron_count=25..}] only ltw:blood/iron2
-advancement grant @a[team=playing,scores={iron_count=35..}] only ltw:blood/iron3
-advancement grant @a[team=playing,scores={iron_count=50..}] only ltw:blood/iron4
+advancement grant @a[team=playing,scores={iron_count=10..}] only ltw:blood/iron1
+advancement grant @a[team=playing,scores={iron_count=20..}] only ltw:blood/iron2
+advancement grant @a[team=playing,scores={iron_count=30..}] only ltw:blood/iron3
+advancement grant @a[team=playing,scores={iron_count=45..}] only ltw:blood/iron4

data/mini/functions/parkour/document.txt

@@ -12,7 +12,7 @@
 1030.5 25.2 1020.5 
 1018.5 12.5 1025.5 S
 活板：
-1028.5 19.2 1036.5 
+1028.5 18.2 1036.5 
 1025.5 09.5 1040.5 S
 1020.5 19.5 1041.5 
 落日：

data/mini/functions/parkour/game/marker_spawn.mcfunction

@@ -13,7 +13,7 @@ summon area_effect_cloud 1023.5 24.2 1030.5 {Tags: ["treasure"], Age:-2147483648
 summon area_effect_cloud 1023.5 27.5 1026.5 {Tags: ["treasure"], Age:-2147483648, Duration:-1, WaitTime:-2147483648}
 summon area_effect_cloud 1030.5 25.2 1020.5 {Tags: ["treasure"], Age:-2147483648, Duration:-1, WaitTime:-2147483648}
 summon area_effect_cloud 1018.5 12.5 1025.5 {Tags: ["treasure","treasure_secret"], Age:-2147483648, Duration:-1, WaitTime:-2147483648}
-summon area_effect_cloud 1028.5 19.2 1036.5 {Tags: ["treasure"], Age:-2147483648, Duration:-1, WaitTime:-2147483648}
+summon area_effect_cloud 1028.5 18.2 1036.5 {Tags: ["treasure"], Age:-2147483648, Duration:-1, WaitTime:-2147483648}
 summon area_effect_cloud 1025.5 09.5 1040.5 {Tags: ["treasure","treasure_secret"], Age:-2147483648, Duration:-1, WaitTime:-2147483648}
 summon area_effect_cloud 1020.5 19.5 1041.5 {Tags: ["treasure"], Age:-2147483648, Duration:-1, WaitTime:-2147483648}
 summon area_effect_cloud 1026.5 23.2 1059.5 {Tags: ["treasure"], Age:-2147483648, Duration:-1, WaitTime:-2147483648}

data/mini/functions/parkour/game/test.mcfunction

@@ -13,7 +13,7 @@ execute positioned 1023.5 27.5 1026.5 run function item:bonus_item/gameparty/aut
 execute positioned 1030.5 25.2 1020.5 run function item:bonus_item/gameparty/auto/low2
 execute positioned 1018.5 12.5 1025.5 run function item:bonus_item/gameparty/auto/low2
 # 活板：
-execute positioned 1028.5 19.2 1036.5 run function item:bonus_item/gameparty/auto/low2
+execute positioned 1028.5 18.2 1036.5 run function item:bonus_item/gameparty/auto/low2
 execute positioned 1025.5 09.5 1040.5 run function item:bonus_item/gameparty/auto/low2
 execute positioned 1020.5 19.5 1041.5 run function item:bonus_item/gameparty/auto/low2
 # 落日：

data/mini/functions/phantom/game/new_item.mcfunction

@@ -1,5 +1,5 @@
 function item:bonus_item/gameparty/auto/low
-execute as @e[tag=bonus_item,limit=1,sort=nearest] run data merge entity @s {NoGravity:0b,Motion:[0.0,0.8,0.0]}
+execute as @e[tag=bonus_item,limit=1,sort=nearest] run data merge entity @s {NoGravity:0b,Motion:[0.0,0.7,0.0]}
 particle minecraft:explosion_emitter ~ ~ ~ 0 0 0 0 1 normal
 kill @s
 tellraw @a ["",{"text": ">> ","color":"gold","bold": true},{"text": "红色幻翼已被击杀！","color":"gold"}]

data/mini/functions/phantom/game/summon2.mcfunction

@@ -14,7 +14,7 @@ execute if score #new_item mem matches 0 run scoreboard players set $new_item_cd
 # 修改奖励幻翼的属性
 team join red @e[tag=bonus_phantom,tag=new_phantom,limit=1]
 effect give @e[tag=bonus_phantom,tag=new_phantom,limit=1] glowing 1000000 0 true
-data merge entity @e[tag=bonus_phantom,tag=new_phantom,limit=1] {Size:5,DeathLootTable:"mini:phantom"}
+data merge entity @e[tag=bonus_phantom,tag=new_phantom,limit=1] {Size:7,DeathLootTable:"mini:phantom"}
 attribute @e[tag=bonus_phantom,tag=new_phantom,limit=1] generic.attack_damage base set 8
 attribute @e[tag=bonus_phantom,tag=new_phantom,limit=1] generic.max_health base set 20
 

data/mini/functions/phantom/tick1.mcfunction

@@ -1,7 +1,7 @@
-# 调整物品：仅在纵向速度 < -0.015 且 y > 21 时，才将 NoGravity 设置为 false
+# 调整物品：仅在纵向速度 < -0.025 且 y > 21 时，才将 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=21,z=6000,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=21,z=6000,dx=100,dy=100,dz=100,scores={temp=-15..}] run data merge entity @s {NoGravity:1b}
+execute as @e[tag=bonus_item] if entity @s[x=1000,y=21,z=6000,dx=100,dy=100,dz=100,scores={temp=-25..}] run data merge entity @s {NoGravity:0b}
+execute as @e[tag=bonus_item] unless entity @s[x=1000,y=21,z=6000,dx=100,dy=100,dz=100,scores={temp=-25..}] run data merge entity @s {NoGravity:1b}
 
 # 奖励幻翼特效
 execute as @e[tag=bonus_phantom] at @s run particle dust 1 0 0 2 ~ ~ ~ 0.2 0 0.2 0 1 normal

data/mini/functions/trade/document.txt

@@ -7,7 +7,7 @@ a/木
 3木栅栏 - 1
 6泥土 - 1
 1燧石 - 1
-6沙砾 - 2
+3沙砾 - 1
 
 b/石
 1石斧 - 1
@@ -41,20 +41,20 @@ d/铁+/钻
 
 e/钻+
 1铁胸甲 - 1
-12藤蔓 - 1
-1熔炉矿车 - 1
-1钻石镐 - 1
-64石头 - 2积分
-1钻石护腿 - 2积分
-32苔石 - 2积分
-1黑曜石 - 2积分
+10藤蔓 - 1
+1熔炉矿车 - 2
+1钻石镐 - 2
+64石头 - 4积分
+1钻石护腿 - 4积分
+32苔石 - 4积分
+1黑曜石 - 4积分
 
 s
-1 - 3煤炭块
-1 - 16橡木原木
+1 - 4煤炭块
+1 - 32橡木原木
 1 - 32圆石
-1 - 8粗铁
-1 - 4铁锭
+1 - 10粗铁
+1 - 5铁锭
 1 - 4钻石矿
-2 - 1积分
-3 - 1地牢箱子
+2 - 2积分
+2 - 1地牢箱子

data/mini/functions/trade/game/get_score.mcfunction

@@ -2,4 +2,4 @@ scoreboard players operation @s total_score += @s temp2
 scoreboard players operation @s total_score_disp += @s temp2
 tellraw @a ["",{"text": ">> ","color":"aqua","bold": true},{"selector": "@s","color":"aqua"}," 从交易中获得了 ",{"score": {"name":"@s","objective": "temp2"},"color":"aqua"},{"text": " 积分","color":"aqua"},", 当前共有 ",{"score": {"name": "@s","objective": "total_score"}}, " 积分"]
 
-advancement grant @s[scores={temp2=2}] only ltw:vs/emerald2
+advancement grant @s[scores={temp2=4}] only ltw:vs/emerald2

data/mini/functions/trade/tick20.mcfunction

@@ -32,7 +32,7 @@ execute if score $countdown mem matches 60 run scoreboard players set $bossbar_c
 execute if score $countdown mem matches 60 run function lib:bossbar/show
 
 # 给予进度
-execute as @a[team=playing] if score @s emerald matches 8.. run advancement grant @s only ltw:vs/emerald1
-execute as @e[tag=TradePlayer,tag=!adv3_checked] store success score @s temp run data get entity @s Offers.Recipes[0]
-execute as @a[team=playing] if score @s player_id = @e[tag=TradePlayer,scores={temp=0},tag=!adv3_checked,limit=1] player_id run advancement grant @s only ltw:vs/emerald3
-tag @e[tag=TradePlayer,scores={temp=0},tag=!adv3_checked] add adv3_checked
+execute as @a[team=playing] if score @s emerald matches 7.. run advancement grant @s only ltw:vs/emerald1
+execute as @e[tag=TradePlayer,tag=!adv3_checked] unless entity @s[nbt={Offers:{Recipes:[{sell:{id:"minecraft:emerald"},uses:0}]}}] run tag @s add adv3_achieved
+execute as @a[team=playing] if score @s player_id = @e[tag=TradePlayer,tag=adv3_achieved,tag=!adv3_checked,limit=1] player_id run advancement grant @s only ltw:vs/emerald3
+tag @e[tag=TradePlayer,tag=adv3_achieved,tag=!adv3_checked] add adv3_checked

data/mini/loot_tables/trade_a.json

@@ -72,9 +72,9 @@
         },
         {
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
-                "tag": "{buy:{id:\"gravel\",Count:6}}"
+                "tag": "{buy:{id:\"gravel\",Count:3}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"emerald\",Count:2}}"
+                "tag":"{sell:{id:\"emerald\",Count:1}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:gravel\"}}]}}"
             }}}]

data/mini/loot_tables/trade_e.json

@@ -18,7 +18,7 @@
         },
         {
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
-                "tag": "{buy:{id:\"vine\",Count:12}}"
+                "tag": "{buy:{id:\"vine\",Count:10}}"
             }, { "function": "set_nbt",
                 "tag":"{sell:{id:\"emerald\",Count:1}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
@@ -29,7 +29,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"furnace_minecart\",Count:1}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"emerald\",Count:1}}"
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:furnace_minecart\"}}]}}"
             }}}]
@@ -38,7 +38,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"diamond_pickaxe\",Count:1}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"emerald\",Count:1}}"
+                "tag":"{sell:{id:\"emerald\",Count:2}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:diamond_pickaxe\"}}]}}"
             }}}]
@@ -47,7 +47,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"stone\",Count:64}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:2,tag:{display:{Name:'{\"text\":\"2 积分\",\"color\":\"aqua\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:4,tag:{display:{Name:'{\"text\":\"4 积分\",\"color\":\"light_purple\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:stone\"}}]}}"
             }}}]
@@ -56,7 +56,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"diamond_leggings\",Count:1}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:2,tag:{display:{Name:'{\"text\":\"2 积分\",\"color\":\"aqua\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:4,tag:{display:{Name:'{\"text\":\"4 积分\",\"color\":\"light_purple\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:diamond_leggings\"}}]}}"
             }}}]
@@ -65,7 +65,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"mossy_cobblestone\",Count:32}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:2,tag:{display:{Name:'{\"text\":\"2 积分\",\"color\":\"aqua\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:4,tag:{display:{Name:'{\"text\":\"4 积分\",\"color\":\"light_purple\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:mossy_cobblestone\"}}]}}"
             }}}]
@@ -74,7 +74,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"obsidian\",Count:1}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:2,tag:{display:{Name:'{\"text\":\"2 积分\",\"color\":\"aqua\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:4,tag:{display:{Name:'{\"text\":\"4 积分\",\"color\":\"light_purple\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:obsidian\"}}]}}"
             }}}]

data/mini/loot_tables/trade_s.json

@@ -11,7 +11,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"emerald\",Count:1}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"coal_block\",Count:3}}"
+                "tag":"{sell:{id:\"coal_block\",Count:4}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:coal_block\"}}]}}"
             }}}]
@@ -20,7 +20,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"emerald\",Count:1}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"oak_log\",Count:16}}"
+                "tag":"{sell:{id:\"oak_log\",Count:32}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:oak_log\"}}]}}"
             }}}]
@@ -38,7 +38,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"emerald\",Count:1}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"raw_iron\",Count:8}}"
+                "tag":"{sell:{id:\"raw_iron\",Count:10}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:raw_iron\"}}]}}"
             }}}]
@@ -47,7 +47,7 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"emerald\",Count:1}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"iron_ingot\",Count:4}}"
+                "tag":"{sell:{id:\"iron_ingot\",Count:5}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:iron_ingot\"}}]}}"
             }}}]
@@ -65,16 +65,16 @@
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
                 "tag": "{buy:{id:\"emerald\",Count:2}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"nether_star\",Count:1,tag:{display:{Name:'{\"text\":\"1 积分\",\"color\":\"white\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"nether_star\",Count:2,tag:{display:{Name:'{\"text\":\"2 积分\",\"color\":\"aqua\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{buy:{id:\"minecraft:emerald\"},sell:{id:\"minecraft:nether_star\"}}]}}"
             }}}]
         },
         {
             "type": "item", "name": "stone", "functions": [{ "function": "set_nbt",
-                "tag": "{buy:{id:\"emerald\",Count:3}}"
+                "tag": "{buy:{id:\"emerald\",Count:2}}"
             }, { "function": "set_nbt",
-                "tag":"{sell:{id:\"chest\",Count:1,tag:{BlockEntityTag:{LootTable:\"mini:diamond\",id:\"minecraft:chest\"},display:{Name:'{\"text\":\"地牢箱子\",\"color\":\"aqua\",\"italic\":false}'}}}}"
+                "tag":"{sell:{id:\"chest\",Count:1,tag:{BlockEntityTag:{LootTable:\"mini:diamond\",id:\"minecraft:chest\"},display:{Name:'{\"text\":\"地牢箱子\",\"color\":\"gold\",\"italic\":false}'}}}}"
             }], "conditions": [{ "condition": "inverted", "term": { "condition": "minecraft:entity_properties", "entity": "this", "predicate": {
                 "nbt": "{Offers:{Recipes:[{sell:{id:\"minecraft:chest\"}}]}}"
             }}}]