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

v1.1.2: fixed dragon's breath and mastery not always being consumed

Browse Source
This commit is contained in:
Evan Debenham 2022-01-12 16:30:10 -05:00
parent 336b2f338d
commit d1b897cc6b
2 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/items/potions/exotic/PotionOfDragonsBreath.java
View File

@ -60,7 +60,7 @@ public class PotionOfDragonsBreath extends ExoticPotion {
//need to override drink so that time isn't spent right away //need to override drink so that time isn't spent right away
protected void drink(final Hero hero) { protected void drink(final Hero hero) {
curUser = hero; curUser = hero;
curItem = this; curItem = detach( hero.belongings.backpack );
if (!isKnown()) { if (!isKnown()) {
identify(); identify();
@ -96,7 +96,7 @@ public class PotionOfDragonsBreath extends ExoticPotion {
switch (index) { switch (index) {
case 0: case 0:
curUser.spendAndNext(1f); curUser.spendAndNext(1f);
detach(curUser.belongings.backpack); identifiedByUse = false;
break; break;
case 1: case 1:
GameScene.selectCell( targeter ); GameScene.selectCell( targeter );
@ -105,6 +105,8 @@ public class PotionOfDragonsBreath extends ExoticPotion {
} }
public void onBackPressed() {} public void onBackPressed() {}
} ); } );
} else if (cell == null && !anonymous){
curItem.collect( curUser.belongings.backpack );
} else if (cell != null) { } else if (cell != null) {
identifiedByUse = false; identifiedByUse = false;
curUser.busy(); curUser.busy();

6
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/potions/exotic/PotionOfMastery.java
View File

@ -50,7 +50,7 @@ public class PotionOfMastery extends ExoticPotion {
//need to override drink so that time isn't spent right away //need to override drink so that time isn't spent right away
protected void drink(final Hero hero) { protected void drink(final Hero hero) {
curUser = hero; curUser = hero;
curItem = this; curItem = detach( hero.belongings.backpack );
if (!isKnown()) { if (!isKnown()) {
identify(); identify();
@ -90,7 +90,7 @@ public class PotionOfMastery extends ExoticPotion {
switch (index) { switch (index) {
case 0: case 0:
curUser.spendAndNext(1f); curUser.spendAndNext(1f);
detach(curUser.belongings.backpack); identifiedByUse = false;
break; break;
case 1: case 1:
GameScene.selectItem(itemSelector); GameScene.selectItem(itemSelector);
@ -99,6 +99,8 @@ public class PotionOfMastery extends ExoticPotion {
} }
public void onBackPressed() {} public void onBackPressed() {}
} ); } );
} else if (item == null && !anonymous){
curItem.collect( curUser.belongings.backpack );
} else if (item != null) { } else if (item != null) {
if (item instanceof Weapon) { if (item instanceof Weapon) {