diff --git a/src/main/java/com/comandante/creeper/spells/LightningSpell.java b/src/main/java/com/comandante/creeper/spells/LightningSpell.java index c2f5af11a67abb5e6637abbb64e7b10d5caa0bde..b986b516ab3d09fba5a9882dec3ed3a34c9e0595 100644 --- a/src/main/java/com/comandante/creeper/spells/LightningSpell.java +++ b/src/main/java/com/comandante/creeper/spells/LightningSpell.java @@ -52,7 +52,7 @@ public class LightningSpell extends Spell { public void attackSpell(Set<String> npcIds, Player player) { Stats playerStats = player.getPlayerStatsWithEquipmentAndLevel(); long willpower = playerStats.getWillpower(); - long i = 500 + (willpower * 3); + long i = 20 + (willpower * 3); this.setEffects(Sets.newHashSet(burnEffect.setApplyStatsOnTick(new StatsBuilder().setCurrentHealth(-i).createStats()).createEffect())); super.attackSpell(npcIds, player); } diff --git a/src/test/com/comandante/creeper/player/NpcTestHarness.java b/src/test/com/comandante/creeper/player/NpcTestHarness.java index 458b4b5dc22b3ad13923d3f0ee71fc20c8eec36e..ebead4eec9ad2734961b9986efcd813e5cbd3da1 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("swamp berserker")).collect(Collectors.toList()).get(0); + Npc treeBerseker = npcsFromFile.stream().filter(npc -> npc.getName().equals("red-eyed 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 new file mode 100644 index 0000000000000000000000000000000000000000..e525cf35f46088eea0bc93bda17b6a251575a01d --- /dev/null +++ b/world/npcs/redeyedbear.json @@ -0,0 +1,54 @@ + +{ + "name": "red-eyed bear", + "colorName": "red-eyed \u001B[1m\u001B[35mbear\u001B[0m", + "dieMessage": "a red-eyed \u001B[1m\u001B[35mbear\u001B[0m breathes his last breath in a pool of \u001B[1m\u001B[31mblood\u001B[0m", + "temperament": "aggressive", + "loot": { + "lootGoldMin": 15, + "lootGoldMax": 25, + "lootItems": [] + }, + "roamAreas": [ + "toft1_zone", + "toft2_zone" + ], + "stats": { + "agile": 6, + "aim": 3, + "armorRating": 20, + "currentHealth": 150, + "currentMana": 105, + "experience": 22500, + "maxHealth": 150, + "maxMana": 105, + "meleSkill": 22, + "numberOfWeaponRolls": 1, + "strength": 13, + "weaponRatingMax": 22, + "weaponRatingMin": 16, + "willPower": 4 + }, + "spawnAreas": { + "toft1_zone": { + "randomChance": 100, + "maxPerRoom": 1, + "spawnIntervalTicks": 600, + "maxInstances": 22 + }, + "toft2_zone": { + "randomChance": 100, + "maxPerRoom": 1, + "spawnIntervalTicks": 600, + "maxInstances": 22 + } + }, + "validTriggers": [ + "r", + "red-eyed bear", + "red", + "red-eyed", + "b", + "bear" + ] +}