chore: revision 189
This commit is contained in:
@@ -2,16 +2,20 @@ import net.runelite.mapping.Export;
|
||||
import net.runelite.mapping.Implements;
|
||||
import net.runelite.mapping.ObfuscatedName;
|
||||
import net.runelite.mapping.ObfuscatedSignature;
|
||||
import net.runelite.rs.ScriptOpcodes;
|
||||
|
||||
@ObfuscatedName("cg")
|
||||
@ObfuscatedName("cd")
|
||||
@Implements("NPC")
|
||||
public final class NPC extends Actor {
|
||||
@ObfuscatedName("i")
|
||||
@Export("SpriteBuffer_yOffsets")
|
||||
public static int[] SpriteBuffer_yOffsets;
|
||||
@ObfuscatedName("c")
|
||||
@ObfuscatedName("di")
|
||||
@ObfuscatedSignature(
|
||||
signature = "Liz;"
|
||||
signature = "Lih;"
|
||||
)
|
||||
@Export("archive13")
|
||||
static Archive archive13;
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedSignature(
|
||||
signature = "Ljj;"
|
||||
)
|
||||
@Export("definition")
|
||||
NPCDefinition definition;
|
||||
@@ -19,12 +23,12 @@ public final class NPC extends Actor {
|
||||
NPC() {
|
||||
}
|
||||
|
||||
@ObfuscatedName("c")
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IBI)V",
|
||||
garbageValue = "-1099283793"
|
||||
garbageValue = "1357831491"
|
||||
)
|
||||
final void method2083(int var1, byte var2) {
|
||||
final void method2133(int var1, byte var2) {
|
||||
int var3 = super.pathX[0];
|
||||
int var4 = super.pathY[0];
|
||||
if (var1 == 0) {
|
||||
@@ -63,7 +67,7 @@ public final class NPC extends Actor {
|
||||
--var4;
|
||||
}
|
||||
|
||||
if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) {
|
||||
if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) {
|
||||
super.sequence = -1;
|
||||
}
|
||||
|
||||
@@ -82,13 +86,13 @@ public final class NPC extends Actor {
|
||||
super.pathTraversed[0] = var2;
|
||||
}
|
||||
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedName("m")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIZB)V",
|
||||
garbageValue = "0"
|
||||
garbageValue = "88"
|
||||
)
|
||||
final void method2077(int var1, int var2, boolean var3) {
|
||||
if (super.sequence != -1 && GraphicsDefaults.SequenceDefinition_get(super.sequence).field3524 == 1) {
|
||||
final void method2136(int var1, int var2, boolean var3) {
|
||||
if (super.sequence != -1 && SpotAnimationDefinition.SequenceDefinition_get(super.sequence).field3524 == 1) {
|
||||
super.sequence = -1;
|
||||
}
|
||||
|
||||
@@ -114,26 +118,26 @@ public final class NPC extends Actor {
|
||||
}
|
||||
|
||||
super.pathLength = 0;
|
||||
super.field998 = 0;
|
||||
super.field997 = 0;
|
||||
super.field1032 = 0;
|
||||
super.field1031 = 0;
|
||||
super.pathX[0] = var1;
|
||||
super.pathY[0] = var2;
|
||||
super.x = super.pathX[0] * 128 + super.field942 * 2013925376;
|
||||
super.y = super.pathY[0] * 128 + super.field942 * 2013925376;
|
||||
super.x = super.field976 * 64 + super.pathX[0] * 128;
|
||||
super.y = super.field976 * 64 + super.pathY[0] * 128;
|
||||
}
|
||||
|
||||
@ObfuscatedName("j")
|
||||
@ObfuscatedName("t")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)Ldx;",
|
||||
garbageValue = "-2133076860"
|
||||
signature = "(I)Lel;",
|
||||
garbageValue = "480835067"
|
||||
)
|
||||
@Export("getModel")
|
||||
protected final Model getModel() {
|
||||
if (this.definition == null) {
|
||||
return null;
|
||||
} else {
|
||||
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? GraphicsDefaults.SequenceDefinition_get(super.sequence) : null;
|
||||
SequenceDefinition var2 = super.movementSequence != -1 && (super.movementSequence != super.readySequence || var1 == null) ? GraphicsDefaults.SequenceDefinition_get(super.movementSequence) : null;
|
||||
SequenceDefinition var1 = super.sequence != -1 && super.sequenceDelay == 0 ? SpotAnimationDefinition.SequenceDefinition_get(super.sequence) : null;
|
||||
SequenceDefinition var2 = super.movementSequence != -1 && (super.readySequence != super.movementSequence || var1 == null) ? SpotAnimationDefinition.SequenceDefinition_get(super.movementSequence) : null;
|
||||
Model var3 = this.definition.getModel(var1, super.sequenceFrame, var2, super.movementFrame);
|
||||
if (var3 == null) {
|
||||
return null;
|
||||
@@ -141,9 +145,9 @@ public final class NPC extends Actor {
|
||||
var3.calculateBoundsCylinder();
|
||||
super.defaultHeight = var3.height;
|
||||
if (super.spotAnimation != -1 && super.spotAnimationFrame != -1) {
|
||||
Model var4 = class65.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
|
||||
Model var4 = MouseHandler.SpotAnimationDefinition_get(super.spotAnimation).getModel(super.spotAnimationFrame);
|
||||
if (var4 != null) {
|
||||
var4.offsetBy(0, -super.field980, 0);
|
||||
var4.offsetBy(0, -super.field1033, 0);
|
||||
Model[] var5 = new Model[]{var3, var4};
|
||||
var3 = new Model(var5, 2);
|
||||
}
|
||||
@@ -158,146 +162,123 @@ public final class NPC extends Actor {
|
||||
}
|
||||
}
|
||||
|
||||
@ObfuscatedName("v")
|
||||
@ObfuscatedName("n")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)Z",
|
||||
garbageValue = "-515224238"
|
||||
garbageValue = "116176402"
|
||||
)
|
||||
@Export("isVisible")
|
||||
final boolean isVisible() {
|
||||
return this.definition != null;
|
||||
}
|
||||
|
||||
@ObfuscatedName("e")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(II)Z",
|
||||
garbageValue = "-728200028"
|
||||
)
|
||||
public static boolean method2088(int var0) {
|
||||
return (var0 >> 21 & 1) != 0;
|
||||
}
|
||||
|
||||
@ObfuscatedName("x")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(I)V",
|
||||
garbageValue = "-213957915"
|
||||
)
|
||||
static void method2079() {
|
||||
Login.loginIndex = 24;
|
||||
Tiles.setLoginResponseString("The game servers are currently being updated.", "Please wait a few minutes and try again.", "");
|
||||
public static final int method2146(double var0, double var2, double var4) {
|
||||
double var6 = var4;
|
||||
double var8 = var4;
|
||||
double var10 = var4;
|
||||
if (0.0D != var2) {
|
||||
double var12;
|
||||
if (var4 < 0.5D) {
|
||||
var12 = (1.0D + var2) * var4;
|
||||
} else {
|
||||
var12 = var2 + var4 - var4 * var2;
|
||||
}
|
||||
|
||||
double var14 = var4 * 2.0D - var12;
|
||||
double var16 = var0 + 0.3333333333333333D;
|
||||
if (var16 > 1.0D) {
|
||||
--var16;
|
||||
}
|
||||
|
||||
double var20 = var0 - 0.3333333333333333D;
|
||||
if (var20 < 0.0D) {
|
||||
++var20;
|
||||
}
|
||||
|
||||
if (var16 * 6.0D < 1.0D) {
|
||||
var6 = var14 + var16 * (var12 - var14) * 6.0D;
|
||||
} else if (var16 * 2.0D < 1.0D) {
|
||||
var6 = var12;
|
||||
} else if (var16 * 3.0D < 2.0D) {
|
||||
var6 = (var12 - var14) * (0.6666666666666666D - var16) * 6.0D + var14;
|
||||
} else {
|
||||
var6 = var14;
|
||||
}
|
||||
|
||||
if (var0 * 6.0D < 1.0D) {
|
||||
var8 = var14 + (var12 - var14) * 6.0D * var0;
|
||||
} else if (var0 * 2.0D < 1.0D) {
|
||||
var8 = var12;
|
||||
} else if (3.0D * var0 < 2.0D) {
|
||||
var8 = var14 + (var12 - var14) * (0.6666666666666666D - var0) * 6.0D;
|
||||
} else {
|
||||
var8 = var14;
|
||||
}
|
||||
|
||||
if (var20 * 6.0D < 1.0D) {
|
||||
var10 = var14 + 6.0D * (var12 - var14) * var20;
|
||||
} else if (var20 * 2.0D < 1.0D) {
|
||||
var10 = var12;
|
||||
} else if (3.0D * var20 < 2.0D) {
|
||||
var10 = (var12 - var14) * (0.6666666666666666D - var20) * 6.0D + var14;
|
||||
} else {
|
||||
var10 = var14;
|
||||
}
|
||||
}
|
||||
|
||||
int var22 = (int)(var6 * 256.0D);
|
||||
int var13 = (int)(var8 * 256.0D);
|
||||
int var23 = (int)(var10 * 256.0D);
|
||||
int var15 = var23 + (var13 << 8) + (var22 << 16);
|
||||
return var15;
|
||||
}
|
||||
|
||||
@ObfuscatedName("ib")
|
||||
@ObfuscatedName("h")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(IIIILjava/lang/String;I)V",
|
||||
garbageValue = "-1867991224"
|
||||
signature = "(ILce;ZI)I",
|
||||
garbageValue = "-1441905186"
|
||||
)
|
||||
@Export("widgetDefaultMenuAction")
|
||||
static void widgetDefaultMenuAction(int var0, int var1, int var2, int var3, String var4) {
|
||||
Widget var5 = SpriteMask.getWidgetChild(var1, var2);
|
||||
if (var5 != null) {
|
||||
if (var5.onOp != null) {
|
||||
ScriptEvent var6 = new ScriptEvent();
|
||||
var6.widget = var5;
|
||||
var6.opIndex = var0;
|
||||
var6.targetName = var4;
|
||||
var6.args = var5.onOp;
|
||||
class4.runScriptEvent(var6);
|
||||
static int method2147(int var0, Script var1, boolean var2) {
|
||||
Widget var3 = var2 ? GrandExchangeOfferNameComparator.field115 : Interpreter.field1130;
|
||||
if (var0 == ScriptOpcodes.CC_GETINVOBJECT) {
|
||||
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemId;
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.CC_GETINVCOUNT) {
|
||||
if (var3.itemId != -1) {
|
||||
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.itemQuantity;
|
||||
} else {
|
||||
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = 0;
|
||||
}
|
||||
|
||||
boolean var11 = true;
|
||||
if (var5.contentType > 0) {
|
||||
var11 = BufferedSink.method5915(var5);
|
||||
}
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.CC_GETID) {
|
||||
Interpreter.Interpreter_intStack[++Interpreter.Interpreter_intStackSize - 1] = var3.childIndex;
|
||||
return 1;
|
||||
} else {
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
|
||||
if (var11) {
|
||||
int var8 = WorldMapIcon_0.getWidgetClickMask(var5);
|
||||
int var9 = var0 - 1;
|
||||
boolean var7 = (var8 >> var9 + 1 & 1) != 0;
|
||||
if (var7) {
|
||||
PacketBufferNode var10;
|
||||
if (var0 == 1) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2234, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 2) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2209, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 3) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2205, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 4) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2273, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 5) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2237, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 6) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2257, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 7) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2204, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 8) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2254, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 9) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2212, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
if (var0 == 10) {
|
||||
var10 = TilePaint.getPacketBufferNode(ClientPacket.field2303, Client.packetWriter.isaacCipher);
|
||||
var10.packetBuffer.writeInt(var1);
|
||||
var10.packetBuffer.writeShort(var2);
|
||||
var10.packetBuffer.writeShort(var3);
|
||||
Client.packetWriter.addNode(var10);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
@ObfuscatedName("an")
|
||||
@ObfuscatedSignature(
|
||||
signature = "(ILce;ZB)I",
|
||||
garbageValue = "-41"
|
||||
)
|
||||
static int method2145(int var0, Script var1, boolean var2) {
|
||||
if (var0 == ScriptOpcodes.SOUND_SYNTH) {
|
||||
Interpreter.Interpreter_intStackSize -= 3;
|
||||
ModelData0.queueSoundEffect(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 2]);
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.SOUND_SONG) {
|
||||
StudioGame.playSong(Interpreter.Interpreter_intStack[--Interpreter.Interpreter_intStackSize]);
|
||||
return 1;
|
||||
} else if (var0 == ScriptOpcodes.SOUND_JINGLE) {
|
||||
Interpreter.Interpreter_intStackSize -= 2;
|
||||
VerticalAlignment.playSoundJingle(Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize], Interpreter.Interpreter_intStack[Interpreter.Interpreter_intStackSize + 1]);
|
||||
return 1;
|
||||
} else {
|
||||
return 2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user