Merge pull request #188 from LengaJenga/main

Broken texture fix, new locations, xtea ignore
ConnorDY · Mar 21, 2024 · 1c142a8 · 1c142a8
2 parents 14bb329 + 39a27d9
commit 1c142a8
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@
 
 ### :sparkles: Enhancements
 
+- More locations added
+
+- Regions with newer textures will now display properly.
+
 - Add custom scale factors and default to 1:128 instead of 1:100 &ndash; [#177](https://github.com/ConnorDY/OSRS-Environment-Exporter/pull/177) @ScoreUnder
 
 - Add command line option to select Z layers &ndash; [#181](https://github.com/ConnorDY/OSRS-Environment-Exporter/pull/181) @ScoreUnder

diff --git a/src/main/kotlin/cache/XteaManager.kt b/src/main/kotlin/cache/XteaManager.kt
@@ -2,6 +2,7 @@ package cache
 
 import com.fasterxml.jackson.annotation.JsonAlias
 import com.fasterxml.jackson.annotation.JsonCreator
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties
 import com.fasterxml.jackson.annotation.JsonProperty
 import com.fasterxml.jackson.databind.ObjectMapper
 import java.io.File
@@ -23,6 +24,7 @@ class XteaManager(path: String) {
         return xteaKeys[region]
     }
 
+    @JsonIgnoreProperties(ignoreUnknown = true)
     data class XteaKey @JsonCreator constructor(
         @JsonProperty("mapsquare") @JsonAlias("region") val mapsquare: Int,
         @JsonProperty("key") @JsonAlias("keys") val key: IntArray

diff --git a/src/main/kotlin/models/scene/SceneRegionBuilder.kt b/src/main/kotlin/models/scene/SceneRegionBuilder.kt
@@ -163,8 +163,8 @@ class SceneRegionBuilder constructor(
                         if (yi in 0 until REGION_SIZE) {
                             val r: RegionDefinition =
                                 regionLoader.findRegionForWorldCoordinates(baseX + xi, baseY + yi) ?: continue
-                            val underlayId: Int = r.tiles[z][xi][yi].underlayId.toInt() and 0xFF
-                            val overlayId: Int = r.tiles[z][xi][yi].overlayId.toInt() and 0xFF
+                            val underlayId: Int = r.tiles[z][xi][yi].underlayId.toInt() and 0xFFF
+                            val overlayId: Int = r.tiles[z][xi][yi].overlayId.toInt() and 0xFFF
                             if (underlayId <= 0 && overlayId <= 0) {
                                 continue
                             }

diff --git a/src/main/resources/data/locations.json b/src/main/resources/data/locations.json
@@ -1,5 +1,28 @@
 {
   "locations": [
+    { "name": "Perilous Moons", "coords": [1440, 9632, 0] },
+    { "name": "Whisperer Arena", "coords": [2656, 6370, 0] },
+    { "name": "Whisperer Arena (Shadow realm)", "coords": [2400, 6370, 0] },
+    { "name": "Duke Sucellus Arena", "coords": [3039, 6440, 0] },
+    { "name": "Vardorvis Arena", "coords": [1120, 3426, 0] },
+    { "name": "The Scar", "coords": [2016, 6434, 0] },
+    { "name": "Leviathan Arena", "coords": [2080, 6370, 0] },
+    { "name": "Lassar Undercity", "coords": [2512, 6396, 0] },
+    { "name": "Lassar Undercity (Shadow realm)", "coords": [2400, 6370, 0] },
+    { "name": "True Yu'biusk", "coords": [3552, 4386, 0] },
+    { "name": "Goblin Temple", "coords": [3744, 4322, 0] },
+    { "name": "Yu'biusk", "coords": [3872, 4386, 0] },
+    { "name": "Daimon's Crater", "coords": [3424, 3695, 0] },
+    { "name": "The Escape Caves", "coords": [3360, 10272, 0] },
+    { "name": "Vet'ion Arena", "coords": [3296, 10208, 0] },
+    { "name": "Callisto Arena", "coords": [3360, 10336, 0] },
+    { "name": "The Stranglewood", "coords": [1567, 3114, 0] },
+    { "name": "Kingdom of Varlamore", "coords": [1567, 3114, 0] },
+    { "name": "Hunter Guild", "coords": [1567, 3050, 0] },
+    { "name": "Ralos' Rise", "coords": [1440, 3178, 0] },
+    { "name": "Fortis", "coords": [1696, 3106, 0] },
+    { "name": "Fortis Colosseum", "coords": [1696, 3114, 0] },
+    { "name": "Venenatis Arena", "coords": [3424, 10208, 0] },
     { "name": "2015 Clan Cup PvM Arena", "coords": [1698, 4700, 0] },
     { "name": "2017 Wilderness Wars lobby", "coords": [3296, 4639, 0] },
     { "name": "2018 Allstars Tournament Arena", "coords": [3329, 5823, 2] },