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

Fixed Less Error

Browse Source
This commit is contained in:
LingASDJ 2023-03-23 21:24:23 +08:00
parent d6071c86c5
commit c3e4002bcf
3 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build.gradle
View File

@ -17,8 +17,8 @@ allprojects {
appName = 'Magic Ling Pixel Dungeon'
appPackageName = 'com.ansdomagiclingpixeldungeon.ling'
appVersionCode =800010
appVersionName = '0.6.1.0-Beta4.5(P3)'
appVersionCode =800011
appVersionName = '0.6.1.0-Beta4.7(P3)'
appJavaCompatibility = JavaVersion.VERSION_1_8

4
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/Dungeon.java
View File

@ -57,7 +57,6 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.CaveTwoBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.CavesGirlDeadLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.CavesLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.CityLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.ColdChestBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.DeadEndLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.DimandKingLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.DwarfMasterBossLevel;
@ -69,6 +68,7 @@ import com.shatteredpixel.shatteredpixeldungeon.levels.LinkLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.NewCavesBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.NewCityBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.NewHallsBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.PrisonBossLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.PrisonLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.SewerLevel;
import com.shatteredpixel.shatteredpixeldungeon.levels.ShopBossLevel;
@ -412,7 +412,7 @@ public class Dungeon {
case 10:
if((Statistics.boss_enhance & 0x2) != 0) level = new DimandKingLevel();
else
level = new ColdChestBossLevel();
level = new PrisonBossLevel();
break;
case 11:
case 12:

8
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/melee/LockSword.java
View File

@ -73,17 +73,15 @@ public class LockSword extends MeleeWeapon {
if (level >= 10) {
lvl += 0;
} else if (defender.properties().contains(Char.Property.BOSS) && defender.HP <= damage && level >= 10) {
} else if (defender.properties().contains(Char.Property.BOSS) && defender.HP <= damage && level <= 10) {
//目标Boss血量小于实际伤害判定为死亡,+100
lvl += 100;
} else if (defender.properties().contains(Char.Property.MINIBOSS) && defender.HP <= damage && level >= 10) {
} else if (defender.properties().contains(Char.Property.MINIBOSS) && defender.HP <= damage && level <= 10) {
//目标迷你Boss血量小于实际伤害判定为死亡,+30
lvl += 50;
} else if (defender.HP <= damage && level >= 10) {
} else if (defender.HP <= damage && level <= 10) {
//目标血量小于实际伤害判定为死亡,+15
lvl += 15;
} else {
lvl = 1000;
}
if (level>= 9) {
dmg = (new Grim()).proc(this, attacker, defender, damage) + 8;