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

Improved handling of skewered food

Browse Source
This commit is contained in:
RiL
2023-05-16 12:22:07 +00:00
committed by Ryan
parent 767117f54e
commit c04ee0f821
3 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/src/main/content/global/skill/cooking/CookableItems.java
+5 -4
View File
@@ -11,6 +11,8 @@ public enum CookableItems {
UGTHANKI(2140, 2138, 2144, 1, 40, 40, 252, 30, 253), UGTHANKI(2140, 2138, 2144, 1, 40, 40, 252, 30, 253),
RABBIT(3228, 3226, 7222, 1, 30, 128, 512, 128, 512), RABBIT(3228, 3226, 7222, 1, 30, 128, 512, 128, 512),
CRAB(7521, 7518, 7520, 21, 100, 57, 377, 57, 377), CRAB(7521, 7518, 7520, 21, 100, 57, 377, 57, 377),
CHOMPY(2878, 2876, 2880, 30, 100, 200, 255, 200, 255),
JUBBLY(7568, 7566, 7570, 41, 160, 195, 250, 195, 250), // Can burn at 99 cooking. Ballpark low/high.
// fish // fish
CRAYFISH(13433, 13435, 13437, 1, 30, 128, 512, 128, 512), CRAYFISH(13433, 13435, 13437, 1, 30, 128, 512, 128, 512),
@@ -56,11 +58,10 @@ public enum CookableItems {
YAK_MEAT(2142, 10816, 2146, 1, 30, 128, 512, 128, 512), YAK_MEAT(2142, 10816, 2146, 1, 30, 128, 512, 128, 512),
// skewered foods // skewered foods
SKEWER_ROAST_BEAST(9988, 9986, 9990, 21, 99, 180, 255, 180, 255), SKEWER_CHOMPY(2878, 7230, 2880, 30, 100, 200, 255, 200, 255),
SKEWER_CHOMPY(2878, 2876, 7226, 30, 140, 200, 255, 200, 255),
SKEWER_JUBBLY(7568, 7566, 7570, 41, 160, 195, 250, 195, 250), // Can burn at 99 cooking. Ballpark low/high.
SKEWER_ROAST_BIRD(9980, 9984, 9982, 11, 62, 155, 255, 155, 255),
SKEWER_ROAST_RABBIT(7223, 7224, 7222, 16, 72, 160, 255, 160, 255), SKEWER_ROAST_RABBIT(7223, 7224, 7222, 16, 72, 160, 255, 160, 255),
SKEWER_ROAST_BIRD(9980, 9984, 9982, 11, 62, 155, 255, 155, 255),
SKEWER_ROAST_BEAST(9988, 9992, 9990, 21, 82.5, 180, 255, 180, 255),
// pies // pies
REDBERRY_PIE(2325, 2321, 2329, 10, 78, 0, 0, 98, 452), REDBERRY_PIE(2325, 2321, 2329, 10, 78, 0, 0, 98, 452),
Server/src/main/content/global/skill/cooking/SkeweredFoodPlugin.java
+5 -1
View File
@@ -7,6 +7,7 @@ import core.game.node.entity.player.Player;
import core.game.node.item.Item; import core.game.node.item.Item;
import core.plugin.Initializable; import core.plugin.Initializable;
import core.plugin.Plugin; import core.plugin.Plugin;
import org.rs09.consts.Items;
/** /**
* Represents the plugin used to make skwered items. * Represents the plugin used to make skwered items.
@@ -56,7 +57,10 @@ public class SkeweredFoodPlugin extends UseWithHandler {
* @date 22/12/2013 * @date 22/12/2013
*/ */
public enum SkeweredSet { public enum SkeweredSet {
RABBIT(new Item(3226), new Item(7224)), CHOMPY(new Item(2876), new Item(7230)), BIRD(new Item(9978), new Item(9984)), BEAST(new Item(9986), new Item(9992)); CHOMPY(new Item(Items.RAW_CHOMPY_2876), new Item(Items.SKEWERED_CHOMPY_7230)),
RABBIT(new Item(Items.RAW_RABBIT_3226), new Item(Items.SKEWERED_RABBIT_7224)),
BIRD(new Item(Items.RAW_BIRD_MEAT_9978), new Item(Items.SKEWERED_BIRD_MEAT_9984)),
BEAST(new Item(Items.RAW_BEAST_MEAT_9986), new Item(Items.SKEWERED_BEAST_9992));
/** /**
* Represents the raw item. * Represents the raw item.
Server/src/main/content/global/skill/cooking/StandardCookingPulse.java
+3 -4
View File
@@ -141,11 +141,10 @@ public class StandardCookingPulse extends Pulse {
//handle special cooking results (spits, cake, etc) that don't justify separate plugin //handle special cooking results (spits, cake, etc) that don't justify separate plugin
switch (initial) { switch (initial) {
case Items.RAW_BEAST_MEAT_9986: case Items.SKEWERED_CHOMPY_7230:
case Items.RAW_CHOMPY_2876: case Items.SKEWERED_RABBIT_7224:
case Items.RAW_JUBBLY_7566:
case Items.SKEWERED_BIRD_MEAT_9984: case Items.SKEWERED_BIRD_MEAT_9984:
case Items.RAW_RABBIT_3226: // Iron spits case Items.SKEWERED_BEAST_9992:
case Items.IRON_SPIT_7225: case Items.IRON_SPIT_7225:
if (RandomFunction.random(15) == 5) { if (RandomFunction.random(15) == 5) {
player.getPacketDispatch().sendMessage("Your iron spit seems to have broken in the process."); player.getPacketDispatch().sendMessage("Your iron spit seems to have broken in the process.");