diff --git a/.gitignore b/.gitignore index aaad67b585826a1835f10f0ebfa2a420d837db70..d52cb9a79b3f3ac2d69ecc1ee95f5fecda0868f1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ -world.json .DS_Store target creeperDb* @@ -11,4 +10,4 @@ creeperDb* .idea/ *.mapdb* *.log -release.properties \ No newline at end of file +release.properties diff --git a/src/main/java/com/comandante/creeper/ConfigureNpc.java b/src/main/java/com/comandante/creeper/ConfigureNpc.java index bbca01062ac0da2863fa71e6d3e917bffa4e8fac..7e6deb5a46ef799850616c54580f0750676a2c14 100755 --- a/src/main/java/com/comandante/creeper/ConfigureNpc.java +++ b/src/main/java/com/comandante/creeper/ConfigureNpc.java @@ -9,6 +9,7 @@ import com.comandante.creeper.npc.NpcExporter; import com.comandante.creeper.spawner.ItemSpawner; import com.comandante.creeper.spawner.NpcSpawner; import com.comandante.creeper.spawner.SpawnRule; +import com.comandante.creeper.spawner.SpawnRuleBuilder; import com.comandante.creeper.spells.ClumsinessSpell; import com.comandante.creeper.spells.LightningSpell; import com.comandante.creeper.spells.SpellRegistry; @@ -41,12 +42,12 @@ public class ConfigureNpc { configureAllNpcs(gameManager); Main.startUpMessage("Adding beer"); - ItemSpawner itemSpawner = new ItemSpawner(ItemType.BEER, new SpawnRule(Area.NEWBIE_ZONE, 10, 100, 5, 40), gameManager); - ItemSpawner itemSpawner1 = new ItemSpawner(ItemType.BEER, new SpawnRule(Area.FANCYHOUSE_ZONE, 10, 12, 2, 50), gameManager); - ItemSpawner itemSpawner2 = new ItemSpawner(ItemType.BEER, new SpawnRule(Area.HOUSE_ZONE, 10, 12, 2, 50), gameManager); + ItemSpawner itemSpawner = new ItemSpawner(ItemType.BEER, new SpawnRuleBuilder().setArea(Area.NEWBIE_ZONE).setSpawnIntervalTicks(600).setMaxInstances(100).setMaxPerRoom(5).setRandomPercent(40).createSpawnRule(), gameManager); + ItemSpawner itemSpawner1 = new ItemSpawner(ItemType.BEER, new SpawnRuleBuilder().setArea(Area.FANCYHOUSE_ZONE).setSpawnIntervalTicks(600).setMaxInstances(12).setMaxPerRoom(2).setRandomPercent(50).createSpawnRule(), gameManager); + ItemSpawner itemSpawner2 = new ItemSpawner(ItemType.BEER, new SpawnRuleBuilder().setArea(Area.HOUSE_ZONE).setSpawnIntervalTicks(600).setMaxInstances(12).setMaxPerRoom(2).setRandomPercent(50).createSpawnRule(), gameManager); - ItemSpawner itemSpawner3 = new ItemSpawner(ItemType.PURPLE_DRANK, new SpawnRule(Area.FANCYHOUSE_ZONE, 10, 30, 5, 50), gameManager); - ItemSpawner itemSpawner4 = new ItemSpawner(ItemType.PURPLE_DRANK, new SpawnRule(Area.HOUSE_ZONE, 10, 30, 5, 50), gameManager); + ItemSpawner itemSpawner3 = new ItemSpawner(ItemType.PURPLE_DRANK, new SpawnRuleBuilder().setArea(Area.FANCYHOUSE_ZONE).setSpawnIntervalTicks(600).setMaxInstances(30).setMaxPerRoom(5).setRandomPercent(50).createSpawnRule(), gameManager); + ItemSpawner itemSpawner4 = new ItemSpawner(ItemType.PURPLE_DRANK, new SpawnRuleBuilder().setArea(Area.HOUSE_ZONE).setSpawnIntervalTicks(600).setMaxInstances(30).setMaxPerRoom(5).setRandomPercent(50).createSpawnRule(), gameManager); entityManager.addEntity(itemSpawner); entityManager.addEntity(itemSpawner1); diff --git a/src/main/java/com/comandante/creeper/managers/GameManager.java b/src/main/java/com/comandante/creeper/managers/GameManager.java index 806ca934de71dffd9d50279f14018498305afa7a..837f0b7579d23b5a4c1609f556cf67cf55cba0fe 100644 --- a/src/main/java/com/comandante/creeper/managers/GameManager.java +++ b/src/main/java/com/comandante/creeper/managers/GameManager.java @@ -674,7 +674,6 @@ public class GameManager { Map.Entry<String, Integer> damageEntry = iterator.next(); totalDamageDone += damageEntry.getValue(); PlayerMetadata playerMetadata = getPlayerManager().getPlayerMetadata(damageEntry.getKey()); - System.out.println(playerMetadata.getPlayerName() + " damage to " + npc.getName() + " was " + damageEntry.getValue()); Optional<Room> playerCurrentRoom = getRoomManager().getPlayerCurrentRoom(playerMetadata.getPlayerId()); if (!playerCurrentRoom.isPresent()) { iterator.remove(); diff --git a/src/main/java/com/comandante/creeper/npc/NpcAdapter.java b/src/main/java/com/comandante/creeper/npc/NpcAdapter.java index 01de773e0fed5c51b75aa082f66afb03b449a508..a2727f5abd5bc5c6974a5b35a5bf76bcef3b04d1 100644 --- a/src/main/java/com/comandante/creeper/npc/NpcAdapter.java +++ b/src/main/java/com/comandante/creeper/npc/NpcAdapter.java @@ -4,6 +4,7 @@ import com.comandante.creeper.Items.ItemType; import com.comandante.creeper.Items.Loot; import com.comandante.creeper.managers.GameManager; import com.comandante.creeper.spawner.SpawnRule; +import com.comandante.creeper.spawner.SpawnRuleBuilder; import com.comandante.creeper.stat.StatsBuilder; import com.comandante.creeper.world.Area; import com.google.common.collect.Sets; @@ -188,7 +189,7 @@ public class NpcAdapter extends TypeAdapter<Npc> { int maxInstances = jsonReader.nextInt(); jsonReader.endObject(); - spawnRules.add(new SpawnRule(Area.getByName(spawnAreaName),spawnIntervalTicks, maxInstances, maxPerRoom, randomChance)); + spawnRules.add(new SpawnRuleBuilder().setArea(Area.getByName(spawnAreaName)).setSpawnIntervalTicks(spawnIntervalTicks).setMaxInstances(maxInstances).setMaxPerRoom(maxPerRoom).setRandomPercent(randomChance).createSpawnRule()); } jsonReader.endObject(); diff --git a/src/main/java/com/comandante/creeper/npc/NpcAdapterTest.java b/src/main/java/com/comandante/creeper/npc/NpcAdapterTest.java index 4b7d4f6fa126720592a9eb66267689068cb860e9..cedd65f7873bc1ba36ad6d473aa22820004b2a98 100644 --- a/src/main/java/com/comandante/creeper/npc/NpcAdapterTest.java +++ b/src/main/java/com/comandante/creeper/npc/NpcAdapterTest.java @@ -4,6 +4,7 @@ import com.comandante.creeper.Items.Item; import com.comandante.creeper.Items.ItemType; import com.comandante.creeper.Items.Loot; import com.comandante.creeper.spawner.SpawnRule; +import com.comandante.creeper.spawner.SpawnRuleBuilder; import com.comandante.creeper.stat.Stats; import com.comandante.creeper.stat.StatsBuilder; import com.comandante.creeper.world.Area; @@ -56,8 +57,8 @@ public class NpcAdapterTest { .createStats(); Loot npcOneLoot = new Loot(randomGenerator.nextInt(100), randomGenerator.nextInt(100), Sets.newHashSet(ItemType.BEER)); - SpawnRule npcOneSpawnRule1 = new SpawnRule(Area.BLOODRIDGE10_ZONE, randomGenerator.nextInt(100), randomGenerator.nextInt(100), randomGenerator.nextInt(100), randomGenerator.nextInt(100)); - SpawnRule npcOneSpawnRule2 = new SpawnRule(Area.BLOODRIDGE10_ZONE, randomGenerator.nextInt(100), randomGenerator.nextInt(100), randomGenerator.nextInt(100), randomGenerator.nextInt(100)); + SpawnRule npcOneSpawnRule1 = new SpawnRuleBuilder().setArea(Area.BLOODRIDGE10_ZONE).setSpawnIntervalTicks(randomGenerator.nextInt(100)).setMaxInstances(randomGenerator.nextInt(100)).setMaxPerRoom(randomGenerator.nextInt(100)).setRandomPercent(randomGenerator.nextInt(100)).createSpawnRule(); + SpawnRule npcOneSpawnRule2 = new SpawnRuleBuilder().setArea(Area.BLOODRIDGE10_ZONE).setSpawnIntervalTicks(randomGenerator.nextInt(100)).setMaxInstances(randomGenerator.nextInt(100)).setMaxPerRoom(randomGenerator.nextInt(100)).setRandomPercent(randomGenerator.nextInt(100)).createSpawnRule(); npcOne = new NpcBuilder() .setColorName(UUID.randomUUID().toString()) .setDieMessage(UUID.randomUUID().toString()) diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java index a7e2ee567453734180ff9d666e3680a47f9335f0..8a02b0ec9025363576cd518e0c1ceefc41294fc9 100755 --- a/src/main/java/com/comandante/creeper/player/Player.java +++ b/src/main/java/com/comandante/creeper/player/Player.java @@ -671,7 +671,6 @@ public class Player extends CreeperEntity { public void removeActiveFight(Npc npc) { synchronized (interner.intern(playerId)) { - System.out.println("Removing active fight for: " + npc.getColorName()); Iterator<Map.Entry<Long, ActiveFight>> iterator = activeFights.entrySet().iterator(); while (iterator.hasNext()) { Map.Entry<Long, ActiveFight> next = iterator.next(); diff --git a/src/main/java/com/comandante/creeper/spawner/SpawnRuleBuilder.java b/src/main/java/com/comandante/creeper/spawner/SpawnRuleBuilder.java new file mode 100644 index 0000000000000000000000000000000000000000..4e652f02ad9929feb6c6075eb084c6e2b51de607 --- /dev/null +++ b/src/main/java/com/comandante/creeper/spawner/SpawnRuleBuilder.java @@ -0,0 +1,40 @@ +package com.comandante.creeper.spawner; + +import com.comandante.creeper.world.Area; + +public class SpawnRuleBuilder { + private Area area; + private int spawnIntervalTicks; + private int maxInstances; + private int maxPerRoom; + private int randomPercent; + + public SpawnRuleBuilder setArea(Area area) { + this.area = area; + return this; + } + + public SpawnRuleBuilder setSpawnIntervalTicks(int spawnIntervalTicks) { + this.spawnIntervalTicks = spawnIntervalTicks; + return this; + } + + public SpawnRuleBuilder setMaxInstances(int maxInstances) { + this.maxInstances = maxInstances; + return this; + } + + public SpawnRuleBuilder setMaxPerRoom(int maxPerRoom) { + this.maxPerRoom = maxPerRoom; + return this; + } + + public SpawnRuleBuilder setRandomPercent(int randomPercent) { + this.randomPercent = randomPercent; + return this; + } + + public SpawnRule createSpawnRule() { + return new SpawnRule(area, spawnIntervalTicks, maxInstances, maxPerRoom, randomPercent); + } +} \ No newline at end of file diff --git a/world/npcs/bergorc.json b/world/npcs/bergorc.json index 588742cc7902dc6c0893ebbe10e3609258114fe8..a098500515722de042956d41e2d365382fc973f0 100755 --- a/world/npcs/bergorc.json +++ b/world/npcs/bergorc.json @@ -30,7 +30,7 @@ "bloodridge1_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 12 } }, diff --git a/world/npcs/blackhoodedwizard.json b/world/npcs/blackhoodedwizard.json index 4ea9fb864d32b12fdf2ef90eb68ff5281d691347..7f7239ca1b41fc73ab678e53e7838b423344a7e5 100755 --- a/world/npcs/blackhoodedwizard.json +++ b/world/npcs/blackhoodedwizard.json @@ -31,13 +31,13 @@ "tisland4_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "tisland5_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/charlesbiggers.json b/world/npcs/charlesbiggers.json index 1ddc5bd50d67bcc73f9641f0f6cf08bbaab0b47c..2b5d6e653ba98cb5c18902f2092e8c7a97f00840 100755 --- a/world/npcs/charlesbiggers.json +++ b/world/npcs/charlesbiggers.json @@ -31,7 +31,7 @@ "tisland10_zone": { "randomChance": 100, "maxPerRoom": 1, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 1 } }, diff --git a/world/npcs/deathgriffin.json b/world/npcs/deathgriffin.json index a1f3eda8b60515b0bb5b7b868e7279345f1bf599..a02a62a75a61847ef6f846b7501a44964ea6c6bd 100755 --- a/world/npcs/deathgriffin.json +++ b/world/npcs/deathgriffin.json @@ -31,13 +31,13 @@ "western8_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "western9_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/demonsuccubus.json b/world/npcs/demonsuccubus.json index 74d01894b41e64692875b5eae63bf616dd65de9f..45cce2d5797725580cb1e7c4a6692be2e13e03e7 100755 --- a/world/npcs/demonsuccubus.json +++ b/world/npcs/demonsuccubus.json @@ -31,13 +31,13 @@ "western9_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "western10_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/dwarfvaettir.json b/world/npcs/dwarfvaettir.json index f5bb41a8c0ecdebe6973800ff0d938e1e641a2a6..5712e89c3c8d0f2ab69536cd9edc68fdbf3b7624 100755 --- a/world/npcs/dwarfvaettir.json +++ b/world/npcs/dwarfvaettir.json @@ -31,13 +31,13 @@ "north10_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 20 }, "north11_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/forestbysen.json b/world/npcs/forestbysen.json index a51b1f668b1a893c3a0a25e2862a3e7b22c6dc20..8fe04b40eb3bda03a9fa4630ac039861d6eab4b4 100755 --- a/world/npcs/forestbysen.json +++ b/world/npcs/forestbysen.json @@ -30,7 +30,7 @@ "south1_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 18 } }, diff --git a/world/npcs/grayekimmu.json b/world/npcs/grayekimmu.json index 8f61093ec8bff28e3ee626696225704c58ff99ee..02dc8039235bfa9d6039d63f470274a4c04f758a 100755 --- a/world/npcs/grayekimmu.json +++ b/world/npcs/grayekimmu.json @@ -31,13 +31,13 @@ "north4_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 }, "north5_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/nightmaretroll.json b/world/npcs/nightmaretroll.json index 2df7e88eeb2185b932313d404c1a00d737a31b03..43e0ee232b41d765eb3ac2061c02d179b60c9852 100755 --- a/world/npcs/nightmaretroll.json +++ b/world/npcs/nightmaretroll.json @@ -31,13 +31,13 @@ "north7_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "north8_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/phantomknight.json b/world/npcs/phantomknight.json index b61ad176b056166706911efc96081c9e10a5d44f..30ce9541ba29cc0659e3b605704f33753276bbd6 100755 --- a/world/npcs/phantomknight.json +++ b/world/npcs/phantomknight.json @@ -32,20 +32,20 @@ "bloodridge5_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "bloodridge6_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } , "bloodridge7_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/phantomorc.json b/world/npcs/phantomorc.json index 41934a48d13a72ec7a59e352b3aa91ad2ba74919..d9cfc02cb837e7623ab0b99e609091ed22c32195 100755 --- a/world/npcs/phantomorc.json +++ b/world/npcs/phantomorc.json @@ -31,13 +31,13 @@ "bloodridge4_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "bloodridge5_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/phantomwizard.json b/world/npcs/phantomwizard.json index 0ee0124a1fa74e5ee05f62744c0323337f7fedbf..1cb75fa0f2fb459c33b76d666ca34391bb0fce0d 100755 --- a/world/npcs/phantomwizard.json +++ b/world/npcs/phantomwizard.json @@ -31,13 +31,13 @@ "bloodridge4_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "bloodridge5_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/razorclawwolf.json b/world/npcs/razorclawwolf.json index 8fe7ff6caa53fbad211c12e1608454ae14c81da2..381f98cd1b2d9f420e24544287c9a05e4aa0fb9a 100755 --- a/world/npcs/razorclawwolf.json +++ b/world/npcs/razorclawwolf.json @@ -31,13 +31,13 @@ "toft2_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "toft3_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/redeyedbear.json b/world/npcs/redeyedbear.json index 055af922cef20b9d9c9d9c7c60c022aa60510f74..9a15ad244934d05e3f4d857a6428090f39d83449 100755 --- a/world/npcs/redeyedbear.json +++ b/world/npcs/redeyedbear.json @@ -31,7 +31,7 @@ "bloodridge1_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/scaleddeathcrawler.json b/world/npcs/scaleddeathcrawler.json index e38b5945af13d85d1f8f7d5a6186d49e35a4c298..3bf3fb0f740c9e689e6ff965a1e17a7a762febc6 100755 --- a/world/npcs/scaleddeathcrawler.json +++ b/world/npcs/scaleddeathcrawler.json @@ -31,13 +31,13 @@ "north10_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 20 }, "north11_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/stealthpanther.json b/world/npcs/stealthpanther.json index 73556a57c5d1d1606f928080fcc4316dcb8ad57d..74188765621b410a6865381d6e9656fbced613ae 100755 --- a/world/npcs/stealthpanther.json +++ b/world/npcs/stealthpanther.json @@ -31,13 +31,13 @@ "north5_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 }, "north6_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/stonegiant.json b/world/npcs/stonegiant.json index 2680e4f331807e0847042b4cd98ab57b96a4b99b..243d557c7c7b90902bb85371331e9fc04954f367 100755 --- a/world/npcs/stonegiant.json +++ b/world/npcs/stonegiant.json @@ -31,13 +31,13 @@ "tisland4_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "tisland5_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/streethustler.json b/world/npcs/streethustler.json index f859919c178805e448065413de084d36de357de6..8838c4658fe8912a5225478a00208c7d12b0852e 100755 --- a/world/npcs/streethustler.json +++ b/world/npcs/streethustler.json @@ -30,7 +30,7 @@ "newbie_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 5 } }, diff --git a/world/npcs/swampbear.json b/world/npcs/swampbear.json index bd731b872889ec5ce247f36a85a720e86594b35d..c80ac20606a041286c8c96cb20e01f85ecd89e47 100755 --- a/world/npcs/swampbear.json +++ b/world/npcs/swampbear.json @@ -31,13 +31,13 @@ "north3_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 }, "north4_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/swampberserker.json b/world/npcs/swampberserker.json index 8b285bd7d3bd854cf55c2bf95934a4e4962823ab..bc5e8b04a13563a184c8bbccdcf46f277c0eab71 100755 --- a/world/npcs/swampberserker.json +++ b/world/npcs/swampberserker.json @@ -30,7 +30,7 @@ "north2_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 12 } }, diff --git a/world/npcs/thefirstnationalbank.json b/world/npcs/thefirstnationalbank.json index 2bbbfa6c341b5537aa45feb493f7e4ed703641fe..bdc059f2d0adf74bdc694eec7f397bc1630be0f2 100755 --- a/world/npcs/thefirstnationalbank.json +++ b/world/npcs/thefirstnationalbank.json @@ -31,7 +31,7 @@ "tisland10_zone": { "randomChance": 5, "maxPerRoom": 1, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 1 } }, diff --git a/world/npcs/tigermonoceruses.json b/world/npcs/tigermonoceruses.json index cd0435f2679f275a72cc695be698cb582f9503f5..4c13abcb3fe2ba5d331a558f79344addd685a2d5 100755 --- a/world/npcs/tigermonoceruses.json +++ b/world/npcs/tigermonoceruses.json @@ -31,13 +31,13 @@ "north8_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "north9_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } }, diff --git a/world/npcs/treeberserker.json b/world/npcs/treeberserker.json index 21b613e0662bd61a39ed4578c3e757cb436af638..fb4ff4f6494fc2722c337a23ec7313360289f498 100755 --- a/world/npcs/treeberserker.json +++ b/world/npcs/treeberserker.json @@ -30,7 +30,7 @@ "north1_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 12 } }, diff --git a/world/npcs/tunnelcobra.json b/world/npcs/tunnelcobra.json index c3baae60317dd9ff8317e37b2cfcba00319abac7..58c252461ca89d0feb9f452608b00a78bfc03b52 100755 --- a/world/npcs/tunnelcobra.json +++ b/world/npcs/tunnelcobra.json @@ -31,13 +31,13 @@ "tisland4_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 6 }, "tisland3_zone": { "randomChance": 100, "maxPerRoom": 3, - "spawnIntervalTicks": 10, + "spawnIntervalTicks": 600, "maxInstances": 14 } },