From ed33ff53c19fc13e0c9762a2e07c50beeeb9809b Mon Sep 17 00:00:00 2001
From: Chris Kearney <chris@kearneymail.com>
Date: Tue, 16 Aug 2016 17:35:26 -0700
Subject: [PATCH] spells overhaul
---
.../com/comandante/creeper/{spells => Items}/Effect.java | 2 +-
.../comandante/creeper/{spells => Items}/EffectBuilder.java | 2 +-
.../creeper/{spells => Items}/EffectSerializer.java | 3 +--
.../creeper/{spells => Items}/EffectsManager.java | 2 +-
src/main/java/com/comandante/creeper/Items/Item.java | 1 -
.../java/com/comandante/creeper/Items/ItemUseAction.java | 1 -
.../creeper/Items/use/DefaultApplyStatsAction.java | 6 +-----
.../comandante/creeper/Items/use/DirtyBombUseAction.java | 6 +-----
.../creeper/Items/use/LightningSpellBookUseAction.java | 2 +-
.../creeper/Items/use/ResetAllEffectsUseAction.java | 6 +-----
.../com/comandante/creeper/command/MovementCommand.java | 2 +-
.../comandante/creeper/command/admin/TeleportCommand.java | 2 +-
.../java/com/comandante/creeper/entity/EntityManager.java | 2 +-
.../java/com/comandante/creeper/managers/GameManager.java | 2 --
src/main/java/com/comandante/creeper/npc/Npc.java | 2 +-
src/main/java/com/comandante/creeper/player/Player.java | 2 +-
src/test/com/comandante/creeper/player/NpcTestHarness.java | 3 +++
17 files changed, 16 insertions(+), 30 deletions(-)
rename src/main/java/com/comandante/creeper/{spells => Items}/Effect.java (98%)
rename src/main/java/com/comandante/creeper/{spells => Items}/EffectBuilder.java (97%)
rename src/main/java/com/comandante/creeper/{spells => Items}/EffectSerializer.java (89%)
rename src/main/java/com/comandante/creeper/{spells => Items}/EffectsManager.java (99%)
diff --git a/src/main/java/com/comandante/creeper/spells/Effect.java b/src/main/java/com/comandante/creeper/Items/Effect.java
similarity index 98%
rename from src/main/java/com/comandante/creeper/spells/Effect.java
rename to src/main/java/com/comandante/creeper/Items/Effect.java
index fce40bdb..732f7d12 100644
--- a/src/main/java/com/comandante/creeper/spells/Effect.java
+++ b/src/main/java/com/comandante/creeper/Items/Effect.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.spells;
+package com.comandante.creeper.Items;
import com.comandante.creeper.entity.CreeperEntity;
diff --git a/src/main/java/com/comandante/creeper/spells/EffectBuilder.java b/src/main/java/com/comandante/creeper/Items/EffectBuilder.java
similarity index 97%
rename from src/main/java/com/comandante/creeper/spells/EffectBuilder.java
rename to src/main/java/com/comandante/creeper/Items/EffectBuilder.java
index cf863b96..0a9c83f8 100644
--- a/src/main/java/com/comandante/creeper/spells/EffectBuilder.java
+++ b/src/main/java/com/comandante/creeper/Items/EffectBuilder.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.spells;
+package com.comandante.creeper.Items;
import com.comandante.creeper.stat.Stats;
diff --git a/src/main/java/com/comandante/creeper/spells/EffectSerializer.java b/src/main/java/com/comandante/creeper/Items/EffectSerializer.java
similarity index 89%
rename from src/main/java/com/comandante/creeper/spells/EffectSerializer.java
rename to src/main/java/com/comandante/creeper/Items/EffectSerializer.java
index 76f35028..fe5549a1 100644
--- a/src/main/java/com/comandante/creeper/spells/EffectSerializer.java
+++ b/src/main/java/com/comandante/creeper/Items/EffectSerializer.java
@@ -1,6 +1,5 @@
-package com.comandante.creeper.spells;
+package com.comandante.creeper.Items;
-import com.comandante.creeper.spells.Effect;
import com.google.gson.GsonBuilder;
import org.mapdb.Serializer;
diff --git a/src/main/java/com/comandante/creeper/spells/EffectsManager.java b/src/main/java/com/comandante/creeper/Items/EffectsManager.java
similarity index 99%
rename from src/main/java/com/comandante/creeper/spells/EffectsManager.java
rename to src/main/java/com/comandante/creeper/Items/EffectsManager.java
index a082ed6e..e8d6d0ae 100644
--- a/src/main/java/com/comandante/creeper/spells/EffectsManager.java
+++ b/src/main/java/com/comandante/creeper/Items/EffectsManager.java
@@ -1,4 +1,4 @@
-package com.comandante.creeper.spells;
+package com.comandante.creeper.Items;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.npc.Npc;
diff --git a/src/main/java/com/comandante/creeper/Items/Item.java b/src/main/java/com/comandante/creeper/Items/Item.java
index b326917f..13771c37 100644
--- a/src/main/java/com/comandante/creeper/Items/Item.java
+++ b/src/main/java/com/comandante/creeper/Items/Item.java
@@ -2,7 +2,6 @@ package com.comandante.creeper.Items;
import com.comandante.creeper.player.Equipment;
-import com.comandante.creeper.spells.Effect;
import java.io.Serializable;
import java.util.List;
diff --git a/src/main/java/com/comandante/creeper/Items/ItemUseAction.java b/src/main/java/com/comandante/creeper/Items/ItemUseAction.java
index e30cb325..e498e967 100644
--- a/src/main/java/com/comandante/creeper/Items/ItemUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/ItemUseAction.java
@@ -2,7 +2,6 @@ package com.comandante.creeper.Items;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.spells.Effect;
import java.util.Set;
diff --git a/src/main/java/com/comandante/creeper/Items/use/DefaultApplyStatsAction.java b/src/main/java/com/comandante/creeper/Items/use/DefaultApplyStatsAction.java
index c92eddea..10602c9f 100644
--- a/src/main/java/com/comandante/creeper/Items/use/DefaultApplyStatsAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/DefaultApplyStatsAction.java
@@ -1,12 +1,8 @@
package com.comandante.creeper.Items.use;
-import com.comandante.creeper.Items.Item;
-import com.comandante.creeper.Items.ItemType;
-import com.comandante.creeper.Items.ItemUseAction;
-import com.comandante.creeper.Items.ItemUseHandler;
+import com.comandante.creeper.Items.*;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.spells.Effect;
import com.comandante.creeper.stat.Stats;
import org.apache.log4j.Logger;
diff --git a/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java b/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
index e291a979..5e874e7f 100644
--- a/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/DirtyBombUseAction.java
@@ -1,15 +1,11 @@
package com.comandante.creeper.Items.use;
-import com.comandante.creeper.Items.Item;
-import com.comandante.creeper.Items.ItemType;
-import com.comandante.creeper.Items.ItemUseAction;
-import com.comandante.creeper.Items.ItemUseHandler;
+import com.comandante.creeper.Items.*;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.npc.Npc;
import com.comandante.creeper.npc.NpcStatsChangeBuilder;
import com.comandante.creeper.player.Player;
import com.comandante.creeper.server.Color;
-import com.comandante.creeper.spells.Effect;
import com.comandante.creeper.stat.StatsBuilder;
import com.comandante.creeper.world.Room;
diff --git a/src/main/java/com/comandante/creeper/Items/use/LightningSpellBookUseAction.java b/src/main/java/com/comandante/creeper/Items/use/LightningSpellBookUseAction.java
index 3a79ea93..35d261c3 100644
--- a/src/main/java/com/comandante/creeper/Items/use/LightningSpellBookUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/LightningSpellBookUseAction.java
@@ -1,11 +1,11 @@
package com.comandante.creeper.Items.use;
+import com.comandante.creeper.Items.Effect;
import com.comandante.creeper.Items.Item;
import com.comandante.creeper.Items.ItemType;
import com.comandante.creeper.Items.ItemUseAction;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.spells.Effect;
import com.comandante.creeper.spells.LightningSpellRunnable;
import java.util.Set;
diff --git a/src/main/java/com/comandante/creeper/Items/use/ResetAllEffectsUseAction.java b/src/main/java/com/comandante/creeper/Items/use/ResetAllEffectsUseAction.java
index bae77982..7becf179 100644
--- a/src/main/java/com/comandante/creeper/Items/use/ResetAllEffectsUseAction.java
+++ b/src/main/java/com/comandante/creeper/Items/use/ResetAllEffectsUseAction.java
@@ -1,12 +1,8 @@
package com.comandante.creeper.Items.use;
-import com.comandante.creeper.Items.Item;
-import com.comandante.creeper.Items.ItemType;
-import com.comandante.creeper.Items.ItemUseAction;
-import com.comandante.creeper.Items.ItemUseHandler;
+import com.comandante.creeper.Items.*;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.Player;
-import com.comandante.creeper.spells.Effect;
import java.util.Set;
diff --git a/src/main/java/com/comandante/creeper/command/MovementCommand.java b/src/main/java/com/comandante/creeper/command/MovementCommand.java
index b8c024cf..be5e2937 100644
--- a/src/main/java/com/comandante/creeper/command/MovementCommand.java
+++ b/src/main/java/com/comandante/creeper/command/MovementCommand.java
@@ -1,9 +1,9 @@
package com.comandante.creeper.command;
+import com.comandante.creeper.Items.Effect;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.CoolDownType;
import com.comandante.creeper.player.PlayerMovement;
-import com.comandante.creeper.spells.Effect;
import com.comandante.creeper.world.RemoteExit;
import com.comandante.creeper.world.Room;
import com.google.common.base.Optional;
diff --git a/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java b/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java
index a0ba7ce2..d394cef7 100644
--- a/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java
+++ b/src/main/java/com/comandante/creeper/command/admin/TeleportCommand.java
@@ -1,6 +1,7 @@
package com.comandante.creeper.command.admin;
+import com.comandante.creeper.Items.Effect;
import com.comandante.creeper.command.Command;
import com.comandante.creeper.managers.GameManager;
import com.comandante.creeper.player.CoolDownType;
@@ -8,7 +9,6 @@ import com.comandante.creeper.player.Player;
import com.comandante.creeper.player.PlayerMovement;
import com.comandante.creeper.player.PlayerRole;
import com.comandante.creeper.server.Color;
-import com.comandante.creeper.spells.Effect;
import com.comandante.creeper.world.Room;
import com.google.common.collect.Sets;
import org.jboss.netty.channel.ChannelHandlerContext;
diff --git a/src/main/java/com/comandante/creeper/entity/EntityManager.java b/src/main/java/com/comandante/creeper/entity/EntityManager.java
index ff637721..e4824c8c 100644
--- a/src/main/java/com/comandante/creeper/entity/EntityManager.java
+++ b/src/main/java/com/comandante/creeper/entity/EntityManager.java
@@ -1,5 +1,6 @@
package com.comandante.creeper.entity;
+import com.comandante.creeper.Items.Effect;
import com.comandante.creeper.Items.EffectSerializer;
import com.comandante.creeper.Items.Item;
import com.comandante.creeper.Items.ItemSerializer;
@@ -8,7 +9,6 @@ import com.comandante.creeper.managers.SentryManager;
import com.comandante.creeper.npc.Npc;
import com.comandante.creeper.player.Player;
import com.comandante.creeper.player.PlayerManager;
-import com.comandante.creeper.spells.Effect;
import com.comandante.creeper.world.Room;
import com.comandante.creeper.world.RoomManager;
import org.apache.log4j.Logger;
diff --git a/src/main/java/com/comandante/creeper/managers/GameManager.java b/src/main/java/com/comandante/creeper/managers/GameManager.java
index 4dafb97e..da0c6ecb 100644
--- a/src/main/java/com/comandante/creeper/managers/GameManager.java
+++ b/src/main/java/com/comandante/creeper/managers/GameManager.java
@@ -19,8 +19,6 @@ import com.comandante.creeper.server.Color;
import com.comandante.creeper.server.GossipCache;
import com.comandante.creeper.server.MultiLineInputManager;
import com.comandante.creeper.spawner.NpcSpawner;
-import com.comandante.creeper.spells.Effect;
-import com.comandante.creeper.spells.EffectsManager;
import com.comandante.creeper.spells.Spells;
import com.comandante.creeper.stat.Stats;
import com.comandante.creeper.stat.StatsBuilder;
diff --git a/src/main/java/com/comandante/creeper/npc/Npc.java b/src/main/java/com/comandante/creeper/npc/Npc.java
index a343305f..c5dd03de 100644
--- a/src/main/java/com/comandante/creeper/npc/Npc.java
+++ b/src/main/java/com/comandante/creeper/npc/Npc.java
@@ -1,6 +1,7 @@
package com.comandante.creeper.npc;
+import com.comandante.creeper.Items.Effect;
import com.comandante.creeper.Items.Item;
import com.comandante.creeper.Items.Loot;
import com.comandante.creeper.Items.Rarity;
@@ -10,7 +11,6 @@ import com.comandante.creeper.managers.SentryManager;
import com.comandante.creeper.player.*;
import com.comandante.creeper.server.Color;
import com.comandante.creeper.spawner.SpawnRule;
-import com.comandante.creeper.spells.Effect;
import com.comandante.creeper.stat.Stats;
import com.comandante.creeper.stat.StatsBuilder;
import com.comandante.creeper.stat.StatsHelper;
diff --git a/src/main/java/com/comandante/creeper/player/Player.java b/src/main/java/com/comandante/creeper/player/Player.java
index a45eb931..80afbee2 100644
--- a/src/main/java/com/comandante/creeper/player/Player.java
+++ b/src/main/java/com/comandante/creeper/player/Player.java
@@ -3,6 +3,7 @@ package com.comandante.creeper.player;
import com.codahale.metrics.Meter;
import com.comandante.creeper.CreeperUtils;
+import com.comandante.creeper.Items.Effect;
import com.comandante.creeper.Items.ForageManager;
import com.comandante.creeper.Items.Item;
import com.comandante.creeper.Items.ItemType;
@@ -14,7 +15,6 @@ import com.comandante.creeper.npc.Npc;
import com.comandante.creeper.npc.NpcStatsChangeBuilder;
import com.comandante.creeper.npc.Temperament;
import com.comandante.creeper.server.Color;
-import com.comandante.creeper.spells.Effect;
import com.comandante.creeper.stat.Stats;
import com.comandante.creeper.stat.StatsBuilder;
import com.comandante.creeper.stat.StatsHelper;
diff --git a/src/test/com/comandante/creeper/player/NpcTestHarness.java b/src/test/com/comandante/creeper/player/NpcTestHarness.java
index 1a4adc0d..cc438421 100644
--- a/src/test/com/comandante/creeper/player/NpcTestHarness.java
+++ b/src/test/com/comandante/creeper/player/NpcTestHarness.java
@@ -239,6 +239,9 @@ public class NpcTestHarness {
int lightningSpellDamage = getLightningSpellDamage(4, 7, 4);
System.out.println("Level 1 player with 7 intelligence vs 4 intelligence npc: " + lightningSpellDamage);
+ lightningSpellDamage = getLightningSpellDamage(5, 11, 6);
+ System.out.println("Level 1 player with 11 intelligence vs 6 intelligence npc: " + lightningSpellDamage);
+
lightningSpellDamage = getLightningSpellDamage(5, 11, 6);
System.out.println("Level 5 player with 11 intelligence vs 6 intelligence npc: " + lightningSpellDamage);
lightningSpellDamage = getLightningSpellDamage(7, 14, 8);
--
GitLab