Snowscape/Server
1
0
Fork 0
forked from 2009Scape/Server
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity

Slayer improvements

Browse source
This commit is contained in:
Ceikry 2021-08-02 04:00:28 +00:00
parent a60c0e3a7b
commit 6f7577ce51
16 changed files with 509 additions and 362 deletions
Download patch file Download diff file Expand all files Collapse all files

95
Client/src/main/java/org/runite/client/AbstractSprite.java
View file

@ -1,6 +1,9 @@
package org.runite.client;
import org.rs09.client.Node;
import org.rs09.client.rendering.Toolkit;
import java.util.Objects;
public abstract class AbstractSprite extends Node {
@ -14,6 +17,98 @@ public abstract class AbstractSprite extends Node {
public int width;
static RSInterface aClass11_3708 = null;
public static AbstractSprite constructItemSprite(int var0, boolean useHDSprite, int itemID, boolean var4, int outlineType, int itemCount, boolean shrinkInSprite) {
try {
ItemDefinition item = ItemDefinition.getItemDefinition(itemID);
if (itemCount > 1 && item.anIntArray804 != null) {
int var9 = -1;
for (int var10 = 0; var10 < 10; ++var10) {
if (item.anIntArray766[var10] <= itemCount && item.anIntArray766[var10] != 0) {
var9 = item.anIntArray804[var10];
}
}
if (var9 != -1) {
item = ItemDefinition.getItemDefinition(var9);
}
}
Class140_Sub1_Sub2 var21 = item.method1120();
if (null == var21) {
return null;
} else {
SoftwareSprite var22 = null;
if (item.anInt791 == -1) {
if (item.anInt762 != -1) {
var22 = (SoftwareSprite) constructItemSprite(var0, true, item.anInt795, false, outlineType, itemCount, false);
if (null == var22) {
return null;
}
}
} else {
var22 = (SoftwareSprite) constructItemSprite(0, true, item.noteID, false, 1, 10, true);
if (null == var22) {
return null;
}
}
int[] var11 = Toolkit.JAVA_TOOLKIT.getBuffer();
int var12 = Toolkit.JAVA_TOOLKIT.width;
int var13 = Toolkit.JAVA_TOOLKIT.height;
int[] var14 = new int[4];
Class74.method1325(var14);
SoftwareSprite var15 = new SoftwareSprite(36, 32);
Class74.setBuffer(var15.anIntArray4081, 36, 32);
Class51.method1134();
Class51.method1145(16, 16);
int var16 = item.anInt810;
Class51.aBoolean843 = false;
if (shrinkInSprite) {
var16 = (int) ((double) var16 * 1.5D);
} else if (outlineType == 2) {
var16 = (int) (1.04D * (double) var16);
}
int var18 = Class51.anIntArray851[item.anInt786] * var16 >> 16;
int var17 = Class51.anIntArray840[item.anInt786] * var16 >> 16;
var21.method1893(item.anInt799, item.anInt768, item.anInt786, item.anInt792, var17 - (var21.method1871() / 2 + -item.anInt754), item.anInt754 + var18);
if (outlineType >= 1) {
var15.method657(1);
if (outlineType >= 2) {
var15.method657(16777215);
}
Class74.setBuffer(var15.anIntArray4081, 36, 32);
}
if (var0 != 0) {
var15.method668(var0);
}
if (item.anInt791 != -1) {
Objects.requireNonNull(var22).drawAt(0, 0);
} else if (-1 != item.anInt762) {
Class74.setBuffer(Objects.requireNonNull(var22).anIntArray4081, 36, 32);
var15.drawAt(0, 0);
var15 = var22;
}
if (var4 && (item.stackingType == 1 || itemCount != 1) && itemCount != -1) {
TextureOperation10.aClass3_Sub28_Sub17_Sub1_3440.method681(Class3_Sub7.itemStackColor(1000, itemCount), 0, 9, 16776960, 1);
}
Class74.setBuffer(var11, var12, var13);
Class74.setClipping(var14);
Class51.method1134();
Class51.aBoolean843 = true;
return HDToolKit.highDetail && !useHDSprite ? new HDSprite(var15) : var15;
}
} catch (RuntimeException var20) {
throw ClientErrorException.clientError(var20, "na.WA(" + var0 + ',' + useHDSprite + ',' + itemID + ',' + var4 + ',' + outlineType + ',' + itemCount + ',' + shrinkInSprite + ')');
}
}
abstract void method635(int var1, int var2);
abstract void method636(int var1, int var2, int var3, int var4, int var5, int var6);

2
Client/src/main/java/org/runite/client/Class114.java
View file

@ -55,7 +55,7 @@ final class Class114 {
AbstractSprite var10 = (AbstractSprite) Class67.aReferenceCache_1013.get(var8);
if (var10 == null) {
Class51.aBoolean837 = false;
var10 = Unsorted.constructItemSprite(var4, false, var1, var2, var0, var3, false);
var10 = AbstractSprite.constructItemSprite(var4, false, var1, var2, var0, var3, false);
if (var10 != null && !Class51.aBoolean837) {
Class67.aReferenceCache_1013.put(var10, var8);
}

3
Client/src/main/java/org/runite/client/HDToolKit.java
View file

@ -1,5 +1,6 @@
package org.runite.client;
import org.rs09.SlayerTracker;
import org.rs09.client.config.GameConfig;
import javax.media.opengl.*;
@ -431,6 +432,7 @@ public final class HDToolKit {
Class68.method1273();
highDetail = false;
SlayerTracker.setSprite();
}
static void method1843(float var0, float var1) {
@ -627,6 +629,7 @@ public final class HDToolKit {
gl = glContext.getGL();
new GLU();
highDetail = true;
SlayerTracker.setSprite();
System.out.println("Setting high detail to " + highDetail);
viewWidth = canvas.getSize().width;
viewHeight = canvas.getSize().height;

38
Client/src/main/java/org/runite/client/PacketParser.java
View file

@ -1404,7 +1404,7 @@ public final class PacketParser {
Unsorted.incomingOpcode = -1;
return true;
} else {
RSInterface var25;
RSInterface iface;
if (Unsorted.incomingOpcode == 22) {
nodeModelId = BufferedDataStream.incomingBuffer.readInt();
var19 = BufferedDataStream.incomingBuffer.readUnsignedShort();
@ -1413,9 +1413,9 @@ public final class PacketParser {
}
if (nodeModelId < 0) {
var25 = null;
iface = null;
} else {
var25 = Unsorted.getRSInterface(nodeModelId);
iface = Unsorted.getRSInterface(nodeModelId);
}
for (; Unsorted.incomingPacketLength > BufferedDataStream.incomingBuffer.index; method2277(var6 + -1, counter, var30, var19, (byte) 46)) {
@ -1429,14 +1429,14 @@ public final class PacketParser {
}
}
if (var25 != null && counter >= 0 && counter < var25.itemAmounts.length) {
var25.itemAmounts[counter] = var6;
var25.itemIds[counter] = var30;
if (iface != null && counter >= 0 && counter < iface.itemAmounts.length) {
iface.itemAmounts[counter] = var6;
iface.itemIds[counter] = var30;
}
}
if (var25 != null) {
Class20.method909(var25);
if (iface != null) {
Class20.method909(iface);
}
BufferedDataStream.method819();
@ -1647,15 +1647,15 @@ public final class PacketParser {
}
if (0 <= nodeModelId) {
var25 = Unsorted.getRSInterface(nodeModelId);
iface = Unsorted.getRSInterface(nodeModelId);
} else {
var25 = null;
iface = null;
}
if (var25 != null) {
for (counter = 0; var25.itemAmounts.length > counter; ++counter) {
var25.itemAmounts[counter] = 0;
var25.itemIds[counter] = 0;
if (iface != null) {
for (counter = 0; iface.itemAmounts.length > counter; ++counter) {
iface.itemAmounts[counter] = 0;
iface.itemIds[counter] = 0;
}
}
@ -1669,16 +1669,16 @@ public final class PacketParser {
}
chatIcon = BufferedDataStream.incomingBuffer.readUnsignedShort();
if (null != var25 && var25.itemAmounts.length > var6) {
var25.itemAmounts[var6] = chatIcon;
var25.itemIds[var6] = var30;
if (null != iface && iface.itemAmounts.length > var6) {
iface.itemAmounts[var6] = chatIcon;
iface.itemIds[var6] = var30;
}
method2277(-1 + chatIcon, var6, var30, var19, (byte) 41);
}
if (var25 != null) {
Class20.method909(var25);
if (iface != null) {
Class20.method909(iface);
}
BufferedDataStream.method819();

92
Client/src/main/java/org/runite/client/Unsorted.java
View file

@ -407,98 +407,6 @@ public class Unsorted {
}
}
static AbstractSprite constructItemSprite(int var0, boolean useHDSprite, int itemID, boolean var4, int outlineType, int itemCount, boolean shrinkInSprite) {
try {
ItemDefinition item = ItemDefinition.getItemDefinition(itemID);
if (itemCount > 1 && item.anIntArray804 != null) {
int var9 = -1;
for (int var10 = 0; var10 < 10; ++var10) {
if (item.anIntArray766[var10] <= itemCount && item.anIntArray766[var10] != 0) {
var9 = item.anIntArray804[var10];
}
}
if (var9 != -1) {
item = ItemDefinition.getItemDefinition(var9);
}
}
Class140_Sub1_Sub2 var21 = item.method1120();
if (null == var21) {
return null;
} else {
SoftwareSprite var22 = null;
if (item.anInt791 == -1) {
if (item.anInt762 != -1) {
var22 = (SoftwareSprite) constructItemSprite(var0, true, item.anInt795, false, outlineType, itemCount, false);
if (null == var22) {
return null;
}
}
} else {
var22 = (SoftwareSprite) constructItemSprite(0, true, item.noteID, false, 1, 10, true);
if (null == var22) {
return null;
}
}
int[] var11 = Toolkit.JAVA_TOOLKIT.getBuffer();
int var12 = Toolkit.JAVA_TOOLKIT.width;
int var13 = Toolkit.JAVA_TOOLKIT.height;
int[] var14 = new int[4];
Class74.method1325(var14);
SoftwareSprite var15 = new SoftwareSprite(36, 32);
Class74.setBuffer(var15.anIntArray4081, 36, 32);
Class51.method1134();
Class51.method1145(16, 16);
int var16 = item.anInt810;
Class51.aBoolean843 = false;
if (shrinkInSprite) {
var16 = (int) ((double) var16 * 1.5D);
} else if (outlineType == 2) {
var16 = (int) (1.04D * (double) var16);
}
int var18 = Class51.anIntArray851[item.anInt786] * var16 >> 16;
int var17 = Class51.anIntArray840[item.anInt786] * var16 >> 16;
var21.method1893(item.anInt799, item.anInt768, item.anInt786, item.anInt792, var17 - (var21.method1871() / 2 + -item.anInt754), item.anInt754 + var18);
if (outlineType >= 1) {
var15.method657(1);
if (outlineType >= 2) {
var15.method657(16777215);
}
Class74.setBuffer(var15.anIntArray4081, 36, 32);
}
if (var0 != 0) {
var15.method668(var0);
}
if (item.anInt791 != -1) {
Objects.requireNonNull(var22).drawAt(0, 0);
} else if (-1 != item.anInt762) {
Class74.setBuffer(Objects.requireNonNull(var22).anIntArray4081, 36, 32);
var15.drawAt(0, 0);
var15 = var22;
}
if (var4 && (item.stackingType == 1 || itemCount != 1) && itemCount != -1) {
TextureOperation10.aClass3_Sub28_Sub17_Sub1_3440.method681(Class3_Sub7.itemStackColor(1000, itemCount), 0, 9, 16776960, 1);
}
Class74.setBuffer(var11, var12, var13);
Class74.setClipping(var14);
Class51.method1134();
Class51.aBoolean843 = true;
return HDToolKit.highDetail && !useHDSprite ? new HDSprite(var15) : var15;
}
} catch (RuntimeException var20) {
throw ClientErrorException.clientError(var20, "na.WA(" + var0 + ',' + useHDSprite + ',' + itemID + ',' + var4 + ',' + outlineType + ',' + itemCount + ',' + shrinkInSprite + ')');
}
}
public static RSString method802(int var0) {
try {

8
Client/src/main/kotlin/org/rs09/CustomVars.kt
View file

@ -17,9 +17,11 @@ object CustomVars {
true
}
2502 -> {
GameConfig.slayerCountEnabled = (varValue and 1) == 0
GameConfig.slayerTaskID = (varValue shr 1) and 127
GameConfig.setSlayerAmount((varValue shr 8) and 511)
GameConfig.slayerCountEnabled = true
GameConfig.slayerTaskID = varValue and 0x7F
GameConfig.setSlayerAmount((varValue shr 7) and 0xFF)
SlayerTracker.setSprite()
SystemLogger.logInfo(varValue.toString())
true
}
else -> false

198
Client/src/main/kotlin/org/rs09/SlayerTracker.kt
View file

@ -3,6 +3,7 @@ package org.rs09
import org.rs09.client.config.GameConfig
import org.rs09.client.rendering.RenderingUtils
import org.rs09.client.rendering.Toolkit
import org.runite.client.*
import java.util.concurrent.TimeUnit
object SlayerTracker {
@ -10,10 +11,15 @@ object SlayerTracker {
const val posY = 30
const val textX = 7
const val textY = 50
const val spriteY = 30
val boxColor = "635a38".toInt(16)
@JvmField
var lastUpdate = 0L
var curSprite: AbstractSprite? = null
@JvmStatic
fun draw(){
val timeSinceUpdate = System.currentTimeMillis() - lastUpdate
@ -21,12 +27,13 @@ object SlayerTracker {
if(GameConfig.slayerTaskAmount == 0) return
if(timeSinceUpdate >= TimeUnit.MINUTES.toMillis(5L)) return
val tk = Toolkit.getActiveToolkit()
var rectWidth = 9 * getTask().length
var amountPos = textX + (6 * getTask().length)
var rectWidth = 60
var amountPos = textX + 40
if(rectWidth < 90) rectWidth = 90
if(amountPos < textX + 60) amountPos = textX + 60
tk.fillRect(posX,posY,rectWidth,30,0,64)
RenderingUtils.drawText(getTask() + ":", textX, textY,-1,2,false)
tk.fillRect(posX,posY,rectWidth,30, boxColor,180)
curSprite?.drawAt(textX, spriteY)
RenderingUtils.drawText(GameConfig.slayerTaskAmount.toString(),amountPos, textY, -1, 2, false)
}
@ -38,91 +45,104 @@ object SlayerTracker {
lastUpdate = 0
}
fun getTask(): String {
return when(GameConfig.slayerTaskID){
0 -> "Abby Spectres"
1 -> "Abyssal Demons"
2 -> "Ankou"
3 -> "Aviansies"
4 -> "Banshee"
5 -> "Basilisks"
6 -> "Bats"
7 -> "Bears"
8 -> "Birds"
9 -> "Black Demons"
10 -> "Black Dragons"
11 -> "Bloodvelds"
12 -> "Blue Dragons"
13 -> "Brine Rats"
14 -> "Bronze Dragons"
15 -> "Catablepons"
16 -> "Cave Bugs"
17 -> "Cave Crawlers"
18 -> "Cave Horrors"
19 -> "Cave Slimes"
20 -> "Cockatrices"
21 -> "Cows"
22 -> "Crawling Hands"
23 -> "Crocodiles"
24 -> "Cyclopes"
25 -> "Dagannoths"
26 -> "Dark Beasts"
27 -> "Desert Lizards"
28 -> "Dogs"
29 -> "Dust Devils"
30 -> "Dwarves"
31 -> "Earth Warriors"
32 -> "Fire Giants"
33 -> "Flesh Crawlers"
34 -> "Gargoyles"
35 -> "Ghosts"
36 -> "Ghouls"
37 -> "Goblins"
38 -> "Goraks"
39 -> "Greater Demons"
40 -> "Green Dragons"
41 -> "Harpie Swarms"
42 -> "Hellhounds"
43 -> "Hill Giants"
44 -> "Hobgoblins"
45 -> "Ice Fiends"
46 -> "Ice Giants"
47 -> "Ice Warriors"
48 -> "Infernal Mages"
49 -> "Iron Dragons"
50 -> "Jellies"
51 -> "Jungle Horrors"
52 -> "Kalphites"
53 -> "Kurasks"
54 -> "Lesser Demons"
55 -> "Mithril Dragons"
56 -> "Minotaurs"
57 -> "Monkeys"
58 -> "Moss Giants"
59 -> "Nechryaels"
60 -> "Ogres"
61 -> "Otherworldly Beings"
62 -> "Pyrefiends"
63 -> "Rats"
64 -> "Rock Slugs"
65 -> "Scorpions"
66 -> "Shades"
67 -> "Skeletons"
68 -> "Spiders"
69 -> "Spiritual Mages"
70 -> "Spiritual Rangers"
71 -> "Spiritual Warriors"
72 -> "Steel Dragons"
73 -> "Trolls"
74 -> "Turoths"
75 -> "Tzhaar"
76 -> "Vampires"
77 -> "Waterfiends"
78 -> "Werewolves"
79 -> "Wolves"
80 -> "Zombies"
89 -> "Skeletal Wyverns"
else -> "Uhh Report Me?"
@JvmStatic
fun setSprite(){
SystemLogger.logInfo("Getting slayer sprite...")
val itemId: Int = when(GameConfig.slayerTaskID){
0 -> 4144
1 -> 4149
2 -> 560
3 -> 10176
4 -> 4135
5 -> 4139
6 -> 14072
7 -> 948
8 -> 12189
9 -> 3098
10 -> 1747
11 -> 4141
12 -> 1751
13 -> 11047
14 -> 2349
15 -> 9008
16 -> 4521
17 -> 4134
18 -> 8900
19 -> 4520
20 -> 4137
21 -> 1739
22 -> 7982
23 -> 10149
24 -> 532
25 -> 8141
26 -> 6637
27 -> 6695
28 -> 8132
29 -> 4145
30 -> 7500
31 -> 1422
32 -> 1387
33 -> 9011
34 -> 4147
35 -> 552
36 -> 6722
37 -> 10998
38 -> 9016
39 -> 2402
40 -> 1753
41 -> 7050
42 -> 8137
43 -> 12570
44 -> 8133
45 -> 4671
46 -> 4671
47 -> 1159
48 -> 4140
49 -> 2351
50 -> 4142
51 -> 7778
52 -> 8139
53 -> 4146
54 -> 2402
55 -> 2359
56 -> 12079
57 -> 12201
58 -> 12570
59 -> 4148
60 -> 4818
61 -> 6107
62 -> 4138
63 -> 14074
64 -> 4136
65 -> 6297
66 -> 10634
67 -> 553
68 -> 8135
69 -> 11732
70 -> 10284
71 -> 13923
72 -> 2353
73 -> 8136
74 -> 4143
75 -> 6528
76 -> 10109
77 -> 1403
78 -> 2952
79 -> 958
80 -> 7594
89 -> 6811
else -> -1
}
var sprite = AbstractSprite.constructItemSprite(0, HDToolKit.highDetail, itemId, false, 1, 1, false)
if(HDToolKit.highDetail) {
if (sprite is Class3_Sub28_Sub16_Sub2_Sub1) {
sprite = Class3_Sub28_Sub16_Sub1_Sub1(sprite as SoftwareSprite)
} else {
sprite = HDSprite(sprite as SoftwareSprite)
}
}
curSprite = sprite
}
}