project: Rev 202

This commit is contained in:
Owain van Brakel
2021-12-14 18:20:58 +01:00
parent e974585ce8
commit 7c7bf0901a
406 changed files with 39725 additions and 39842 deletions

View File

@@ -77,15 +77,15 @@ public class WorldMapArea {
LinkedList sections;
public WorldMapArea() {
this.id = -1; // L: 9
this.backGroundColor = -1; // L: 12
this.zoom = -1; // L: 13
this.origin = null; // L: 14
this.regionLowX = Integer.MAX_VALUE; // L: 15
this.regionHighX = 0; // L: 16
this.regionLowY = Integer.MAX_VALUE; // L: 17
this.regionHighY = 0; // L: 18
this.isMain = false; // L: 19
this.id = -1;
this.backGroundColor = -1;
this.zoom = -1;
this.origin = null;
this.regionLowX = Integer.MAX_VALUE;
this.regionHighX = 0;
this.regionLowY = Integer.MAX_VALUE;
this.regionHighY = 0;
this.isMain = false;
}
@ObfuscatedName("c")
@@ -95,23 +95,23 @@ public class WorldMapArea {
)
@Export("read")
public void read(Buffer var1, int var2) {
this.id = var2; // L: 23
this.internalName = var1.readStringCp1252NullTerminated(); // L: 24
this.externalName = var1.readStringCp1252NullTerminated(); // L: 25
this.origin = new Coord(var1.readInt()); // L: 26
this.backGroundColor = var1.readInt(); // L: 27
var1.readUnsignedByte(); // L: 28
this.isMain = var1.readUnsignedByte() == 1; // L: 29
this.zoom = var1.readUnsignedByte(); // L: 30
int var3 = var1.readUnsignedByte(); // L: 31
this.sections = new LinkedList(); // L: 32
this.id = var2;
this.internalName = var1.readStringCp1252NullTerminated();
this.externalName = var1.readStringCp1252NullTerminated();
this.origin = new Coord(var1.readInt());
this.backGroundColor = var1.readInt();
var1.readUnsignedByte();
this.isMain = var1.readUnsignedByte() == 1;
this.zoom = var1.readUnsignedByte();
int var3 = var1.readUnsignedByte();
this.sections = new LinkedList();
for (int var4 = 0; var4 < var3; ++var4) { // L: 33
this.sections.add(this.readWorldMapSection(var1)); // L: 34
for (int var4 = 0; var4 < var3; ++var4) {
this.sections.add(this.readWorldMapSection(var1));
}
this.setBounds(); // L: 36
} // L: 37
this.setBounds();
}
@ObfuscatedName("b")
@ObfuscatedSignature(
@@ -120,28 +120,28 @@ public class WorldMapArea {
)
@Export("readWorldMapSection")
WorldMapSection readWorldMapSection(Buffer var1) {
int var2 = var1.readUnsignedByte(); // L: 40
WorldMapSectionType var3 = (WorldMapSectionType)class130.findEnumerated(WorldMapSectionType.method4754(), var2); // L: 41
Object var4 = null; // L: 42
switch(var3.type) { // L: 43
int var2 = var1.readUnsignedByte();
WorldMapSectionType var3 = (WorldMapSectionType)class130.findEnumerated(WorldMapSectionType.method4754(), var2);
Object var4 = null;
switch(var3.type) {
case 0:
var4 = new WorldMapSection1(); // L: 51
break; // L: 52
var4 = new WorldMapSection1();
break;
case 1:
var4 = new WorldMapSection2(); // L: 48
break; // L: 49
var4 = new WorldMapSection2();
break;
case 2:
var4 = new class221(); // L: 45
var4 = new class221();
break;
case 3:
var4 = new WorldMapSection0(); // L: 54
break; // L: 55
var4 = new WorldMapSection0();
break;
default:
throw new IllegalStateException(""); // L: 57
throw new IllegalStateException("");
}
((WorldMapSection)var4).read(var1); // L: 59
return (WorldMapSection)var4; // L: 60
((WorldMapSection)var4).read(var1);
return (WorldMapSection)var4;
}
@ObfuscatedName("p")
@@ -151,18 +151,18 @@ public class WorldMapArea {
)
@Export("containsCoord")
public boolean containsCoord(int var1, int var2, int var3) {
Iterator var4 = this.sections.iterator(); // L: 64
Iterator var4 = this.sections.iterator();
WorldMapSection var5;
do {
if (!var4.hasNext()) {
return false; // L: 72
return false;
}
var5 = (WorldMapSection)var4.next(); // L: 65
} while(!var5.containsCoord(var1, var2, var3)); // L: 67
var5 = (WorldMapSection)var4.next();
} while(!var5.containsCoord(var1, var2, var3));
return true; // L: 68
return true;
}
@ObfuscatedName("m")
@@ -172,22 +172,22 @@ public class WorldMapArea {
)
@Export("containsPosition")
public boolean containsPosition(int var1, int var2) {
int var3 = var1 / 64; // L: 76
int var4 = var2 / 64; // L: 77
if (var3 >= this.regionLowX && var3 <= this.regionHighX) { // L: 78
if (var4 >= this.regionLowY && var4 <= this.regionHighY) { // L: 79
Iterator var5 = this.sections.iterator(); // L: 80
int var3 = var1 / 64;
int var4 = var2 / 64;
if (var3 >= this.regionLowX && var3 <= this.regionHighX) {
if (var4 >= this.regionLowY && var4 <= this.regionHighY) {
Iterator var5 = this.sections.iterator();
WorldMapSection var6;
do {
if (!var5.hasNext()) {
return false; // L: 88
return false;
}
var6 = (WorldMapSection)var5.next(); // L: 81
} while(!var6.containsPosition(var1, var2)); // L: 83
var6 = (WorldMapSection)var5.next();
} while(!var6.containsPosition(var1, var2));
return true; // L: 84
return true;
} else {
return false;
}
@@ -203,18 +203,18 @@ public class WorldMapArea {
)
@Export("position")
public int[] position(int var1, int var2, int var3) {
Iterator var4 = this.sections.iterator(); // L: 92
Iterator var4 = this.sections.iterator();
WorldMapSection var5;
do {
if (!var4.hasNext()) {
return null; // L: 100
return null;
}
var5 = (WorldMapSection)var4.next(); // L: 93
} while(!var5.containsCoord(var1, var2, var3)); // L: 95
var5 = (WorldMapSection)var4.next();
} while(!var5.containsCoord(var1, var2, var3));
return var5.getBorderTileLengths(var1, var2, var3); // L: 96
return var5.getBorderTileLengths(var1, var2, var3);
}
@ObfuscatedName("s")
@@ -224,18 +224,18 @@ public class WorldMapArea {
)
@Export("coord")
public Coord coord(int var1, int var2) {
Iterator var3 = this.sections.iterator(); // L: 104
Iterator var3 = this.sections.iterator();
WorldMapSection var4;
do {
if (!var3.hasNext()) {
return null; // L: 112
return null;
}
var4 = (WorldMapSection)var3.next(); // L: 105
} while(!var4.containsPosition(var1, var2)); // L: 107
var4 = (WorldMapSection)var3.next();
} while(!var4.containsPosition(var1, var2));
return var4.coord(var1, var2); // L: 108
return var4.coord(var1, var2);
}
@ObfuscatedName("j")
@@ -245,14 +245,14 @@ public class WorldMapArea {
)
@Export("setBounds")
void setBounds() {
Iterator var1 = this.sections.iterator(); // L: 116
Iterator var1 = this.sections.iterator();
while (var1.hasNext()) {
WorldMapSection var2 = (WorldMapSection)var1.next(); // L: 117
var2.expandBounds(this); // L: 119
WorldMapSection var2 = (WorldMapSection)var1.next();
var2.expandBounds(this);
}
} // L: 122
}
@ObfuscatedName("w")
@ObfuscatedSignature(
@@ -261,7 +261,7 @@ public class WorldMapArea {
)
@Export("getId")
public int getId() {
return this.id; // L: 125
return this.id;
}
@ObfuscatedName("n")
@@ -271,7 +271,7 @@ public class WorldMapArea {
)
@Export("getIsMain")
public boolean getIsMain() {
return this.isMain; // L: 129
return this.isMain;
}
@ObfuscatedName("r")
@@ -281,7 +281,7 @@ public class WorldMapArea {
)
@Export("getInternalName")
public String getInternalName() {
return this.internalName; // L: 133
return this.internalName;
}
@ObfuscatedName("o")
@@ -291,7 +291,7 @@ public class WorldMapArea {
)
@Export("getExternalName")
public String getExternalName() {
return this.externalName; // L: 137
return this.externalName;
}
@ObfuscatedName("v")
@@ -301,7 +301,7 @@ public class WorldMapArea {
)
@Export("getBackGroundColor")
int getBackGroundColor() {
return this.backGroundColor; // L: 141
return this.backGroundColor;
}
@ObfuscatedName("d")
@@ -331,7 +331,7 @@ public class WorldMapArea {
)
@Export("getRegionHighX")
public int getRegionHighX() {
return this.regionHighX; // L: 153
return this.regionHighX;
}
@ObfuscatedName("e")
@@ -341,7 +341,7 @@ public class WorldMapArea {
)
@Export("getRegionLowY")
public int getRegionLowY() {
return this.regionLowY; // L: 157
return this.regionLowY;
}
@ObfuscatedName("a")
@@ -351,7 +351,7 @@ public class WorldMapArea {
)
@Export("getRegionHighY")
public int getRegionHighY() {
return this.regionHighY; // L: 161
return this.regionHighY;
}
@ObfuscatedName("u")
@@ -361,7 +361,7 @@ public class WorldMapArea {
)
@Export("getOriginX")
public int getOriginX() {
return this.origin.x; // L: 165
return this.origin.x;
}
@ObfuscatedName("k")
@@ -371,7 +371,7 @@ public class WorldMapArea {
)
@Export("getOriginPlane")
public int getOriginPlane() {
return this.origin.plane; // L: 169
return this.origin.plane;
}
@ObfuscatedName("f")
@@ -381,7 +381,7 @@ public class WorldMapArea {
)
@Export("getOriginY")
public int getOriginY() {
return this.origin.y; // L: 173
return this.origin.y;
}
@ObfuscatedName("l")
@@ -391,7 +391,7 @@ public class WorldMapArea {
)
@Export("getOrigin")
public Coord getOrigin() {
return new Coord(this.origin); // L: 177
return new Coord(this.origin);
}
@ObfuscatedName("c")
@@ -400,27 +400,27 @@ public class WorldMapArea {
garbageValue = "0"
)
static int method4490(AbstractArchive var0, AbstractArchive var1) {
int var2 = 0; // L: 143
String[] var3 = Login.field892; // L: 145
int var2 = 0;
String[] var3 = Login.field892;
int var4;
String var5;
for (var4 = 0; var4 < var3.length; ++var4) { // L: 146
var5 = var3[var4]; // L: 147
if (var0.tryLoadFileByNames(var5, "")) { // L: 149
for (var4 = 0; var4 < var3.length; ++var4) {
var5 = var3[var4];
if (var0.tryLoadFileByNames(var5, "")) {
++var2;
}
}
var3 = Login.field893; // L: 154
var3 = Login.field893;
for (var4 = 0; var4 < var3.length; ++var4) { // L: 155
var5 = var3[var4]; // L: 156
if (var1.tryLoadFileByNames(var5, "")) { // L: 158
for (var4 = 0; var4 < var3.length; ++var4) {
var5 = var3[var4];
if (var1.tryLoadFileByNames(var5, "")) {
++var2;
}
}
return var2; // L: 162
return var2;
}
}