소스 검색

各种小调整

LTCatt 5 년 전
부모
커밋
c498a44b29

+ 1 - 1
data/ltw/functions/state/3/state_enter.mcfunction

@@ -19,7 +19,7 @@ scoreboard players set $countdown mem 3
 scoreboard players set $tempo_enable mem 0
 
 # 修改队伍颜色
-team modify playing color white
+team modify playing color reset
 
 # 小游戏编号:生成一个 1~[最大游戏编号] 的 randomarray,每次从其中取下一个数。
 execute unless data storage ltw:mini types[0] run function ltw:state/3/newarray

+ 1 - 1
data/mini/functions/trade/villager_init.mcfunction → data/mini/functions/trade/game/villager_init.mcfunction

@@ -1,5 +1,5 @@
 # 每个玩家生成村民
-summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradePlayer","newVillager"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[]},VillagerData:{level:2,type:"jungle",profession:"nitwit"},Xp:10}
+summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradePlayer","newVillager"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[]},VillagerData:{level:2,type:"jungle"},Xp:10}
 # 设置对应的积分
 scoreboard players operation @e[type=villager,tag=newVillager] player_id = @s player_id
 tag @e[type=villager,tag=newVillager] remove newVillager

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

@@ -35,9 +35,9 @@ gamerule doEntityDrops true
 gamerule doMobLoot true
 
 # 生成实体
-summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradeOrigin"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[{buy:{id:"emerald",Count:4},maxUses:999999,rewardExp:false,xp:20,sell:{id:"spider_spawn_egg",Count:1b}}]},VillagerData:{level:5,type:"jungle",profession:"nitwit"},Xp:10}
+summon villager 1000 5 5000 {NoAI:1b,Tags:["TradeMarker","TradeOrigin"],Invulnerable:1b,Silent:1b,Offers:{Recipes:[{buy:{id:"emerald",Count:4},maxUses:999999,rewardExp:false,xp:20,sell:{id:"spider_spawn_egg",Count:1b}}]},CustomName:'{"text":"使用生物雷达是作弊行为哦!","color":"red"}'}
 # 设置交易列表
-execute as @a[team=playing] run function mini:trade/villager_init
+execute as @a[team=playing] run function mini:trade/game/villager_init
 # 复制交易列表
 execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[0]
 execute as @e[type=villager,tag=TradePlayer] run data modify entity @s Offers.Recipes append from entity @e[type=villager,tag=TradeOrigin,limit=1] Offers.Recipes[0]

+ 18 - 3
data/mini/loot_tables/diamond.json

@@ -2,7 +2,7 @@
 
     {
         "type": "minecraft:item",
-        "weight": 2,
+        "weight": 3,
         "name": "minecraft:nether_star",
         "functions": [
             {
@@ -24,12 +24,27 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 6,
+        "weight": 4,
         "name": "minecraft:diamond"
     },
     {
         "type": "minecraft:item",
-        "weight": 2,
+        "weight": 3,
+        "name": "minecraft:iron_ingot",
+        "functions": [
+          {
+            "function": "minecraft:set_count",
+            "count": {
+              "min": 2.0,
+              "max": 4.0,
+              "type": "minecraft:uniform"
+            }
+          }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 3,
         "name": "minecraft:book"
     }