v0.3.3: changed EVIL propery to DEMONIC, implemented it

This commit is contained in:
Evan Debenham 2015-12-16 18:08:26 -05:00
parent 83b73c50ad
commit 108fd0085d
12 changed files with 23 additions and 25 deletions

View File

@ -456,7 +456,7 @@ public abstract class Char extends Actor {
BOSS,
MINIBOSS,
UNDEAD,
EVIL,
DEMONIC,
IMMOVABLE
}
}

View File

@ -51,6 +51,8 @@ public class Elemental extends Mob {
loot = new PotionOfLiquidFlame();
lootChance = 0.1f;
properties.add(Property.DEMONIC);
}
@Override

View File

@ -60,6 +60,8 @@ public class Eye extends Mob {
loot = new Dewdrop();
lootChance = 0.5f;
properties.add(Property.DEMONIC);
}
@Override

View File

@ -46,7 +46,7 @@ public class FetidRat extends Rat {
state = WANDERING;
properties.add(Property.MINIBOSS);
properties.add(Property.UNDEAD);
properties.add(Property.DEMONIC);
}
@Override

View File

@ -63,6 +63,7 @@ public class Goo extends Mob {
lootChance = 0.333f;
properties.add(Property.BOSS);
properties.add(Property.DEMONIC);
}
private int pumpedUp = 0;

View File

@ -54,7 +54,7 @@ public class Guard extends Mob {
loot = null; //see createloot.
lootChance = 1;
properties.add(Property.UNDEAD);
properties.add(Property.DEMONIC);
}
@Override

View File

@ -50,6 +50,8 @@ public class Mimic extends Mob {
{
name = "mimic";
spriteClass = MimicSprite.class;
properties.add(Property.DEMONIC);
}
public ArrayList<Item> items;

View File

@ -52,6 +52,8 @@ public class Scorpio extends Mob {
loot = new PotionOfHealing();
lootChance = 0.2f;
properties.add(Property.DEMONIC);
}
@Override

View File

@ -59,6 +59,8 @@ public class Succubus extends Mob {
loot = new ScrollOfLullaby();
lootChance = 0.05f;
properties.add(Property.DEMONIC);
}
@Override

View File

@ -56,6 +56,8 @@ public class Thief extends Mob {
lootChance = 0.01f;
FLEEING = new Fleeing();
properties.add(Property.DEMONIC);
}
private static final String ITEM = "item";

View File

@ -73,6 +73,7 @@ public class Yog extends Mob {
properties.add(Property.BOSS);
properties.add(Property.IMMOVABLE);
properties.add(Property.DEMONIC);
}
private static final String TXT_DESC =
@ -233,7 +234,7 @@ public class Yog extends Mob {
state = WANDERING;
properties.add(Property.BOSS);
properties.add(Property.UNDEAD);
properties.add(Property.DEMONIC);
}
@Override
@ -326,6 +327,7 @@ public class Yog extends Mob {
state = WANDERING;
properties.add(Property.BOSS);
properties.add(Property.DEMONIC);
}
@Override
@ -441,6 +443,8 @@ public class Yog extends Mob {
EXP = 0;
state = HUNTING;
properties.add(Property.DEMONIC);
}
@Override

View File

@ -59,25 +59,6 @@ public class WandOfPrismaticLight extends Wand {
collisionProperties = Ballistica.MAGIC_BOLT;
}
//FIXME: this is sloppy
private static HashSet<Class> evilMobs = new HashSet<Class>(Arrays.asList(
//Any Location
Mimic.class, Wraith.class,
//Sewers
FetidRat.class,
Goo.class,
//Prison
Skeleton.class , Thief.class, Bandit.class,
//Caves
//City
Warlock.class, Monk.class, Senior.class,
King.class, King.Undead.class,
//Halls
Succubus.class, Eye.class, Scorpio.class, Acidic.class,
Yog.class, Yog.RottingFist.class, Yog.BurningFist.class, Yog.Larva.class
));
@Override
protected void onZap(Ballistica beam) {
Char ch = Actor.findChar(beam.collisionPos);
@ -100,7 +81,7 @@ public class WandOfPrismaticLight extends Wand {
ch.sprite.emitter().burst(Speck.factory(Speck.LIGHT), 6 );
}
if (evilMobs.contains(ch.getClass())){
if (ch.properties().contains(Char.Property.DEMONIC) || ch.properties().contains(Char.Property.UNDEAD)){
ch.sprite.emitter().start( ShadowParticle.UP, 0.05f, 10+level() );
Sample.INSTANCE.play(Assets.SND_BURNING);
@ -173,7 +154,7 @@ public class WandOfPrismaticLight extends Wand {
"This wand is made of a solid piece of translucent crystal, like a long chunk of smooth glass. " +
"It becomes clear towards the tip, where you can see colorful lights dancing around inside it.\n\n" +
"This wand shoots rays of light which damage and blind enemies and cut through the darkness of the dungeon, " +
"revealing hidden areas and traps. Evildoers, demons, and the undead will burn in the bright light " +
"revealing hidden areas and traps. Demonic and undead foes will burn in the bright light " +
"of the wand, taking significant bonus damage.";
}
}