diff --git a/src/test/com/comandante/creeper/common/ColorizedTextTemplateTest.java b/src/test/com/comandante/creeper/common/ColorizedTextTemplateTest.java index dabfcd8c308efbfee4a10d40e20757b39ac8689e..9ecac04a9469be490b7cbf142c5428922ef2928b 100644 --- a/src/test/com/comandante/creeper/common/ColorizedTextTemplateTest.java +++ b/src/test/com/comandante/creeper/common/ColorizedTextTemplateTest.java @@ -1,10 +1,12 @@ package com.comandante.creeper.common; import com.comandante.creeper.items.ItemMetadata; +import com.comandante.creeper.items.Loot; import com.comandante.creeper.merchant.MerchantMetadata; import com.comandante.creeper.server.player_communication.Color; import com.comandante.creeper.storage.*; import com.google.common.collect.Maps; +import com.google.common.collect.Sets; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import org.junit.Assert; @@ -171,7 +173,10 @@ public class ColorizedTextTemplateTest { // } - + Loot loot = new Loot(16, 28, Sets.newHashSet("beserker baton", "bersker boots")); + Gson gson = new GsonBuilder().setPrettyPrinting().create(); + String s = gson.toJson(loot); + System.out.println(s); } } \ No newline at end of file diff --git a/world/npcs/red-eyed_bear.json b/world/npcs/red-eyed_bear.json index 1dee089f5215d8d2e0792123f06fbf2b063d713e..7056c1612224d38d63416b5019807d00c54fc2ac 100644 --- a/world/npcs/red-eyed_bear.json +++ b/world/npcs/red-eyed_bear.json @@ -52,6 +52,11 @@ } ], "loot": { + "internalItemNames": [ + "beserker shorts", + "beserker chest", + "beserker helm" + ], "lootGoldMax": 24, "lootGoldMin": 18 }, diff --git a/world/npcs/swamp_bear.json b/world/npcs/swamp_bear.json index fbf6bd7c63a9d2d41d2febc0b86be8aa53598669..0869b13b0039530d5bd7b2dd6aa8f77d9d94d88a 100644 --- a/world/npcs/swamp_bear.json +++ b/world/npcs/swamp_bear.json @@ -51,6 +51,11 @@ } ], "loot": { + "internalItemNames": [ + "beserker shorts", + "beserker chest", + "beserker helm" + ], "lootGoldMax": 18, "lootGoldMin": 12 }, diff --git a/world/npcs/swamp_berserker.json b/world/npcs/swamp_berserker.json index 92dff6bbebe1fb66f8c96578a605f27d3a0c6382..bc4ca611a211aaeb425fd033ed258b792641e3aa 100644 --- a/world/npcs/swamp_berserker.json +++ b/world/npcs/swamp_berserker.json @@ -42,6 +42,9 @@ } ], "loot": { + "internalItemNames": [ + "beserker bracers" + ], "lootGoldMax": 10, "lootGoldMin": 5 }, diff --git a/world/npcs/tree_berserker.json b/world/npcs/tree_berserker.json index 9dfc4588ade0ce19143e9ca1fe62d23adbce800c..c8acb5d21c913b8ac05860bc039a244ade58dc3e 100644 --- a/world/npcs/tree_berserker.json +++ b/world/npcs/tree_berserker.json @@ -43,6 +43,10 @@ } ], "loot": { + "internalItemNames": [ + "beserker baton", + "bersker boots" + ], "lootGoldMax": 14, "lootGoldMin": 8 },