diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java index ace11cd1f..34bcc00a9 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/ShatteredPixelDungeon.java @@ -45,10 +45,10 @@ public class ShatteredPixelDungeon extends Game { // 0.2.4 com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shock.class, + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shocking.class, "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Piercing" ); com.watabou.utils.Bundle.addAlias( - com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shock.class, + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shocking.class, "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Swing" ); com.watabou.utils.Bundle.addAlias( @@ -107,9 +107,42 @@ public class ShatteredPixelDungeon extends Game { "com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.Wandmaker$Rotberry$Seed" ); //0.4.0 + //equipment com.watabou.utils.Bundle.addAlias( com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.WornShortsword.class, "com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.ShortSword" ); + //enchants/glyphs + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blazing.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Fire" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Eldritch.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Horror" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Unstable.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Instability" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Vampiric.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Lucky.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Luck" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Stunning.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Paralysis" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Venomous.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Poison" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shocking.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shock" ); + com.watabou.utils.Bundle.addAlias( + com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Chilling.class, + "com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Slow" ); + } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java index f170b5e0c..7cb5d849c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bat.java @@ -25,7 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Vampiric; import com.shatteredpixel.shatteredpixeldungeon.sprites.BatSprite; import com.watabou.utils.Random; @@ -92,7 +92,7 @@ public class Bat extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { - RESISTANCES.add( Leech.class ); + RESISTANCES.add( Vampiric.class ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java index 0815b50aa..e169ebd70 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/DM300.java @@ -38,7 +38,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.CapeOfThorns; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -167,7 +167,7 @@ public class DM300 extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { - RESISTANCES.add( Death.class ); + RESISTANCES.add( Grim.class ); RESISTANCES.add( ScrollOfPsionicBlast.class ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java index 459ef451b..7ccfeceb5 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Elemental.java @@ -28,7 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Frost; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfLiquidFlame; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfFireblast; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Fire; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blazing; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.sprites.ElementalSprite; import com.watabou.utils.Random; @@ -98,7 +98,7 @@ public class Elemental extends Mob { private static final HashSet> IMMUNITIES = new HashSet<>(); static { IMMUNITIES.add( Burning.class ); - IMMUNITIES.add( Fire.class ); + IMMUNITIES.add( Blazing.class ); IMMUNITIES.add( WandOfFireblast.class ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java index 3c79625db..401c660f4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Eye.java @@ -29,8 +29,8 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle; import com.shatteredpixel.shatteredpixeldungeon.items.Dewdrop; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Vampiric; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite; @@ -140,8 +140,8 @@ public class Eye extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { RESISTANCES.add( WandOfDisintegration.class ); - RESISTANCES.add( Death.class ); - RESISTANCES.add( Leech.class ); + RESISTANCES.add( Grim.class ); + RESISTANCES.add( Vampiric.class ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java index 90abaf38b..286715ca4 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Goo.java @@ -36,7 +36,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ElmoParticle; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; @@ -275,7 +275,7 @@ public class Goo extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { RESISTANCES.add( ToxicGas.class ); - RESISTANCES.add( Death.class ); + RESISTANCES.add( Grim.class ); RESISTANCES.add( ScrollOfPsionicBlast.class ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java index ea05ee5a3..438cfd3e6 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/King.java @@ -38,7 +38,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfDisintegration; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.levels.CityBossLevel; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -231,7 +231,7 @@ public class King extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { RESISTANCES.add( ToxicGas.class ); - RESISTANCES.add( Death.class ); + RESISTANCES.add( Grim.class ); RESISTANCES.add( ScrollOfPsionicBlast.class ); RESISTANCES.add( WandOfDisintegration.class ); } @@ -324,7 +324,7 @@ public class King extends Mob { private static final HashSet> IMMUNITIES = new HashSet<>(); static { - IMMUNITIES.add( Death.class ); + IMMUNITIES.add( Grim.class ); IMMUNITIES.add( Paralysis.class ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java index 14b9b59a5..66a8b6faf 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Scorpio.java @@ -29,7 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Vampiric; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.sprites.ScorpioSprite; @@ -107,7 +107,7 @@ public class Scorpio extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { - RESISTANCES.add( Leech.class ); + RESISTANCES.add( Vampiric.class ); RESISTANCES.add( Poison.class ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java index a164ed340..91cda7081 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Skeleton.java @@ -25,7 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.Dungeon; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.items.Item; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.sprites.SkeletonSprite; @@ -110,7 +110,7 @@ public class Skeleton extends Mob { private static final HashSet> IMMUNITIES = new HashSet<>(); static { - IMMUNITIES.add( Death.class ); + IMMUNITIES.add( Grim.class ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java index 9f084d3c9..229804095 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Statue.java @@ -28,8 +28,8 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Poison; import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon.Enchantment; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Vampiric; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -160,8 +160,8 @@ public class Statue extends Mob { static { RESISTANCES.add( ToxicGas.class ); RESISTANCES.add( Poison.class ); - RESISTANCES.add( Death.class ); - IMMUNITIES.add( Leech.class ); + RESISTANCES.add( Grim.class ); + IMMUNITIES.add( Vampiric.class ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java index 2892d0acf..d77a2bd50 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Succubus.java @@ -30,7 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Sleep; import com.shatteredpixel.shatteredpixeldungeon.effects.Speck; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfLullaby; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Vampiric; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.sprites.SuccubusSprite; @@ -137,7 +137,7 @@ public class Succubus extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { - RESISTANCES.add( Leech.class ); + RESISTANCES.add( Vampiric.class ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java index 95c74b12a..edfaf383d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java @@ -35,7 +35,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.TomeOfMastery; import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.LloydsBeacon; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.PrisonBossLevel; import com.shatteredpixel.shatteredpixeldungeon.levels.Terrain; @@ -227,7 +227,7 @@ public class Tengu extends Mob { static { RESISTANCES.add( ToxicGas.class ); RESISTANCES.add( Poison.class ); - RESISTANCES.add( Death.class ); + RESISTANCES.add( Grim.class ); RESISTANCES.add( ScrollOfPsionicBlast.class ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java index ccc8eefea..f64755b6c 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Warlock.java @@ -27,7 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Weakness; import com.shatteredpixel.shatteredpixeldungeon.items.Generator; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -146,7 +146,7 @@ public class Warlock extends Mob implements Callback { private static final HashSet> RESISTANCES = new HashSet<>(); static { - RESISTANCES.add( Death.class ); + RESISTANCES.add( Grim.class ); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Wraith.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Wraith.java index d35299690..137ea8eab 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Wraith.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Wraith.java @@ -25,7 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Actor; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Terror; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.sprites.WraithSprite; @@ -120,7 +120,7 @@ public class Wraith extends Mob { private static final HashSet> IMMUNITIES = new HashSet<>(); static { - IMMUNITIES.add( Death.class ); + IMMUNITIES.add( Grim.class ); IMMUNITIES.add( Terror.class ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java index 825f7dcf7..33270471d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Yog.java @@ -40,7 +40,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.Pushing; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle; import com.shatteredpixel.shatteredpixeldungeon.items.keys.SkeletonKey; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfPsionicBlast; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -183,7 +183,7 @@ public class Yog extends Mob { private static final HashSet> IMMUNITIES = new HashSet<>(); static { - IMMUNITIES.add( Death.class ); + IMMUNITIES.add( Grim.class ); IMMUNITIES.add( Terror.class ); IMMUNITIES.add( Amok.class ); IMMUNITIES.add( Charm.class ); @@ -269,7 +269,7 @@ public class Yog extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { RESISTANCES.add( ToxicGas.class ); - RESISTANCES.add( Death.class ); + RESISTANCES.add( Grim.class ); RESISTANCES.add( ScrollOfPsionicBlast.class ); } @@ -379,7 +379,7 @@ public class Yog extends Mob { private static final HashSet> RESISTANCES = new HashSet<>(); static { RESISTANCES.add( ToxicGas.class ); - RESISTANCES.add( Death.class ); + RESISTANCES.add( Grim.class ); } diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java index 3c529444a..c922170c7 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfDisintegration.java @@ -27,7 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.effects.Beam; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.PurpleParticle; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; @@ -104,7 +104,7 @@ public class WandOfDisintegration extends Wand { public void onHit(MagesStaff staff, Char attacker, Char defender, int damage) { //less likely Grim proc if (Random.Int(3) == 0) - new Death().proc( staff, attacker, defender, damage); + new Grim().proc( staff, attacker, defender, damage); } private int distance() { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java index 95689974a..ac1501fca 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfFireblast.java @@ -30,6 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple; import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Paralysis; import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blazing; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; @@ -109,9 +110,8 @@ public class WandOfFireblast extends Wand { @Override public void onHit(MagesStaff staff, Char attacker, Char defender, int damage) { - //acts like blazing enchantment, package conflict..... - new com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Fire() - .proc( staff, attacker, defender, damage); + //acts like blazing enchantment + new Blazing().proc( staff, attacker, defender, damage); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java index 93dc0f8c3..a5877487f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfLightning.java @@ -26,7 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.effects.CellEmitter; import com.shatteredpixel.shatteredpixeldungeon.effects.Lightning; import com.shatteredpixel.shatteredpixeldungeon.effects.particles.SparkParticle; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shock; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shocking; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff; import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.LightningTrap; @@ -78,7 +78,7 @@ public class WandOfLightning extends Wand { @Override public void onHit(MagesStaff staff, Char attacker, Char defender, int damage) { //acts like shocking enchantment - new Shock().proc(staff, attacker, defender, damage); + new Shocking().proc(staff, attacker, defender, damage); } private void arc( Char ch ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java index 486284794..8fe9c519b 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfVenom.java @@ -26,7 +26,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Blob; import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.VenomGas; import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Poison; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Venomous; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; @@ -62,7 +62,8 @@ public class WandOfVenom extends Wand { @Override public void onHit(MagesStaff staff, Char attacker, Char defender, int damage) { - new Poison().proc(staff, attacker, defender, damage); + //acts like venomous enchantment + new Venomous().proc(staff, attacker, defender, damage); } @Override diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java index be5049e19..a1023a5e1 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/Weapon.java @@ -29,16 +29,16 @@ import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.KindOfWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfFuror; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfSharpshooting; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Death; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Fire; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Horror; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Instability; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Leech; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Luck; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Paralysis; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Poison; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shock; -import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Slow; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Blazing; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Chilling; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Eldritch; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Grim; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Lucky; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Shocking; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Stunning; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Unstable; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Vampiric; +import com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments.Venomous; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MeleeWeapon; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.MissileWeapon; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; @@ -243,12 +243,11 @@ abstract public class Weapon extends KindOfWeapon { return enchantment != null ? enchantment.glowing() : null; } - //FIXME: most enchantment names are pretty broken, should refactor public static abstract class Enchantment implements Bundlable { private static final Class[] enchants = new Class[]{ - Fire.class, Poison.class, Death.class, Paralysis.class, Leech.class, - Slow.class, Shock.class, Instability.class, Horror.class, Luck.class }; + Blazing.class, Venomous.class, Grim.class, Stunning.class, Vampiric.class, + Chilling.class, Shocking.class, Unstable.class, Eldritch.class, Lucky.class }; private static final float[] chances= new float[]{ 10, 10, 1, 2, 1, 2, 6, 3, 2, 2 }; public abstract boolean proc( Weapon weapon, Char attacker, Char defender, int damage ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blazing.java similarity index 97% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blazing.java index b39377e4e..7f5f1cb74 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Fire.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Blazing.java @@ -29,7 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; -public class Fire extends Weapon.Enchantment { +public class Blazing extends Weapon.Enchantment { private static ItemSprite.Glowing ORANGE = new ItemSprite.Glowing( 0xFF4400 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Chilling.java similarity index 97% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Chilling.java index 6c3ac6de0..20f607205 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Slow.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Chilling.java @@ -28,7 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; -public class Slow extends Weapon.Enchantment { +public class Chilling extends Weapon.Enchantment { private static ItemSprite.Glowing BLUE = new ItemSprite.Glowing( 0x0044FF ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Eldritch.java similarity index 97% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Eldritch.java index cccf8e540..e503c3bad 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Horror.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Eldritch.java @@ -30,7 +30,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; -public class Horror extends Weapon.Enchantment { +public class Eldritch extends Weapon.Enchantment { private static ItemSprite.Glowing GREY = new ItemSprite.Glowing( 0x222222 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java similarity index 97% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java index f0d0d437c..a0ad46f37 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Death.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Grim.java @@ -29,7 +29,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; -public class Death extends Weapon.Enchantment { +public class Grim extends Weapon.Enchantment { private static ItemSprite.Glowing BLACK = new ItemSprite.Glowing( 0x000000 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Lucky.java similarity index 97% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Lucky.java index b90cfd182..02ac6e6d0 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Luck.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Lucky.java @@ -25,7 +25,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; -public class Luck extends Weapon.Enchantment { +public class Lucky extends Weapon.Enchantment { private static ItemSprite.Glowing GREEN = new ItemSprite.Glowing( 0x00FF00 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java similarity index 98% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java index f61d49c4a..494a3a81d 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shock.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Shocking.java @@ -32,7 +32,7 @@ import com.watabou.utils.Random; import java.util.ArrayList; import java.util.HashSet; -public class Shock extends Weapon.Enchantment { +public class Shocking extends Weapon.Enchantment { @Override public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Stunning.java similarity index 97% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Stunning.java index 4c5262115..ca1da9025 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Paralysis.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Stunning.java @@ -27,7 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; -public class Paralysis extends Weapon.Enchantment { +public class Stunning extends Weapon.Enchantment { private static ItemSprite.Glowing YELLOW = new ItemSprite.Glowing( 0xCCAA44 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Unstable.java similarity index 95% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Unstable.java index 00388b761..30638560f 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Instability.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Unstable.java @@ -23,7 +23,7 @@ package com.shatteredpixel.shatteredpixeldungeon.items.weapon.enchantments; import com.shatteredpixel.shatteredpixeldungeon.actors.Char; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; -public class Instability extends Weapon.Enchantment { +public class Unstable extends Weapon.Enchantment { @Override public boolean proc( Weapon weapon, Char attacker, Char defender, int damage ) { diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Vampiric.java similarity index 97% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Vampiric.java index c56be22b7..8acfa62af 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Leech.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Vampiric.java @@ -28,7 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; -public class Leech extends Weapon.Enchantment { +public class Vampiric extends Weapon.Enchantment { private static ItemSprite.Glowing RED = new ItemSprite.Glowing( 0x660022 ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Venomous.java similarity index 97% rename from src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java rename to src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Venomous.java index 4ca41e9c6..d198dbd69 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Poison.java +++ b/src/com/shatteredpixel/shatteredpixeldungeon/items/weapon/enchantments/Venomous.java @@ -27,7 +27,7 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite.Glowing; import com.watabou.utils.Random; -public class Poison extends Weapon.Enchantment { +public class Venomous extends Weapon.Enchantment { private static ItemSprite.Glowing PURPLE = new ItemSprite.Glowing( 0x4400AA ); diff --git a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties index 836dfe5bd..e20c553fd 100644 --- a/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties +++ b/src/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties @@ -659,25 +659,25 @@ items.wands.wandofvenom.desc=This wand has a purple body which opens to a brilli ###enchantments -items.weapon.enchantments.death.name=grim %s +items.weapon.enchantments.blazing.name=blazing %s -items.weapon.enchantments.fire.name=blazing %s +items.weapon.enchantments.chilling.name=chilling %s -items.weapon.enchantments.horror.name=eldritch %s +items.weapon.enchantments.eldritch.name=eldritch %s -items.weapon.enchantments.instability.name=unstable %s +items.weapon.enchantments.lucky.name=lucky %s -items.weapon.enchantments.leech.name=vampiric %s +items.weapon.enchantments.shocking.name=shocking %s -items.weapon.enchantments.luck.name=lucky %s +items.weapon.enchantments.stunning.name=stunning %s -items.weapon.enchantments.paralysis.name=stunning %s +items.weapon.enchantments.unstable.name=unstable %s -items.weapon.enchantments.poison.name=venomous %s +items.weapon.enchantments.vampiric.name=vampiric %s -items.weapon.enchantments.shock.name=shocking %s +items.weapon.enchantments.venomous.name=venomous %s -items.weapon.enchantments.slow.name=chilling %s +items.weapon.enchantments.grim.name=grim %s ###melee weapons