Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: Dynamic region loading types #617

Merged
merged 3 commits into from
Feb 24, 2025
Merged

fix: Dynamic region loading types #617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f286a3d
fix: make gradle wrapper executable
titandino Feb 23, 2025
26b8d40
fix: add enum with research information for dynamic region load types
titandino Feb 23, 2025
b9fe6f2
chore: remove old redundant paramType documentation on dynamicMapRegion
titandino Feb 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified gradlew
100644 → 100755
View file
Open in desktop
Empty file.
17 changes: 12 additions & 5 deletions ...ork/src/main/kotlin/world/gregs/voidps/network/login/protocol/encode/MapRegionEncoders.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,16 @@ private fun getLength(clientTile: Int?, playerRegions: IntArray?, clientIndex: I
return count
}

/**
* @param unknownMode (0 = only shows 1 region, 1 = ?, 2 = ?, 3 = ?, 4 = ?)
*/
enum class DynamicRegionLoadType(val index: Int) {
// not sure if zero is even a valid input to the packet glancing at the
// client logic, it shouldn't really perform different than 1 as they both
// set the loading type to the same value
STANDARD(1), //No difference from non-dynamic logic essentially
STANDARD_NO_ENTITY_RESET(2), //Same as above except this one won't reset local entities on load (Matrix and most other bases default to this)
LARGE(3), //Ignores render-distance restrictions on zone updates (current Void default)
LARGE_NO_UPDATEZONE_RESET(4) //Ignores render-distance restrictions on zone updates and doesn't reset objs, locs, etc on load
}

fun Client.dynamicMapRegion(
zoneX: Int,
zoneY: Int,
Expand All @@ -63,14 +70,14 @@ fun Client.dynamicMapRegion(
clientIndex: Int? = null,
clientTile: Int? = null,
playerRegions: IntArray? = null,
unknownMode: Int = 3
loadType: DynamicRegionLoadType = DynamicRegionLoadType.LARGE
) = send(Protocol.DYNAMIC_REGION, getLength(clientTile, playerRegions, clientIndex, zones, xteas), SHORT) {
mapInit(clientTile, playerRegions, clientIndex)
writeByte(mapSize)
writeShortAddLittle(zoneY)
writeByte(forceRefresh)
writeShortAdd(zoneX)
writeByteAdd(unknownMode)
writeByteAdd(loadType.index)
bitAccess {
zones.forEach { data ->
writeBit(data != null)
Expand Down