龙腾猫跃 3 лет назад
Родитель
Сommit
faba6afda6
39 измененных файлов с 64 добавлено и 49 удалено
  1. 3 3
      data/item/functions/shop/buy/011_bow.mcfunction
  2. 2 2
      data/item/functions/shop/document.txt
  3. 1 1
      data/item/functions/shop/refresh_equip.mcfunction
  4. BIN
      data/item/loot_tables/item/document.xlsx
  5. 23 8
      data/item/loot_tables/mixed/purple.json
  6. 2 2
      data/item/loot_tables/score/blue.json
  7. 1 1
      data/minecraft/recipes/baked_potato_from_smoking.json
  8. 1 1
      data/minecraft/recipes/coal_from_blasting_coal_ore.json
  9. 1 1
      data/minecraft/recipes/coal_from_blasting_deepslate_coal_ore.json
  10. 1 1
      data/minecraft/recipes/cooked_beef_from_smoking.json
  11. 1 1
      data/minecraft/recipes/cooked_chicken_from_smoking.json
  12. 1 1
      data/minecraft/recipes/cooked_cod_from_smoking.json
  13. 1 1
      data/minecraft/recipes/cooked_mutton_from_smoking.json
  14. 1 1
      data/minecraft/recipes/cooked_porkchop_from_smoking.json
  15. 1 1
      data/minecraft/recipes/cooked_rabbit_from_smoking.json
  16. 1 1
      data/minecraft/recipes/cooked_salmon_from_smoking.json
  17. 1 1
      data/minecraft/recipes/copper_ingot_from_blasting_copper_ore.json
  18. 1 1
      data/minecraft/recipes/copper_ingot_from_blasting_deepslate_copper_ore.json
  19. 1 1
      data/minecraft/recipes/copper_ingot_from_blasting_raw_copper.json
  20. 1 1
      data/minecraft/recipes/diamond_from_blasting_deepslate_diamond_ore.json
  21. 1 1
      data/minecraft/recipes/diamond_from_blasting_diamond_ore.json
  22. 1 1
      data/minecraft/recipes/dried_kelp_from_smoking.json
  23. 1 1
      data/minecraft/recipes/emerald_from_blasting_deepslate_emerald_ore.json
  24. 1 1
      data/minecraft/recipes/emerald_from_blasting_emerald_ore.json
  25. 1 1
      data/minecraft/recipes/gold_ingot_from_blasting_deepslate_gold_ore.json
  26. 1 1
      data/minecraft/recipes/gold_ingot_from_blasting_gold_ore.json
  27. 1 1
      data/minecraft/recipes/gold_ingot_from_blasting_nether_gold_ore.json
  28. 1 1
      data/minecraft/recipes/gold_ingot_from_blasting_raw_gold.json
  29. 1 1
      data/minecraft/recipes/gold_nugget_from_blasting.json
  30. 1 1
      data/minecraft/recipes/iron_ingot_from_blasting_deepslate_iron_ore.json
  31. 1 1
      data/minecraft/recipes/iron_ingot_from_blasting_iron_ore.json
  32. 1 1
      data/minecraft/recipes/iron_ingot_from_blasting_raw_iron.json
  33. 1 1
      data/minecraft/recipes/iron_nugget_from_blasting.json
  34. 1 1
      data/minecraft/recipes/lapis_lazuli_from_blasting_deepslate_lapis_ore.json
  35. 1 1
      data/minecraft/recipes/lapis_lazuli_from_blasting_lapis_ore.json
  36. 1 1
      data/minecraft/recipes/netherite_scrap_from_blasting.json
  37. 1 1
      data/minecraft/recipes/quartz_from_blasting.json
  38. 1 1
      data/minecraft/recipes/redstone_from_blasting_deepslate_redstone_ore.json
  39. 1 1
      data/minecraft/recipes/redstone_from_blasting_redstone_ore.json

+ 3 - 3
data/item/functions/shop/buy/011_bow.mcfunction

@@ -1,12 +1,12 @@
-# 一次性弓 (1g)
+# 破损的弓 (1g)
 scoreboard players add @s shop_01_bow 0
 tag @s remove canbuy
 tag @s[scores={shop_01_bow=0,gold=9..}] add canbuy
 tellraw @s[scores={shop_01_bow=1..}] ["",{"text":">> ","color":"aqua","bold":true},{"text":"你已经购买了这个物品了!","color":"aqua"}]
 tellraw @s[scores={shop_01_bow=0,gold=..8}] ["",{"text":">> ","color":"red","bold":true},{"text":"你没有足够的金锭来购买这个物品!","color":"red"}]
 tellraw @s[scores={shop_01_bow=..-1}] ["",{"text":">> ","color":"red","bold":true},{"text":"你需要先购买上一级的物品!","color":"red"}]
-tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"一次性弓","color":"green"}]
-execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"一次性弓","color":"green"}]
+tellraw @s[tag=canbuy] ["",{"text":">> ","color":"green","bold":true},"你购买了 ",{"text":"破损的弓","color":"green"}]
+execute as @s[tag=canbuy] run tellraw @a[tag=!canbuy] ["",{"text":">> ","color":"green","bold":true},{"selector": "@s","color":"green"}," 购买了 ",{"text":"破损的弓","color":"green"}]
 scoreboard players add @s[tag=canbuy] shop_01_bow 1
 scoreboard players remove @s[tag=canbuy] gold 9
 execute as @s[tag=!canbuy] at @s run function lib:sounds/error

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

@@ -20,8 +20,8 @@
 破损的钓鱼竿(1)
 + 5 耐久度(6)
 
-一次性弓(1)
-+ 1 耐久度(2)
+破损的弓(2)
++ 10% 耐久度
 + 冲击 I
 
 箭

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

@@ -2,7 +2,7 @@
 
 # 01
 clear @s bow
-give @s[scores={shop_01_bow=1}] bow{display:{Name:'{"text":"一次性弓","italic":false,"color":"gray"}'},Damage:384}
+give @s[scores={shop_01_bow=1}] bow{display:{Name:'{"text":"破损的弓","italic":false,"color":"gray"}'},Damage:382}
 give @s[scores={shop_01_bow=2}] bow{display:{Name:'{"text":"弓","italic":false,"color":"gray"}'},Damage:346}
 give @s[scores={shop_01_bow=3}] bow{display:{Name:'{"text":"<冲击 I> 弓","italic":false,"color":"white"}'},Damage:346,Enchantments:[{id:"minecraft:punch",lvl:1s}]}
 

BIN
data/item/loot_tables/item/document.xlsx


+ 23 - 8
data/item/loot_tables/mixed/purple.json

@@ -2,38 +2,53 @@
 
     {
         "type": "minecraft:loot_table",
-        "weight": 6,
+        "weight": 10,
         "name": "item:item/purple"
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 2,
         "name": "minecraft:shulker_shell",
+        "functions": [
+            {
+                "function": "minecraft:set_nbt",
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机橙色道具\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"purple\",\"count\":1}]}"
+            }
+        ]
+    },
+    {
+        "type": "minecraft:item",
+        "weight": 3,
+        "name": "minecraft:blaze_powder",
         "functions": [
             {
                 "function": "minecraft:set_count",
-                "count": 4
+                "count": 3
             },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"四种品质的道具各一件\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"purple\",\"count\":1},{\"type\":\"item\",\"level\":\"blue\",\"count\":1},{\"type\":\"item\",\"level\":\"green\",\"count\":1},{\"type\":\"item\",\"level\":\"white\",\"count\":1}]}"
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"清空物品栏, 换取随机紫色道具 x3\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"clean_inventory\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"blue\",\"count\":3}]}"
             }
         ]
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 3,
         "name": "minecraft:shulker_shell",
         "functions": [
+            {
+                "function": "minecraft:set_count",
+                "count": 4
+            },
             {
                 "function": "minecraft:set_nbt",
-                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机橙色道具\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"purple\",\"count\":1}]}"
+                "tag": "{\"item_name\":\"{\\\"text\\\":\\\"随机紫色、蓝色、白色道具各一件\\\",\\\"color\\\":\\\"gold\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_random_bonus\":[{\"type\":\"item\",\"level\":\"blue\",\"count\":1},{\"type\":\"item\",\"level\":\"green\",\"count\":1},{\"type\":\"item\",\"level\":\"white\",\"count\":1}]}"
             }
         ]
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 3,
         "name": "minecraft:shulker_shell",
         "functions": [
             {
@@ -48,7 +63,7 @@
     },
     {
         "type": "minecraft:item",
-        "weight": 1,
+        "weight": 3,
         "name": "minecraft:shulker_shell",
         "functions": [
             {

+ 2 - 2
data/item/loot_tables/score/blue.json

@@ -52,11 +52,11 @@
     "functions": [
         {
             "function": "minecraft:set_count",
-            "count": 10
+            "count": 12
         },
         {
             "function": "minecraft:set_nbt",
-            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"10 金粒\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_gold\":10}"
+            "tag": "{\"item_name\":\"{\\\"text\\\":\\\"12 金粒\\\",\\\"color\\\":\\\"light_purple\\\"}\",\"is_bonus\":1b,\"bonus_new\":1b,\"bonus_gold\":12}"
         }
     ]
 },

+ 1 - 1
data/minecraft/recipes/baked_potato_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:baked_potato",
   "experience": 0.35,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/coal_from_blasting_coal_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:coal",
   "experience": 0.1,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/coal_from_blasting_deepslate_coal_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:coal",
   "experience": 0.1,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/cooked_beef_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_beef",
   "experience": 0.35,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/cooked_chicken_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_chicken",
   "experience": 0.35,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/cooked_cod_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_cod",
   "experience": 0.35,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/cooked_mutton_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_mutton",
   "experience": 0.35,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/cooked_porkchop_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_porkchop",
   "experience": 0.35,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/cooked_rabbit_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_rabbit",
   "experience": 0.35,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/cooked_salmon_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:cooked_salmon",
   "experience": 0.35,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/copper_ingot_from_blasting_copper_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:copper_ingot",
   "experience": 0.7,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/copper_ingot_from_blasting_deepslate_copper_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:copper_ingot",
   "experience": 0.7,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/copper_ingot_from_blasting_raw_copper.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:copper_ingot",
   "experience": 0.7,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/diamond_from_blasting_deepslate_diamond_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:diamond",
   "experience": 1.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/diamond_from_blasting_diamond_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:diamond",
   "experience": 1.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/dried_kelp_from_smoking.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:dried_kelp",
   "experience": 0.1,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/emerald_from_blasting_deepslate_emerald_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:emerald",
   "experience": 1.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/emerald_from_blasting_emerald_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:emerald",
   "experience": 1.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/gold_ingot_from_blasting_deepslate_gold_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:gold_ingot",
   "experience": 1.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/gold_ingot_from_blasting_gold_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:gold_ingot",
   "experience": 1.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/gold_ingot_from_blasting_nether_gold_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:gold_ingot",
   "experience": 1.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/gold_ingot_from_blasting_raw_gold.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:gold_ingot",
   "experience": 1.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/gold_nugget_from_blasting.json

@@ -34,5 +34,5 @@
   ],
   "result": "minecraft:gold_nugget",
   "experience": 0.1,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/iron_ingot_from_blasting_deepslate_iron_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:iron_ingot",
   "experience": 0.7,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/iron_ingot_from_blasting_iron_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:iron_ingot",
   "experience": 0.7,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/iron_ingot_from_blasting_raw_iron.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:iron_ingot",
   "experience": 0.7,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/iron_nugget_from_blasting.json

@@ -46,5 +46,5 @@
   ],
   "result": "minecraft:iron_nugget",
   "experience": 0.1,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/lapis_lazuli_from_blasting_deepslate_lapis_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:lapis_lazuli",
   "experience": 0.2,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/lapis_lazuli_from_blasting_lapis_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:lapis_lazuli",
   "experience": 0.2,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/netherite_scrap_from_blasting.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:netherite_scrap",
   "experience": 2.0,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/quartz_from_blasting.json

@@ -5,5 +5,5 @@
   },
   "result": "minecraft:quartz",
   "experience": 0.2,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/redstone_from_blasting_deepslate_redstone_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:redstone",
   "experience": 0.7,
-  "cookingtime": 20
+  "cookingtime": 10
 }

+ 1 - 1
data/minecraft/recipes/redstone_from_blasting_redstone_ore.json

@@ -6,5 +6,5 @@
   },
   "result": "minecraft:redstone",
   "experience": 0.7,
-  "cookingtime": 20
+  "cookingtime": 10
 }