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

v1.4.0: fixed further issues with spellbook and siren's song

Browse Source
This commit is contained in:
Evan Debenham
2022-08-15 13:13:52 -04:00
parent d42162b67f
commit 94e7ea0561
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java
+4 -2
View File
@@ -37,6 +37,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.bags.ScrollHolder;
import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEnergy; import com.shatteredpixel.shatteredpixeldungeon.items.rings.RingOfEnergy;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.Scroll;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfIdentify; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfIdentify;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfLullaby;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfMagicMapping;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRemoveCurse; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfRemoveCurse;
import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation; import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfTeleportation;
@@ -124,7 +125,7 @@ public class UnstableSpellbook extends Artifact {
Scroll scroll; Scroll scroll;
do { do {
scroll = (Scroll) Generator.randomUsingDefaults(Generator.Category.SCROLL); scroll = new ScrollOfLullaby();
} while (scroll == null } while (scroll == null
//reduce the frequency of these scrolls by half //reduce the frequency of these scrolls by half
||((scroll instanceof ScrollOfIdentify || ||((scroll instanceof ScrollOfIdentify ||
@@ -155,6 +156,7 @@ public class UnstableSpellbook extends Artifact {
if (index == 1){ if (index == 1){
Scroll scroll = Reflection.newInstance(ExoticScroll.regToExo.get(fScroll.getClass())); Scroll scroll = Reflection.newInstance(ExoticScroll.regToExo.get(fScroll.getClass()));
charge--; charge--;
scroll.anonymize();
scroll.doRead(); scroll.doRead();
Talent.onArtifactUsed(Dungeon.hero); Talent.onArtifactUsed(Dungeon.hero);
} else { } else {
@@ -292,7 +294,7 @@ public class UnstableSpellbook extends Artifact {
&& target.buff(MagicImmune.class) == null && target.buff(MagicImmune.class) == null
&& (lock == null || lock.regenOn())) { && (lock == null || lock.regenOn())) {
//120 turns to charge at full, 80 turns to charge at 0/8 //120 turns to charge at full, 80 turns to charge at 0/8
float chargeGain = 1 / (120f - (chargeCap - charge)*5f); float chargeGain = 1;
chargeGain *= RingOfEnergy.artifactChargeMultiplier(target); chargeGain *= RingOfEnergy.artifactChargeMultiplier(target);
partialCharge += chargeGain; partialCharge += chargeGain;
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/exotic/ScrollOfSirensSong.java
+1 -1
View File
@@ -56,7 +56,7 @@ public class ScrollOfSirensSong extends ExoticScroll {
@Override @Override
public void onSelect(Integer cell) { public void onSelect(Integer cell) {
if (cell == null && isKnown() && !anonymous){ if (cell == null && isKnown()){
return; return;
} }