Fixed BloodthirstyThorn No SYNC Level

build.gradle

@@ -18,7 +18,7 @@ allprojects {
         appPackageName = 'com.ansdomagiclingpixeldungeon.ling'
 
         appVersionCode =900873
-        appVersionName = '0.6.2.0-Beta4.2'
+        appVersionName = '0.6.2.0-Beta4.5'
 
         appJavaCompatibility = JavaVersion.VERSION_11
 

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

@@ -53,6 +53,9 @@ public class Statistics {
 	public static int piranhasKilled;
 	public static int ankhsUsed;
 	public static int spawnersIce;
+
+	public static int ChaicBlood;
+
 	public static int naiyaziCollected;
 	//used for hero unlock badges
 	public static int upgradesUsed;
@@ -114,7 +117,7 @@ public class Statistics {
 
 
 		boss_enhance = 0;
-
+		ChaicBlood = 0;
 		goldCollected	= 0;
 		deepestFloor	= -1;
 		enemiesSlain	= 0;
@@ -247,6 +250,10 @@ public class Statistics {
 	private static final String WON		        = "won";
 	private static final String ASCENDED		= "ascended";
 
+	//嗜血荆棘
+	private static final String CHACEBLOOD		= "ChaicBlood";
+
+
 	public static void storeInBundle( Bundle bundle ) {
 
 		//分数
@@ -269,6 +276,8 @@ public class Statistics {
 		bundle.put( WON,        gameWon );
 		bundle.put( ASCENDED,   ascended );
 
+		bundle.put(CHACEBLOOD,ChaicBlood);
+
 		bundle.put(BossSelect,boss_enhance);
 
 		bundle.put( LANTERACTIVE, lanterfireactive );
@@ -326,6 +335,9 @@ public class Statistics {
 	
 	public static void restoreFromBundle( Bundle bundle ) {
 
+		//嗜血荆棘等级处理
+		ChaicBlood   = bundle.getInt( CHACEBLOOD );
+
 		//分数
 		progressScore   = bundle.getInt( PROG_SCORE );
 		heldItemValue   = bundle.getInt( ITEM_VAL );

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/bosses/DiamondKnight.java

@@ -223,18 +223,11 @@ public class DiamondKnight extends Boss {
 
         ColdChestBossLevel.State level = ((ColdChestBossLevel)Dungeon.level).pro();
         //血量低于360后追加phase并加载楼层的进度方法,加载迷宫
-
         if (level == ColdChestBossLevel.State.START && this.HP <= 360 && phase == 0) {
             GLog.n(Messages.get(DiamondKnight.class,"now_go"));
             GameScene.flash(0x808080);
             ((ColdChestBossLevel)Dungeon.level).progress();
             phase++;
-            //血量低于300加载第三场景
-//        } else if(level == ColdChestBossLevel.State.MAZE_START && this.HP <= 300 && phase == 1) {
-//            GLog.n(Messages.get(DiamondKnight.class,"war_go"));
-//            GameScene.flash(0x808080);
-//            ((ColdChestBossLevel)Dungeon.level).progress();
-//            phase++;
         } else if (level == ColdChestBossLevel.State.VSBOSS_START && this.HP <= 240 && phase == 2) {
             ((ColdChestBossLevel)Dungeon.level).progress();
             phase++;

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java

@@ -25,6 +25,7 @@ import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.hero;
 
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
+import com.shatteredpixel.shatteredpixeldungeon.Statistics;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.RoseShiled;
 import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
 import com.shatteredpixel.shatteredpixeldungeon.effects.particles.ShadowParticle;
@@ -84,6 +85,8 @@ public class ChaliceOfBlood extends Artifact {
 
 		if (action.equals(AC_PRICK)){
 
+			Statistics.ChaicBlood++;
+
 			int damage = 3*(level()*level());
 
 			if (damage > hero.HP*0.75) {

core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java

@@ -5,6 +5,7 @@ import static com.shatteredpixel.shatteredpixeldungeon.Dungeon.hero;
 import com.shatteredpixel.shatteredpixeldungeon.Assets;
 import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
 import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
+import com.shatteredpixel.shatteredpixeldungeon.Statistics;
 import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Bleeding;
 import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
@@ -192,7 +193,7 @@ public class BloodthirstyThorn extends MeleeWeapon {
             if(chaliceOfBlood!=null){
                 bloodthirstyThorn.level=chaliceOfBlood.level();
             } else {
-                bloodthirstyThorn.level=Random.NormalIntRange(3,6);
+                bloodthirstyThorn.level=Statistics.ChaicBlood;
             }
 
             if(chaliceOfBlood!=null) {
@@ -221,7 +222,7 @@ public class BloodthirstyThorn extends MeleeWeapon {
             if(chaliceOfBlood!=null){
                 bloodthirstyThorn.level=chaliceOfBlood.level();
             } else {
-                bloodthirstyThorn.level=0;
+                bloodthirstyThorn.level= Statistics.ChaicBlood;
             }
 
             return bloodthirstyThorn;