rs-client: refactoring (#1344)
* Rename some things to be more consistent everywhere * rs-client: refactoring * MenuAction -> MenuOpcode merge
This commit is contained in:
Lucwousin
GitHub
@@ -267,131 +267,129 @@ public abstract class AbstractWorldMapData {
|
||||
)
|
||||
@Export("addNpcToMenu")
|
||||
static final void addNpcToMenu(NPCDefinition var0, int var1, int var2, int var3) {
|
||||
if (Client.menuOptionsCount < 400) {
|
||||
if (var0.transforms != null) {
|
||||
var0 = var0.transform();
|
||||
if (Client.menuOptionsCount >= 400) {
|
||||
return;
|
||||
}
|
||||
if (var0.transforms != null) {
|
||||
var0 = var0.transform();
|
||||
}
|
||||
|
||||
if (var0 == null || !var0.isInteractable || (var0.isFollower && Client.followerIndex != var1)) {
|
||||
return;
|
||||
}
|
||||
String var4 = var0.name;
|
||||
if (var0.combatLevel != 0) {
|
||||
int var7 = var0.combatLevel;
|
||||
int var8 = Client.localPlayer.combatLevel;
|
||||
int var9 = var8 - var7;
|
||||
String var6;
|
||||
if (var9 < -9) {
|
||||
var6 = ClientPreferences.colorStartTag(0xff0000);
|
||||
} else if (var9 < -6) {
|
||||
var6 = ClientPreferences.colorStartTag(0xff3000);
|
||||
} else if (var9 < -3) {
|
||||
var6 = ClientPreferences.colorStartTag(0xff7000);
|
||||
} else if (var9 < 0) {
|
||||
var6 = ClientPreferences.colorStartTag(0xffb000);
|
||||
} else if (var9 > 9) {
|
||||
var6 = ClientPreferences.colorStartTag(0xff00);
|
||||
} else if (var9 > 6) {
|
||||
var6 = ClientPreferences.colorStartTag(0x40ff00);
|
||||
} else if (var9 > 3) {
|
||||
var6 = ClientPreferences.colorStartTag(0x80ff00);
|
||||
} else if (var9 > 0) {
|
||||
var6 = ClientPreferences.colorStartTag(0xc0ff00);
|
||||
} else {
|
||||
var6 = ClientPreferences.colorStartTag(0xffff00);
|
||||
}
|
||||
|
||||
if (var0 != null) {
|
||||
if (var0.isInteractable) {
|
||||
if (!var0.isFollower || Client.followerIndex == var1) {
|
||||
String var4 = var0.name;
|
||||
int var7;
|
||||
int var8;
|
||||
if (var0.combatLevel != 0) {
|
||||
var7 = var0.combatLevel;
|
||||
var8 = Client.localPlayer.combatLevel;
|
||||
int var9 = var8 - var7;
|
||||
String var6;
|
||||
if (var9 < -9) {
|
||||
var6 = ClientPreferences.colorStartTag(0xff0000);
|
||||
} else if (var9 < -6) {
|
||||
var6 = ClientPreferences.colorStartTag(16723968);
|
||||
} else if (var9 < -3) {
|
||||
var6 = ClientPreferences.colorStartTag(16740352);
|
||||
} else if (var9 < 0) {
|
||||
var6 = ClientPreferences.colorStartTag(16756736);
|
||||
} else if (var9 > 9) {
|
||||
var6 = ClientPreferences.colorStartTag(0xff00);
|
||||
} else if (var9 > 6) {
|
||||
var6 = ClientPreferences.colorStartTag(4259584);
|
||||
} else if (var9 > 3) {
|
||||
var6 = ClientPreferences.colorStartTag(8453888);
|
||||
} else if (var9 > 0) {
|
||||
var6 = ClientPreferences.colorStartTag(12648192);
|
||||
} else {
|
||||
var6 = ClientPreferences.colorStartTag(0xffff00);
|
||||
}
|
||||
var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
|
||||
}
|
||||
|
||||
var4 = var4 + var6 + " " + " (" + "level-" + var0.combatLevel + ")";
|
||||
}
|
||||
if (var0.isFollower && Client.followerOpsLowPriority) {
|
||||
class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3);
|
||||
}
|
||||
|
||||
if (var0.isFollower && Client.followerOpsLowPriority) {
|
||||
class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3);
|
||||
}
|
||||
|
||||
if (Client.isItemSelected == 1) {
|
||||
class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 7, var1, var2, var3);
|
||||
} else if (Client.isSpellSelected) {
|
||||
if ((WorldMapCacheName.selectedSpellFlags & 2) == 2) {
|
||||
class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 8, var1, var2, var3);
|
||||
}
|
||||
} else {
|
||||
int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0;
|
||||
String[] var11 = var0.actions;
|
||||
if (var11 != null) {
|
||||
for (var7 = 4; var7 >= 0; --var7) {
|
||||
if (var11[var7] != null && !var11[var7].equalsIgnoreCase("Attack")) {
|
||||
var8 = 0;
|
||||
if (var7 == 0) {
|
||||
var8 = var10 + 9;
|
||||
}
|
||||
|
||||
if (var7 == 1) {
|
||||
var8 = var10 + 10;
|
||||
}
|
||||
|
||||
if (var7 == 2) {
|
||||
var8 = var10 + 11;
|
||||
}
|
||||
|
||||
if (var7 == 3) {
|
||||
var8 = var10 + 12;
|
||||
}
|
||||
|
||||
if (var7 == 4) {
|
||||
var8 = var10 + 13;
|
||||
}
|
||||
|
||||
class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (var11 != null) {
|
||||
for (var7 = 4; var7 >= 0; --var7) {
|
||||
if (var11[var7] != null && var11[var7].equalsIgnoreCase("Attack")) {
|
||||
short var12 = 0;
|
||||
if (AttackOption.AttackOption_hidden != Client.npcAttackOption) {
|
||||
if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Client.localPlayer.combatLevel) {
|
||||
var12 = 2000;
|
||||
}
|
||||
|
||||
var8 = 0;
|
||||
if (var7 == 0) {
|
||||
var8 = var12 + 9;
|
||||
}
|
||||
|
||||
if (var7 == 1) {
|
||||
var8 = var12 + 10;
|
||||
}
|
||||
|
||||
if (var7 == 2) {
|
||||
var8 = var12 + 11;
|
||||
}
|
||||
|
||||
if (var7 == 3) {
|
||||
var8 = var12 + 12;
|
||||
}
|
||||
|
||||
if (var7 == 4) {
|
||||
var8 = var12 + 13;
|
||||
}
|
||||
|
||||
class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!var0.isFollower || !Client.followerOpsLowPriority) {
|
||||
class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
if (Client.isItemSelected == 1) {
|
||||
class188.insertMenuItemNoShift("Use", Client.selectedItemName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 7, var1, var2, var3);
|
||||
return;
|
||||
} else if (Client.isSpellSelected) {
|
||||
if ((WorldMapCacheName.selectedSpellFlags & 2) == 2) {
|
||||
class188.insertMenuItemNoShift(Client.selectedSpellActionName, Client.selectedSpellName + " " + "->" + " " + ClientPreferences.colorStartTag(0xffff00) + var4, 8, var1, var2, var3);
|
||||
}
|
||||
return;
|
||||
}
|
||||
String[] var11 = var0.actions;
|
||||
if (var11 != null) {
|
||||
for (int var7 = 4; var7 >= 0; --var7) {
|
||||
if (var11[var7] == null || var11[var7].equalsIgnoreCase("Attack")) {
|
||||
continue;
|
||||
}
|
||||
int var8 = 0;
|
||||
int var10 = var0.isFollower && Client.followerOpsLowPriority ? 2000 : 0;
|
||||
if (var7 == 0) {
|
||||
var8 = var10 + 9;
|
||||
}
|
||||
|
||||
if (var7 == 1) {
|
||||
var8 = var10 + 10;
|
||||
}
|
||||
|
||||
if (var7 == 2) {
|
||||
var8 = var10 + 11;
|
||||
}
|
||||
|
||||
if (var7 == 3) {
|
||||
var8 = var10 + 12;
|
||||
}
|
||||
|
||||
if (var7 == 4) {
|
||||
var8 = var10 + 13;
|
||||
}
|
||||
|
||||
class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3);
|
||||
}
|
||||
|
||||
for (int var7 = 4; var7 >= 0; --var7) {
|
||||
if (var11[var7] == null || !var11[var7].equalsIgnoreCase("Attack")) {
|
||||
continue;
|
||||
}
|
||||
short var12 = 0;
|
||||
if (AttackOption.AttackOption_hidden == Client.npcAttackOption) {
|
||||
continue;
|
||||
}
|
||||
if (Client.npcAttackOption == AttackOption.AttackOption_alwaysRightClick || AttackOption.AttackOption_dependsOnCombatLevels == Client.npcAttackOption && var0.combatLevel > Client.localPlayer.combatLevel) {
|
||||
var12 = 2000;
|
||||
}
|
||||
|
||||
int var8 = 0;
|
||||
if (var7 == 0) {
|
||||
var8 = var12 + 9;
|
||||
}
|
||||
|
||||
if (var7 == 1) {
|
||||
var8 = var12 + 10;
|
||||
}
|
||||
|
||||
if (var7 == 2) {
|
||||
var8 = var12 + 11;
|
||||
}
|
||||
|
||||
if (var7 == 3) {
|
||||
var8 = var12 + 12;
|
||||
}
|
||||
|
||||
if (var7 == 4) {
|
||||
var8 = var12 + 13;
|
||||
}
|
||||
|
||||
class188.insertMenuItemNoShift(var11[var7], ClientPreferences.colorStartTag(0xffff00) + var4, var8, var1, var2, var3);
|
||||
}
|
||||
}
|
||||
|
||||
if (!var0.isFollower || !Client.followerOpsLowPriority) {
|
||||
class188.insertMenuItemNoShift("Examine", ClientPreferences.colorStartTag(0xffff00) + var4, 1003, var1, var2, var3);
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user