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

v0.2.3: unstable spellbook polish + tweaks

Browse Source
This commit is contained in:
Evan Debenham 2014-12-09 15:20:27 -05:00
parent 08271837b7
commit 8dba48813d
2 changed files with 48 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/com/shatteredpixel/shatteredpixeldungeon/items/artifacts/UnstableSpellbook.java
View File

@ -63,16 +63,16 @@ public class UnstableSpellbook extends Artifact {
@Override
public ArrayList<String> actions( Hero hero ) {
ArrayList<String> actions = super.actions( hero );
if (isEquipped( hero ) && charge > 0)
if (isEquipped( hero ) && charge > 0 && !cursed)
actions.add(AC_READ);
if (level < levelCap )
if (level < levelCap && !cursed)
actions.add(AC_ADD);
return actions;
}
@Override
public void execute( Hero hero, String action ) {
if (action.equals( AC_READ)) {
if (action.equals( AC_READ )) {
if (hero.buff( Blindness.class ) != null) GLog.w("You cannot read from the book while blinded.");
else {
@ -111,7 +111,41 @@ public class UnstableSpellbook extends Artifact {
@Override
public String desc() {
return "";
String desc = "This Tome is in surprising good condition given its age. ";
if (level < 3)
desc += "It emanates a strange chaotic energy. ";
else if (level < 7)
desc += "It glows with a strange chaotic energy. ";
else
desc += "It fizzes and crackles as you move the pages, surging with unstable energy. ";
desc += "It seems to contains a list of spells, but the order and position of them in the index is " +
"constantly shifting. if you read from this book, there's no telling what spell you might cast.";
if (isEquipped (Dungeon.hero)){
desc += "\n\n";
if (!cursed)
desc += "The book fits firmly at your side, sending you the occasional zip of static energy.";
else
desc += "The cursed book has bound itself to you, it is inhibiting your ability to use most scrolls.";
desc += "\n\n";
//all simple names for scrolls begin with ScrollOf, so picking a specific substring index works well here.
if (level < levelCap)
if (scrolls.size() > 1)
desc += "The book's index points to some pages which are blank." +
"Those pages are listed as:" + scrolls.get(0).substring(8) + " and "
+ scrolls.get(1).substring(8) + ". Perhaps adding to the book will increase its power";
else
desc += "The book's index has one remaining blank page. " +
"That page is listed as " + scrolls.get(0).substring(8) + ".";
else
desc += "The book's index is full, it doesn't look like you can add anything more to it.";
}
return desc;
}
//needs to bundle chargecap as it is dynamic.
@ -136,8 +170,8 @@ public class UnstableSpellbook extends Artifact {
public class bookRecharge extends ArtifactBuff{
@Override
public boolean act() {
if (charge < chargeCap) {
partialCharge += 1 / (200f - (chargeCap - charge)*20f);
if (charge < chargeCap && !cursed) {
partialCharge += 1 / (300f - (chargeCap - charge)*30f);
if (partialCharge >= 1) {
partialCharge --;

8
src/com/shatteredpixel/shatteredpixeldungeon/items/scrolls/Scroll.java
View File

@ -22,6 +22,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.buffs.Blindness;
import com.shatteredpixel.shatteredpixeldungeon.actors.hero.Hero;
import com.shatteredpixel.shatteredpixeldungeon.items.Item;
import com.shatteredpixel.shatteredpixeldungeon.items.ItemStatusHandler;
import com.shatteredpixel.shatteredpixeldungeon.items.artifacts.UnstableSpellbook;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSpriteSheet;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.utils.Bundle;
@ -33,6 +34,9 @@ public abstract class Scroll extends Item {
private static final String TXT_BLINDED = "You can't read a scroll while blinded";
private static final String TXT_CURSED = "Your cursed spellbook prevents you from invoking this scroll's magic! " +
"A scroll of remove curse might be strong enough to still work though...";
public static final String AC_READ = "READ";
protected static final float TIME_TO_READ = 1f;
@ -116,6 +120,10 @@ public abstract class Scroll extends Item {
if (hero.buff( Blindness.class ) != null) {
GLog.w( TXT_BLINDED );
} else if (hero.buff(UnstableSpellbook.bookRecharge.class) != null
&& hero.buff(UnstableSpellbook.bookRecharge.class).isCursed()
&& !(this instanceof ScrollOfRemoveCurse)) {
GLog.n( TXT_CURSED );
} else {
curUser = hero;
curItem = detach( hero.belongings.backpack );