From 7193f59e71b71c6397d82a7194c9ef5e2f4c9382 Mon Sep 17 00:00:00 2001 From: Graham Date: Tue, 29 Aug 2023 12:24:05 +0100 Subject: [PATCH] Refactor Loc-related code Signed-off-by: Graham --- share/deob/map/client.yaml | 178 ++++++++++++++++++------------------- 1 file changed, 89 insertions(+), 89 deletions(-) diff --git a/share/deob/map/client.yaml b/share/deob/map/client.yaml index 68a81858..267185de 100644 --- a/share/deob/map/client.yaml +++ b/share/deob/map/client.yaml @@ -2854,7 +2854,7 @@ fields: name: "EXPERIENCE_FOR_LEVEL" client!ge.d [I: owner: "Static3" - name: "anIntArray166" + name: "wallDecorXOffsets" client!gf.a Lclient!cc;: owner: "LocTypeList" name: "types" @@ -11023,7 +11023,7 @@ fields: name: "anInt5680" client!w.B [I: owner: "Static7" - name: "anIntArray646" + name: "wallDecorZOffsets" client!w.C Lclient!he;: owner: "ObjStackNode" name: "value" @@ -14939,11 +14939,11 @@ methods: owner: "Static11" name: "readMapLocs" arguments: - 0: "arg0" + 0: "underwater" 1: "bytes" - 3: "arg2" - 4: "arg3" - 5: "arg4" + 3: "destZ" + 4: "destX" + 5: "collisionMaps" locals: 10: "buffer" 20: "id" @@ -14955,11 +14955,11 @@ methods: 66: "shapeAndAngle" 70: "angle" 74: "shape" - 79: "local79" - 84: "local84" + 79: "x2" + 84: "z2" 88: "level" 104: "collisionMap" - 108: "local108" + 108: "collisionLevel" client!ch.b (I)V: owner: "CollisionMap" name: "clear" @@ -15727,19 +15727,19 @@ methods: 116: "extended" 139: "clearMovementQueue" client!db.a (IIIIIIII)V: - owner: "Static12" - name: "method736" + owner: "SceneGraph" + name: "changeLoc" arguments: 1: "level" - 2: "angle" + 6: "x" 3: "z" 4: "layer" - 5: "id" - 6: "x" 7: "shape" + 5: "id" + 2: "angle" locals: 39: "local39" - 64: "local64" + 64: "virtualLevel" 97: "prevGroundDecoration" client!db.a (ILclient!f;)V: owner: "AreaSoundManager" @@ -17860,10 +17860,10 @@ methods: owner: "Static14" name: "method1212" arguments: - 0: "arg0" - 1: "arg1" + 0: "sprite" + 1: "xFine" 2: "arg2" - 3: "arg3" + 3: "zFine" locals: 12: "local12" 22: "local22" @@ -17931,7 +17931,7 @@ methods: owner: "Static14" name: "method1214" arguments: - 0: "arg0" + 0: "sprite" 1: "arg1" 2: "arg2" 3: "arg3" @@ -19364,16 +19364,16 @@ methods: owner: "Static15" name: "readZoneLocs" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" + 0: "destLevel" + 1: "destX" + 2: "collisionMaps" 3: "bytes" - 4: "zoneAngle" - 5: "zoneZ" - 6: "zoneX" - 7: "zoneLevel" - 8: "arg8" - 10: "arg9" + 4: "rotation" + 5: "srcZ" + 6: "srcX" + 7: "srcLevel" + 8: "underwater" + 10: "destZ" locals: 10: "buffer" 12: "id" @@ -19387,10 +19387,10 @@ methods: 73: "shape" 77: "angle" 108: "type" - 125: "rotatedX" - 145: "rotatedZ" + 125: "x2" + 145: "z2" 162: "collisionMap" - 166: "local166" + 166: "collisionLevel" client!fl.a (Lclient!fh;ILclient!fh;)V: owner: "QuickChatCatTypeList" name: "init" @@ -24578,23 +24578,23 @@ methods: 1: "node" locals: {} client!jh.a (BIIILclient!ch;II)V: - owner: "Static21" - name: "method2018" + owner: "SceneGraph" + name: "removeLoc" arguments: 1: "level" - 2: "arg1" - 3: "z" - 4: "arg3" - 5: "arg4" + 2: "virtualLevel" 6: "x" + 3: "z" + 5: "layer" + 4: "collisionMap" locals: 9: "key" 67: "shape" 74: "id" 81: "angle" 85: "type" - 105: "local105" - 107: "local107" + 105: "primary" + 107: "secondary" 117: "wall" 155: "wallDecor" 173: "scenery" @@ -25616,19 +25616,19 @@ methods: 11: "centerXFine" 19: "centerZFine" client!ka.a (IIIIIIZILclient!ch;ZI)V: - owner: "Static22" - name: "method2193" + owner: "SceneGraph" + name: "setLoc" arguments: - 0: "angle" 1: "level" - 2: "id" - 3: "arg3" + 3: "virtualLevel" 4: "x" - 6: "arg5" 7: "z" + 2: "id" + 10: "shape" + 0: "angle" 8: "collisionMap" + 6: "underwater" 9: "arg8" - 10: "shape" locals: 60: "type" 78: "width" @@ -25637,14 +25637,14 @@ methods: 102: "local102" 128: "local128" 130: "local130" - 151: "local151" - 159: "local159" - 167: "local167" + 151: "tileHeightsBelow" + 159: "xFine" + 167: "zFine" 193: "local193" 195: "local195" - 203: "local203" + 203: "tileHeightsBase" 250: "key" - 253: "local253" + 253: "tileHeightsAbove" 321: "key2" 330: "local330" 377: "local377" @@ -25686,8 +25686,8 @@ methods: 2300: "offsetScale" 2305: "wallKey" 2328: "local2328" - 2350: "local2350" - 2356: "local2356" + 2350: "xOffset" + 2356: "zOffset" 2372: "local2372" 2392: "local2392" 2410: "local2410" @@ -29390,20 +29390,20 @@ methods: owner: "Static24" name: "method2708" arguments: - 0: "arg0" + 0: "underwater" locals: - 11: "local11" - 13: "local13" - 27: "local27" - 38: "local38" - 43: "local43" - 54: "local54" - 63: "local63" - 77: "local77" - 83: "local83" - 89: "local89" - 99: "local99" - 101: "local101" + 11: "levels" + 13: "locBytes" + 27: "destLevel" + 38: "destX" + 43: "destZ" + 54: "zone" + 63: "srcLevel" + 77: "angle" + 83: "srcZ" + 89: "srcX" + 99: "mapSquare" + 101: "i" client!mh.a ()V: owner: "GlCleaner" name: "clear" @@ -31949,16 +31949,16 @@ methods: 9: "modifiers" client!ng.a (IIIIIII)I: owner: "Static26" - name: "method4356" + name: "rotateZoneZ" arguments: - 1: "arg0" - 2: "arg1" - 3: "arg2" - 4: "arg3" - 5: "arg4" - 6: "arg5" + 1: "x" + 5: "z" + 3: "width" + 2: "length" + 6: "angle" + 4: "rotation" locals: - 8: "local8" + 8: "temp" client!ng.a (I[Lclient!ch;[BIIIIIIZI)[I: owner: "Static26" name: "readZone" @@ -34884,16 +34884,16 @@ methods: locals: {} client!pg.a (IIIIIII)I: owner: "Static29" - name: "method3147" + name: "rotateZoneX" arguments: - 0: "arg0" - 1: "arg1" - 2: "arg2" - 3: "arg3" - 4: "arg4" - 6: "arg5" + 3: "x" + 1: "z" + 0: "width" + 6: "length" + 2: "angle" + 4: "rotation" locals: - 17: "local17" + 17: "temp" client!pg.a (Z)V: owner: "Class41" name: "createPermutation" @@ -45400,14 +45400,14 @@ methods: owner: "Static37" name: "method4710" arguments: - 1: "arg0" + 1: "underwater" locals: - 11: "local11" - 29: "local29" - 31: "local31" - 42: "local42" - 55: "local55" - 66: "local66" + 11: "locBytes" + 29: "len" + 31: "i" + 42: "bytes" + 55: "x" + 66: "z" client!wd.a (Z[Ljava/lang/String;II)Ljava/lang/String;: owner: "StringUtils" name: "join"