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

@@ -198,26 +198,26 @@ public class NPCComposition extends DualNode {
this.idleSequence = -1;
this.turnLeftSequence = -1;
this.turnRightSequence = -1;
this.walkSequence = -1; // L: 28
this.walkBackSequence = -1; // L: 29
this.walkLeftSequence = -1; // L: 30
this.walkRightSequence = -1; // L: 31
this.actions = new String[5]; // L: 36
this.drawMapDot = true; // L: 37
this.combatLevel = -1; // L: 38
this.widthScale = 128; // L: 39
this.heightScale = 128; // L: 40
this.isVisible = false; // L: 41
this.ambient = 0; // L: 42
this.contrast = 0; // L: 43
this.headIconPrayer = -1; // L: 44
this.rotation = 32; // L: 45
this.transformVarbit = -1; // L: 47
this.transformVarp = -1; // L: 48
this.isInteractable = true; // L: 49
this.isClickable = true; // L: 50
this.isFollower = false; // L: 51
} // L: 54
this.walkSequence = -1;
this.walkBackSequence = -1;
this.walkLeftSequence = -1;
this.walkRightSequence = -1;
this.actions = new String[5];
this.drawMapDot = true;
this.combatLevel = -1;
this.widthScale = 128;
this.heightScale = 128;
this.isVisible = false;
this.ambient = 0;
this.contrast = 0;
this.headIconPrayer = -1;
this.rotation = 32;
this.transformVarbit = -1;
this.transformVarp = -1;
this.isInteractable = true;
this.isClickable = true;
this.isFollower = false;
}
@ObfuscatedName("p")
@ObfuscatedSignature(
@@ -226,7 +226,7 @@ public class NPCComposition extends DualNode {
)
@Export("postDecode")
void postDecode() {
} // L: 73
}
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -236,12 +236,12 @@ public class NPCComposition extends DualNode {
@Export("decode")
void decode(Buffer var1) {
while (true) {
int var2 = var1.readUnsignedByte(); // L: 77
if (var2 == 0) { // L: 78
return; // L: 81
int var2 = var1.readUnsignedByte();
if (var2 == 0) {
return;
}
this.decodeNext(var1, var2); // L: 79
this.decodeNext(var1, var2);
}
}
@@ -254,123 +254,123 @@ public class NPCComposition extends DualNode {
void decodeNext(Buffer var1, int var2) {
int var3;
int var4;
if (var2 == 1) { // L: 84
var3 = var1.readUnsignedByte(); // L: 85
this.models = new int[var3]; // L: 86
if (var2 == 1) {
var3 = var1.readUnsignedByte();
this.models = new int[var3];
for (var4 = 0; var4 < var3; ++var4) { // L: 87
for (var4 = 0; var4 < var3; ++var4) {
this.models[var4] = var1.readUnsignedShort();
}
} else if (var2 == 2) { // L: 89
} else if (var2 == 2) {
this.name = var1.readStringCp1252NullTerminated();
} else if (var2 == 12) { // L: 90
} else if (var2 == 12) {
this.size = var1.readUnsignedByte();
} else if (var2 == 13) { // L: 91
} else if (var2 == 13) {
this.idleSequence = var1.readUnsignedShort();
} else if (var2 == 14) { // L: 92
} else if (var2 == 14) {
this.walkSequence = var1.readUnsignedShort();
} else if (var2 == 15) { // L: 93
} else if (var2 == 15) {
this.turnLeftSequence = var1.readUnsignedShort();
} else if (var2 == 16) { // L: 94
} else if (var2 == 16) {
this.turnRightSequence = var1.readUnsignedShort();
} else if (var2 == 17) { // L: 95
this.walkSequence = var1.readUnsignedShort(); // L: 96
this.walkBackSequence = var1.readUnsignedShort(); // L: 97
this.walkLeftSequence = var1.readUnsignedShort(); // L: 98
this.walkRightSequence = var1.readUnsignedShort(); // L: 99
} else if (var2 == 18) { // L: 101
var1.readUnsignedShort(); // L: 102
} else if (var2 >= 30 && var2 < 35) { // L: 104
this.actions[var2 - 30] = var1.readStringCp1252NullTerminated(); // L: 105
if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) { // L: 106
} else if (var2 == 17) {
this.walkSequence = var1.readUnsignedShort();
this.walkBackSequence = var1.readUnsignedShort();
this.walkLeftSequence = var1.readUnsignedShort();
this.walkRightSequence = var1.readUnsignedShort();
} else if (var2 == 18) {
var1.readUnsignedShort();
} else if (var2 >= 30 && var2 < 35) {
this.actions[var2 - 30] = var1.readStringCp1252NullTerminated();
if (this.actions[var2 - 30].equalsIgnoreCase("Hidden")) {
this.actions[var2 - 30] = null;
}
} else if (var2 == 40) { // L: 108
var3 = var1.readUnsignedByte(); // L: 109
this.recolorFrom = new short[var3]; // L: 110
this.recolorTo = new short[var3]; // L: 111
} else if (var2 == 40) {
var3 = var1.readUnsignedByte();
this.recolorFrom = new short[var3];
this.recolorTo = new short[var3];
for (var4 = 0; var4 < var3; ++var4) { // L: 112
this.recolorFrom[var4] = (short)var1.readUnsignedShort(); // L: 113
this.recolorTo[var4] = (short)var1.readUnsignedShort(); // L: 114
for (var4 = 0; var4 < var3; ++var4) {
this.recolorFrom[var4] = (short)var1.readUnsignedShort();
this.recolorTo[var4] = (short)var1.readUnsignedShort();
}
} else if (var2 == 41) { // L: 117
var3 = var1.readUnsignedByte(); // L: 118
this.retextureFrom = new short[var3]; // L: 119
this.retextureTo = new short[var3]; // L: 120
} else if (var2 == 41) {
var3 = var1.readUnsignedByte();
this.retextureFrom = new short[var3];
this.retextureTo = new short[var3];
for (var4 = 0; var4 < var3; ++var4) { // L: 121
this.retextureFrom[var4] = (short)var1.readUnsignedShort(); // L: 122
this.retextureTo[var4] = (short)var1.readUnsignedShort(); // L: 123
for (var4 = 0; var4 < var3; ++var4) {
this.retextureFrom[var4] = (short)var1.readUnsignedShort();
this.retextureTo[var4] = (short)var1.readUnsignedShort();
}
} else if (var2 == 60) { // L: 126
var3 = var1.readUnsignedByte(); // L: 127
this.field1868 = new int[var3]; // L: 128
} else if (var2 == 60) {
var3 = var1.readUnsignedByte();
this.field1868 = new int[var3];
for (var4 = 0; var4 < var3; ++var4) { // L: 129
for (var4 = 0; var4 < var3; ++var4) {
this.field1868[var4] = var1.readUnsignedShort();
}
} else if (var2 == 93) { // L: 131
} else if (var2 == 93) {
this.drawMapDot = false;
} else if (var2 == 95) { // L: 132
} else if (var2 == 95) {
this.combatLevel = var1.readUnsignedShort();
} else if (var2 == 97) { // L: 133
} else if (var2 == 97) {
this.widthScale = var1.readUnsignedShort();
} else if (var2 == 98) { // L: 134
} else if (var2 == 98) {
this.heightScale = var1.readUnsignedShort();
} else if (var2 == 99) { // L: 135
} else if (var2 == 99) {
this.isVisible = true;
} else if (var2 == 100) { // L: 136
} else if (var2 == 100) {
this.ambient = var1.readByte();
} else if (var2 == 101) { // L: 137
} else if (var2 == 101) {
this.contrast = var1.readByte() * 5;
} else if (var2 == 102) { // L: 138
} else if (var2 == 102) {
this.headIconPrayer = var1.readUnsignedShort();
} else if (var2 == 103) { // L: 139
} else if (var2 == 103) {
this.rotation = var1.readUnsignedShort();
} else if (var2 != 106 && var2 != 118) { // L: 140
if (var2 == 107) { // L: 158
} else if (var2 != 106 && var2 != 118) {
if (var2 == 107) {
this.isInteractable = false;
} else if (var2 == 109) { // L: 159
} else if (var2 == 109) {
this.isClickable = false;
} else if (var2 == 111) { // L: 160
} else if (var2 == 111) {
this.isFollower = true;
} else if (var2 == 249) { // L: 161
} else if (var2 == 249) {
this.params = Canvas.readStringIntParameters(var1, this.params);
}
} else {
this.transformVarbit = var1.readUnsignedShort(); // L: 141
this.transformVarbit = var1.readUnsignedShort();
if (this.transformVarbit == 65535) {
this.transformVarbit = -1; // L: 142
this.transformVarbit = -1;
}
this.transformVarp = var1.readUnsignedShort(); // L: 143
if (this.transformVarp == 65535) { // L: 144
this.transformVarp = var1.readUnsignedShort();
if (this.transformVarp == 65535) {
this.transformVarp = -1;
}
var3 = -1; // L: 145
if (var2 == 118) { // L: 146
var3 = var1.readUnsignedShort(); // L: 147
if (var3 == 65535) { // L: 148
var3 = -1;
if (var2 == 118) {
var3 = var1.readUnsignedShort();
if (var3 == 65535) {
var3 = -1;
}
}
var4 = var1.readUnsignedByte(); // L: 150
this.transforms = new int[var4 + 2]; // L: 151
var4 = var1.readUnsignedByte();
this.transforms = new int[var4 + 2];
for (int var5 = 0; var5 <= var4; ++var5) { // L: 152
this.transforms[var5] = var1.readUnsignedShort(); // L: 153
if (this.transforms[var5] == 65535) { // L: 154
for (int var5 = 0; var5 <= var4; ++var5) {
this.transforms[var5] = var1.readUnsignedShort();
if (this.transforms[var5] == 65535) {
this.transforms[var5] = -1;
}
}
this.transforms[var4 + 1] = var3; // L: 156
this.transforms[var4 + 1] = var3;
}
} // L: 163
}
@ObfuscatedName("s")
@ObfuscatedSignature(
@@ -379,9 +379,9 @@ public class NPCComposition extends DualNode {
)
@Export("getModel")
public final Model getModel(SequenceDefinition var1, int var2, SequenceDefinition var3, int var4) {
if (this.transforms != null) { // L: 166
NPCComposition var12 = this.transform(); // L: 167
return var12 == null ? null : var12.getModel(var1, var2, var3, var4); // L: 168
if (this.transforms != null) {
NPCComposition var12 = this.transform();
return var12 == null ? null : var12.getModel(var1, var2, var3, var4);
} else {
Model var5 = (Model)NpcDefinition_cachedModels.get((long)this.id);
if (var5 == null) {
@@ -393,56 +393,56 @@ public class NPCComposition extends DualNode {
}
}
if (var6) { // L: 175
if (var6) {
return null;
}
ModelData[] var8 = new ModelData[this.models.length]; // L: 177
ModelData[] var8 = new ModelData[this.models.length];
int var9;
for (var9 = 0; var9 < this.models.length; ++var9) { // L: 178
for (var9 = 0; var9 < this.models.length; ++var9) {
var8[var9] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.models[var9], 0);
}
ModelData var10;
if (var8.length == 1) { // L: 179
if (var8.length == 1) {
var10 = var8[0];
} else {
var10 = new ModelData(var8, var8.length); // L: 180
var10 = new ModelData(var8, var8.length);
}
if (this.recolorFrom != null) { // L: 181
for (var9 = 0; var9 < this.recolorFrom.length; ++var9) { // L: 182
var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]); // L: 183
if (this.recolorFrom != null) {
for (var9 = 0; var9 < this.recolorFrom.length; ++var9) {
var10.recolor(this.recolorFrom[var9], this.recolorTo[var9]);
}
}
if (this.retextureFrom != null) { // L: 186
for (var9 = 0; var9 < this.retextureFrom.length; ++var9) { // L: 187
var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]); // L: 188
if (this.retextureFrom != null) {
for (var9 = 0; var9 < this.retextureFrom.length; ++var9) {
var10.retexture(this.retextureFrom[var9], this.retextureTo[var9]);
}
}
var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30); // L: 191
NpcDefinition_cachedModels.put(var5, (long)this.id); // L: 192
var5 = var10.toModel(this.ambient + 64, this.contrast + 850, -30, -50, -30);
NpcDefinition_cachedModels.put(var5, (long)this.id);
}
Model var11;
if (var1 != null && var3 != null) { // L: 195
if (var1 != null && var3 != null) {
var11 = var1.applyTransformations(var5, var2, var3, var4);
} else if (var1 != null) { // L: 196
} else if (var1 != null) {
var11 = var1.transformActorModel(var5, var2);
} else if (var3 != null) { // L: 197
} else if (var3 != null) {
var11 = var3.transformActorModel(var5, var4);
} else {
var11 = var5.toSharedSequenceModel(true); // L: 198
var11 = var5.toSharedSequenceModel(true);
}
if (this.widthScale != 128 || this.heightScale != 128) { // L: 199
if (this.widthScale != 128 || this.heightScale != 128) {
var11.scale(this.widthScale, this.heightScale, this.widthScale);
}
return var11; // L: 200
return var11;
}
}
@@ -453,50 +453,50 @@ public class NPCComposition extends DualNode {
)
@Export("getModelData")
public final ModelData getModelData() {
if (this.transforms != null) { // L: 204
NPCComposition var7 = this.transform(); // L: 205
return var7 == null ? null : var7.getModelData(); // L: 206 207
} else if (this.field1868 == null) { // L: 209
if (this.transforms != null) {
NPCComposition var7 = this.transform();
return var7 == null ? null : var7.getModelData();
} else if (this.field1868 == null) {
return null;
} else {
boolean var1 = false; // L: 210
boolean var1 = false;
for (int var2 = 0; var2 < this.field1868.length; ++var2) { // L: 211
for (int var2 = 0; var2 < this.field1868.length; ++var2) {
if (!NpcDefinition_modelArchive.tryLoadFile(this.field1868[var2], 0)) {
var1 = true;
}
}
if (var1) { // L: 212
if (var1) {
return null;
} else {
ModelData[] var5 = new ModelData[this.field1868.length]; // L: 213
ModelData[] var5 = new ModelData[this.field1868.length];
for (int var3 = 0; var3 < this.field1868.length; ++var3) { // L: 214
for (int var3 = 0; var3 < this.field1868.length; ++var3) {
var5[var3] = ModelData.ModelData_get(NpcDefinition_modelArchive, this.field1868[var3], 0);
}
ModelData var6;
if (var5.length == 1) {
var6 = var5[0]; // L: 216
var6 = var5[0];
} else {
var6 = new ModelData(var5, var5.length); // L: 217
var6 = new ModelData(var5, var5.length);
}
int var4;
if (this.recolorFrom != null) { // L: 218
for (var4 = 0; var4 < this.recolorFrom.length; ++var4) { // L: 219
var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]); // L: 220
if (this.recolorFrom != null) {
for (var4 = 0; var4 < this.recolorFrom.length; ++var4) {
var6.recolor(this.recolorFrom[var4], this.recolorTo[var4]);
}
}
if (this.retextureFrom != null) { // L: 223
for (var4 = 0; var4 < this.retextureFrom.length; ++var4) { // L: 224
var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]); // L: 225
if (this.retextureFrom != null) {
for (var4 = 0; var4 < this.retextureFrom.length; ++var4) {
var6.retexture(this.retextureFrom[var4], this.retextureTo[var4]);
}
}
return var6; // L: 228
return var6;
}
}
}
@@ -508,21 +508,21 @@ public class NPCComposition extends DualNode {
)
@Export("transform")
public final NPCComposition transform() {
int var1 = -1; // L: 232
if (this.transformVarbit != -1) { // L: 233
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = class273.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { // L: 234
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
int var2;
if (var1 >= 0 && var1 < this.transforms.length - 1) { // L: 236
var2 = this.transforms[var1]; // L: 237
if (var1 >= 0 && var1 < this.transforms.length - 1) {
var2 = this.transforms[var1];
} else {
var2 = this.transforms[this.transforms.length - 1];
}
return var2 != -1 ? WorldMapLabelSize.getNpcDefinition(var2) : null; // L: 238 239
return var2 != -1 ? WorldMapLabelSize.getNpcDefinition(var2) : null;
}
@ObfuscatedName("n")
@@ -532,18 +532,18 @@ public class NPCComposition extends DualNode {
)
@Export("transformIsVisible")
public boolean transformIsVisible() {
if (this.transforms == null) { // L: 243
if (this.transforms == null) {
return true;
} else {
int var1 = -1; // L: 244
if (this.transformVarbit != -1) { // L: 245
int var1 = -1;
if (this.transformVarbit != -1) {
var1 = class273.getVarbit(this.transformVarbit);
} else if (this.transformVarp != -1) { // L: 246
} else if (this.transformVarp != -1) {
var1 = Varps.Varps_main[this.transformVarp];
}
if (var1 >= 0 && var1 < this.transforms.length) { // L: 247
return this.transforms[var1] != -1; // L: 248
if (var1 >= 0 && var1 < this.transforms.length) {
return this.transforms[var1] != -1;
} else {
return this.transforms[this.transforms.length - 1] != -1;
}
@@ -557,7 +557,7 @@ public class NPCComposition extends DualNode {
)
@Export("getIntParam")
public int getIntParam(int var1, int var2) {
return class12.method158(this.params, var1, var2); // L: 252
return class12.method158(this.params, var1, var2);
}
@ObfuscatedName("o")
@@ -567,7 +567,7 @@ public class NPCComposition extends DualNode {
)
@Export("getStringParam")
public String getStringParam(int var1, String var2) {
return Skeleton.method3948(this.params, var1, var2); // L: 256
return Skeleton.method3948(this.params, var1, var2);
}
@ObfuscatedName("c")
@@ -576,17 +576,17 @@ public class NPCComposition extends DualNode {
garbageValue = "1930490534"
)
static void method3321(int var0, byte[] var1, ArchiveDisk var2) {
ArchiveDiskAction var3 = new ArchiveDiskAction(); // L: 18
var3.type = 0; // L: 19
var3.key = (long)var0; // L: 20
var3.data = var1; // L: 21
var3.archiveDisk = var2; // L: 22
synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) { // L: 23
ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3); // L: 24
} // L: 25
ArchiveDiskAction var3 = new ArchiveDiskAction();
var3.type = 0;
var3.key = (long)var0;
var3.data = var1;
var3.archiveDisk = var2;
synchronized(ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue) {
ArchiveDiskActionHandler.ArchiveDiskActionHandler_requestQueue.addFirst(var3);
}
class174.method3383(); // L: 26
} // L: 27
class174.method3383();
}
@ObfuscatedName("m")
@ObfuscatedSignature(
@@ -595,14 +595,14 @@ public class NPCComposition extends DualNode {
)
@Export("isKeyDown")
public static final boolean isKeyDown() {
synchronized(KeyHandler.KeyHandler_instance) { // L: 169
if (KeyHandler.field143 == KeyHandler.field145) { // L: 170
synchronized(KeyHandler.KeyHandler_instance) {
if (KeyHandler.field143 == KeyHandler.field145) {
return false;
} else {
Players.field1247 = KeyHandler.field131[KeyHandler.field143]; // L: 171
ModeWhere.field3954 = KeyHandler.field137[KeyHandler.field143]; // L: 172
KeyHandler.field143 = KeyHandler.field143 + 1 & 127; // L: 173
return true; // L: 174
Players.field1247 = KeyHandler.field131[KeyHandler.field143];
ModeWhere.field3954 = KeyHandler.field137[KeyHandler.field143];
KeyHandler.field143 = KeyHandler.field143 + 1 & 127;
return true;
}
}
}