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

Fixed warp i18n

Browse Source 
Fixed warp i18n
Temp workaround for #15
This commit is contained in:
Collin Smith 2019-03-15 16:54:53 -07:00
parent 8c6a1e073e
commit 54b502bb83
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -47,7 +47,7 @@ public class Warp extends Entity {
assert wrp >= 0 : "Invalid warp";
dstLevel = Riiablo.files.Levels.get(dst);
name(dstLevel.LevelWarp);
name(Riiablo.string.lookup(dstLevel.LevelWarp));
warp = Riiablo.files.LvlWarp.get(wrp);
position.set(x, y).add(warp.OffsetX, warp.OffsetY);
@ -91,7 +91,7 @@ public class Warp extends Entity {
Warp dstWarp = dst.findWarp(dstIndex);
if (dstWarp == null) throw new AssertionError("Invalid dstWarp: " + dstIndex);
gameScreen.player.position().set(dstWarp.position());
gameScreen.player.setPath(map, new Vector2(dstWarp.warp.ExitWalkX, dstWarp.warp.ExitWalkY).add(dstWarp.position()));
gameScreen.player.setPath(map, dstWarp.position().cpy().add(dstWarp.warp.ExitWalkX, dstWarp.warp.ExitWalkY));
}
@Override

4
core/src/com/riiablo/screen/GameScreen.java
View File

@ -768,8 +768,8 @@ public class GameScreen extends ScreenAdapter implements LoadingScreen.Loadable
}
// TODO: i18n? Not sure if these have translations.
String entryFile = "data\\local\\ui\\eng\\" + ACT_NAME[map.act] + "\\" + curZone.level.EntryFile + ".dc6";
AssetDescriptor<DC6> entryDescriptor = new AssetDescriptor<>(entryFile, DC6.class, DC6Loader.DC6Parameters.COMBINE);
String entryFile = curZone.level.Id == 8 ? "A1Q1" : curZone.level.EntryFile;
AssetDescriptor<DC6> entryDescriptor = new AssetDescriptor<>("data\\local\\ui\\eng\\" + ACT_NAME[map.act] + "\\" + entryFile + ".dc6", DC6.class, DC6Loader.DC6Parameters.COMBINE);
Riiablo.assets.load(entryDescriptor);
Riiablo.assets.finishLoadingAsset(entryDescriptor);
enteringImage.setDrawable(Riiablo.assets.get(entryDescriptor));