konsthol/shattered-pixel-dungeon-web-port
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v0.9.0: unidentified scrolls can now be alchemized

Browse Source
This commit is contained in:
Evan Debenham
2020-09-30 18:40:58 -04:00
parent e45d05e027
commit a208b8b1b4
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
+6 -1
View File
@@ -338,7 +338,6 @@ public abstract class Scroll extends Item {
@Override @Override
public boolean testIngredients(ArrayList<Item> ingredients) { public boolean testIngredients(ArrayList<Item> ingredients) {
if (ingredients.size() != 1 if (ingredients.size() != 1
|| !ingredients.get(0).isIdentified()
|| !(ingredients.get(0) instanceof Scroll) || !(ingredients.get(0) instanceof Scroll)
|| !stones.containsKey(ingredients.get(0).getClass())){ || !stones.containsKey(ingredients.get(0).getClass())){
return false; return false;
@@ -359,6 +358,7 @@ public abstract class Scroll extends Item {
Scroll s = (Scroll) ingredients.get(0); Scroll s = (Scroll) ingredients.get(0);
s.quantity(s.quantity() - 1); s.quantity(s.quantity() - 1);
s.setKnown();
return Reflection.newInstance(stones.get(s.getClass())).quantity(amnts.get(s.getClass())); return Reflection.newInstance(stones.get(s.getClass())).quantity(amnts.get(s.getClass()));
} }
@@ -368,7 +368,12 @@ public abstract class Scroll extends Item {
if (!testIngredients(ingredients)) return null; if (!testIngredients(ingredients)) return null;
Scroll s = (Scroll) ingredients.get(0); Scroll s = (Scroll) ingredients.get(0);
if (!s.isKnown()){
return new Runestone.PlaceHolder();
} else {
return Reflection.newInstance(stones.get(s.getClass())).quantity(amnts.get(s.getClass())); return Reflection.newInstance(stones.get(s.getClass())).quantity(amnts.get(s.getClass()));
} }
} }
}
} }