From a5fb65e594f0cc4fb2379736b2abdaeaccd6dccd Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Sun, 7 Aug 2016 22:41:00 -0700
Subject: [PATCH] tuned berserker gear
---
.../com/comandante/creeper/Items/ItemType.java | 2 +-
src/main/java/com/comandante/creeper/Main.java | 6 +-----
.../comandante/creeper/player/NpcTestHarness.java | 14 ++------------
3 files changed, 4 insertions(+), 18 deletions(-)
diff --git a/src/main/java/com/comandante/creeper/Items/ItemType.java b/src/main/java/com/comandante/creeper/Items/ItemType.java
index 4517d17e..648e5d0c 100755
--- a/src/main/java/com/comandante/creeper/Items/ItemType.java
+++ b/src/main/java/com/comandante/creeper/Items/ItemType.java
@@ -56,7 +56,7 @@ public enum ItemType {
0,
60,
true,
- Rarity.BASIC,
+ Rarity.UNCOMMON,
50, Sets.<TimeTracker.TimeOfDay>newHashSet()),
BERSERKER_CHEST(5, Arrays.asList("chest", "berserker chest", "c"),
diff --git a/src/main/java/com/comandante/creeper/Main.java b/src/main/java/com/comandante/creeper/Main.java
index fb7e1ef2..213d0757 100644
--- a/src/main/java/com/comandante/creeper/Main.java
+++ b/src/main/java/com/comandante/creeper/Main.java
@@ -7,9 +7,9 @@ import com.codahale.metrics.graphite.GraphiteReporter;
import com.codahale.metrics.graphite.PickledGraphite;
import com.comandante.creeper.Items.ItemUseRegistry;
import com.comandante.creeper.entity.EntityManager;
-import com.comandante.creeper.player.PlayerManagementManager;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.managers.SessionManager;
+import com.comandante.creeper.player.PlayerManagementManager;
import com.comandante.creeper.player.PlayerManager;
import com.comandante.creeper.server.ChannelUtils;
import com.comandante.creeper.server.CreeperServer;
@@ -24,14 +24,10 @@ import org.mapdb.DB;
import org.mapdb.DBMaker;
import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
import java.net.InetSocketAddress;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.concurrent.TimeUnit;
-import java.util.jar.JarInputStream;
-import java.util.jar.Manifest;
public class Main {
diff --git a/src/test/com/comandante/creeper/player/NpcTestHarness.java b/src/test/com/comandante/creeper/player/NpcTestHarness.java
index bed2d246..1b8e3389 100644
--- a/src/test/com/comandante/creeper/player/NpcTestHarness.java
+++ b/src/test/com/comandante/creeper/player/NpcTestHarness.java
@@ -3,7 +3,6 @@ package com.comandante.creeper.player;
import com.comandante.creeper.ConfigureCommands;
import com.comandante.creeper.CreeperConfiguration;
import com.comandante.creeper.Items.Item;
-import com.comandante.creeper.Items.ItemType;
import com.comandante.creeper.Items.ItemUseRegistry;
import com.comandante.creeper.Main;
import com.comandante.creeper.entity.EntityManager;
@@ -14,21 +13,15 @@ import com.comandante.creeper.npc.NpcBuilder;
import com.comandante.creeper.npc.NpcExporter;
import com.comandante.creeper.server.ChannelCommunicationUtils;
import com.comandante.creeper.server.CreeperSession;
-import com.comandante.creeper.stat.Stats;
-import com.comandante.creeper.stat.StatsBuilder;
-import com.comandante.creeper.stat.StatsHelper;
import com.comandante.creeper.world.MapsManager;
import com.comandante.creeper.world.RoomManager;
import com.comandante.creeper.world.WorldExporter;
-import com.google.common.collect.Interner;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
-import org.apache.commons.codec.language.Soundex;
import org.apache.commons.configuration.MapConfiguration;
import org.jboss.netty.channel.Channel;
import org.junit.Before;
import org.junit.Test;
-import org.mapdb.Atomic;
import org.mapdb.DB;
import org.mapdb.DBMaker;
import org.nocrala.tools.texttablefmt.BorderStyle;
@@ -38,11 +31,8 @@ import org.nocrala.tools.texttablefmt.Table;
import java.io.FileNotFoundException;
import java.util.*;
import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Consumer;
-import java.util.function.Function;
import java.util.stream.Collectors;
-import static org.mockito.Matchers.eq;
import static org.mockito.Mockito.mock;
public class NpcTestHarness {
@@ -105,11 +95,11 @@ public class NpcTestHarness {
//equipment.add(ItemType.BERSEKER_SHORTS.create());
Map<String, AtomicInteger> drops = new HashMap<String, AtomicInteger>();
- int totalGold = 0;
for (int level = 0; level < 10; level++) {
Set<Item> equipment = Sets.newHashSet();
int playerWins = 0;
int npcWins = 0;
+ int totalGold = 0;
totalFightRounds = 0;
for (int i = 0; i < 100; i++) {
String username = UUID.randomUUID().toString();
@@ -122,7 +112,7 @@ public class NpcTestHarness {
if (conductFight(player, npc)) {
playerWins++;
int gold = (int) gameManager.getLootManager().lootGoldAmountReturn(npc.getLoot());
- totalGold =+ gold;
+ totalGold += gold;
Set<Item> items = gameManager.getLootManager().lootItemsReturn(npc.getLoot());
items.forEach(item -> {
if (!drops.containsKey(item.getItemName())) {
--
GitLab