From 54b502bb83ed024a5235e00bd4ee206aee79d082 Mon Sep 17 00:00:00 2001 From: Collin Smith Date: Fri, 15 Mar 2019 16:54:53 -0700 Subject: [PATCH] Fixed warp i18n Fixed warp i18n Temp workaround for #15 --- core/src/com/riiablo/entity/Warp.java | 4 ++-- core/src/com/riiablo/screen/GameScreen.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/core/src/com/riiablo/entity/Warp.java b/core/src/com/riiablo/entity/Warp.java index 87a98794..3f670f15 100644 --- a/core/src/com/riiablo/entity/Warp.java +++ b/core/src/com/riiablo/entity/Warp.java @@ -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 diff --git a/core/src/com/riiablo/screen/GameScreen.java b/core/src/com/riiablo/screen/GameScreen.java index 1b457036..67b96f55 100644 --- a/core/src/com/riiablo/screen/GameScreen.java +++ b/core/src/com/riiablo/screen/GameScreen.java @@ -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 entryDescriptor = new AssetDescriptor<>(entryFile, DC6.class, DC6Loader.DC6Parameters.COMBINE); + String entryFile = curZone.level.Id == 8 ? "A1Q1" : curZone.level.EntryFile; + AssetDescriptor 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));