0.9.5

0.9.5

java/com/hmdzl/spspd/Assets.java

@@ -340,8 +340,15 @@ public class Assets {
 	public static final String ICE13 = "ice13.png";
 
 	public static final String FIRERABBIT = "firerabbit.png";
+	public static final String ICERABBIT = "icerabbit.png";
 	public static final String MANY_SKELETON = "manyskeleton.png";
 	public static final String BEAST_YEAR = "beastyear.png";
 
+	public static final String CATSHEEP = "catsheep.png";
+	public static final String BLACKMEOW = "blackmeow.png";
+    public static final String MOB_BAMBOO = "bamboo.png";
+
+
+	public static final String GREATMOSS = "greatmoss.png";
 }
 

java/com/hmdzl/spspd/Dungeon.java

@@ -25,6 +25,7 @@
 import java.util.Calendar;
 import java.util.HashSet;
 
+import com.hmdzl.spspd.actors.buffs.actbuff.NmImbue;
 import com.hmdzl.spspd.items.artifacts.DriedRose;
 import com.hmdzl.spspd.levels.ChaosLevel;
 import com.hmdzl.spspd.levels.PotLevel;
@@ -108,7 +109,7 @@ public class Dungeon {
 	// nicer for bundling/initializing.
 	public static enum limitedDrops {
 		// limited world drops
-		strengthPotions, upgradeScrolls,
+		strengthPotions,
 
 		//Norn Stones
 		nornstones,
@@ -903,6 +904,12 @@ public static Level newLevel() {
 			Buff.prolong(Dungeon.hero, Dewcharge.class, Dewcharge.DURATION+(Math.max(Statistics.prevfloormoves,1)));
 		    //GLog.p("You feel the dungeon charge with dew!");
 		}
+		NmImbue nm = Dungeon.hero.buff(NmImbue.class);
+         if (Dungeon.hero.heroClass == HeroClass.SOLDIER && Dungeon.skins == 4 && nm == null ){
+
+			Buff.affect(Dungeon.hero,NmImbue.class);
+		}		
+
 		/*if(Dungeon.hero.heroClass == HeroClass.PERFORMER){
 			//Buff.prolong(Dungeon.hero,Rhythm.class,50);
 			Buff.affect(Dungeon.hero,GlassShield.class).turns(3);
@@ -1026,15 +1033,10 @@ public static void dropToChasm(Item item) {
 	}
 
 	public static boolean posNeeded() {
-		int[] quota = { 4, 2, 9, 4, 14, 6, 19, 8, 24, 10 };
+		int[] quota = { 2,1,  4,2,  7,3,  9,4,  12,5,  14,6,  17,7,   19,8,  22,9,  24,10 };
 		return chance(quota, limitedDrops.strengthPotions.count);
 	}
 
-	public static boolean souNeeded() {
-		int[] quota = { 5, 4, 10, 8, 15, 12, 20, 16, 25, 20 };
-		return chance(quota, limitedDrops.upgradeScrolls.count);
-	}
-
 	private static boolean chance(int[] quota, int number) {
 
 		for (int i = 0; i < quota.length; i += 2) {

java/com/hmdzl/spspd/Rankings.java

@@ -54,7 +54,7 @@ public void submit(boolean win) {
 		rec.info = Dungeon.resultDescription;
 		rec.win = win;
 		rec.heroClass = Dungeon.hero.heroClass;
-		rec.skin = 7-Dungeon.skins;
+		rec.skin = Dungeon.skins;
 		rec.herolevel = Dungeon.hero.lvl;
 		rec.depth = Dungeon.depth;
 		rec.score = score(win);

java/com/hmdzl/spspd/Skins.java

@@ -23,15 +23,19 @@ public class Skins {
 	public static final int FIRST = 1;
 	public static final int SECOND = 2;
 	public static final int THIRD = 3;
+	public static final int FOURTH = 4;
+	public static final int FIFTH = 5;
 
 	public static final String[] NAME_IDS = {
 			"normal",
 			"first",
 			"second",
 			"third",
+			"fourth",
+			"fifth"
 		};
 
 	public static final int[] MASKS = {
-	        NORMAL, FIRST,SECOND,THIRD};
+	        NORMAL, FIRST,SECOND,THIRD,FOURTH,FIFTH };
 
 }

java/com/hmdzl/spspd/actors/Char.java

@@ -51,28 +51,34 @@
 import com.hmdzl.spspd.actors.buffs.HighVoice;
 import com.hmdzl.spspd.actors.buffs.Hot;
 import com.hmdzl.spspd.actors.buffs.Hunger;
+import com.hmdzl.spspd.actors.buffs.MagicWeak;
 import com.hmdzl.spspd.actors.buffs.MechArmor;
 import com.hmdzl.spspd.actors.buffs.Needling;
 import com.hmdzl.spspd.actors.buffs.ParyAttack;
 import com.hmdzl.spspd.actors.buffs.Rhythm;
 import com.hmdzl.spspd.actors.buffs.Rhythm2;
 import com.hmdzl.spspd.actors.buffs.ShieldArmor;
 import com.hmdzl.spspd.actors.buffs.Shocked;
+import com.hmdzl.spspd.actors.buffs.SoulMark;
 import com.hmdzl.spspd.actors.buffs.StoneIce;
 import com.hmdzl.spspd.actors.buffs.Tar;
 import com.hmdzl.spspd.actors.buffs.MagicalSleep;
 import com.hmdzl.spspd.actors.buffs.Paralysis;
 import com.hmdzl.spspd.actors.buffs.Poison;
 import com.hmdzl.spspd.actors.buffs.Slow;
 import com.hmdzl.spspd.actors.buffs.Speed;
+import com.hmdzl.spspd.actors.buffs.Terror;
 import com.hmdzl.spspd.actors.buffs.Vertigo;
 import com.hmdzl.spspd.actors.buffs.BloodImbue;
 import com.hmdzl.spspd.actors.buffs.Wet;
+import com.hmdzl.spspd.actors.buffs.mindbuff.AmokMind;
+import com.hmdzl.spspd.actors.buffs.mindbuff.TerrorMind;
 import com.hmdzl.spspd.actors.hero.Hero;
 import com.hmdzl.spspd.actors.hero.HeroClass;
 import com.hmdzl.spspd.actors.hero.HeroSubClass;
 import com.hmdzl.spspd.actors.mobs.Bestiary;
 import com.hmdzl.spspd.effects.Lightning;
+import com.hmdzl.spspd.items.wands.Wand;
 import com.hmdzl.spspd.items.wands.WandOfFirebolt;
 import com.hmdzl.spspd.items.weapon.enchantments.EnchantmentFire;
 import com.hmdzl.spspd.items.weapon.enchantments.EnchantmentFire2;
@@ -278,6 +284,8 @@ public static boolean hit(Char attacker, Char defender, boolean magic) {
 		if (defender.buff(Bless.class) != null) defRoll *= 1.20f;
 		if (attacker.buff(Wet.class) != null) acuRoll *= 0.90f;
 		if (defender.buff(Wet.class) != null) defRoll *= 0.90f;
+		if (attacker.buff(AmokMind.class) != null) acuRoll *= 0.70f;
+		if (defender.buff(TerrorMind.class) != null) defRoll *= 0.70f;
 		if (attacker.buff(Rhythm.class) != null) acuRoll *= 3.00f;
 		if (defender.buff(Rhythm.class) != null) defRoll *= 1.50f;
 		if (defender.buff(HighAttack.class) != null) defRoll *= 1.20f;
@@ -367,6 +375,10 @@ public void damage(int dmg, Object src) {
 			dmg = (int) Math.ceil(dmg * 1.2);
 		}
 
+        if (src instanceof Wand && Dungeon.hero.heroClass == HeroClass.MAGE && Dungeon.skins == 4) {
+			dmg = (int) Math.ceil(dmg * 1.5);
+		}
+
 		DefenceUp drup = buff(DefenceUp.class);
 		if (buff(DefenceUp.class) != null) {
 			dmg = (int) Math.ceil(dmg *(-drup.level()*0.01+1));
@@ -376,6 +388,15 @@ public void damage(int dmg, Object src) {
 			dmg = (int) Math.ceil(dmg *0.8);
 		}
 
+		if (buff(MagicWeak.class) != null && src instanceof Wand) {
+			dmg = (int) Math.ceil(dmg *1.5);
+		}
+
+
+		if (buff(SoulMark.class) != null) {
+			dmg = (int) Math.ceil(dmg *1.5);
+		}
+
 		ShieldArmor sarmor = buff(ShieldArmor.class);
 		if (sarmor != null && !(src instanceof Hunger)) {
 				dmg = sarmor.absorb(dmg);

java/com/hmdzl/spspd/change/actors/blobs/ToxicGas.java → java/com/hmdzl/spspd/actors/blobs/NmGas.java

@@ -15,36 +15,32 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-package com.hmdzl.spspd.change.actors.blobs;
+package com.hmdzl.spspd.actors.blobs;
 
-import com.hmdzl.spspd.change.Badges;
-import com.hmdzl.spspd.change.Dungeon;
-import com.hmdzl.spspd.change.ResultDescriptions;
-import com.hmdzl.spspd.change.actors.Actor;
-import com.hmdzl.spspd.change.actors.Char;
-import com.hmdzl.spspd.change.actors.hero.Hero;
-import com.hmdzl.spspd.change.effects.BlobEmitter;
-import com.hmdzl.spspd.change.effects.Speck;
-import com.hmdzl.spspd.change.messages.Messages;
-import com.hmdzl.spspd.change.utils.GLog;
+import com.hmdzl.spspd.Badges;
+import com.hmdzl.spspd.Dungeon;
+import com.hmdzl.spspd.ResultDescriptions;
+import com.hmdzl.spspd.actors.Actor;
+import com.hmdzl.spspd.actors.Char;
+import com.hmdzl.spspd.actors.hero.Hero;
+import com.hmdzl.spspd.effects.BlobEmitter;
+import com.hmdzl.spspd.effects.Speck;
+import com.hmdzl.spspd.messages.Messages;
 import com.watabou.utils.Random;
 
-public class ToxicGas extends Blob implements Hero.Doom {
+public class NmGas extends Blob implements Hero.Doom {
 
 	@Override
 	protected void evolve() {
 		super.evolve();
 
-		int levelDamage = 5 + Dungeon.depth * 5;
+		int levelDamage = Dungeon.hero.spp;
 
 		Char ch;
 		for (int i = 0; i < LENGTH; i++) {
 			if (cur[i] > 0 && (ch = Actor.findChar(i)) != null) {
 
-				int damage = (ch.HT + levelDamage) / 40;
-				if (Random.Int(40) < (ch.HT + levelDamage) % 40) {
-					damage++;
-				}
+				int damage = levelDamage ;
 
 				ch.damage(damage, this);
 			}
@@ -55,7 +51,7 @@ protected void evolve() {
 	public void use(BlobEmitter emitter) {
 		super.use(emitter);
 
-		emitter.pour(Speck.factory(Speck.TOXIC), 0.6f);
+		emitter.pour(Speck.factory(Speck.CONFUSION), 0.6f);
 	}
 
 	@Override

java/com/hmdzl/spspd/change/actors/blobs/TarGas.java → java/com/hmdzl/spspd/actors/blobs/PoisonGas.java

@@ -15,23 +15,26 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>
  */
-package com.hmdzl.spspd.change.actors.blobs;
+package com.hmdzl.spspd.actors.blobs;
 
-import com.hmdzl.spspd.change.actors.Actor;
-import com.hmdzl.spspd.change.actors.Char;
-import com.hmdzl.spspd.change.actors.buffs.Buff;
-import com.hmdzl.spspd.change.actors.buffs.Burning;
-import com.hmdzl.spspd.change.effects.BlobEmitter;
-import com.hmdzl.spspd.change.effects.Speck;
-import com.hmdzl.spspd.change.Dungeon;
-import com.hmdzl.spspd.change.actors.buffs.Tar;
-import com.hmdzl.spspd.change.messages.Messages;
+import com.hmdzl.spspd.actors.Actor;
+import com.hmdzl.spspd.actors.Char;
+import com.hmdzl.spspd.actors.buffs.ArmorBreak;
+import com.hmdzl.spspd.actors.buffs.Buff;
+import com.hmdzl.spspd.actors.buffs.Burning;
+import com.hmdzl.spspd.actors.buffs.Roots;
+import com.hmdzl.spspd.actors.buffs.Slow;
+import com.hmdzl.spspd.effects.BlobEmitter;
+import com.hmdzl.spspd.effects.Speck;
+import com.hmdzl.spspd.Dungeon;
+import com.hmdzl.spspd.actors.buffs.Tar;
+import com.hmdzl.spspd.messages.Messages;
 import com.watabou.utils.Random;
-import com.hmdzl.spspd.change.levels.Level;
-import com.hmdzl.spspd.change.scenes.GameScene;
+import com.hmdzl.spspd.levels.Level;
+import com.hmdzl.spspd.scenes.GameScene;
 
 
-public class TarGas extends Blob {
+public class PoisonGas extends Blob {
 
 	@Override
 	protected void evolve() {
@@ -40,9 +43,10 @@ protected void evolve() {
 		Char ch;
 		for (int i = 0; i < LENGTH; i++) {
 			if (cur[i] > 0 && (ch = Actor.findChar(i)) != null) {
-				if (!ch.immunities().contains(this.getClass()))
-					Buff.affect(ch,Tar.class);
-		         if ( ch.buff( Burning.class ) != null ) {GameScene.add(Blob.seed(ch.pos, 2, Fire.class));
+				if (!ch.immunities().contains(this.getClass())){          
+					Buff.affect(ch,Slow.class,3f);
+					Buff.affect(ch,Roots.class,3f);
+					Buff.affect(ch,ArmorBreak.class,3f).level(20);
                 }	
 			}				
         }

java/com/hmdzl/spspd/actors/blobs/WaterOfTransmutation.java

@@ -206,10 +206,6 @@ private Potion changePotion(Potion p) {
 		if (p instanceof PotionOfStrength) {
 
 			return new PotionOfMight();
-
-		} else if (p instanceof PotionOfMending){
-
-			return new PotionOfHealing();
 
 		} else {