Merging Source v1.7.2: actor changes

2014-10-20 23:51:15 -04:00
parent 724338b57f
commit 4a49763309
30 changed files with 980 additions and 682 deletions
@@ -32,99 +32,105 @@ import com.shatteredpixel.shatteredpixeldungeon.sprites.SpinnerSprite;
 import com.watabou.utils.Random;

 public class Spinner extends Mob {
-	
-	{
-		name = "cave spinner";
-		spriteClass = SpinnerSprite.class;
-		
-		HP = HT = 50;
-		defenseSkill = 14;
-		
-		EXP = 9;
-		maxLvl = 16;
-		
-		loot = new MysteryMeat();
-		lootChance = 0.125f;
-	}
-	
-	@Override
-	public int damageRoll() {
-		return Random.NormalIntRange( 12, 16 );
-	}
-	
-	@Override
-	protected void nowhereToRun() {
-		if (buff( Terror.class ) == null) {
-			state = State.HUNTING;
-		} else {
-			super.nowhereToRun();
-		}
-	}
-	
-	@Override
-	public int attackSkill( Char target ) {
-		return 20;
-	}
-	
-	@Override
-	public int dr() {
-		return 6;
-	}
-	
-	@Override
-	protected boolean act() {
-		boolean result = super.act();
-		
-		if (state == State.FLEEING  && buff( Terror.class ) == null && 
-			enemySeen && enemy.buff( Poison.class ) == null) {
-			
-			state = State.HUNTING;
-		}
-		return result;
-	}
-	
-	@Override
-	public int attackProc( Char enemy, int damage ) {
-		if (Random.Int( 2 ) == 0) {
-			Buff.affect( enemy, Poison.class ).set( Random.Int( 5, 7 ) * Poison.durationFactor( enemy ) );
-			state = State.FLEEING;
-		}
-		
-		return damage;
-	}
-	
-	@Override
-	public void move( int step ) {
-		if (state == State.FLEEING) {
-			GameScene.add( Blob.seed( pos, Random.Int( 5, 7 ), Web.class ) );
-		}
-		super.move( step );
-	}
-	
-	@Override
-	public String description() {		
-		return 
-			"These greenish furry cave spiders try to avoid direct combat, preferring to wait in the distance " +
-			"while their victim, entangled in the spinner's excreted cobweb, slowly dies from their poisonous bite.";
-	}
-	
-	private static final HashSet<Class<?>> RESISTANCES = new HashSet<Class<?>>();
-	static {
-		RESISTANCES.add( Poison.class );
-	}
-	
-	@Override
-	public HashSet<Class<?>> resistances() {
-		return RESISTANCES;
-	}
-	
-	private static final HashSet<Class<?>> IMMUNITIES = new HashSet<Class<?>>();
-	static {
-		IMMUNITIES.add( Roots.class );
-	}
-	
-	@Override
-	public HashSet<Class<?>> immunities() {
-		return IMMUNITIES;
-	}
+
+    {
+        name = "cave spinner";
+        spriteClass = SpinnerSprite.class;
+
+        HP = HT = 50;
+        defenseSkill = 14;
+
+        EXP = 9;
+        maxLvl = 16;
+
+        loot = new MysteryMeat();
+        lootChance = 0.125f;
+
+        FLEEING = new Fleeing();
+    }
+
+    @Override
+    public int damageRoll() {
+        return Random.NormalIntRange(12, 16);
+    }
+
+    @Override
+    public int attackSkill(Char target) {
+        return 20;
+    }
+
+    @Override
+    public int dr() {
+        return 6;
+    }
+
+    @Override
+    protected boolean act() {
+        boolean result = super.act();
+
+        if (state == FLEEING && buff(Terror.class) == null &&
+                enemySeen && enemy.buff(Poison.class) == null) {
+
+            state = HUNTING;
+        }
+        return result;
+    }
+
+    @Override
+    public int attackProc(Char enemy, int damage) {
+        if (Random.Int(2) == 0) {
+            Buff.affect(enemy, Poison.class).set(Random.Int(7, 9) * Poison.durationFactor(enemy));
+            state = FLEEING;
+        }
+
+        return damage;
+    }
+
+    @Override
+    public void move(int step) {
+        if (state == FLEEING) {
+            GameScene.add(Blob.seed(pos, Random.Int(5, 7), Web.class));
+        }
+        super.move(step);
+    }
+
+    @Override
+    public String description() {
+        return
+                "These greenish furry cave spiders try to avoid direct combat, preferring to wait in the distance " +
+                        "while their victim, entangled in the spinner's excreted cobweb, slowly dies from their poisonous bite.";
+    }
+
+    private static final HashSet<Class<?>> RESISTANCES = new HashSet<Class<?>>();
+
+    static {
+        RESISTANCES.add(Poison.class);
+    }
+
+    @Override
+    public HashSet<Class<?>> resistances() {
+        return RESISTANCES;
+    }
+
+    private static final HashSet<Class<?>> IMMUNITIES = new HashSet<Class<?>>();
+
+    static {
+        IMMUNITIES.add(Roots.class);
+    }
+
+    @Override
+    public HashSet<Class<?>> immunities() {
+        return IMMUNITIES;
+    }
+
+    private class Fleeing extends Mob.Fleeing {
+        @Override
+        protected void nowhereToRun() {
+            if (buff(Terror.class) == null) {
+                state = HUNTING;
+            } else {
+                super.nowhereToRun();
+            }
+        }
+    }
 }