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

v0.7.0: various corrections:

Browse Source 
- fixed freezing in tengu fight
- fixed 'TODO' in potion of dragon's breath
- fixed incorrect visuals in stone of intuition
This commit is contained in:
Evan Debenham 2018-07-25 10:35:43 -04:00
parent c41417951f
commit 24d63a37d2
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/Tengu.java
View File

@ -178,11 +178,13 @@ public class Tengu extends Mob {
if (HP > HT/2) { if (HP > HT/2) {
//place new traps //place new traps
int tries;
for (int i=0; i < 4; i++) { for (int i=0; i < 4; i++) {
int trapPos; int trapPos;
tries = 15;
do { do {
trapPos = Random.Int( level.length() ); trapPos = Random.Int( level.length() );
} while (level.map[trapPos] != Terrain.INACTIVE_TRAP } while (tries-- > 0 && level.map[trapPos] != Terrain.INACTIVE_TRAP
&& level.map[trapPos] != Terrain.TRAP); && level.map[trapPos] != Terrain.TRAP);
if (level.map[trapPos] == Terrain.INACTIVE_TRAP) { if (level.map[trapPos] == Terrain.INACTIVE_TRAP) {
@ -192,7 +194,7 @@ public class Tengu extends Mob {
} }
} }
int tries = 50; tries = 50;
do { do {
newPos = Random.IntRange(3, 7) + 32*Random.IntRange(26, 30); newPos = Random.IntRange(3, 7) + 32*Random.IntRange(26, 30);
} while ( (level.adjacent(newPos, enemy.pos) || Actor.findChar(newPos) != null) } while ( (level.adjacent(newPos, enemy.pos) || Actor.findChar(newPos) != null)

3
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfDragonsBreath.java
View File

@ -33,6 +33,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Cripple;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero; import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile; import com.shatteredpixel.shatteredpixeldungeon.effects.MagicMissile;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica; import com.shatteredpixel.shatteredpixeldungeon.mechanics.Ballistica;
import com.shatteredpixel.shatteredpixeldungeon.messages.Messages;
import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector; import com.shatteredpixel.shatteredpixeldungeon.scenes.CellSelector;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.watabou.noosa.audio.Sample; import com.watabou.noosa.audio.Sample;
@ -154,7 +155,7 @@ public class PotionOfDragonsBreath extends ExoticPotion {
@Override @Override
public String prompt() { public String prompt() {
return "test"; return Messages.get(PotionOfDragonsBreath.class, "prompt");
} }
}; };

2
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/stones/StoneOfIntuition.java
View File

@ -206,7 +206,7 @@ public class StoneOfIntuition extends InventoryStone {
super.onClick(); super.onClick();
} }
}; };
Image im = new Image(Assets.CONS_ICONS, 7*i, all == potions ? 0 : 8, 7, 8); Image im = new Image(Assets.CONS_ICONS, 7*i, all == potions ? 0 : 16, 7, 8);
im.scale.set(2f); im.scale.set(2f);
btn.icon(im); btn.icon(im);
btn.setRect(left + placed*BTN_SIZE, top, BTN_SIZE, BTN_SIZE); btn.setRect(left + placed*BTN_SIZE, top, BTN_SIZE, BTN_SIZE);

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

@ -568,6 +568,7 @@ items.potions.exotic.potionofcorrosivegas.name=potion of corrosive gas
items.potions.exotic.potionofcorrosivegas.desc=Uncorking or shattering this pressurized glass will cause its contents to explode into a deadly cloud of corrosive rust-colored gas. The gas is less concentrated however, and will not last for very long. items.potions.exotic.potionofcorrosivegas.desc=Uncorking or shattering this pressurized glass will cause its contents to explode into a deadly cloud of corrosive rust-colored gas. The gas is less concentrated however, and will not last for very long.
items.potions.exotic.potionofdragonsbreath.name=potion of dragon's breath items.potions.exotic.potionofdragonsbreath.name=potion of dragon's breath
items.potions.exotic.potionofdragonsbreath.prompt=Choose a location to burn
items.potions.exotic.potionofdragonsbreath.desc=This flask contains an unusual compound which bursts into flame shortly after mixing with saliva. Quickly spitting the liquid will allow the user to spew flame from their mouth! items.potions.exotic.potionofdragonsbreath.desc=This flask contains an unusual compound which bursts into flame shortly after mixing with saliva. Quickly spitting the liquid will allow the user to spew flame from their mouth!
items.potions.exotic.potionofearthenarmor.name=potion of earthen armor items.potions.exotic.potionofearthenarmor.name=potion of earthen armor