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

v2.4.0: scroll of transmutation is now usable on trinkets

Browse Source
This commit is contained in:
Evan Debenham
2024-04-14 11:33:19 -04:00
parent 6fc6fb1fc9
commit 6f173e26fa
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/ScrollOfTransmutation.java
View File

@@ -39,6 +39,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.quest.Pickaxe;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.Ring;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.exotic.ExoticScroll;
import com.shatteredpixel.shatteredpixeldungeon.items.stones.Runestone;
import com.shatteredpixel.shatteredpixeldungeon.items.trinkets.Trinket;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.Weapon;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.melee.MagesStaff;
@@ -82,10 +83,11 @@ public class ScrollOfTransmutation extends InventoryScroll {
} else if (item instanceof Scroll){
return item != this || item.quantity() > 1;
//all rings, wands, artifacts, seeds, and runestones
//all rings, wands, artifacts, trinkets, seeds, and runestones
} else {
return item instanceof Ring || item instanceof Wand || item instanceof Artifact
|| item instanceof Plant.Seed || item instanceof Runestone;
|| item instanceof Trinket || item instanceof Plant.Seed
|| item instanceof Runestone;
}
}
@@ -174,6 +176,8 @@ public class ScrollOfTransmutation extends InventoryScroll {
} else {
return a;
}
} else if (item instanceof Trinket) {
return changeTrinket( (Trinket)item );
} else {
return null;
}
@@ -289,6 +293,19 @@ public class ScrollOfTransmutation extends InventoryScroll {
return null;
}
private static Trinket changeTrinket( Trinket t ){
Trinket n;
do {
n = (Trinket)Generator.random(Generator.Category.TRINKET);
} while ( Challenges.isItemBlocked(n) || n.getClass() == t.getClass());
n.level(t.trueLevel());
n.levelKnown = t.levelKnown;
n.cursed = t.cursed;
return n;
}
private static Wand changeWand( Wand w ) {
Wand n;