From f2480cf6e61b8b5cde0058cd3c6d245af1ee2f82 Mon Sep 17 00:00:00 2001 From: LingASDJ <2735951230@qq.com> Date: Wed, 31 May 2023 12:39:29 +0800 Subject: [PATCH] Fixed BloodthirstyThorn No SYNC Level --- build.gradle | 2 +- .../main/assets/sprites/boss/SeaVastGirl.png | Bin 3697 -> 4344 bytes .../shatteredpixeldungeon/Statistics.java | 14 +++++++++++++- .../actors/mobs/bosses/DiamondKnight.java | 7 ------- .../items/artifacts/ChaliceOfBlood.java | 3 +++ .../items/weapon/melee/BloodthirstyThorn.java | 5 +++-- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/build.gradle b/build.gradle index 95fe03306..eecb5cfbe 100644 --- a/build.gradle +++ b/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 diff --git a/core/src/main/assets/sprites/boss/SeaVastGirl.png b/core/src/main/assets/sprites/boss/SeaVastGirl.png index 76d317d607f8b6bf69e3578872757928da30b1bc..00991bca04dee2b31aa70ab8ea1e6d9bdbd23974 100644 GIT binary patch literal 4344 zcmVA|_AcRV!BtT=LfvA7b0RNz3 zYhn`!sRU3&6eD15frzDqhxSEDSfD_8Y~Q7|OCQ4ZeCF);?(fc?bMCpXwyRF|-kEb| z=KK52Z+^e;nK|d&ZF2ul1I_}^ZzvR|jA&|Vl;YrnU5yO&eRG?0mrZD#j*S|-#eHB^ zYzLjI=XfGJT`ydlM>b#h<-1-hOdQ+c#H;U^d6ymYWOa0YgUAOnV)MKlU{+7TE8DUn zoiW*oLEUsAR`W$HX?0eL}f;kF~P7=l1!&OX&Y&C${?Y z5En9a;mETR#Woj?-sSf9Y;i}l9OrSCy*8vowKV%kFXkHZ`s%64Boh)<^GDlD@S6v> zxRJ*0e_jsGfJh2d+a|8b_syj3Sb47-JZzNj z5IV%6jF0ZM+DE~rKnsZgLZePsaLDQ#w>(!gZkj{?;4g(jh*j(q6v8v$-7F${0xa^{|gtM%YDLJ`sUz@$md}i&yTiT`@mbz>DaF zW$m6+9y0!#LZzfqjudOP5B`C!cJ*gB^R%zr=DOc|Q&p+> zmFh3zV(VCLYZ%Rszh7m^3WYT1Mdf-6R(~xXsQS@kn+p4yTm8z&u85MziuNL`j<#dn zDWBy`|1{7@t4L7cgyGZ-568AnVYd$&el-s9zlu-LkwU`a9CKh-2$eWAWLPe6kYQ6L z__kl3a;5Xj%G(BKC_}5OpFG^u|N;9|-*kz9ho3j$A z$4tDs*i;wN&_B!J76DA568(u0$u4Ir;Yw7V_!7RbA+3mH7C zKj+1yt*oSj2#aHpmR-H6-Jz0~5S9#T4T+*m$k^er$`eON^d6;^uf;cl@0;8ASG-r8_tWOMhhNA*^s53W_iwN1k(y-}0nwrI44DAgeq9FMMHS z$*ITuN{-ECFZoj_C$E26%%pONt2SBqk1V>???Sj>W6w1Eob|&G3U=;?iZ*G4Xvr$Xm+th>!cWq_9`-@5Qr118B(h4oVEp-a z@s@{irv-~-DIleTY?T!-!q*B~eZ#!o_ObX{U2)HfWcB7auYb}uEj3bq$wUTa5m)G+ z)X7If|I`I0y2m-!ZVR~$pa&!NsbEN0V3TZo#%KDzwZh`ep}NW{Sz*bbC~TczRP;1= zee@s(BffFMOkbXL%(L#n9p^dfF8O@?m=(vOFDcyeSZwO6#kU5xgeZqga)L_qxA^E8 z%HSNS8vWy*>E9xhY64OYokUtV^s;BVi-95yl5CY0FzS<)+c~bMeekQFK2)mzg=e2! zyolzV-z?p!Yn1+>T;$YZpG7Yg3c8Q=Nsn`S=W1wSZ&B2VpK2~yVHGP(K{0Ah9rD}4 z!>qC_IrU)`b?wNto}_34S#|!V%}v?=tnYH>f>a#&)TxsefZ(7VwcxnU!SOd8op$t;n!*(oEV}KSrL%mp5E?1GpEMeaAc_5+8V#h zqhoGZCy|u~{EP3k`>h8y;!`QUaL6GLyV}(iUbay%*290ay3+hg|1|%p);}4S^e1lw zJ~BwP+9&dVR#|?v6eGspJDZyQdse(_WzVOTi6ec|+8k=p(5$L0j4ZnRtdX;Tk;D@)}h|HYtU%KD4P-|L~Or$=$MjZ|A=U>8P??tF_8{9k|y02ulWKYq0M5$GlNdr=_*sT|9D2 zaT`ea3pe~eQ&YR0q9NF|;FlxBa`=ov+gQq#>aQ^nkoB-nXgr8StEzehd?-Wq=X|vR z!vhbIpzt9^>>{#ybb0Om1Ge6|k{soYus_(cPb2V!&D_?C&rX085)5QDw58eY?CIMc z#x4IlzDo$p8dSrBv`EwDJ?_49-*$iH#2M3q9a7<{m_%0Aq4VHhHhYemmE_ucTN%<_ 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 P00000NkvXXu0mjftNMcE diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Statistics.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Statistics.java index d0e2c0f34..dece0fb38 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Statistics.java +++ b/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 ); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/bosses/DiamondKnight.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/bosses/DiamondKnight.java index 0ec4d0674..423349dfb 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/bosses/DiamondKnight.java +++ b/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++; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java index e409f3cda..87bde1bcc 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/ChaliceOfBlood.java +++ b/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) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java index a4c7eed7e..679d9ad17 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/BloodthirstyThorn.java +++ b/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;