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

v0.8.0: Fixes:

Browse Source 
- Added a missing translation for the prompt for dart tipping
- fixed a rare crash bug with disarming traps
This commit is contained in:
Evan Debenham 2019-12-07 18:00:22 -05:00
parent 8bcb1e4630
commit f831a84816
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/weapon/missiles/darts/Dart.java
View File

@ -60,7 +60,7 @@ public class Dart extends MissileWeapon {
@Override @Override
public void execute(Hero hero, String action) { public void execute(Hero hero, String action) {
if (action.equals(AC_TIP)){ if (action.equals(AC_TIP)){
GameScene.selectItem(itemSelector, WndBag.Mode.SEED, "select a seed"); GameScene.selectItem(itemSelector, WndBag.Mode.SEED, Messages.get(this, "prompt"));
} }
super.execute(hero, action); super.execute(hero, action);

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/traps/DisarmingTrap.java
View File

@ -68,8 +68,10 @@ public class DisarmingTrap extends Trap{
if (weapon != null && !weapon.cursed) { if (weapon != null && !weapon.cursed) {
int cell; int cell;
int tries = 20;
do { do {
cell = Dungeon.level.randomRespawnCell(); cell = Dungeon.level.randomRespawnCell();
if (tries-- < 0 && cell != -1) break;
PathFinder.buildDistanceMap(pos, Dungeon.level.passable); PathFinder.buildDistanceMap(pos, Dungeon.level.passable);
} while (cell == -1 || PathFinder.distance[cell] < 10 || PathFinder.distance[cell] > 20); } while (cell == -1 || PathFinder.distance[cell] < 10 || PathFinder.distance[cell] > 20);

1
core/src/main/resources/com/shatteredpixel/shatteredpixeldungeon/messages/items/items.properties
View File

@ -1458,6 +1458,7 @@ items.weapon.missiles.darts.chillingdart.desc=These darts are tipped with an ice
items.weapon.missiles.darts.dart.name=dart items.weapon.missiles.darts.dart.name=dart
items.weapon.missiles.darts.dart.ac_tip=TIP items.weapon.missiles.darts.dart.ac_tip=TIP
items.weapon.missiles.darts.dart.prompt=Select a seed
items.weapon.missiles.darts.dart.tip_title=Tip Darts items.weapon.missiles.darts.dart.tip_title=Tip Darts
items.weapon.missiles.darts.dart.tip_desc=A seed can be combined with one or two darts to tip them. Each type of seed produces its own type of tipped dart, with a unique single-use effect.\n\nTipping a dart with these seeds will produce a _%s._ items.weapon.missiles.darts.dart.tip_desc=A seed can be combined with one or two darts to tip them. Each type of seed produces its own type of tipped dart, with a unique single-use effect.\n\nTipping a dart with these seeds will produce a _%s._
items.weapon.missiles.darts.dart.tip_all=tip %1$d darts with %2$d seeds items.weapon.missiles.darts.dart.tip_all=tip %1$d darts with %2$d seeds