LingASDJ/Magic_Ling_Pixel_Dungeon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update 0.6.3.0-Beta4.7

Browse Source
This commit is contained in:
LingASDJ 2023-07-09 14:17:01 +08:00
parent 88c2238aea
commit 54369bc416
19 changed files with 93 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
android/build.gradle
View File

@ -104,7 +104,7 @@ dependencies {
implementation "com.badlogicgames.gdx-controllers:gdx-controllers-android:$gdxControllersVersion"
//修复小米手表与低安卓系统的WebView冲突兼容问题
implementation 'androidx.appcompat:appcompat:1.4.1'
implementation 'androidx.appcompat:appcompat:1.0.2'
}
// called every time gradle gets executed, takes the native dependencies of

3
android/src/main/java/com/shatteredpixel/shatteredpixeldungeon/android/AndroidLauncher.java
View File

@ -31,12 +31,11 @@ import android.widget.TextView;
import com.badlogic.gdx.graphics.g2d.freetype.FreeType;
import com.badlogic.gdx.utils.GdxNativesLoader;
import com.google.firebase.analytics.FirebaseAnalytics;
import com.shatteredpixel.shatteredpixeldungeon.services.analytics.Analytics;
import com.shatteredpixel.shatteredpixeldungeon.services.analytics.AnalyticsImpl;
public class AndroidLauncher extends Activity {
public FirebaseAnalytics mFirebaseAnalytics;
@SuppressLint("SetTextI18n")
@Override
protected void onCreate(Bundle savedInstanceState) {

5
build.gradle
View File

@ -6,6 +6,7 @@ buildscript {
dependencies {
classpath 'com.android.tools.build:gradle:7.0.4'
classpath 'com.google.gms:google-services:4.3.15'
//noinspection GradleDependency
classpath 'com.google.firebase:firebase-crashlytics-gradle:2.9.2'
}
@ -17,8 +18,8 @@ allprojects {
appName = 'Magic Ling Pixel Dungeon'
appPackageName = 'com.ansdomagiclingpixeldungeon.ling'
appVersionCode =900921
appVersionName = '0.6.3.0-Beta4.6'
appVersionCode =900922
appVersionName = '0.6.3.0-Beta4.7'
appJavaCompatibility = JavaVersion.VERSION_11

2
core/src/main/assets/messages/actors/actors.properties
View File

@ -156,7 +156,7 @@ actors.buffs.clearbleesdgoodbuff.blessimmune.name=纯洁的祝福-隐没
actors.buffs.clearbleesdgoodbuff.blessimmune.desc=隐没在这人群之中，我们便是超凡脱俗的个体\n\n本大层英雄免疫诅咒效果和魔法效果和减少40%的物理伤害以及无视血色哨卫的伤害。
actors.buffs.clearbleesdgoodbuff.blessgoread.name=纯洁的祝福-前路
actors.buffs.clearbleesdgoodbuff.blessgoread.desc=行走在这令人惧怕的地牢中，灯火是前路的指引\n\n本大层英雄灯火值高于60%的情况下，获得每回合进行血量回复。
actors.buffs.clearbleesdgoodbuff.blessgoread.desc=行走在这令人惧怕的地牢中，灯火是前路的指引\n\n本大层英雄灯火值高于60%的情况下，获得每3回合进行血量回复。
actors.buffs.clearbleesdgoodbuff.blessanmy.name=纯洁的祝福-共生
actors.buffs.clearbleesdgoodbuff.blessanmy.desc=昏暗的地牢，其实仍然可以共生共存。\n\n本大层玩家获得_“共生法杖”_，可在每层选择一个怪物成为你的盟友，该法杖无法升级，且Buff效果消失后自动消失。(_共生只是为了生存，我们所做的只有拯救自己_)

2
core/src/main/assets/messages/ui/ui.properties
View File

@ -542,5 +542,5 @@ ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x76=-V0.6.3-Beta3.6\n1.修复PC端音
ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x77=-V0.6.3-Beta4.0\n1.修复上个版本的一些遗漏错误\n2.修复水袋和提灯可以升级的错误
ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x78=-V0.6.3-Beta4.5\n1.修复护身符的错误\n2.修复一些严重错误\n3.修复粽子无法生成的问题，且活动时间补偿到7月12号。
ui.changelist.mlpd.vm0_6_7_x_changes.bug_06x78=-V0.6.3-Beta4.5\n1.修复护身符的错误\n2.修复一些严重错误\n3.修复粽子无法生成的问题，且活动时间补偿到7月12号。\n4.修复部分Boss可以被腐化的问题
//ui.changelist.mlpd.vm0_5_x_changes.xxx//

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/ClearBleesdGoodBuff/BlessGoRead.java
View File

@ -29,7 +29,7 @@ public class BlessGoRead extends Buff {
detach();
}
if(hero.lanterfire > 60 ) {
if(hero.lanterfire > 60) {
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.

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/buffs/StormCloudDied.java
View File

@ -61,9 +61,9 @@ public class StormCloudDied extends Buff {
}
ArrayList<Integer> cells = new ArrayList<>();
for(int i = 10; i > 0; i--){
for (int i = 10; i > 0; i--) {
int c = Random.Int(Dungeon.level.length());
if(hero.fieldOfView[c] && !cells.contains(c)){
if (c >= 0 && c < Dungeon.level.length() && hero.fieldOfView[c] && !cells.contains(c)) {
cells.add(c);
}
}

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

@ -56,6 +56,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Burning;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ChampionEnemy;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ChampionHero;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Chill;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ClearBleesdGoodBuff.BlessAnmy;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ClearBleesdGoodBuff.BlessGoRead;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ClearBleesdGoodBuff.BlessGoodSTR;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ClearBleesdGoodBuff.BlessImmune;
@ -154,6 +155,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.exotic.ScrollOfChallenge;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfAnmy;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfLivingEarth;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.SpiritBow;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
@ -979,7 +981,7 @@ public class Hero extends Char {
Buff.affect( this, Nyctophobia.class );
switch (Random.Int(4)){
switch (Random.Int(5)){
case 0: default:
Buff.affect(hero, BlessMobDied.class).set( (100), 1 );
break;
@ -992,6 +994,9 @@ public class Hero extends Char {
case 3:
Buff.affect(hero, BlessGoRead.class).set( (100), 1 );
break;
case 4:
new WandOfAnmy().quantity(1).identify().collect();
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
}
GLog.b(Messages.get(WndStory.class,"letxz"));
}
@ -2444,7 +2449,7 @@ public class Hero extends Char {
if(lanterfireactive){
if (hero.lanterfire == 100){
switch (Random.Int(4)){
switch (Random.Int(5)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -2460,10 +2465,13 @@ public class Hero extends Char {
case 4:
Buff.affect(hero, BlessImmune.class).set( (100), 1 );
break;
case 5:
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
}
GLog.p(Messages.get(WndStory.class,"good"));
} else if (hero.lanterfire <= 99 && hero.lanterfire >= 90) {
switch (Random.Int(4)){
switch (Random.Int(5)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -2479,6 +2487,9 @@ public class Hero extends Char {
case 4:
Buff.affect(hero, BlessImmune.class).set( (100), 1 );
break;
case 5:
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
}
GLog.p(Messages.get(WndStory.class,"good"));
} else if (hero.lanterfire <= 89 && hero.lanterfire >= 80 && Random.Float() <= 0.05f ) {
@ -2504,7 +2515,7 @@ public class Hero extends Char {
}
GLog.n(Messages.get(WndStory.class,"bad"));
} else if (hero.lanterfire <= 89 && hero.lanterfire >= 80 && Random.Float() <= 0.85f ) {
switch (Random.Int(4)){
switch (Random.Int(5)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -2520,6 +2531,9 @@ public class Hero extends Char {
case 4:
Buff.affect(hero, BlessImmune.class).set( (100), 1 );
break;
case 5:
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
}
GLog.p(Messages.get(WndStory.class,"good"));
} else if (hero.lanterfire <= 89 && hero.lanterfire >= 80) {
@ -2547,7 +2561,7 @@ public class Hero extends Char {
}
GLog.n(Messages.get(WndStory.class,"bad"));
} else if (hero.lanterfire <= 79 && hero.lanterfire >= 60 && Random.Float() <= 0.70f ) {
switch (Random.Int(4)){
switch (Random.Int(6)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -2558,11 +2572,15 @@ public class Hero extends Char {
Buff.affect(hero, BlessMobDied.class).set( (100), 1 );
break;
case 3:
Buff.affect(hero, BlessMixShiled.class).set( (100), 1 );
new WandOfAnmy().quantity(1).identify().collect();
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
case 4:
Buff.affect(hero, BlessImmune.class).set( (100), 1 );
break;
case 5:
Buff.affect(hero, BlessMixShiled.class).set( (100), 1 );
break;
}
GLog.p(Messages.get(WndStory.class,"good"));
} else if (hero.lanterfire <= 79 && hero.lanterfire >= 60) {

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/hero/HeroClass.java
View File

@ -63,6 +63,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.bags.HerbBag;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.KingBag;
import com.shatteredpixel.shatteredpixeldungeon.items.bags.VelvetPouch;
import com.shatteredpixel.shatteredpixeldungeon.items.books.bookslist.BrokenBooks;
import com.shatteredpixel.shatteredpixeldungeon.items.books.bookslist.DimandBook;
import com.shatteredpixel.shatteredpixeldungeon.items.books.bookslist.TestBooks;
import com.shatteredpixel.shatteredpixeldungeon.items.books.bookslist.YellowSunBooks;
import com.shatteredpixel.shatteredpixeldungeon.items.food.Food;
@ -170,7 +171,7 @@ public enum HeroClass {
new PotionOfHealing().quantity(50).identify().collect();
new PotionOfLiquidFlame().quantity(50).identify().collect();
new DimandBook().quantity(50).identify().collect();
new PotionOfExperience().quantity(100).identify().collect();
new ScrollOfMagicMapping().quantity(100).identify().collect();
new ScrollOfUpgrade().quantity(100).identify().collect();

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Mob.java
View File

@ -76,7 +76,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.plants.Swiftthistle;
import com.shatteredpixel.shatteredpixeldungeon.services.analytics.Analytics;
import com.shatteredpixel.shatteredpixeldungeon.sprites.CharSprite;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.audio.Sample;
@ -860,9 +859,9 @@ public abstract class Mob extends Char {
@Override
public void die( Object cause ) {
if (((Char) this).properties.contains(Char.Property.BOSS) && !(this instanceof YogFist)) {
Analytics.trackBossBeaten(this);
}
// if (((Char) this).properties.contains(Char.Property.BOSS) && !(this instanceof YogFist)) {
// Analytics.trackBossBeaten(this);
// }
if (cause == Chasm.class){
//50% chance to round up, 50% to round down

7
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/LightFood.java
View File

@ -1,5 +1,7 @@
package com.shatteredpixel.shatteredpixeldungeon.items.food;
import static com.shatteredpixel.shatteredpixeldungeon.items.potions.PotionOfHealing.heal;
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
@ -37,7 +39,10 @@ public class LightFood extends Food {
}
protected void satisfy( Hero hero ){
if (Dungeon.isChallenged(Challenges.NO_FOOD)){
if (Dungeon.isChallenged(Challenges.NO_HEALING)) {
heal( hero );
Buff.affect(hero, Hunger.class).satisfy(energy/3f);
} else if (Dungeon.isChallenged(Challenges.NO_FOOD)){
Buff.affect(hero, Hunger.class).satisfy(energy/3f);
Buff.affect(hero, Healing.class).setHeal((int) (0.6f * hero.HT + 14), 0.25f, 0);
} else {

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/food/RiceDumplings.java
View File

@ -72,7 +72,7 @@ public class RiceDumplings extends Food {
protected void satisfy(Hero hero) {
super.satisfy(hero);
if (Dungeon.isChallenged(Challenges.NO_HEALING)){
Buff.affect(hero, Healing.class).setHeal((int) (0.4f * hero.HT + 8), 0.25f, 0);
Buff.affect(hero, Healing.class).setHeal((int) (0.2f * hero.HT + 3), 0.25f, 0);
} else {
Buff.affect(hero, Healing.class).setHeal((int) (0.8f * hero.HT + 14), 0.25f, 0);
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/PotionOfHealing.java
View File

@ -71,7 +71,7 @@ public class PotionOfHealing extends Potion {
public static void pharmacophobiaProc( Hero hero ){
// harms the hero for ~40% of their max HP in poison
Buff.affect( hero, Poison.class).set(4 + hero.lvl/2);
Buff.affect( hero, Poison.class).set(4 + hero.lvl/2f);
}
public static void cure( Char ch ) {

13
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/wands/WandOfAnmy.java
View File

@ -8,6 +8,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.Char;
import com.shatteredpixel.shatteredpixeldungeon.actors.blobs.Fire;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.AllyBuff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile;
import com.shatteredpixel.shatteredpixeldungeon.items.Heap;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
@ -24,8 +25,20 @@ import com.watabou.utils.Callback;
import com.watabou.utils.PointF;
import com.watabou.utils.Random;
import java.util.ArrayList;
public class WandOfAnmy extends DamageWand {
@Override
public ArrayList<String> actions(Hero hero ) {
ArrayList<String> actions = super.actions( hero );
actions.remove(AC_DROP);
actions.remove(AC_THROW);
actions.add(AC_ZAP);
return actions;
}
public static class AllyToRestart extends AllyBuff {
@Override

11
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
View File

@ -25,6 +25,7 @@ import static com.shatteredpixel.shatteredpixeldungeon.Challenges.SBSG;
import com.shatteredpixel.shatteredpixeldungeon.Assets;
import com.shatteredpixel.shatteredpixeldungeon.Challenges;
import com.shatteredpixel.shatteredpixeldungeon.Conducts;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.ShatteredPixelDungeon;
import com.shatteredpixel.shatteredpixeldungeon.Statistics;
@ -265,7 +266,7 @@ public abstract class Level implements Bundlable {
Random.pushGenerator( Dungeon.seedCurDepth() );
if (!(Dungeon.bossLevel())) {
if (!(Dungeon.bossLevel()) || Dungeon.isDLC(Conducts.Conduct.BOSSRUSH)) {
addItemToSpawn(Generator.random(Generator.Category.FOOD));
@ -387,10 +388,6 @@ public abstract class Level implements Bundlable {
}
createMobs();
}
public void playLevelMusic(){
//do nothing by default
}
@Override
public void restoreFromBundle( Bundle bundle ) {
@ -485,6 +482,10 @@ public abstract class Level implements Bundlable {
cleanWalls();
}
public void playLevelMusic(){
//do nothing by default
}
@Override
public void storeInBundle( Bundle bundle ) {

14
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/scenes/GameScene.java
View File

@ -165,11 +165,11 @@ public class GameScene extends PixelScene {
private void tell(String text) {
Game.runOnRenderThread(new Callback() {
@Override
public void call() {
GameScene.show(new WndQuest(new Slyl(), text));
}
}
@Override
public void call() {
GameScene.show(new WndQuest(new Slyl(), text));
}
}
);
}
@ -1447,10 +1447,6 @@ public class GameScene extends PixelScene {
break;
}
if(lanterfireactive){
cure( Dungeon.hero );
}
if (Dungeon.hero.buff(LockedFloor.class) == null) {
BGMPlayer.playBGMWithDepth();
}

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/StatusPane.java
View File

@ -440,7 +440,7 @@ public class StatusPane extends Component {
}
if(Dungeon.hero.isAlive()){
if (Dungeon.hero != null && Dungeon.hero.isAlive()) {
Date date = new Date();
String strDateFormat = "yyyy-MM-dd HH:mm";
SimpleDateFormat sdf = new SimpleDateFormat(strDateFormat, Locale.getDefault());

9
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/ui/changelist/mlpd/vM0_6_7_X_Changes.java
View File

@ -108,7 +108,7 @@ public class vM0_6_7_X_Changes {
}
public static void add_v0_6_50_Changes( ArrayList<ChangeInfo> changeInfos ) {
ChangeInfo changes = new ChangeInfo("v0.6.3.0-Beta4.5-6", true, "");
ChangeInfo changes = new ChangeInfo("v0.6.3.0-Beta4.5-7", true, "");
changes.hardlight(Window.TITLE_COLOR);
changeInfos.add(changes);
@ -116,6 +116,10 @@ public class vM0_6_7_X_Changes {
changes.hardlight(Window.GREEN_COLOR);
changeInfos.add(changes);
changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.LANTERNB), ("灯火前路-V2.5"),
("新增正向Buff--共生，与地牢的生物一起，携手前进吧！")));
changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.ARTIFACT_SANDALS), ("自然之鞋同步"),
("同步为破碎的那种了。")));
@ -130,6 +134,9 @@ public class vM0_6_7_X_Changes {
changes.hardlight(Window.CYELLOW);
changeInfos.add(changes);
changes.addButton(new ChangeButton(new ItemSprite(ItemSpriteSheet.LSPDA), ("闪电饭团"),
("修复部分挑战情况下的仍然可以治疗的Bug")));
changes.addButton(new ChangeButton(Icons.get(Icons.RANKINGS), ("排行榜进行了一些改进"),
("现在排行榜会显示你每局所在的挑战数量。")));

23
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/windows/WndStory.java
View File

@ -28,6 +28,7 @@ import static com.shatteredpixel.shatteredpixeldungeon.Statistics.lanterfireacti
import com.shatteredpixel.shatteredpixeldungeon.Chrome;
import com.shatteredpixel.shatteredpixeldungeon.Dungeon;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Buff;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ClearBleesdGoodBuff.BlessAnmy;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ClearBleesdGoodBuff.BlessGoodSTR;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ClearBleesdGoodBuff.BlessImmune;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.ClearBleesdGoodBuff.BlessMixShiled;
@ -40,6 +41,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicGirlDebuff.Mag
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicGirlDebuff.MagicGirlSaySlowy;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicGirlDebuff.MagicGirlSaySoftDied;
import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.MagicGirlDebuff.MagicGirlSayTimeLast;
import com.shatteredpixel.shatteredpixeldungeon.effects.SpellSprite;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.WandOfAnmy;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.PixelScene;
@ -208,10 +210,11 @@ public class WndStory extends Window {
}
public static void lanterfireRoll(){
SpellSprite.show( hero, SpellSprite.MASTERY );
if(lanterfireactive) {
if (Dungeon.depth == 6){
//TODO 首次到达6层 给予1个增益Buff
switch (Random.Int(5)){
switch (Random.Int(6)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -229,7 +232,7 @@ public class WndStory extends Window {
break;
case 5:
new WandOfAnmy().quantity(1).identify().collect();
Buff.affect(hero, MagicGirlSayTimeLast.class).set( (100), 1 );
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
}
GLog.b(Messages.get(WndStory.class,"start"));
@ -237,7 +240,7 @@ public class WndStory extends Window {
if (RollLevel()) {
//TODO 常规刷新
if (hero.lanterfire == 100){
switch (Random.Int(5)){
switch (Random.Int(6)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -255,12 +258,12 @@ public class WndStory extends Window {
break;
case 5:
new WandOfAnmy().quantity(1).identify().collect();
Buff.affect(hero, MagicGirlSayTimeLast.class).set( (100), 1 );
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
}
GLog.p(Messages.get(WndStory.class,"good"));
} else if (hero.lanterfire <= 99 && hero.lanterfire >= 90) {
switch (Random.Int(5)){
switch (Random.Int(6)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -278,7 +281,7 @@ public class WndStory extends Window {
break;
case 5:
new WandOfAnmy().quantity(1).identify().collect();
Buff.affect(hero, MagicGirlSayTimeLast.class).set( (100), 1 );
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
}
GLog.p(Messages.get(WndStory.class,"good"));
@ -305,7 +308,7 @@ public class WndStory extends Window {
}
GLog.n(Messages.get(WndStory.class,"bad"));
} else if (hero.lanterfire <= 89 && hero.lanterfire >= 80 && Random.Float() <= 0.85f ) {
switch (Random.Int(5)){
switch (Random.Int(6)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -323,7 +326,7 @@ public class WndStory extends Window {
break;
case 5:
new WandOfAnmy().quantity(1).identify().collect();
Buff.affect(hero, MagicGirlSayTimeLast.class).set( (100), 1 );
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
}
GLog.p(Messages.get(WndStory.class,"good"));
@ -352,7 +355,7 @@ public class WndStory extends Window {
}
GLog.n(Messages.get(WndStory.class,"bad"));
} else if (hero.lanterfire <= 79 && hero.lanterfire >= 60 && Random.Float() <= 0.50f ) {
switch (Random.Int(5)){
switch (Random.Int(6)){
case 0: default:
Buff.affect(hero, BlessNoMoney.class).set( (100), 1 );
break;
@ -370,7 +373,7 @@ public class WndStory extends Window {
break;
case 5:
new WandOfAnmy().quantity(1).identify().collect();
Buff.affect(hero, MagicGirlSayTimeLast.class).set( (100), 1 );
Buff.affect(hero, BlessAnmy.class).set( (100), 1 );
break;
}
GLog.p(Messages.get(WndStory.class,"good"));