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

Fixes for #990, #987

Browse Source 
removed pickaxe head flying off random event
added sweetcorn + basic baked potato cooking
This commit is contained in:
Woah
2021-03-26 15:17:01 -04:00
parent f51be46f8b
commit 57f60aff6a
3 changed files with 54 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/java/core/game/node/entity/skill/cooking/CookableItems.java
+4
View File
@@ -83,6 +83,10 @@ public enum CookableItems {
BOWL_4(7084, 1871, 7092,43, 60, 70,68,392),
BOWL_5(7082, 7080, 7094,57, 120, 80,68,392),
/* Vegetables */
BAKED_POTATO(6701, 1942, 6699, 7, 15, 41, 108, 472),
SWEETCORN(5988, 5986, 5990, 28, 104, 54, 90, 424),
//Miscellaneous
RAW_OOMLIE(Items.RAW_OOMLIE_2337, 0, Items.BURNT_OOMLIE_2426, 50, 0, 999,0,0), // always burns
OOMLIE_WRAP(Items.COOKED_OOMLIE_WRAP_2343, Items.WRAPPED_OOMLIE_2341, Items.BURNT_OOMLIE_WRAP_2345, 50, 110, 999,0,0);
Server/src/main/java/core/game/node/entity/skill/gather/SkillingTool.java
+1 -8
View File
@@ -80,11 +80,6 @@ public enum SkillingTool {
*/
RUNE_PICKAXE(1275, 41, 0.65D, new Animation(624)),
/**
* Represents a dragon pickaxe (mining).
*/
DRAGON_PICKAXE(14669, 61, 1.0D, new Animation(11171)),
/**
* Represents the Inferno Adze (woodcutting)
*/
@@ -182,11 +177,9 @@ public enum SkillingTool {
public static SkillingTool getPickaxe(Player player) {
SkillingTool tool = null;
if (checkTool(player, Skills.MINING, SkillingTool.INFERNO_ADZE2)) {
if(player.getSkills().getLevel(Skills.FIREMAKING) >= 92) {
if (player.getSkills().getLevel(Skills.FIREMAKING) >= 92) {
tool = SkillingTool.INFERNO_ADZE2;
}
} else if (checkTool(player, Skills.MINING, SkillingTool.DRAGON_PICKAXE)) {
tool = SkillingTool.DRAGON_PICKAXE;
} else if (checkTool(player, Skills.MINING, SkillingTool.RUNE_PICKAXE)) {
tool = SkillingTool.RUNE_PICKAXE;
} else if (checkTool(player, Skills.MINING, SkillingTool.ADAMANT_PICKAXE)) {