mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-02-21 20:18:14 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Partial implementation of #12

Browse Source
This commit is contained in:
Collin Smith 2019-03-13 23:57:35 -07:00
parent 8721ed3a91
commit b7e745a0b8
4 changed files with 58 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
core/src/com/riiablo/entity/Warp.java
View File

@ -4,20 +4,22 @@ import com.badlogic.gdx.graphics.Color;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Align;
import com.badlogic.gdx.utils.IntIntMap;
import com.riiablo.Riiablo;
import com.riiablo.codec.excel.Levels;
import com.riiablo.codec.excel.LvlWarp;
import com.riiablo.codec.util.BBox;
import com.riiablo.graphics.PaletteIndexedBatch;
import com.riiablo.map.DT1;
import com.riiablo.map.Map;
import static com.riiablo.map.DT1.Tile;
public class Warp extends Entity {
private static final IntIntMap EMPTY_INT_INT_MAP = new IntIntMap();
public final Map map;
public final Map.Zone zone;
public final int index;
public final LvlWarp.Entry warp;
public final Levels.Entry dstLevel;
@ -25,16 +27,16 @@ public class Warp extends Entity {
public final Vector2 pixelLoc;
BBox box;
public final IntIntMap substs;
public Warp(Map map, Map.Zone zone, int index, int x, int y) {
public Warp(Map map, Map.Zone zone, int orientation, int mainIndex, int subIndex, int x, int y) {
super(Type.WRP, "warp", null);
this.map = map;
this.zone = zone;
this.index = index;
this.map = map;
this.zone = zone;
int dst = zone.level.Vis[index];
int dst = zone.level.Vis[mainIndex];
assert dst > 0 : "Warp to unknown level!";
int wrp = zone.level.Warp[index];
int wrp = zone.level.Warp[mainIndex];
assert wrp >= 0 : "Invalid warp";
dstLevel = Riiablo.files.Levels.get(dst);
@ -55,19 +57,32 @@ public class Warp extends Entity {
pixelLoc.x = +(position.x * Tile.SUBTILE_WIDTH50) - (position.y * Tile.SUBTILE_WIDTH50);
pixelLoc.y = -(position.x * Tile.SUBTILE_HEIGHT50) - (position.y * Tile.SUBTILE_HEIGHT50);
/**
* TODO: warp.LitVersion determines whether or not warp has special highlighted tiles
* warp.Tile is added to subindex of tile to find corresponding highlighted tiles (if warp.LitVersion set)
* Above info is wrong -- unhighlighted 21/2 highlighted 21/6 -- might be hard-coded? table?
* All vanilla warps have warp.Tile == 2, only different ones are A5 barricade
* caves\cavedr.dt1 up replaces 4 tiles -- value == 2 and replaces 0-3 with 4-7
* caves\cavedr.dt1 down replaces 4 tiles -- value == 2 and replaces 0-3 with 4-7
* sewer\chamb.dt1 up replaces 2 tiles -- value == 2 and replaces 0-1 with 2-3
* sewer\chamb.dt1 down replaces 4 tiles -- value == 2 and replaces 0-3 with 4-7
* spider\spiderent.dt1 down replaces 4 tiles -- value == 2 and replaces 0-3 with 4-7
*
* Subindex of special warp tile is the main index of the tiles it replaces
*/
if (warp.LitVersion) {
substs = new IntIntMap();
if (subIndex < 2) {
substs.put(DT1.Tile.Index.create(orientation, mainIndex, 0), DT1.Tile.Index.create(orientation, mainIndex, 2));
substs.put(DT1.Tile.Index.create(orientation, mainIndex, 1), DT1.Tile.Index.create(orientation, mainIndex, 3));
} else {
substs.put(DT1.Tile.Index.create(0, subIndex, 0), DT1.Tile.Index.create(0, subIndex, 4));
substs.put(DT1.Tile.Index.create(0, subIndex, 1), DT1.Tile.Index.create(0, subIndex, 5));
substs.put(DT1.Tile.Index.create(0, subIndex, 2), DT1.Tile.Index.create(0, subIndex, 6));
substs.put(DT1.Tile.Index.create(0, subIndex, 3), DT1.Tile.Index.create(0, subIndex, 7));
}
} else {
substs = EMPTY_INT_INT_MAP;
}
}
@Override
public void setOver(boolean b) {
super.setOver(b);
if (substs != EMPTY_INT_INT_MAP) {
if (b) {
map.addWarpSubsts(substs);
} else {
map.clearWarpSubsts(substs);
}
}
}
@Override

2
core/src/com/riiablo/map/DT1.java
View File

@ -396,7 +396,7 @@ public class DT1 implements Disposable {
}
}
static class Index {
public static class Index {
private static final int MAIN_INDEX_OFFSET = 16;
private static final int MAIN_INDEX_BITS = 0xFF;

18
core/src/com/riiablo/map/Map.java
View File

@ -17,6 +17,7 @@ import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.utils.Array;
import com.badlogic.gdx.utils.Bits;
import com.badlogic.gdx.utils.Disposable;
import com.badlogic.gdx.utils.IntIntMap;
import com.badlogic.gdx.utils.IntMap;
import com.badlogic.gdx.utils.IntSet;
import com.badlogic.gdx.utils.ObjectSet;
@ -295,8 +296,9 @@ public class Map implements Disposable {
}
// TODO: maybe replace with R-tree? // https://en.wikipedia.org/wiki/R-tree
Array<Zone> zones = new Array<>();
final Array<Zone> zones = new Array<>();
IntMap<DT1s> dt1s;
final IntIntMap warpSubsts = new IntIntMap();
public static Map instance; // TODO: remove
private Map() {}
@ -592,6 +594,16 @@ public class Map implements Disposable {
}
}
public void addWarpSubsts(IntIntMap warps) {
this.warpSubsts.putAll(warps);
}
public void clearWarpSubsts(IntIntMap warps) {
for (IntIntMap.Entry entry : warps.entries()) {
this.warpSubsts.remove(entry.key, entry.value);
}
}
private MapGraph mapGraph = new MapGraph(this);
private IndexedAStarPathFinder<MapGraph.Point2> pathFinder = new IndexedAStarPathFinder<>(mapGraph, true);
@ -687,7 +699,7 @@ public class Map implements Disposable {
final int x = this.x + (warpX * DT1.Tile.SUBTILE_SIZE);
final int y = this.y + (warpY * DT1.Tile.SUBTILE_SIZE);
if (entities == EMPTY_ENTITY_ARRAY) entities = new Array<>();
Warp warp = new Warp(map, this, tile.cell.mainIndex, x, y);
Warp warp = new Warp(map, this, tile.cell.orientation, tile.cell.mainIndex, tile.cell.subIndex, x, y);
entities.add(warp);
}
@ -945,7 +957,7 @@ public class Map implements Disposable {
popPad.setEnd(
x * DT1.Tile.SUBTILE_SIZE + DT1.Tile.SUBTILE_SIZE + preset.PopPad,
y * DT1.Tile.SUBTILE_SIZE + DT1.Tile.SUBTILE_SIZE + preset.PopPad);
} else if (ID.WARPS.contains(cell.id)) {
} else if (ID.WARPS.contains(cell.id) && cell.subIndex != 1) {
zone.addWarp(tile, tx, ty);
}
}

8
core/src/com/riiablo/map/MapRenderer.java
View File

@ -628,7 +628,13 @@ public class MapRenderer {
for (int i = Map.FLOOR_OFFSET; i < Map.FLOOR_OFFSET + Map.MAX_FLOORS; i++) {
Map.Tile tile = zone.get(i, tx, ty);
if (tile == null) continue;
TextureRegion texture = tile.tile.texture;
TextureRegion texture;
int subst = tile.cell != null ? map.warpSubsts.get(tile.cell.id, -1) : -1;
if (subst != -1) { // TODO: Performance can be improved if the reference is updated to below subst
texture = map.dt1s.get(zone.level.LevelType).get(subst).texture;
} else {
texture = tile.tile.texture;
}
//if (texture.getTexture().getTextureObjectHandle() == 0) return;
batch.draw(texture, px, py, texture.getRegionWidth(), texture.getRegionHeight() + 1);
}