From 45146768b8875d4b09b5ee502c4e92e4cbc290ba Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Sun, 14 Aug 2016 22:06:26 -0700
Subject: [PATCH] swamp bear is back
---
.../creeper/player/NpcTestHarness.java | 2 +-
world/npcs/redeyedbear.json | 1 -
world/npcs/swampbear.json | 52 +++++++++++++++++++
3 files changed, 53 insertions(+), 2 deletions(-)
create mode 100644 world/npcs/swampbear.json
diff --git a/src/test/com/comandante/creeper/player/NpcTestHarness.java b/src/test/com/comandante/creeper/player/NpcTestHarness.java
index ebead4ee..2f4c0401 100644
--- a/src/test/com/comandante/creeper/player/NpcTestHarness.java
+++ b/src/test/com/comandante/creeper/player/NpcTestHarness.java
@@ -90,7 +90,7 @@ public class NpcTestHarness {
@Test
public void testCombat() throws Exception {
List<Npc> npcsFromFile = NpcExporter.getNpcsFromFile(gameManager);
- Npc treeBerseker = npcsFromFile.stream().filter(npc -> npc.getName().equals("red-eyed bear")).collect(Collectors.toList()).get(0);
+ Npc treeBerseker = npcsFromFile.stream().filter(npc -> npc.getName().equals("swamp bear")).collect(Collectors.toList()).get(0);
int totalIterations = 100;
Player player;
Npc npc = null;
diff --git a/world/npcs/redeyedbear.json b/world/npcs/redeyedbear.json
index a47dc5e9..ac8ba26c 100644
--- a/world/npcs/redeyedbear.json
+++ b/world/npcs/redeyedbear.json
@@ -1,4 +1,3 @@
-
{
"name": "red-eyed bear",
"colorName": "red-eyed \u001B[1m\u001B[35mbear\u001B[0m",
diff --git a/world/npcs/swampbear.json b/world/npcs/swampbear.json
new file mode 100644
index 00000000..96598355
--- /dev/null
+++ b/world/npcs/swampbear.json
@@ -0,0 +1,52 @@
+{
+ "name": "swamp bear",
+ "colorName": "swamp \u001B[1m\u001B[35mbear\u001B[0m",
+ "dieMessage": "a swamp \u001B[1m\u001B[35mbear\u001B[0m breathes his last breath in a pool of \u001B[1m\u001B[31mblood\u001B[0m",
+ "temperament": "passive",
+ "loot": {
+ "lootGoldMin": 19,
+ "lootGoldMax": 30,
+ "lootItems": []
+ },
+ "roamAreas": [
+ "toft1_zone",
+ "toft2_zone"
+ ],
+ "stats": {
+ "agile": 6,
+ "aim": 3,
+ "armorRating": 20,
+ "currentHealth": 175,
+ "currentMana": 105,
+ "experience": 90000,
+ "maxHealth": 150,
+ "maxMana": 105,
+ "meleSkill": 22,
+ "numberOfWeaponRolls": 1,
+ "strength": 13,
+ "weaponRatingMax": 25,
+ "weaponRatingMin": 19,
+ "willPower": 4
+ },
+ "spawnAreas": {
+ "toft1_zone": {
+ "randomChance": 100,
+ "maxPerRoom": 1,
+ "spawnIntervalTicks": 600,
+ "maxInstances": 12
+ },
+ "toft2_zone": {
+ "randomChance": 100,
+ "maxPerRoom": 1,
+ "spawnIntervalTicks": 600,
+ "maxInstances": 12
+ }
+ },
+ "validTriggers": [
+ "s",
+ "swamp bear",
+ "swamp",
+ "b",
+ "bear"
+ ]
+}
--
GitLab