Finished elite mob challenges, misc fixes

README.md

@@ -1,38 +1,5 @@
-<<<<<<< HEAD
-# ShatteredPixelDungeon-DetailedDescVersion #
-
-A private mod of ShatteredPixelDungeon (Evan) working as a dictionary and a tester.
-
-Aim to help dungeon players know the data and mechanics of game, and have a platform to test game data and mechanics.
-
-*****************NOTE THAT*****************
-
-- All the description are ONLY available in CHINESE. 
-
-- Currently this version is ONLY distributed in Tencent PD groups in China.
-
-*****************Main Features*****************
-
-- Detailed descrption for most items, creatures, plants etc. and important mechanics of game.
-
-- TestMode that has convinet access to most items and can travel between floors.
-
-- A few interesting and hard challenges or expansions to distinguish with original Shattered and improve play experience. Content might be somewhat limited because I can't make too many changes to original ShPD code, or it would be a disaster when transfering between versions.
-
-- And other parts of the game is TOTALLY UNCHANGED to keep inline with the original ShatterdPD.
-
-*****************More*****************
-
-- This project is built with Android Studio. 
-
-- v091 is not where this mod started. It started from Shattered ~v072, but it was very messy and much less functional until Shattered ~v081.
-
-- Update (usually) each time when ShatteredPD releases a major version.
-
-- Since the gameplay is almost the same to original ShPD, you can just regard it as a dictionary.
 
-=======
-# ShatteredPD-DetailedDescVer #
+# ShatteredPixelDungeon-DetailedDescVersion #
 
 A private mod of ShatteredPixelDungeon (Evan) working as a dictionary and a tester.
 
@@ -62,6 +29,4 @@ Aim to help dungeon players know the data and mechanics of game, and have a plat
 
 - Update (usually) each time when ShatteredPD releases a major version.
 
-- Since the gameplay is almost the same to original ShPD, you can just regard it as a dictionary.
-
->>>>>>> ca8b4b0c6e57f321e00c437eaa5067dcca0a0d10
+- Since the gameplay is almost the same to original ShPD, you can just regard it as a dictionary.

core/src/main/assets/messages/misc/misc_zh.properties

@@ -92,25 +92,25 @@ challenges.add = 追加挑战
 challenges.expansion = 扩展包
 
 challenges.elite_bosses_1 = 极端措施-I
-challenges.elite_bosses_1_desc = 强化粘咕。\n\n咕，咕——咕！
+challenges.elite_bosses_1_desc = 强化粘咕。\n\n咕，咕——咕！\n\n开启任一“极端措施”挑战将禁用元素之戒。强化Boss层移速增加效果减少75%，且移速不超过1.5。
 challenges.elite_bosses_2 = 极端措施-II
-challenges.elite_bosses_2_desc = 强化天狗。\n\n抓到你了！
+challenges.elite_bosses_2_desc = 强化天狗。\n\n抓到你了！\n\n开启任一“极端措施”挑战将禁用元素之戒。强化Boss层移速增加效果减少75%，且移速不超过1.5。
 challenges.elite_bosses_3 = 极端措施-III
-challenges.elite_bosses_3_desc = 强化DM-300。\n\n检 测 到 未 授 权 人 员
+challenges.elite_bosses_3_desc = 强化DM-300。\n\n检 测 到 未 授 权 人 员\n\n开启任一“极端措施”挑战将禁用元素之戒。强化Boss层移速增加效果减少75%，且移速不超过1.5。
 challenges.elite_bosses_4 = 极端措施-IV
-challenges.elite_bosses_4_desc = 强化矮人国王。\n\n我-是-不-朽-哒！
+challenges.elite_bosses_4_desc = 强化矮人国王。\n\n我-是-不-朽-哒！\n\n开启任一“极端措施”挑战将禁用元素之戒。强化Boss层移速增加效果减少75%，且移速不超过1.5。
 challenges.elite_bosses_5 = 极端措施-V
-challenges.elite_bosses_5_desc = 强化古神。\n\n希-望-皆-为-虚-妄-...
-challenges.elite_enemies_1 = 福利待遇-I
-challenges.elite_enemies_1_desc = 强化下水道区域敌人。
-challenges.elite_enemies_2 = 福利待遇-II
-challenges.elite_enemies_2_desc = 强化监狱区域敌人。
-challenges.elite_enemies_3 = 福利待遇-III
-challenges.elite_enemies_3_desc = 强化废弃矿洞区域敌人。
-challenges.elite_enemies_4 = 福利待遇-IV
-challenges.elite_enemies_4_desc = 强化矮人城邦区域敌人。
-challenges.elite_enemies_5 = 福利待遇-V
-challenges.elite_enemies_5_desc = 强化恶魔巢穴区域敌人。
+challenges.elite_bosses_5_desc = 强化古神。\n\n希-望-皆-为-虚-妄-...\n\n开启任一“极端措施”挑战将禁用元素之戒。强化Boss层移速增加效果减少75%，且移速不超过1.5。
+challenges.elite_enemies_1 = 全副武装-I
+challenges.elite_enemies_1_desc = 强化下水道区域敌人。\n\n开启任一“全副武装”挑战将禁用冲击波法杖。
+challenges.elite_enemies_2 = 全副武装-II
+challenges.elite_enemies_2_desc = 强化监狱区域敌人。\n\n开启任一“全副武装”挑战将禁用冲击波法杖。
+challenges.elite_enemies_3 = 全副武装-III
+challenges.elite_enemies_3_desc = 强化废弃矿洞区域敌人。\n\n开启任一“全副武装”挑战将禁用冲击波法杖。
+challenges.elite_enemies_4 = 全副武装-IV
+challenges.elite_enemies_4_desc = 强化矮人城邦区域敌人。\n\n开启任一“全副武装”挑战将禁用冲击波法杖。
+challenges.elite_enemies_5 = 全副武装-V
+challenges.elite_enemies_5_desc = 强化恶魔巢穴区域敌人。\n\n开启任一“全副武装”挑战将禁用冲击波法杖。
 challenges.test_mode=测试时间
 challenges.test_mode_desc= 追加选项\n\n测试时间！\n\n你可以自由生成物品，并可以自由地在地牢内移动。\n\n在测试模式下，右上角的版本号会发生变化以指示测试模式。\n\n注意，测试模式不计入排行榜。
 challenges.mimic_dungeon = 拟形地牢

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Challenges.java

@@ -25,7 +25,6 @@
 import com.shatteredpixel.shatteredpixeldungeon.items.Item;
 import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfElements;
 import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfBlastWave;
-import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfCorruption;
 
 public class Challenges {
 
@@ -115,7 +114,7 @@ public static boolean isItemBlocked( Item item ){
 		}
 
 		if(Dungeon.isChallenged(ELITE_ENEMIES)){
-			if(item instanceof WandOfBlastWave || item instanceof WandOfCorruption){
+			if(item instanceof WandOfBlastWave ){
 				return true;
 			}
 		}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java

@@ -526,10 +526,15 @@ public float speed() {
 		}
 
 		if(Dungeon.isChallenged(Challenges.ELITE_BOSSES)){
-			if(Dungeon.bossLevel(Dungeon.depth)) {
+			//judge if boss is reinforced
+			long id = Dungeon.challenges / Challenges.ELITE_ENEMIES_1;
+			boolean slow = (id & (1<<(Dungeon.depth/5-1)))>0;
+			if(Dungeon.bossLevel(Dungeon.depth) && slow) {
 				if (buff(LockedFloor.class) != null) {
-					// 1/3 effect for extra speed
-					speed = 1f + (speed - 1f) * 0.33f;
+					// 1/4 effect for extra speed,  capped at 1.5
+					if(speed>1f) {
+						speed = Math.min(1f + (speed - 1f) * 0.25f, 1.5f);
+					}
 				}
 			}
 		}

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java

@@ -43,7 +43,6 @@ public static ArrayList<Class<? extends Mob>> getMobRotation( int depth ){
 			swapMobAlts(mobs);
 		}else{
 			mobs = MobList.HardMobList(depth);
-			MobList.swapMobAlts(mobs);
 		}
 		Random.shuffle(mobs);
 		return mobs;