ra/runelite
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

rs-client: refactoring (#1344)

Browse Source 
* Rename some things to be more consistent everywhere

* rs-client: refactoring

* MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
2019-08-20 22:24:51 +02:00
committed by GitHub
parent 0f46656e9d
commit db705f5dd5
297 changed files with 13734 additions and 14043 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
runescape-client/src/main/java/Friend.java
View File

@@ -83,78 +83,79 @@ public class Friend extends Buddy {
garbageValue = "230469601"
)
static final void method5226(Actor var0) {
if (var0.field948 != 0) {
if (var0.targetIndex != -1) {
Object var1 = null;
if (var0.targetIndex < 32768) {
var1 = Client.npcs[var0.targetIndex];
} else if (var0.targetIndex >= 32768) {
var1 = Client.players[var0.targetIndex - 32768];
}
if (var1 != null) {
int var2 = var0.x - ((Actor)var1).x;
int var3 = var0.y - ((Actor)var1).y;
if (var2 != 0 || var3 != 0) {
var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
}
} else if (var0.false0) {
var0.targetIndex = -1;
var0.false0 = false;
}
if (var0.field948 == 0) {
return;
}
if (var0.targetIndex != -1) {
Object var1 = null;
if (var0.targetIndex < 32768) {
var1 = Client.npcs[var0.targetIndex];
} else if (var0.targetIndex >= 32768) {
var1 = Client.players[var0.targetIndex - 32768];
}
if (var0.field976 != -1 && (var0.pathLength == 0 || var0.field1007 > 0)) {
var0.orientation = var0.field976;
var0.field976 = -1;
}
int var4 = var0.orientation - var0.field950 & 2047;
if (var4 == 0 && var0.false0) {
if (var1 != null) {
int var2 = var0.x - ((Actor)var1).x;
int var3 = var0.y - ((Actor)var1).y;
if (var2 != 0 || var3 != 0) {
var0.orientation = (int)(Math.atan2((double)var2, (double)var3) * 325.949D) & 2047;
}
} else if (var0.false0) {
var0.targetIndex = -1;
var0.false0 = false;
}
}
if (var4 != 0) {
++var0.field1009;
boolean var6;
if (var4 > 1024) {
var0.field950 -= var0.field948;
var6 = true;
if (var4 < var0.field948 || var4 > 2048 - var0.field948) {
var0.field950 = var0.orientation;
var6 = false;
}
if (var0.field976 != -1 && (var0.pathLength == 0 || var0.field1007 > 0)) {
var0.orientation = var0.field976;
var0.field976 = -1;
}
if (var0.movementSequence == var0.readySequence && (var0.field1009 > 25 || var6)) {
if (var0.turnLeftSequence != -1) {
var0.movementSequence = var0.turnLeftSequence;
} else {
var0.movementSequence = var0.walkSequence;
}
}
} else {
var0.field950 += var0.field948;
var6 = true;
if (var4 < var0.field948 || var4 > 2048 - var0.field948) {
var0.field950 = var0.orientation;
var6 = false;
}
int var4 = var0.orientation - var0.rotation & 2047;
if (var4 == 0 && var0.false0) {
var0.targetIndex = -1;
var0.false0 = false;
}
if (var0.readySequence == var0.movementSequence && (var0.field1009 > 25 || var6)) {
if (var0.turnRightSequence != -1) {
var0.movementSequence = var0.turnRightSequence;
} else {
var0.movementSequence = var0.walkSequence;
}
}
}
var0.field950 &= 2047;
} else {
var0.field1009 = 0;
if (var4 == 0) {
var0.field1009 = 0;
return;
}
++var0.field1009;
boolean var6;
if (var4 > 1024) {
var0.rotation -= var0.field948;
var6 = true;
if (var4 < var0.field948 || var4 > 2048 - var0.field948) {
var0.rotation = var0.orientation;
var6 = false;
}
if (var0.movementSequence == var0.readySequence && (var0.field1009 > 25 || var6)) {
if (var0.turnLeftSequence != -1) {
var0.movementSequence = var0.turnLeftSequence;
} else {
var0.movementSequence = var0.walkSequence;
}
}
} else {
var0.rotation += var0.field948;
var6 = true;
if (var4 < var0.field948 || var4 > 2048 - var0.field948) {
var0.rotation = var0.orientation;
var6 = false;
}
if (var0.readySequence == var0.movementSequence && (var0.field1009 > 25 || var6)) {
if (var0.turnRightSequence != -1) {
var0.movementSequence = var0.turnRightSequence;
} else {
var0.movementSequence = var0.walkSequence;
}
}
}
var0.rotation &= 2047;
}
}