From 2c1946c8a6d3640637d2639c590509f97425b4ce Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Sun, 14 May 2017 20:46:38 -0700
Subject: [PATCH] added loot items
---
.../creeper/common/ColorizedTextTemplateTest.java | 7 ++++++-
world/npcs/red-eyed_bear.json | 5 +++++
world/npcs/swamp_bear.json | 5 +++++
world/npcs/swamp_berserker.json | 3 +++
world/npcs/tree_berserker.json | 4 ++++
5 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/src/test/com/comandante/creeper/common/ColorizedTextTemplateTest.java b/src/test/com/comandante/creeper/common/ColorizedTextTemplateTest.java
index dabfcd8c..9ecac04a 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 1dee089f..7056c161 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 fbf6bd7c..0869b13b 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 92dff6bb..bc4ca611 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 9dfc4588..c8acb5d2 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
},
--
GitLab