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

V0.2.1 : adjusted quest logic, should elegantly handle old quests now.

Browse Source
This commit is contained in:
Evan Debenham 2014-10-13 14:45:35 -04:00
parent 01fa54eb38
commit bada599913
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Ghost.java
View File

@ -28,6 +28,7 @@ import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Crab;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Gnoll; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Gnoll;
import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Rat; import com.shatteredpixel.shatteredpixeldungeon.actors.mobs.Rat;
import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat; import com.shatteredpixel.shatteredpixeldungeon.items.food.MysteryMeat;
import com.shatteredpixel.shatteredpixeldungeon.items.quest.RatSkull;
import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand; import com.shatteredpixel.shatteredpixeldungeon.items.wands.Wand;
import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.CurareDart; import com.shatteredpixel.shatteredpixeldungeon.items.weapon.missiles.CurareDart;
import com.shatteredpixel.shatteredpixeldungeon.levels.Level; import com.shatteredpixel.shatteredpixeldungeon.levels.Level;
@ -96,7 +97,7 @@ public class Ghost extends Mob.NPC {
"Hello adventurer... Once I was like you - strong and confident... " + "Hello adventurer... Once I was like you - strong and confident... " +
"But I was slain by an ancient creature... I can't leave this place... Not until I have my revenge... " + "But I was slain by an ancient creature... I can't leave this place... Not until I have my revenge... " +
"Slay the _great crab_, that has taken my life...\n\n" + "Slay the _great crab_, that has taken my life...\n\n" +
"It is unnaturally old... With a massive single claw and a thick shell. " + "It is unnaturally old... With a massive single claw and a thick shell... " +
"Beware its claw, the crab blocks and strikes with it..."; "Beware its claw, the crab blocks and strikes with it...";
private static final String TXT_CRAB2 = private static final String TXT_CRAB2 =
@ -149,7 +150,7 @@ public class Ghost extends Mob.NPC {
if (Quest.given) { if (Quest.given) {
if (Quest.processed){ if (Quest.processed || Dungeon.hero.belongings.getItem( RatSkull.class ) != null){
GameScene.show( new WndSadGhost( this, Quest.type ) ); GameScene.show( new WndSadGhost( this, Quest.type ) );
} else { } else {
switch (Quest.type){ switch (Quest.type){
@ -288,15 +289,25 @@ public class Ghost extends Mob.NPC {
Bundle node = bundle.getBundle( NODE ); Bundle node = bundle.getBundle( NODE );
//TODO: may be some issues with an old quest in progress that already spawned a fetid rat if (!node.isNull() && (spawned = node.getBoolean( SPAWNED ))) {
//logic for pre- 2.1.0 quests
if (!node.isNull() && !node.contains( ALTERNATIVE ) && (spawned = node.getBoolean( SPAWNED ))) { if (node.contains( ALTERNATIVE )){
if (node.getBoolean( ALTERNATIVE)){
type = node.getInt( TYPE );
given = node.getBoolean( GIVEN ); given = node.getBoolean( GIVEN );
depth = node.getInt( DEPTH ); type = 1;
processed = false;
} else {
type = 1;
given = false;
processed = false;
}
} else {
type = node.getInt(TYPE);
processed = node.getBoolean( PROCESSED ); processed = node.getBoolean( PROCESSED );
given = node.getBoolean( GIVEN );
}
depth = node.getInt( DEPTH );
weapon = (Weapon)node.get( WEAPON ); weapon = (Weapon)node.get( WEAPON );
armor = (Armor)node.get( ARMOR ); armor = (Armor)node.get( ARMOR );