Merge remote-tracking branch 'origin/ceshi' into ceshi

behavior_pack_v8jz0zSR/Script_NeteaseModousIY5aSF/xiangyemod/ziran/NaturalData.py

@@ -29,13 +29,15 @@ NaturalService / NaturalTimerService 读取，FeatureDispatcher 通过方块名/
 # ============================================================================
 # 一、柴火堆叠/取用（右键）
 #     firewood_2(柴火_2) + 手持柴火 -> firewood(柴火_1 堆放)
-#     firewood(堆放) 空手右键 -> firewood_2 + 给1个柴火
+#     firewood(堆放) 空手右键 -> firewood_2 + 掉落1个柴火_2(掉落物, 不进背包)
 # ============================================================================
 FIREWOOD_RULES = [
     {"source": "rtdd:firewood_2", "item": "rtdd:firewood",
      "target": "rtdd:firewood", "consume": 1, "tip": "§a堆放柴火"},
     {"source": "rtdd:firewood", "item": None,
-     "target": "rtdd:firewood_2", "giveItem": "rtdd:firewood", "tip": "§a取走柴火"},
+     "target": "rtdd:firewood_2",
+     "dropItem": [{"name": "rtdd:firewood_2", "count": 1}],
+     "tip": "§a取走柴火"},
 ]
 
 # ============================================================================

behavior_pack_v8jz0zSR/trading/xiangye_farmer_trades.json

@@ -3,7 +3,7 @@
     {
       "groups": [
         {
-          "num_to_select": 7,
+          "num_to_select": 8,
           "trades": [
             {
               "wants": [
@@ -81,6 +81,17 @@
               "max_uses": 64,
               "reward_exp": true,
               "trader_exp": 1
+            },
+            {
+              "wants": [
+                { "item": "minecraft:emerald", "quantity": 1 }
+              ],
+              "gives": [
+                { "item": "rtdd:rice_seeds", "quantity": 3 }
+              ],
+              "max_uses": 64,
+              "reward_exp": true,
+              "trader_exp": 1
             }
           ]
         }