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

v0.5.0b: implemented conversion logic for mass grave bones visuals

Browse Source
This commit is contained in:
Evan Debenham 2017-02-16 17:59:31 -05:00
parent 2d09869044
commit 20e3297e74
1 changed files with 28 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
core/src/main/java/com/shatteredpixel/shatteredpixeldungeon/levels/Level.java
View File

@ -65,6 +65,7 @@ import com.shatteredpixel.shatteredpixeldungeon.items.scrolls.ScrollOfUpgrade;
import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm; import com.shatteredpixel.shatteredpixeldungeon.levels.features.Chasm;
import com.shatteredpixel.shatteredpixeldungeon.levels.features.Door; import com.shatteredpixel.shatteredpixeldungeon.levels.features.Door;
import com.shatteredpixel.shatteredpixeldungeon.levels.features.HighGrass; import com.shatteredpixel.shatteredpixeldungeon.levels.features.HighGrass;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.MassGravePainter;
import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter; import com.shatteredpixel.shatteredpixeldungeon.levels.painters.Painter;
import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap; import com.shatteredpixel.shatteredpixeldungeon.levels.traps.Trap;
import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster; import com.shatteredpixel.shatteredpixeldungeon.mechanics.ShadowCaster;
@ -74,6 +75,7 @@ import com.shatteredpixel.shatteredpixeldungeon.plants.Plant;
import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene; import com.shatteredpixel.shatteredpixeldungeon.scenes.GameScene;
import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite; import com.shatteredpixel.shatteredpixeldungeon.sprites.ItemSprite;
import com.shatteredpixel.shatteredpixeldungeon.tiles.CustomTiledVisual; import com.shatteredpixel.shatteredpixeldungeon.tiles.CustomTiledVisual;
import com.shatteredpixel.shatteredpixeldungeon.tiles.DungeonTileSheet;
import com.shatteredpixel.shatteredpixeldungeon.utils.BArray; import com.shatteredpixel.shatteredpixeldungeon.utils.BArray;
import com.shatteredpixel.shatteredpixeldungeon.utils.GLog; import com.shatteredpixel.shatteredpixeldungeon.utils.GLog;
import com.watabou.noosa.Game; import com.watabou.noosa.Game;
@ -362,7 +364,32 @@ public abstract class Level implements Bundlable {
collection = bundle.getCollection( CUSTOM_TILES ); collection = bundle.getCollection( CUSTOM_TILES );
for (Bundlable p : collection) { for (Bundlable p : collection) {
CustomTiledVisual vis = (CustomTiledVisual)p; CustomTiledVisual vis = (CustomTiledVisual)p;
customTiles.add( vis ); //for compatibilities with pre-0.5.0b saves
//extends one of the bones visuals and discards the rest
if (vis instanceof MassGravePainter.Bones && vis.tileH == 0){
int cell = vis.tileX + vis.tileY*width;
if (map[cell] == Terrain.EMPTY_SP &&
DungeonTileSheet.wallStitcheable(map[cell - width]) &&
DungeonTileSheet.wallStitcheable(map[cell - 1])){
vis.tileY--; //move top to into the wall
vis.tileW = 1;
vis.tileH = 2;
while (map[cell+1] == Terrain.EMPTY_SP){
vis.tileW++;
cell++;
}
while (map[cell+width] == Terrain.EMPTY_SP){
vis.tileH++;
cell+=width;
}
customTiles.add(vis);
}
} else {
customTiles.add(vis);
}
} }
collection = bundle.getCollection( MOBS ); collection = bundle.getCollection( MOBS );