yuriy/2009scape
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement Authentic Interaction Subsystem

Browse Source 
Implemented authentic script/interaction queues
This does now mean we have a total of 3 interaction systems, but this additional system is necessary to fix certain categories of bug and implement some authentic features
Converted mining to new system
Converted fishing to new system
Converted woodcutting to new system
Provided an example of soft-queued scripts with GrandTreePodListener
Implemented tick-eating (it is now possible to eat a shark, drink a potion, and eat a karambwan all on the same tick)
Can now eat and drop items while stunned
This commit is contained in:
Ceikry
2023-02-28 23:41:14 +00:00
committed by Ryan
parent 5206c99151
commit 124eeab893
61 changed files with 1466 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/data/consumables/Consumables.java
+8 -6
View File
@@ -42,7 +42,7 @@ public enum Consumables {
SALMON(new Food(new int[] {329}, new HealingEffect(9))),
SLIMY_EEL(new Food(new int[] {3381}, new HealingEffect(6))),
TUNA(new Food(new int[] {361}, new HealingEffect(10))),
COOKED_KARAMBWAN(new Food(new int[] {3144}, new HealingEffect(18))),
COOKED_KARAMBWAN(new Food(new int[] {3144}, new HealingEffect(18)), true),
COOKED_CHOMPY(new Food(new int[] {2878}, new HealingEffect(10))),
RAINBOW_FISH(new Food(new int[] {10136}, new HealingEffect(11))),
CAVE_EEL(new Food(new int[] {5003}, new HealingEffect(7))),
@@ -364,24 +364,26 @@ public enum Consumables {
SC_MAGIC(new Potion(new int[] {14267, 14269, 14271, 14273, 14275}, new SkillEffect(Skills.MAGIC, 3, 0.1))),
SC_SUMMONING(new Potion(new int[] {14277, 14279, 14281, 14283, 14285}, new SummoningEffect(7, 0.25)));
public static HashMap<Integer,Consumable> consumables = new HashMap<>();
public static HashMap<Integer,Consumables> consumables = new HashMap<>();
private final Consumable consumable;
public boolean isIgnoreMainClock = false;
Consumables(Consumable consumable) {
this.consumable = consumable;
}
Consumables(Consumable consumable, boolean isIgnoreMainClock) {this.consumable = consumable; this.isIgnoreMainClock = isIgnoreMainClock;}
public Consumable getConsumable() {
return consumable;
}
public static Consumable getConsumableById(final int itemId) {
public static Consumables getConsumableById(final int itemId) {
return consumables.get(itemId);
}
public static void add(final Consumable consumable) {
for (int id : consumable.getIds()) {
public static void add(final Consumables consumable) {
for (int id : consumable.consumable.getIds()) {
consumables.putIfAbsent(id, consumable);
}
}
@@ -391,7 +393,7 @@ public enum Consumables {
*/
static {
for (Consumables consumable : Consumables.values()) {
add(consumable.consumable);
add(consumable);
}
}
}