From 5d01c13bf80c5cab5eba8a183a37992eb40ffae1 Mon Sep 17 00:00:00 2001 From: Obique Date: Sun, 19 May 2019 15:57:46 -0500 Subject: [PATCH] Fixed table ID output --- .../support/data/server_info/loader/npc/LootTableLoader.kt | 2 +- .../services/gameplay/combat/loot/LootGenerationService.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/npc/LootTableLoader.kt b/src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/npc/LootTableLoader.kt index ed1f3f4ca..92c27acca 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/npc/LootTableLoader.kt +++ b/src/main/java/com/projectswg/holocore/resources/support/data/server_info/loader/npc/LootTableLoader.kt @@ -46,7 +46,7 @@ class LootTableLoader : DataLoader() { } @Throws(IOException::class) - public override fun load() { + override fun load() { SdbLoader.load(File("serverdata/loot/loot_table.sdb")).use { set -> val itemGroups = set.getTextArrayParser("items_group_([0-9]+)") val chanceGroups = set.getIntegerArrayParser("chance_group_([0-9]+)") diff --git a/src/main/java/com/projectswg/holocore/services/gameplay/combat/loot/LootGenerationService.kt b/src/main/java/com/projectswg/holocore/services/gameplay/combat/loot/LootGenerationService.kt index 0dd1d05f4..f0fd8a35b 100644 --- a/src/main/java/com/projectswg/holocore/services/gameplay/combat/loot/LootGenerationService.kt +++ b/src/main/java/com/projectswg/holocore/services/gameplay/combat/loot/LootGenerationService.kt @@ -183,10 +183,10 @@ class LootGenerationService : Service() { if (tableRoll > tableChance) { // Skip ahead if there's no drop chance - adminOutput1.append("/ \\#FF0000 loot_table").append(tableId) + adminOutput1.append("/ \\#FF0000 loot_table").append(tableId+1) break } - adminOutput1.append("/ \\#00FF00 loot_table").append(tableId) + adminOutput1.append("/ \\#00FF00 loot_table").append(tableId+1) val groupRoll = random.nextInt(100) + 1 val lootTableItem = lootTables.getLootTableItem(npcTable.lootTable, difficulty.name, level) ?: continue