mirrors/riiablo
1
0
Fork 0
mirror of https://github.com/collinsmith/riiablo.git synced 2025-07-04 07:17:26 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added notes on warp special tiles

Browse Source 
Fixed warp label positioning
Fixed bug with player acting when animation was null
This commit is contained in:
Collin Smith
2019-03-13 03:27:25 -07:00
parent 87de881d56
commit 8721ed3a91
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/com/riiablo/entity/Player.java
View File

@ -162,7 +162,7 @@ public class Player extends Entity {
@Override @Override
public void act(float delta) { public void act(float delta) {
super.act(delta); super.act(delta);
if (animation != null && mode == getWalkMode() || mode == getRunMode()) { if (animation != null && (mode == getWalkMode() || mode == getRunMode())) {
int frame = animation.getFrame(); int frame = animation.getFrame();
int numFrames = animation.getNumFramesPerDir(); int numFrames = animation.getNumFramesPerDir();
if (frame == 0 || frame == numFrames >>> 1) { if (frame == 0 || frame == numFrames >>> 1) {

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

@ -58,6 +58,15 @@ public class Warp extends Entity {
/** /**
* TODO: warp.LitVersion determines whether or not warp has special highlighted tiles * 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) * 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
*/ */
} }
@ -86,7 +95,7 @@ public class Warp extends Entity {
@Override @Override
public void draw(PaletteIndexedBatch batch) { public void draw(PaletteIndexedBatch batch) {
label.setPosition(pixelLoc.x, pixelLoc.y + getLabelOffset() + label.getHeight() / 2, Align.center); label.setPosition(pixelLoc.x + box.xMin + box.width / 2, pixelLoc.y - box.yMax + box.height / 2 + getLabelOffset() + label.getHeight() / 2, Align.center);
} }
@Override @Override