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

v0.3.2: fixed some wandmaker quest bugs

Browse Source
This commit is contained in:
Evan Debenham 2015-10-17 20:34:11 -04:00
parent c3ea21d5f4
commit 43327a5f4e
2 changed files with 5 additions and 3 deletions
src/com/shatteredpixel/shatteredpixeldungeon
actors/mobs/npcs
Wandmaker.java
levels/painters
RitualSitePainter.java

6
src/com/shatteredpixel/shatteredpixeldungeon/actors/mobs/npcs/Wandmaker.java
View File

@ -270,7 +270,7 @@ public class Wandmaker extends NPC {
node.put( GIVEN, given );
node.put( WAND1, wand1 );
node.put(WAND2, wand2);
node.put( WAND2, wand2 );
if (type == 2){
node.put( RITUALPOS, CeremonialCandle.ritualPos );
@ -288,7 +288,7 @@ public class Wandmaker extends NPC {
if (!node.isNull() && (spawned = node.getBoolean( SPAWNED ))) {
//TODO remove when pre-0.3.2 saves are no longer supported
if (bundle.contains(TYPE)) {
if (node.contains(TYPE)) {
type = node.getInt(TYPE);
} else {
type = node.getBoolean("alternative")? 1 : 3;
@ -300,7 +300,7 @@ public class Wandmaker extends NPC {
wand2 = (Wand)node.get( WAND2 );
if (type == 2){
CeremonialCandle.ritualPos = bundle.getInt( RITUALPOS );
CeremonialCandle.ritualPos = node.getInt( RITUALPOS );
}
} else {

2
src/com/shatteredpixel/shatteredpixeldungeon/levels/painters/RitualSitePainter.java
View File

@ -47,6 +47,8 @@ public class RitualSitePainter extends Painter {
level.customTiles.add(vis);
fill(level, c.x-1, c.y-1, 3, 3, Terrain.EMPTY_DECO);
level.addItemToSpawn(new CeremonialCandle());
level.addItemToSpawn(new CeremonialCandle());
level.addItemToSpawn(new CeremonialCandle());