From f5850010677adec0c8875d75bb094b8d7c7c118b Mon Sep 17 00:00:00 2001 From: LingASDJ <2735951230@qq.com> Date: Mon, 15 May 2023 00:01:27 +0800 Subject: [PATCH] Update V0.6.1.0 Beta7.2 --- .../android/AndroidGame.java | 2 +- .../android/AndroidLauncher.java | 3 +- .../android/MyDefaultErrorActivity.java | 0 build.gradle | 4 +- .../src/main/assets/interfaces/go-surface.png | Bin 2000 -> 6607 bytes .../main/assets/interfaces/menu_button.png | Bin 827 -> 959 bytes .../interfaces/status_pane-puresoul.png | Bin 3123 -> 3551 bytes .../main/assets/interfaces/status_pane.png | Bin 2521 -> 3551 bytes core/src/main/assets/interfaces/surface.png | Bin 1499 -> 5576 bytes .../main/assets/interfaces/talent_button.png | Bin 621 -> 825 bytes core/src/main/assets/interfaces/toolbar.png | Bin 4594 -> 4219 bytes .../assets/messages/actors/actors.properties | 6 +-- .../src/main/assets/messages/ui/ui.properties | 1 + .../shatteredpixeldungeon/actors/Char.java | 4 +- .../ClearBleesdGoodBuff/BlessGoRead.java | 2 +- .../ClearBleesdGoodBuff/BlessMixShiled.java | 8 ++-- .../actors/hero/Hero.java | 2 +- .../actors/mobs/Bestiary.java | 27 ++++++----- .../actors/mobs/GnollShiled.java | 10 ++++- .../items/Generator.java | 2 +- .../potions/elixirs/ElixirOfNukeCole.java | 4 +- .../ui/changelist/mlpd/vM0_6_7_X_Changes.java | 42 ++++++++++++++++++ .../windows/WndDLCX.java | 17 +++++-- .../windows/WndRedDragon.java | 3 +- 24 files changed, 103 insertions(+), 34 deletions(-) delete mode 100644 android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/MyDefaultErrorActivity.java diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java index e3e6c163e..717f16682 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidGame.java @@ -47,7 +47,7 @@ import com.watabou.utils.FileUtils; public class AndroidGame extends AndroidApplication { public static AndroidApplication instance; - private FirebaseAnalytics mFirebaseAnalytics; + private static AndroidPlatformSupport support; @Override diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java index f5c364d41..4aad8a0bb 100644 --- a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java +++ b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java @@ -31,9 +31,10 @@ import android.widget.TextView; import com.badlogic.gdx.graphics.g2d.freetype.FreeType; import com.badlogic.gdx.utils.GdxNativesLoader; +import com.google.firebase.analytics.FirebaseAnalytics; public class AndroidLauncher extends Activity { - + public FirebaseAnalytics mFirebaseAnalytics; @SuppressLint("SetTextI18n") @Override protected void onCreate(Bundle savedInstanceState) { diff --git a/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/MyDefaultErrorActivity.java b/android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/MyDefaultErrorActivity.java deleted file mode 100644 index e69de29bb..000000000 diff --git a/build.gradle b/build.gradle index e47241d81..72932e48c 100644 --- a/build.gradle +++ b/build.gradle @@ -17,8 +17,8 @@ allprojects { appName = 'Magic Ling Pixel Dungeon' appPackageName = 'com.ansdomagiclingpixeldungeon.ling' - appVersionCode =800865 - appVersionName = '0.6.1.0-Beta7(P3)' + appVersionCode =800866 + appVersionName = '0.6.1.0-Beta7.2(P3)' appJavaCompatibility = JavaVersion.VERSION_11 diff --git a/core/src/main/assets/interfaces/go-surface.png b/core/src/main/assets/interfaces/go-surface.png index 137072d76790828071a4d9b5c0ff3fc5a1b1f2f9..4c576d7b1cf461ea434b640a9d5737dbfa4bb348 100644 GIT binary patch literal 6607 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 N002ovPDHLkV1g5n$rk_s delta 1997 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 diff --git a/core/src/main/assets/interfaces/menu_button.png b/core/src/main/assets/interfaces/menu_button.png index fdc17355bc3583610ac5b15ae87f8999f1eece0e..df6b449b7ffb2dcfacfecccaf9b18695071126a7 100644 GIT binary patch delta 937 zcmV;a16KUI2EPZ8B!7lUL_t(o3B^}WNK`=>|7KYzI&5jInkXI;#luoovQ!7R4t2>( z3leqcAee_j?4VJQBq-6L5It0|haiIl3o?W*+p|EFunrQ^YQkc!ZDJOZ-Fm&>y!~dU z)m?YrN)Eg?znS^I`R4mK?|Z^*Hci@wcIOLG$A}QQhzZ19A*!mXq#>$n`^E5JgT!?erQ+`E35mtd8euNokl5q#h^eV5i6fB+6qlIy zbTbGo8w|7R$A1p?QF|FtJZ4)~XDS-IqK4m&^(hQ6{d-*UwU-$r9twi8P@0J{jp2DH zZz)2NnQDUa;Wx8X?wuzn|8a4NX!Qj_`MIHPT04G@pnNzSCh%CzwD=iIk!~o_GhvJW z<&D`O$M=B++X#!%QpvfmB1XXIDQX)-VrzA}aGc_&SAXbHs34=1R6~Fm9!z*&G&BxN z1KjJM7S!*T1_+%$BSID(46wfiVeXR#Xl-p}1H*WXrF<6-vlUHOUf+)u=XGA&EbUTL zf%y`>3gfoRH3~O9d8zQ{`^ix6?d?_boIbptyZCGYRkobuabEpDo=@z=k)Rs@GO0N! zO3!)Brhkr;lnN;?$_PkIBLbMhjsSb4MSzSVra|x02Tn0734S&LaJqS{Rl01W!_%8R z8yG}+H17zAKik?AfO2ST2;KAcO73s{lGJn9x(AfUub%KLEWF(c`+PoyEy*Hr8LC65 zuYj6y2sqcl4y9S~)Op^%vF;{Kj&$-ct3IDPz<)A?l#%!fD5JQFUuC|HvpE@i8?@=d zUZ2lq&vZ1X19%N}0Athvj8O+LMjgP|>UAuqK^)P@Aiu-FxfbgGc|X`?)-NC?bn};%R7{{e-01ESKrOvJl;`G#~Ry00000 LNkvXXu0mjfX!pTp delta 804 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 Y5467kntvCH!2kdN07*qoM6N<$g87u4=l}o! delta 3119 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 Y5467kntvCH!2kdN07*qoM6N<$g2Ppw2><{9 delta 2512 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 delta 1492 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 diff --git a/core/src/main/assets/interfaces/toolbar.png b/core/src/main/assets/interfaces/toolbar.png index 5ee82f75d3e0ad4424df8a8bdc2491f756b8db39..ac849eada029fa7d88cf7b8e1948d9c52b4e4436 100644 GIT binary patch literal 4219 zcmc&&*E<}5v)x4&v3hh?O%QdpuzD}iqekx$L6EhqwxWk1YDCR1N@VpFq7yAT!4f@c zSgZH?bN_?;bnnB=d7AIc!+dkjOq`*T+TlK>#zCM?0Un=Y^DDKLyE{ILYhpXXf{U%rF%d}zsDa+!Rguac5_&SKbZF-s*- zcvB7f{h~^er%q2P3j6XU4_!9ngY1F=I<%uu>BPHQoA_->B<-cGa4=$B)@^+_R~At}#N)74J%D^t);N|B=9nOZ`>;lpB`~~GvleSW+0cmCJ5Pz zH|*bjSbCo?-qTaQv{3JwU|G{)!MdmIwFX!H?KS^skj(@Cw#HL*xDL@YXxS@Nuh9ng z`yG3q`b8x8g@xIYddAQ{DNzXY^N2*w;|F(4h9wVa^(Oa?7F~1mUBVH)R>gL&E!&(R zc@B>#W!W?NOcecjGF0bhcD&Fs?K?4xyHSXJ6;|MO`X}l3r(*%uj9>1n2%HhVkAWa( zJ{-Q1N3dFZthiDNCk8Emg+-s2GgJuR4#r}n_$W*pQpD@b2$vCIfUt)Ingkh2v@C6%Whp(nO zm0InTmK}UPi}TTs;h@nZWLJ1|VauH>*C@>yV3pU{w>@LYG>}Sg$e=Lfm<7dUmQpE4 z!vXcVqJ#Yd9w5ZwNY;dlaC4>9TqpIrWPb9np{tPfwvFxYnP=O6D=Caq_!wa*ooyQrpI^<>KB*P>&F&}}){U&fI1;G{92ABxN2A`ro> zd*;;^8fa53nLR9l3p?(FW#t{Yw8K!l4=FPsOd7Z6sPiSoA%m~h!GkAje0#r6c1?s$ z#X~RD+Lzmc_gVT-k{`D;1h4Rj2;TYEN+x_Uy$pWuHVjI z-mP~!#H9l-UZ+ruXd6_@UAUAwX^DuXO(~u#=C(UNe4ItCaFYU4rtgcBdqJ_pycol9 zF{t0t3>lW&x~O2_3UZiIJDkaG8hVB$9VX$Y$bPf=MOU<53R`Ze4N;Uo~;o`=|B(H!$ zhWhL!8N(EJrsb3u4+8h-7@wzfL`0Q)68pw4!sNc*p$bjBdrx~mGjt9I20<#~8ab=3 zPYUBA;#cyX04?1zUHdT!W$|95sa9As-X=tfi}SXXbNgG94=AHVAd7u?uT4k!GR^Ml zJ&b@~@%ob}8nl=B>+Nina{^Kvv&H374=uBVM2{#rxPd*T#?{9Na;yyIjc}5BrihJz zrv?$sR*8g8eAsLXu`aOW3ZRytPw#&HPX2&oXo-^E){5rULvDEsVx?Jp)npQT^jRyv zlJ`p8p+=`*jAC@yzk6*&MiT(EnKh>@Y z2yfxl9}oQP-{DxW0_@OD^KIea{GK66|K_Jp*?q|vbfY(7mwIx3#3 zJJAb%a&8rMjI_MLes0`w7kj3Zg@Tp&@GUA`0&N@4F?O?4yJw z8m5jX?Sw!5xNwoK$42#XqtsFmKYzHPdlsc{`7oQqPIyXpqMqN%hV+aiAIU_2oQ2$p z(m{2~ZYH2zd5MpY_T31M%eLhdKe(7jSNZWe2^*a!7#wF__hvLx8G~gNWtgk&tz&bK z{9BS(QypYKvbvYh5OsC%V)IAX6jI@RXqU57aGQ=oF2IH5@4!Vc+A~HDpK2S1XY@Ps zmWTT?v2=)~EY?G`2&O@;9a>&kkrL`NZq%a+ybD;bkt2-<0L*aKJ z-y^}u`7KJE#&hr^!R%3t)!5AJ?`Id+qFfPa@bie}ivSMj(s5eNVdzR#G1- zDfuJ6lY_V&(<<^yQ^_v0LU3~|*DuuUnNN^3GK2=^5d36h{oiLrMiO6C1{go_TLD;r zSmAGnmgTVg2xO#wWl3B)`Am*U&>9(x7FDfl&Lvt7L5VmY2bZ$^hkL)e*+bRQkmCG= z)sF!5VLg({aT7UHb>4Uz*-4!#hbO zExh6lq;vANx&5*wq+Be+sm7G1SLbC`&HS+L^yuR~5xKO|lT4nCy<+o}l?&b68n;y# zfLRf~W$q^vu)8+5t&k;f61t!pVE+m(Im$e%Po&9Gh~^Ab(c+Ekfq@r@%cjYQ|5bc@ zpk2Tgq>q=#KVNZj-JW(DyxiTb??y07D>ZYD1AEv{6%VgH+)NjVosH5K2!3ZOTf!<> zMf`Og4a@d1G2$7G$)7h4U6KdMw0BtpGaCLjKgF5Kwi<^eV$?*i$(sO?R@l7m_3wFq!M`NbxDx}gKJ59wzEfo4ep`2&m#B!8Wr3kYqP+TI{AxQr|RL)Vi&I!H8 z90e8DX41iF_b)f;3U1QYB5xf7yxA9jsctu4H|1a`S4aY4wr$kmykfkHWi z?23_c!Dz!h6z-SD)2p|Js!!RhepZRo?-%W2Z#5v$K7lW+&~d?dNnZ?(gaz#E{eQLtk~Lt^aDf|KMY8~ zd*T%t?tI75vu!wC@Ek<=spwaM-TFI4_@~X5x47SOgyq`LzlLXSYD1{Qla#wPlk8nHNCz=Z+cxNNf0)s=Kcm|~NDRKD_l#rp zU42ddtZMsM>K?Ccc-AYn@9H3C#X{R}D{cjzM?W@OuCkkhbq~?ePi6L(7cZE!t|(8u zI+hEgA2C(gf%fg1wZNe>LM~cPU3*bc_uL(lE);lYo>FaMlIqG8%2HmWfE4~Q5 zT~D$}Z}eLp@Sev#IO2&7cL)HlW@2i(*ceLO;y2i&%<~THj}Zg4hvZ?R4+vIj)sThz zn7tz5_emZ=9LuSldu!lNym67ir?U_-6T{f>L7NT>(g@lzYuPzn>5T)0f{na4xsoPY z-uP!0B!&A3#Z%eCLEI^kY&dGnITh>-1MJo0*cT*>NPVSEjtfunTLdj1`0HIQdtrP# zUts>c?Oy3Lt8q-fMuL~B?L49lq>AwF(!`fo5`#DMi`(Kr(H-vmHJ)Y)0B8G znI=_>jpLC=(9AcACC-PBKERZ8u_v{rZ0)K#x?FJ7$1=P-8itBV`>1x;hvn?J85}^# z4~?4uI@Z*cly3nb#*Q?lgk8>_23C{*k3_3*l-aG1i7pYvaUGJ){_7JR9Q!Z|rX+1% zG+{!_S7h1AQba*DY|1Y=3Dj}N?rD?~M*5lR=)qCOpCp@&wg7*v(~Y086{NY6d#C-c z%do&=NK+Z2TfL|&Vaaem|gvU@yocpu?IZ9c~=A|cQi;gLs3)qmN zu%C5*Y}RwLE(gzKoVFVvX+RexCPUEwH7IC``5mW?e+c%?~m^}_ul88d+s^UJp^W3d_onq|Cxdts zbV2<4xuwO552T;W9!LarsPhcC;pOtDYN`GVs9(g)C2rrvOmCPd(G0FvM3#z~VW#>vDq!&$uw8o%&fSj3^RdaIj~qkee+ zRk?rVRcw5L(=tp?D~=Y$p~?`YiXtOqGA6J6E?T~%H`JBBWftHfP74!GbWKfARcc2w zsJ&i{$gdT&=142k@;4ZfZ`XqrN_8sw=A_m$vi?B~mLdm2E*=vw3L`3sK24>Y%jl6- zc;xl@8BhZ*kDxO7b=73|i_w@24(b!Z50_i|4gL|(5@7%KNwN^Q`jXzLu&Pxs^SU{! zN3z^Y$W=1s8N24+vf{Ym2G3^5Xs_3rU@U6b&zcnkKh!8YY$zqfsyc?MBYcY^h!EjwH z`Z>Xdkd$>9QFYz=_U!2A%`YYenaDT^G*zbDT>=0?NrF0uvn3Xj+hqbGubFlb_*soX znbXq>IJ|OE_H4os2_(#8WX5|J5?4gOv~aghD=LIQ2n)>5(bbpi2y>1$c37m^)Rsgl|5yN&O^tZz`|x&;ZUH$y>At@CH9-qXu-@1`LwX*h z=O&ByLHYwv^`?8c0aZRfw&ekKe9pJ_#Q=*^MEhSc`(=!V?POG{y122aGnlYkW^x6qI3i;+xzNEqJK$kT8H?EZosFzRjOD1I2)o0#3jPHtqbDml+sNzr9O26D z+C569gB|7jIlSeXXGI;RA`dg4B<#oxWHR~IH#y+)^Hh0k;mWwSeD1-9;1u!;I8vvQ zB^ai;=4hnCdawyi3-)__N$BU812B~%sytx&eR?PG)mu2_6qm4sPR86G%EU?qd_yp$ zr4}&ND2a6I-KBE#?{^i>_UdtOj*8Tz_gE^uIGJM=>~8F$zFS_b3dp8MC^{fRWjnV| z{vnq>aTyNB9RC*gKHg2w!VEG&d;&gr%MCf~OD9K^L-#fpWXU z(LSH8*62a$_t(}l_aEWXYFHB6mSF3VjX!ECydn~pY4Dvs(i=rx4zfdfR>nQ>>-V3@ z#RS}V1gqx_IkJZAJ{Od6#w9DTWMuh1RPPG_L&#~xMPZlu`gY6+SDoWC}&E0t-lGKw4?;g}(mHS}`|+*3(Z&e+l-LxU0K zJ~cK?N3F8{BzrJ&|0HO<;U7?LVqZfLsRRqp>(9Jg?8(R3P&-~NgqB8NrTHh2P#+1+ z$Vaf6Jr+@WYndxoSLw4d=|&jZ$Eot2X1``yN%CVQXdZ#qSP(OW`FdsL1>kn0mdvHx zpO&;N{{2oeSFr3?y>^)An&e&i{dXkY4C*6?9$zhlkm!q{GQ$1g$u7T7pb1VoB;(c> zKT{yPBfWfqa5ik1VvjOvJJl@Z zcw{Pb_Gb|@{WiKPvj_6CbCI2~_HDg;sOwb-S&<0zo<@9u25m(}QljG|L+Pm?d-_1s zKVGKYJM;8ItF?r|`?L&tTZ$Z=5iGYHXLvY*Fk7b`^=*5?z^vROhqU$^iHSr9RJXzl z7VDwPcPm+$4k(Ig>iUxw0GJH-04dkxSGSsjir?UK9%Z%;!@`M%5MjyWTRYE3{T;nF z&{_%6y_?McUAPAkF8ym37%&+hM5m`v$@DI!Qz_yaLB>Bcdq@2s>p6NnjDHZtW&eSH zrRJ&kvHFJWcSjI-s!Eo(hX10eQGJ1>-#A+_2?MgJD>&hzY9!=j>pr5vJ)d;d4}TxD z7O_Bl-uKd_kUe+wh_1bUBD8V2NP{W03b-as%;b!d3BVN%*xjkfs5glI4$}Ix6PS~B zvCBN?VVcad>9z_KSt3@TX~~mu^q29i=x5*G1mXK*XsNG6V{9rwlt`*}S8FCUibIic z7#1a~D<{=nIq|nLLe879;#%22H~F)fG3IU*)W1hjQi6h3EBgk0Sdwt)G0%%qsJcG` z6sjVQ`Pn}!{ua$DkBu8n`NFF^x}*BF!%Jt#q7Y=8vd^E~afi}4Tv6?bgTAr*fhoCH z_DZWYlD2-Y#ojTvgc!=#8vN;iI#o2}=5EHHA{*?xv|g7d)f^or5$Zl%@IqaDr)kr? z<%?!U!ge56eywBwAEiN0AG5kwFE4P*R^d0$u(_z}X{@-ulirz`4)gfJJhth@N?TM{uGxyhLo7t4 z;~0AP?sgYm>?QOkx>LrLYIT0=JN<|Y89zSeEbO$o`HVM86@N=h#d}&v_p`=v`>xNT zJWhpjR`c0gUzr!>g*1cLP5aZ~xx5{fBvo~t*iIWf7@!Luy{K=_Dj9=1^$#@UlQ`|< zdJVsa*R!lx+sqOD62@W;9PKs$=5ZVDv%i3{##3p^2fv$rj*DSohNz9~4+}~7YXEjIu9tivkOpRV=t;fhw=&a(&-W;#=x5<8 z6F2;#Am^#*l#0gF>W>civY8_JW}0Bo|IXc9w=4s8+AHNLGiNvx?U$Yz1Pl57s`b+K zIRV`CJmuy2XiA!+f%8hAX>$Td-9YF?aK(&!B+a7xPwt1on$oqFi@rIDNlero5dqkK zN)^DsaR>95PA-pE3u_BOdGCtyHHWV77YDrSGWGvvEqCV$=qHyfeU!R!wb>4rvSnAB zYawef1pm^N1jJi)?^(sUxtbl2Y&ID_jlabXNzQ(ub*nxmdXMRCWvTwKj=G>&d!euP zW-eP2l^;8PQ70)Qm2S!O(S@tR><<;`jm^O6yjfmSuZx?bHS;#0xdT@)9~>wW?Hf0h znYAV2#Fh%Gft!NNWBPXu#;3j{P8xYUS&}0gwy6~)$ z(nTw9Yo;OM*fx4`54DX+6}B1#&5UVqs;%LaKvE9C(sON=XQhS0^J$*KMo4wSODj~?lKT6l1Zih7lz!_%y z_MjUZrO$9#Q<rsH9Kha>L=FzhrADc~m&_V(~c) zlQZeGpqIBIH7BlzNRF2Y^%Igf{GEfjWA^%_c~v*K?HD_Ef06aQd7l^p#1_=VSNP|d z+jjQD{l%vz^KGt{jz6pQ)~i6YP&3?9{@+#UZu3F{HXhz?c{>R0y=JL3q+2eI8*t?3 z`DA+N_JOlOc#ba6LbAw3shkm6At<>PrX7)Ldzn}#BwCH63%<%)+)0AEuK4?gIAh{$ zD@fhg8dZa{Z@sZ$kl3w(HM$Oldj;Le?3%SsG(GbWeBMF2r+MK4kLU42o_MtwM;KKd zpT&a!;&XSohr>c|{s8q6RF+JK5=ahpbl18#L*hVpF;zI@A$n4=psh2Yc|hx7da=2y zR&WSiOFul-+{N-8U5;KE4ha3Ye5GwKUhYBb`XqS*&phw9AgDC?1NJCt&W|K`_LS05 zk-xBJr2I_H6XMdz%^ue|lPQO(%N-^sk|bx@)6XftIC9=X z5~2l1Ohp>rUoI01CvqHKY2S@GiP|M;hs~9{GV008vg%>;N16x??|tKiP70S7hzdo- zEQ5eB?eoo~>^um02bSSRu+*JK@H%}9osIona+FK5?0QBNqIG#$*r{oO716O0sp15X zKCdz2*q;F%i-#G3R+z`bRVfLjV>yX0{E1-g^J`VOKKMNB_F323ilSrX4(Usj!!E1f z`ZR`4V_!NBcl5Q$C41ms^7e%C=hL+-B}2hrHEGqCGv63l<04l{_BjxB=i@ZtQGcCa_2Utt=j`demhRC&)g8uJ8kqlu|3U}JGun-eauH? zdH#_GKWuvf2BvY&d91SuQ`pu++Th65^&ai~dZ=lH4DfO_#}zo)0~t3NZGXT-i@L zGZ(p-TN1iw5;I`Pn>CMOZ_;`d;!&yhS_>;C;dR4j6EP*0Z<(A1k7lF6`I)XgMCd-tq?r zHDuRj5GFdccbuO64@NTU AWdHyG diff --git a/core/src/main/assets/messages/actors/actors.properties b/core/src/main/assets/messages/actors/actors.properties index addf94ba1..9df6395be 100644 --- a/core/src/main/assets/messages/actors/actors.properties +++ b/core/src/main/assets/messages/actors/actors.properties @@ -100,7 +100,7 @@ actors.buffs.puresoul.desc=灯火前行，光芒前路。没有什么东西可 ### Magic Say debuffs actors.buffs.magicgirldebuff.magicgirlsaynostr.name=魔女的低语-无力 -actors.buffs.magicgirldebuff.magicgirlsaynostr.desc=无力将会吞噬你自己，而幕后黑手仍然在背后暗暗发笑。\n\n本大层力量将会-3点，下一大层恢复。 +actors.buffs.magicgirldebuff.magicgirlsaynostr.desc=无力将会吞噬你自己，而幕后黑手仍然在背后暗暗发笑。\n\n本大层力量将会-1点，下一大层恢复。 actors.buffs.magicgirldebuff.magicgirlsaycursed.name=魔女的低语-束缚 actors.buffs.magicgirldebuff.magicgirlsaycursed.desc=束缚只是我的一个考验，而失去信心的你。想必比我这个考验更可怕吧。\n\n本大层装备会被诅咒，下一大层失效 @@ -128,10 +128,10 @@ actors.buffs.clearbleesdgoodbuff.blessnomoney.name=纯洁的祝福-富饶 actors.buffs.clearbleesdgoodbuff.blessnomoney.desc=魔女的气息在我们身旁徘徊，商人们一定会对你毕恭毕敬。\n\n本大层商店全场打3折 actors.buffs.clearbleesdgoodbuff.blessmobdied.name=纯洁的祝福-安息 -actors.buffs.clearbleesdgoodbuff.blessmobdied.desc=安息吧！怪物们!!!\n\n本大层英雄物理伤害x2! +actors.buffs.clearbleesdgoodbuff.blessmobdied.desc=安息吧！怪物们!!!\n\n本大层英雄物理伤害x1.5! actors.buffs.clearbleesdgoodbuff.blessmixshiled.name=纯洁的祝福-守护 -actors.buffs.clearbleesdgoodbuff.blessmixshiled.desc=守护我们最后的种子！\n\n本大层英雄在血满的情况下每100回合获得一些护盾。 +actors.buffs.clearbleesdgoodbuff.blessmixshiled.desc=守护我们最后的种子！\n\n本大层英雄在血满的情况下每150回合获得一些护盾。 actors.buffs.clearbleesdgoodbuff.blessimmune.name=纯洁的祝福-隐没 actors.buffs.clearbleesdgoodbuff.blessimmune.desc=隐没在这人群之中，我们便是超凡脱俗的个体\n\n本大层英雄免疫诅咒效果和减少40%的物理伤害。 diff --git a/core/src/main/assets/messages/ui/ui.properties b/core/src/main/assets/messages/ui/ui.properties index 7e340dc36..dfdd34d58 100644 --- a/core/src/main/assets/messages/ui/ui.properties +++ b/core/src/main/assets/messages/ui/ui.properties @@ -513,5 +513,6 @@ ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x62=-V0.6.1-Beta6\n1.修复一些错 ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x63=-V0.6.1-Beta7\n1.修复染血金币控制终端的一些小错误\n2.修复魔法坐标房间重复生成的问题 +ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x64=-V0.6.1-Beta7.2\n1.修复一些小错误\n2.少量UI迭代优化 //ui.changelist.mlpd.vm0_5_x_changes.xxx// \ No newline at end of file diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java index 216526311..51b54160d 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/Char.java @@ -573,9 +573,9 @@ public abstract class Char extends Actor { //TODO 审判 削弱10%伤害 if ( buff(MagicGirlSayKill.class) != null ){ damage *= 0.90f; - //TODO 安息 x2伤害 + //TODO 安息 x1.5伤害 } else if ( buff(BlessMobDied.class) != null ) { - damage *= 2f; + damage *= 1.5f; } if ( buff(AnkhInvulnerability.GodDied.class) != null ) { damage *= 2.25f; diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessGoRead.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessGoRead.java index 73cf5df13..37de3afa2 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessGoRead.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessGoRead.java @@ -30,7 +30,7 @@ public class BlessGoRead extends Buff { } if(hero.lanterfire > 60 ) { - float healDelay = 10f - 10*0.9f; + float healDelay = 10f - 10*0.5f; healDelay /= 0.1f; //effectively 1HP at lvl 0-5, 2HP lvl 6-8, 3HP lvl 9, and 5HP lvl 10. target.HP = Math.min( target.HT, target.HP + (int)Math.ceil(5/healDelay)); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessMixShiled.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessMixShiled.java index 1b92f4719..779ba5c36 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessMixShiled.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessMixShiled.java @@ -27,12 +27,12 @@ public class BlessMixShiled extends Buff { if(Dungeon.hero.buff(BlessMixShiled.class) != null && hero.HT == hero.HP){ if(Dungeon.depth <= 5) { - Buff.affect(hero, Barrier.class).setShield(((60))); + Buff.affect(hero, Barrier.class).setShield(((30))); } else { - Buff.affect(hero, Barrier.class).setShield(((60) * Dungeon.depth / 5)); + Buff.affect(hero, Barrier.class).setShield(((20) * Dungeon.depth / 5)); } - spend(100f); - GLog.w("你的血量已满，奖励你一些护盾值。"); + spend(150f); + GLog.w("你的血量已满，奖励你"+(Dungeon.depth<=5 ? 20 : (20) * Dungeon.depth / 5)+"点护盾值。"); } spend(interval); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java index 647d8d99a..c6baa40d1 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/Hero.java @@ -320,7 +320,7 @@ public class Hero extends Char { //无力 本大层-3力量 : 坚毅 本大层力量+2 if(Dungeon.hero.buff(MagicGirlSayNoSTR.class) != null){ - strBonus -= 3; + strBonus -= 1; } else if(Dungeon.hero.buff(BlessGoodSTR.class) != null) { strBonus += 2; } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java index e5a1fe0d4..7ce2c0b5b 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Bestiary.java @@ -212,7 +212,8 @@ public class Bestiary { return new ArrayList<>(Arrays.asList( Bat.class, Brute.class,Spinner.class, - DM100.class,RedSwarm.class)); + DM100.class,RedSwarm.class,MolotovHuntsman.class, + MolotovHuntsman.class)); case 14: return new ArrayList<>(Arrays.asList( @@ -248,15 +249,15 @@ public class Bestiary { case 19: //1x elemental, 1x warlock, 2x monk, 3x golem return new ArrayList<>(Arrays.asList( - Monk.class,IceGolem.class, + Monk.class, Golem.class,ShieldHuntsman.class)); case 20: //1x elemental, 1x warlock, 2x monk, 3x golem return new ArrayList<>(Arrays.asList( Elemental.random(), Warlock.class, Warlock.class, - Monk.class, IceGolem.class, - Golem.class, IceGolem.class, Golem.class,Ice_Scorpio.class)); + Monk.class, + Golem.class, Golem.class,Ice_Scorpio.class)); case 21: //3x succubus, 3x evil eye @@ -299,22 +300,22 @@ public class Bestiary { // Sewers default: return; - case 9: + case 4: if (Random.Float() < 0.025f) rotation.add(Thief.class); return; // Prison - case 19: + case 9: if (Random.Float() < 0.025f) rotation.add(Bat.class); return; // Caves - case 29: + case 14: if (Random.Float() < 0.025f) rotation.add(Ghoul.class); return; // City - case 39: + case 19: if (Random.Float() < 0.025f) rotation.add(Succubus.class); return; } @@ -327,8 +328,8 @@ public class Bestiary { Class cl = rotation.get(i); if (cl == Rat.class) { cl = Albino.class; - } else if (cl == Slime.class) { - cl = CausticSlime.class; + } else if (cl == Guard.class) { + cl = SRPDHBLR.class; } else if (cl == Thief.class) { cl = Bandit.class; } else if (cl == Brute.class) { @@ -337,8 +338,14 @@ public class Bestiary { cl = DM201.class; } else if (cl == Monk.class) { cl = Senior.class; + } else if (cl == Golem.class) { + cl = IceGolem.class; } else if (cl == Scorpio.class) { cl = Acidic.class; + } else if (cl == Spinner.class) { + cl = GnollShiled.class; + } else if (cl == FireGhost.class) { + cl = MolotovHuntsman.class; } rotation.set(i, cl); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GnollShiled.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GnollShiled.java index 74665d4b5..74bd2c162 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GnollShiled.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/GnollShiled.java @@ -24,7 +24,7 @@ public class GnollShiled extends Gnoll { public GnollShiled() { this.spriteClass = BombGnollTricksterSprites.class; - this.HT = HP = Random.Int(50,210); + this.HT = HP = Random.Int(80,120); this.defenseSkill = 5; this.EXP = 8; this.state = this.WANDERING; @@ -114,8 +114,14 @@ public class GnollShiled extends Gnoll { public void die(Object cause) { GnollShiled.super.die(cause); - RedDragon.Quest.process(); //赋予红龙权限 + for (Mob mob : Dungeon.level.mobs.toArray(new Mob[0])) { + if (mob instanceof RedDragon && mob.isAlive()) { + RedDragon.Quest.process(); + } + } + + } public void storeInBundle(Bundle bundle) { diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java index 605dcde80..96f438b80 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/Generator.java @@ -378,7 +378,7 @@ public class Generator { GreenSword.class, }; - WEP_T3.probs = new float[]{ 1, 5, 5, 4, 0, 4 ,3,5,3,6,0}; + WEP_T3.probs = new float[]{ 1, 5, 5, 4, 4, 4 ,3,5,3,6,0}; WEP_T4.classes = new Class[]{ Longsword.class, diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfNukeCole.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfNukeCole.java index 53b994a95..0e681b7c4 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfNukeCole.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/elixirs/ElixirOfNukeCole.java @@ -12,7 +12,7 @@ import com.shatteredpixel.shatteredpixeldungeon.effects.particles.FlameParticle; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet; import com.watabou.noosa.audio.Sample; -//TODO 娱乐模式加入 + public class ElixirOfNukeCole extends Elixir { { @@ -24,7 +24,7 @@ public class ElixirOfNukeCole extends Elixir { Buff.affect(hero, HaloFireImBlue.class).set(HaloFireImBlue.DURATION); Buff.affect(hero, Haste.class, 10f); Buff.affect(hero, WellFed.class).resetload(); - Buff.affect(hero, Barrier.class).setShield((int) (0.6f * hero.HT + 10)); + Buff.affect(hero, Barrier.class).setShield((int) (0.3f * hero.HT + 10)); Buff.affect(hero, Healing.class).setHeal((int) (0.4f * hero.HT + 5), 0.2f, 0); Sample.INSTANCE.play( Assets.Sounds.BURNING ); hero.sprite.emitter().burst(FlameParticle.FACTORY, 10); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java index de67ee16c..5b0f0c5b7 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java @@ -49,6 +49,7 @@ import java.util.ArrayList; public class vM0_6_7_X_Changes { public static void addAllChanges(ArrayList changeInfos) { + add_v0_6_35_Changes(changeInfos); add_v0_6_34_Changes(changeInfos); add_v0_6_33_Changes(changeInfos); add_v0_6_32_Changes(changeInfos); @@ -86,6 +87,47 @@ public class vM0_6_7_X_Changes { add_v0_6_0_Changes(changeInfos); } + public static void add_v0_6_35_Changes( ArrayList changeInfos ) { + ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta7.2(P3)", true, ""); + changes.hardlight(Window.TITLE_COLOR); + changeInfos.add(changes); + + changes = new ChangeInfo("新内容", false, null); + changes.hardlight(Window.GREEN_COLOR); + changeInfos.add(changes); + + Image issxsaxs =new MolotovHuntsmanSprite(); + issxsaxs.scale.set(PixelScene.align(0.8f)); + changes.addButton(new ChangeButton(issxsaxs, ("精英刷怪机制调整"), + ("在原有基础上修改以下精英怪：\n" + + "魔像---》冰魔像 精英\n" + + "监狱守卫---》赏金猎人 精英\n"+ + "洞穴蜘蛛---》豺狼炼药长老 精英\n" + + "红色怨灵---》血月火把猎人 精英\n\n" + + "同时现阶段有关于上面的正常刷怪被移除，也就是说冰魔像他们不再是常规刷新了。"))); + + changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.REDDRAGON), "核子可乐回归", + "核子可乐现在回归正常模式，且仅在困难难度前获得，并且效果有所减弱。")); + + changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.LANTERNB), "部分灯火Buff调整", + "部分灯火buff都进行了一定的调整：\n" + + "1.纯洁的祝福--前路\n调整：回血效果减半\n\n" + + "2.魔女的低语--无力\n调整：效果持续期间力量从-3调整至-1\n\n" + + "3.纯洁的祝福--安息\n调整：物理伤害从x2调整至x1.5\n\n" + + "4.纯洁的祝福--守护\n调整：效果持续期间每150回合获得一些护盾")); + + changes = new ChangeInfo("改动", false, null); + changes.hardlight(Window.CYELLOW); + changeInfos.add(changes); + + changes.addButton(new ChangeButton(new Image(Assets.Interfaces.HAICONS, 32, 0, 16, 16), "难度系统", + "难度系统现在困难模式暂时去除，数值的困难太敷衍，难度系统需要更多时间制作，敬请期待。")); + + changes.addButton(new ChangeButton(new Image("sprites/spinner.png", 144, 0, 16, 16), + Messages.get(ChangesScene.class, "bugfixes"), Messages.get(vM0_6_7_X_Changes.class, "bug_06X64"))); + + } + public static void add_v0_6_34_Changes( ArrayList changeInfos ) { ChangeInfo changes = new ChangeInfo("v0.6.1.0-Beta7(P3)", true, ""); changes.hardlight(Window.TITLE_COLOR); diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDLCX.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDLCX.java index fa5c99aa1..b77aedb5e 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDLCX.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndDLCX.java @@ -100,8 +100,7 @@ public class WndDLCX extends Window { cb.checked(false); cb.visible=false; } - cb.active = editable; - cb.difficultyConduct = i; + pos += GAP; cb.setRect(0, pos, WIDTH - 16, BTN_HEIGHT); @@ -109,6 +108,15 @@ public class WndDLCX extends Window { cb.setSize(WIDTH, BTN_HEIGHT); } + if (i == Difficulty.DifficultyConduct.HARD){ + cb.alpha(0.7f); + cb.active=false; + cb.setPos(0,9000); + } else { + cb.active = editable; + cb.difficultyConduct = i; + } + content.add(cb); boxes.add(cb); if (i != Difficulty.DifficultyConduct.NULL) { @@ -124,7 +132,10 @@ public class WndDLCX extends Window { infos.add(info); Image icon = new Image(Assets.Interfaces.HAICONS, (i.ordinal() - 1) * 16, 0, 16, 16); icon.x = cb.left()+1; - icon.y = cb.top()+1; + if (i == Difficulty.DifficultyConduct.HARD) { + info.setPos(0,9000); + } + icon.y = cb.top() + 1; content.add(icon); } diff --git a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRedDragon.java b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRedDragon.java index 357cc9843..50cb9d096 100644 --- a/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRedDragon.java +++ b/core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndRedDragon.java @@ -36,6 +36,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Degrade; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.npcs.RedDragon; import com.shatteredpixel.shatteredpixeldungeon.items.Item; import com.shatteredpixel.shatteredpixeldungeon.items.armor.Armor; +import com.shatteredpixel.shatteredpixeldungeon.items.potions.elixirs.ElixirOfNukeCole; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon; import com.shatteredpixel.shatteredpixeldungeon.messages.Messages; import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene; @@ -134,7 +135,7 @@ public class WndRedDragon extends Window { reward.identify(); if (reward.doPickUp( hero )) { GLog.i( Messages.get(hero, "you_now_have", reward.name()) ); - //new ElixirOfNukeCole().quantity(5).identify().collect(); + new ElixirOfNukeCole().quantity(2).identify().collect(); rewardObtained = true; } else { Dungeon.level.drop( reward, reddragon.pos ).sprite.drop();