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

@@ -67,12 +67,12 @@ public class PlayerComposition {
boolean field3200;
static {
equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10}; // L: 26
Widget_cachedSprites = new EvictingDualNodeHashTable(260); // L: 27
equipmentIndices = new int[]{8, 11, 4, 6, 9, 7, 10};
Widget_cachedSprites = new EvictingDualNodeHashTable(260);
}
public PlayerComposition() {
this.field3200 = false; // L: 21
this.field3200 = false;
}
@ObfuscatedName("c")
@@ -81,9 +81,9 @@ public class PlayerComposition {
garbageValue = "1940992993"
)
public void method5368(int[] var1, class160[] var2, boolean var3, int[] var4, boolean var5, int var6) {
this.field3199 = var2; // L: 30
this.field3199 = var2;
this.field3200 = var3;
this.update(var1, var4, var5, var6); // L: 32
this.update(var1, var4, var5, var6);
}
@ObfuscatedName("b")
@@ -107,12 +107,12 @@ public class PlayerComposition {
}
}
this.equipment = var1; // L: 48
this.equipment = var1;
this.bodyColors = var2;
this.isFemale = var3;
this.npcTransformId = var4;
this.setHash(); // L: 52
} // L: 53
this.setHash();
}
@ObfuscatedName("p")
@ObfuscatedSignature(
@@ -123,31 +123,31 @@ public class PlayerComposition {
public void changeAppearance(int var1, boolean var2) {
if (var1 != 1 || !this.isFemale) {
int var3 = this.equipment[equipmentIndices[var1]];
if (var3 != 0) { // L: 58
if (var3 != 0) {
var3 -= 256;
KitDefinition var4;
do {
if (!var2) { // L: 61
--var3; // L: 62
if (var3 < 0) { // L: 63
if (!var2) {
--var3;
if (var3 < 0) {
var3 = KitDefinition.KitDefinition_fileCount - 1;
}
} else {
++var3; // L: 66
if (var3 >= KitDefinition.KitDefinition_fileCount) { // L: 67
++var3;
if (var3 >= KitDefinition.KitDefinition_fileCount) {
var3 = 0;
}
}
var4 = ArchiveDisk.KitDefinition_get(var3); // L: 69
} while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1); // L: 70
var4 = ArchiveDisk.KitDefinition_get(var3);
} while(var4 == null || var4.nonSelectable || var4.bodypartID != (this.isFemale ? 7 : 0) + var1);
this.equipment[equipmentIndices[var1]] = var3 + 256; // L: 72
this.setHash(); // L: 73
this.equipment[equipmentIndices[var1]] = var3 + 256;
this.setHash();
}
}
} // L: 74
}
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -155,39 +155,39 @@ public class PlayerComposition {
garbageValue = "1596195653"
)
public void method5391(int var1, boolean var2) {
int var3 = this.bodyColors[var1]; // L: 77
int var3 = this.bodyColors[var1];
boolean var4;
if (!var2) { // L: 78
if (!var2) {
do {
--var3; // L: 80
if (var3 < 0) { // L: 81
var3 = class114.field1382[var1].length - 1; // L: 82
--var3;
if (var3 < 0) {
var3 = class114.field1382[var1].length - 1;
}
if (var1 == 4 && var3 >= 8) { // L: 86
var4 = false; // L: 87
if (var1 == 4 && var3 >= 8) {
var4 = false;
} else {
var4 = true; // L: 90
var4 = true;
}
} while(!var4); // L: 92
} while(!var4);
} else {
do {
++var3; // L: 97
if (var3 >= class114.field1382[var1].length) { // L: 98
++var3;
if (var3 >= class114.field1382[var1].length) {
var3 = 0;
}
if (var1 == 4 && var3 >= 8) { // L: 101
var4 = false; // L: 102
if (var1 == 4 && var3 >= 8) {
var4 = false;
} else {
var4 = true; // L: 105
var4 = true;
}
} while(!var4); // L: 107
} while(!var4);
}
this.bodyColors[var1] = var3; // L: 110
this.setHash(); // L: 111
} // L: 112
this.bodyColors[var1] = var3;
this.setHash();
}
@ObfuscatedName("t")
@ObfuscatedSignature(
@@ -196,10 +196,10 @@ public class PlayerComposition {
)
@Export("changeSex")
public void changeSex(boolean var1) {
if (this.isFemale != var1) { // L: 115
this.update((int[])null, this.bodyColors, var1, -1); // L: 116
if (this.isFemale != var1) {
this.update((int[])null, this.bodyColors, var1, -1);
}
} // L: 117
}
@ObfuscatedName("s")
@ObfuscatedSignature(
@@ -208,23 +208,23 @@ public class PlayerComposition {
)
@Export("write")
public void write(Buffer var1) {
var1.writeByte(this.isFemale ? 1 : 0); // L: 120
var1.writeByte(this.isFemale ? 1 : 0);
int var2;
for (var2 = 0; var2 < 7; ++var2) { // L: 121
int var3 = this.equipment[equipmentIndices[var2]]; // L: 122
if (var3 == 0) { // L: 123
for (var2 = 0; var2 < 7; ++var2) {
int var3 = this.equipment[equipmentIndices[var2]];
if (var3 == 0) {
var1.writeByte(-1);
} else {
var1.writeByte(var3 - 256); // L: 124
var1.writeByte(var3 - 256);
}
}
for (var2 = 0; var2 < 5; ++var2) { // L: 126
for (var2 = 0; var2 < 5; ++var2) {
var1.writeByte(this.bodyColors[var2]);
}
} // L: 127
}
@ObfuscatedName("j")
@ObfuscatedSignature(
@@ -233,43 +233,43 @@ public class PlayerComposition {
)
@Export("setHash")
void setHash() {
long var1 = this.hash; // L: 130
int var3 = this.equipment[5]; // L: 131
int var4 = this.equipment[9]; // L: 132
this.equipment[5] = var4; // L: 133
this.equipment[9] = var3; // L: 134
this.hash = 0L; // L: 135
long var1 = this.hash;
int var3 = this.equipment[5];
int var4 = this.equipment[9];
this.equipment[5] = var4;
this.equipment[9] = var3;
this.hash = 0L;
int var5;
for (var5 = 0; var5 < 12; ++var5) { // L: 136
this.hash <<= 4; // L: 137
if (this.equipment[var5] >= 256) { // L: 138
for (var5 = 0; var5 < 12; ++var5) {
this.hash <<= 4;
if (this.equipment[var5] >= 256) {
this.hash += (long)(this.equipment[var5] - 256);
}
}
if (this.equipment[0] >= 256) { // L: 140
if (this.equipment[0] >= 256) {
this.hash += (long)(this.equipment[0] - 256 >> 4);
}
if (this.equipment[1] >= 256) { // L: 141
if (this.equipment[1] >= 256) {
this.hash += (long)(this.equipment[1] - 256 >> 8);
}
for (var5 = 0; var5 < 5; ++var5) { // L: 142
this.hash <<= 3; // L: 143
this.hash += (long)this.bodyColors[var5]; // L: 144
for (var5 = 0; var5 < 5; ++var5) {
this.hash <<= 3;
this.hash += (long)this.bodyColors[var5];
}
this.hash <<= 1; // L: 146
this.hash += (long)(this.isFemale ? 1 : 0); // L: 147
this.equipment[5] = var3; // L: 148
this.equipment[9] = var4; // L: 149
if (var1 != 0L && var1 != this.hash || this.field3200) { // L: 150
this.hash <<= 1;
this.hash += (long)(this.isFemale ? 1 : 0);
this.equipment[5] = var3;
this.equipment[9] = var4;
if (var1 != 0L && var1 != this.hash || this.field3200) {
Widget_cachedSprites.remove(var1);
}
} // L: 151
}
@ObfuscatedName("w")
@ObfuscatedSignature(
@@ -278,127 +278,127 @@ public class PlayerComposition {
)
@Export("getModel")
public Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
if (this.npcTransformId != -1) { // L: 154
return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4); // L: 155
if (this.npcTransformId != -1) {
return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModel(var1, var2, var3, var4);
} else {
long var5 = this.hash; // L: 157
int[] var7 = this.equipment; // L: 158
if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) { // L: 159
var7 = new int[12]; // L: 160
long var5 = this.hash;
int[] var7 = this.equipment;
if (var1 != null && (var1.shield >= 0 || var1.weapon >= 0)) {
var7 = new int[12];
for (int var8 = 0; var8 < 12; ++var8) { // L: 161
for (int var8 = 0; var8 < 12; ++var8) {
var7[var8] = this.equipment[var8];
}
if (var1.shield >= 0) { // L: 162
var5 += (long)(var1.shield - this.equipment[5] << 40); // L: 163
var7[5] = var1.shield; // L: 164
if (var1.shield >= 0) {
var5 += (long)(var1.shield - this.equipment[5] << 40);
var7[5] = var1.shield;
}
if (var1.weapon >= 0) { // L: 166
var5 += (long)(var1.weapon - this.equipment[3] << 48); // L: 167
var7[3] = var1.weapon; // L: 168
if (var1.weapon >= 0) {
var5 += (long)(var1.weapon - this.equipment[3] << 48);
var7[3] = var1.weapon;
}
}
Model var18 = (Model)Widget_cachedSprites.get(var5); // L: 171
if (var18 == null) { // L: 172
boolean var9 = false; // L: 173
Model var18 = (Model)Widget_cachedSprites.get(var5);
if (var18 == null) {
boolean var9 = false;
int var11;
for (int var10 = 0; var10 < 12; ++var10) { // L: 174
var11 = var7[var10]; // L: 175
if (var11 >= 256 && var11 < 512 && !ArchiveDisk.KitDefinition_get(var11 - 256).ready()) { // L: 176 177
for (int var10 = 0; var10 < 12; ++var10) {
var11 = var7[var10];
if (var11 >= 256 && var11 < 512 && !ArchiveDisk.KitDefinition_get(var11 - 256).ready()) {
var9 = true;
}
if (var11 >= 512 && !UserComparator6.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) { // L: 179 180
if (var11 >= 512 && !UserComparator6.ItemDefinition_get(var11 - 512).hasNoValidModel(this.isFemale)) {
var9 = true;
}
}
if (var9) { // L: 183
if (this.field3201 != -1L) { // L: 184
if (var9) {
if (this.field3201 != -1L) {
var18 = (Model)Widget_cachedSprites.get(this.field3201);
}
if (var18 == null) { // L: 185
if (var18 == null) {
return null;
}
}
if (var18 == null) { // L: 187
ModelData[] var19 = new ModelData[12]; // L: 188
var11 = 0; // L: 189
if (var18 == null) {
ModelData[] var19 = new ModelData[12];
var11 = 0;
int var13;
for (int var12 = 0; var12 < 12; ++var12) { // L: 190
var13 = var7[var12]; // L: 191
if (var13 >= 256 && var13 < 512) { // L: 192
ModelData var14 = ArchiveDisk.KitDefinition_get(var13 - 256).getModelData(); // L: 193
if (var14 != null) { // L: 194
for (int var12 = 0; var12 < 12; ++var12) {
var13 = var7[var12];
if (var13 >= 256 && var13 < 512) {
ModelData var14 = ArchiveDisk.KitDefinition_get(var13 - 256).getModelData();
if (var14 != null) {
var19[var11++] = var14;
}
}
if (var13 >= 512) { // L: 196
ItemComposition var22 = UserComparator6.ItemDefinition_get(var13 - 512); // L: 197
ModelData var15 = var22.method3554(this.isFemale); // L: 198
if (var15 != null) { // L: 199
if (this.field3199 != null) { // L: 200
class160 var16 = this.field3199[var12]; // L: 201
if (var16 != null) { // L: 202
if (var13 >= 512) {
ItemComposition var22 = UserComparator6.ItemDefinition_get(var13 - 512);
ModelData var15 = var22.method3554(this.isFemale);
if (var15 != null) {
if (this.field3199 != null) {
class160 var16 = this.field3199[var12];
if (var16 != null) {
int var17;
if (var16.field1732 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1732.length) { // L: 203
for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) { // L: 204
var15.recolor(var22.recolorTo[var17], var16.field1732[var17]); // L: 205
if (var16.field1732 != null && var22.recolorFrom != null && var22.recolorTo.length == var16.field1732.length) {
for (var17 = 0; var17 < var22.recolorFrom.length; ++var17) {
var15.recolor(var22.recolorTo[var17], var16.field1732[var17]);
}
}
if (var16.field1738 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1738.length) { // L: 208
for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) { // L: 209
var15.retexture(var22.retextureTo[var17], var16.field1738[var17]); // L: 210
if (var16.field1738 != null && var22.retextureFrom != null && var22.retextureTo.length == var16.field1738.length) {
for (var17 = 0; var17 < var22.retextureFrom.length; ++var17) {
var15.retexture(var22.retextureTo[var17], var16.field1738[var17]);
}
}
}
}
var19[var11++] = var15; // L: 215
var19[var11++] = var15;
}
}
}
ModelData var20 = new ModelData(var19, var11); // L: 219
ModelData var20 = new ModelData(var19, var11);
for (var13 = 0; var13 < 5; ++var13) { // L: 220
if (this.bodyColors[var13] < class114.field1382[var13].length) { // L: 221
for (var13 = 0; var13 < 5; ++var13) {
if (this.bodyColors[var13] < class114.field1382[var13].length) {
var20.recolor(field3197[var13], class114.field1382[var13][this.bodyColors[var13]]);
}
if (this.bodyColors[var13] < field3203[var13].length) { // L: 222
if (this.bodyColors[var13] < field3203[var13].length) {
var20.recolor(class132.field1540[var13], field3203[var13][this.bodyColors[var13]]);
}
}
var18 = var20.toModel(64, 850, -30, -50, -30); // L: 224
Widget_cachedSprites.put(var18, var5); // L: 225
this.field3201 = var5; // L: 226
var18 = var20.toModel(64, 850, -30, -50, -30);
Widget_cachedSprites.put(var18, var5);
this.field3201 = var5;
}
}
if (var1 == null && var3 == null) { // L: 230
if (var1 == null && var3 == null) {
return var18;
} else {
Model var21;
if (var1 != null && var3 != null) { // L: 231
if (var1 != null && var3 != null) {
var21 = var1.applyTransformations(var18, var2, var3, var4);
} else if (var1 != null) { // L: 232
} else if (var1 != null) {
var21 = var1.transformActorModel(var18, var2);
} else {
var21 = var3.transformActorModel(var18, var4); // L: 233
var21 = var3.transformActorModel(var18, var4);
}
return var21; // L: 234
return var21;
}
}
}
@@ -410,61 +410,61 @@ public class PlayerComposition {
)
@Export("getModelData")
ModelData getModelData() {
if (this.npcTransformId != -1) { // L: 238
return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModelData(); // L: 239
if (this.npcTransformId != -1) {
return WorldMapLabelSize.getNpcDefinition(this.npcTransformId).getModelData();
} else {
boolean var1 = false; // L: 241
boolean var1 = false;
int var3;
for (int var2 = 0; var2 < 12; ++var2) { // L: 242
var3 = this.equipment[var2]; // L: 243
if (var3 >= 256 && var3 < 512 && !ArchiveDisk.KitDefinition_get(var3 - 256).method3210()) { // L: 244 245
for (int var2 = 0; var2 < 12; ++var2) {
var3 = this.equipment[var2];
if (var3 >= 256 && var3 < 512 && !ArchiveDisk.KitDefinition_get(var3 - 256).method3210()) {
var1 = true;
}
if (var3 >= 512 && !UserComparator6.ItemDefinition_get(var3 - 512).method3555(this.isFemale)) { // L: 247 248
if (var3 >= 512 && !UserComparator6.ItemDefinition_get(var3 - 512).method3555(this.isFemale)) {
var1 = true;
}
}
if (var1) { // L: 251
if (var1) {
return null;
} else {
ModelData[] var7 = new ModelData[12]; // L: 252
var3 = 0; // L: 253
ModelData[] var7 = new ModelData[12];
var3 = 0;
int var5;
for (int var4 = 0; var4 < 12; ++var4) { // L: 254
var5 = this.equipment[var4]; // L: 255
for (int var4 = 0; var4 < 12; ++var4) {
var5 = this.equipment[var4];
ModelData var6;
if (var5 >= 256 && var5 < 512) { // L: 256
var6 = ArchiveDisk.KitDefinition_get(var5 - 256).getKitDefinitionModels(); // L: 257
if (var6 != null) { // L: 258
if (var5 >= 256 && var5 < 512) {
var6 = ArchiveDisk.KitDefinition_get(var5 - 256).getKitDefinitionModels();
if (var6 != null) {
var7[var3++] = var6;
}
}
if (var5 >= 512) { // L: 260
var6 = UserComparator6.ItemDefinition_get(var5 - 512).method3601(this.isFemale); // L: 261
if (var6 != null) { // L: 262
if (var5 >= 512) {
var6 = UserComparator6.ItemDefinition_get(var5 - 512).method3601(this.isFemale);
if (var6 != null) {
var7[var3++] = var6;
}
}
}
ModelData var8 = new ModelData(var7, var3); // L: 265
ModelData var8 = new ModelData(var7, var3);
for (var5 = 0; var5 < 5; ++var5) { // L: 266
if (this.bodyColors[var5] < class114.field1382[var5].length) { // L: 267
for (var5 = 0; var5 < 5; ++var5) {
if (this.bodyColors[var5] < class114.field1382[var5].length) {
var8.recolor(field3197[var5], class114.field1382[var5][this.bodyColors[var5]]);
}
if (this.bodyColors[var5] < field3203[var5].length) { // L: 268
if (this.bodyColors[var5] < field3203[var5].length) {
var8.recolor(class132.field1540[var5], field3203[var5][this.bodyColors[var5]]);
}
}
return var8; // L: 270
return var8;
}
}
}
@@ -476,7 +476,7 @@ public class PlayerComposition {
)
@Export("getChatHeadId")
public int getChatHeadId() {
return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + WorldMapLabelSize.getNpcDefinition(this.npcTransformId).id; // L: 274 275
return this.npcTransformId == -1 ? (this.equipment[0] << 15) + this.equipment[1] + (this.equipment[11] << 5) + (this.equipment[8] << 10) + (this.bodyColors[0] << 25) + (this.bodyColors[4] << 20) : 305419896 + WorldMapLabelSize.getNpcDefinition(this.npcTransformId).id;
}
@ObfuscatedName("c")
@@ -487,36 +487,36 @@ public class PlayerComposition {
@Export("loadWorlds")
static boolean loadWorlds() {
try {
if (HorizontalAlignment.World_request == null) { // L: 31
if (HorizontalAlignment.World_request == null) {
HorizontalAlignment.World_request = WorldMapData_1.urlRequester.request(new URL(AbstractWorldMapIcon.field2761));
} else if (HorizontalAlignment.World_request.isDone()) { // L: 33
byte[] var0 = HorizontalAlignment.World_request.getResponse(); // L: 34
Buffer var1 = new Buffer(var0); // L: 35
var1.readInt(); // L: 36
World.World_count = var1.readUnsignedShort(); // L: 37
class334.World_worlds = new World[World.World_count]; // L: 38
} else if (HorizontalAlignment.World_request.isDone()) {
byte[] var0 = HorizontalAlignment.World_request.getResponse();
Buffer var1 = new Buffer(var0);
var1.readInt();
World.World_count = var1.readUnsignedShort();
class334.World_worlds = new World[World.World_count];
World var3;
for (int var2 = 0; var2 < World.World_count; var3.index = var2++) { // L: 39 47
var3 = class334.World_worlds[var2] = new World(); // L: 40
var3.id = var1.readUnsignedShort(); // L: 41
var3.properties = var1.readInt(); // L: 42
var3.host = var1.readStringCp1252NullTerminated(); // L: 43
for (int var2 = 0; var2 < World.World_count; var3.index = var2++) {
var3 = class334.World_worlds[var2] = new World();
var3.id = var1.readUnsignedShort();
var3.properties = var1.readInt();
var3.host = var1.readStringCp1252NullTerminated();
var3.activity = var1.readStringCp1252NullTerminated();
var3.location = var1.readUnsignedByte();
var3.population = var1.readShort();
}
UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2); // L: 49
HorizontalAlignment.World_request = null; // L: 50
return true; // L: 51
UserComparator4.sortWorlds(class334.World_worlds, 0, class334.World_worlds.length - 1, World.World_sortOption1, World.World_sortOption2);
HorizontalAlignment.World_request = null;
return true;
}
} catch (Exception var4) { // L: 55
var4.printStackTrace(); // L: 56
HorizontalAlignment.World_request = null; // L: 57
} catch (Exception var4) {
var4.printStackTrace();
HorizontalAlignment.World_request = null;
}
return false; // L: 59
return false;
}
@ObfuscatedName("t")
@@ -526,7 +526,7 @@ public class PlayerComposition {
)
@Export("Messages_getHistorySize")
static int Messages_getHistorySize(int var0) {
ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0); // L: 44
return var1 == null ? 0 : var1.size(); // L: 45 46
ChatChannel var1 = (ChatChannel)Messages.Messages_channels.get(var0);
return var1 == null ? 0 : var1.size();
}
}