Fix: Cooking Overhaul, Draynor Seed Market, and Port Sarim Examines

- Most object examines in Port Sarim have been accounted for and added
- Stuffed Swordfish, Shelf, Barrel, Fish Barrel, Large Table, Crate, Crate (stacked), Plant, Clock, Chest, Small Table, Counter, two Ladders, three Crates, Painting (Landscape), Drawers, Chair, Bookcase, Bed, Dresser, Range, Candles, Cabinet, Axe Cabinet, Staircase, Charms and Mirror objects located within Port Sarim now have the proper examine text added

- Draynor Seed Market shop name correction
- Draynor Seed Market shop stock correction (can now correctly buy some low-level Farming seeds)

- Cooking Overhaul:
- Removed stinky OSRS Dark Crab from the CookableItems.java
- Can now correctly cook Crayfish
- Can now correctly consume Cooked Crayfish for 2HP.
- Can now correctly cook Mud pies
- Correct burn levels for Shrimp, Crayfish, Karambwanji, Salmon, Tuna, Cave Eel, Bass, Karambwan, Chicken, Ugthanki Meat, Rabbit, Crab Meat, Thin Snail, Lean Snail, Fat Snail, Bread, Cake, Beef, Rat Meat, Yak Meat, Bear Meat, Plain Pizza, Cooked Chompy, Roast Bird, Roast Rabbit, Redberry Pie, Meat Pie, Mud Pie, Apple Pie, Garden Pie, Fish Pie, Admiral Pie, Scrambled Egg, Fried Onions, Fried Mushrooms
- Cooking EXP corrections:
- Cooking Shrimp EXP corrected from 45 EXP -> 30 EXP
- Cooking Salmon EXP corrected from 58 EXP -> 90 EXP
- Cooking Karambwan EXP corrected from 80 -> 190 EXP
- Cooking Roast Beast meat EXP corrected from 82 EXP -> 99 EXP
- Cooking Roast Rabbit EXP corrected from 70 EXP -> 72 EXP
- Cooking Fried Mushrooms EXP corrected from 120 EXP -> 60 EXP
This commit is contained in:
skelsoft
2021-08-12 09:33:44 +10:00
parent 9288ca7ff7
commit e732f904bf
4 changed files with 20577 additions and 20440 deletions
File diff suppressed because it is too large Load Diff
+2 -2
View File
@@ -1391,8 +1391,8 @@
"currency": "995",
"general_store": "false",
"id": "157",
"title": "Draynor Seed Marker",
"stock": "{5318,0}-{5319,0}-{5324,0}-{5322,0}-{5320,0}-{5323,0}-{5321,0}-{5305,0}-{5306,5}-{5097,20}-{5096,20}-{5307,20}-{5308,5}-{5310,0}-{5311,0}"
"title": "Draynor Seed Market",
"stock": "{5318,20}-{5319,10}-{5324,10}-{5322,0}-{5320,0}-{5323,0}-{5321,0}-{5305,20}-{5306,5}-{5097,20}-{5096,20}-{5307,20}-{5308,10}-{5309,5}-{5310,0}-{5311,0}"
},
{
"npcs": "3205",
@@ -55,7 +55,8 @@ public enum Consumables {
MANTA_RAY(new Food(new int[] {391}, new HealingEffect(22))),
KARAMBWANJI(new Food(new int[] {3151}, new HealingEffect(3))),
STUFFED_SNAKE(new Food(new int[] {7579}, new HealingEffect(20), "You eat the stuffed snake-it's quite a meal! It tastes like chicken.")),
CRAYFISH(new Food(new int[] {13433}, new HealingEffect(2))),
/** Breads */
BREAD(new Food(new int[] {2309}, new HealingEffect(5))),
BAGUETTE(new Food(new int[] {6961}, new HealingEffect(6))),
@@ -7,15 +7,15 @@ import java.util.HashMap;
public enum CookableItems {
/** meats */
CHICKEN(2140,2138,2144,1,30,30,128,512),
UGTHANKI(2140,2138,2144,1,40,40,128,512),
RABBIT(3228,3226,7222,1,30,30,128,512),
DARK_CRAB(14939, 14937, 14941, 90, 215, 100,0,150),
CRAB(7521, 7518, 7520,21, 100, 100,85,438),
CHICKEN(2140,2138,2144,1,30,34,128,512),
UGTHANKI(2140,2138,2144,1,40,100,0,512),
RABBIT(3228,3226,7222,1,30,34,128,512),
CRAB(7521, 7518, 7520,21, 100, 62,85,438),
/** fish */
SHRIMP(315, 317, 7954,1, 45, 35,128,512),
KARAMBWANJI(3151, 3150, 592,1, 10, 30,128,512),
CRAYFISH(13433, 13435, 13437,1, 30, 34,128,512),
SHRIMP(315, 317, 7954,1, 30, 34,128,512),
KARAMBWANJI(3151, 3150, 592,1, 10, 28,128,512),
SARDINE(325, 327, 369,1, 40, 38,118,492),
ANCHOVIES(319, 321, 323,1, 30, 34,128,512),
HERRING(347, 345, 357,5, 50, 41,108,472),
@@ -23,65 +23,65 @@ public enum CookableItems {
TROUT(333, 335, 343,15, 70, 50,88,432),
COD(339, 341, 343,18, 75, 52,74,420),
PIKE(351, 349, 343,20, 80, 53,78,412),
SALMON(329, 331, 343,25, 58, 90,68,392),
SALMON(329, 331, 343,25, 90, 58,68,392),
SLIMY_EEL(3381, 3379, 3383,28, 95, 58,72,406),
TUNA(361, 359, 367,30, 100, 64,58,372),
TUNA(361, 359, 367,30, 100, 65,58,372),
RAINBOW_FISH(10136, 10138, 10140,35, 110, 60,48,387),
CAVE_EEL(5003, 5001, 5002,38, 115, 40,42,386),
CAVE_EEL(5003, 5001, 5002,38, 115, 74,42,386),
LOBSTER(379, 377, 381,40, 120, 74,38,332),
BASS(365, 363, 367,43, 130, 80,28,312),
BASS(365, 363, 367,43, 130, 79,28,312),
SWORDFISH(373, 371, 375,45, 140, 86,18,292),
LAVA_EEL(2149, 2148, 3383,53, 30, 53,12,282),
MONKFISH(7946, 7944, 7948,62, 150, 92,11,275),
SHARK(385, 383, 387,80, 210, 100,0,202),
SEA_TURTLE(397, 395, 399,82, 212, 100,0,202),
MANTA_RAY(391, 389, 393,91, 216, 100,0,202),
KARAMBWAN(3144, 3142, 3146,1, 80, 30,70,255),
KARAMBWAN(3144, 3142, 3146,30, 190, 100,0,255),
/** snails */
THIN_SNAIL(3369, 3363, 3375,12, 70, 70,109,502),
LEAN_SNAIL(3371, 3365, 3375,17, 80, 80,100,486),
FAT_SNAIL(3373, 3367, 3375,22, 95, 95,95,456),
THIN_SNAIL(3369, 3363, 3375,12, 70, 47,109,502),
LEAN_SNAIL(3371, 3365, 3375,17, 80, 50,100,486),
FAT_SNAIL(3373, 3367, 3375,22, 95, 56,95,456),
//Bread
BREAD(2309, 2307, 2311,1,40,40,118,492),
BREAD(2309, 2307, 2311,1,40,37,118,492),
//Cake
CAKE(1891, 1889, 1903, 40, 180, 95,38,332),
CAKE(1891, 1889, 1903, 40, 180, 74,38,332),
//Beef(s) (Rat, Bear, Cow, Yak)
BEEF(2142,2132,2146,1,30,30,128,512),
RAT_MEAT(2142,2134,2146,1,30,30,128,512),
BEAR_MEAT(2142,2136,2146,1,30,30,128,512),
YAK_MEAT(2142,10816,2146,1,30,30,128,512),
BEEF(2142,2132,2146,1,30,34,128,512),
RAT_MEAT(2142,2134,2146,1,30,34,128,512),
BEAR_MEAT(2142,2136,2146,1,30,34,128,512),
YAK_MEAT(2142,10816,2146,1,30,34,128,512),
//Skewered foods
SKEWER_1(9988, 9986, 9990,21, 82, 82,108,496),
SKEWER_2(2878, 2876, 7226,30, 140, 140,85,476),
SKEWER_3(7568, 7566, 7570,41, 160, 140,75,456),
SKEWER_4(9980, 9984, 9982,11, 62, 62,115,502),
SKEWER_5(7223, 7224, 7222,16, 70, 62,113,499),
SKEWER_ROAST_BEAST(9988, 9986, 9990,21, 99, 82,108,496),
SKEWER_CHOMPY(2878, 2876, 7226,30, 140, 99,85,476),
SKEWER_JUBBLY(7568, 7566, 7570,41, 160, 140,75,456),
SKEWER_ROAST_BIRD(9980, 9984, 9982,11, 62, 99,115,502),
SKEWER_ROAST_RABBIT(7223, 7224, 7222,16, 72, 99,113,499),
//Pies
PIE_1(2325, 2321, 2329, 10, 78, 60,78,412),
PIE_2(2327, 2319, 2329, 20, 110, 80,78,412),
PIE_3(7170, 7169, 2329, 29,128,85,78,412),
PIE_4(2323,2317,2329,30,130,85,78,412),
GARDEN_PIE(7178,7176,2329,34,138, 89,78,412),
FISH_PIE(7188,7186,2329,47,164,110,78,412),
ADMIRAL_PIE(7198,7196,2329,70,210,140,78,412),
PIE_REDBERRY(2325, 2321, 2329, 10, 78, 50,78,412),
PIE_MEAT(2327, 2319, 2329, 20, 110, 53,78,412),
PIE_MUD(7170, 7168, 2329, 29,128,63,78,412),
PIE_APPLE(2323,2317,2329,30,130,63,78,412),
GARDEN_PIE(7178,7176,2329,34,138, 68,78,412),
FISH_PIE(7188,7186,2329,47,164,74,78,412),
ADMIRAL_PIE(7198,7196,2329,70,210,94,78,412),
WILD_PIE(7208,7206,2329,85,240,140,78,412),
SUMMER_PIE(7218,7216,2329,95,260,160,78,412),
//Pizzas
PIZZA_1(2289, 2287,2305, 35, 143, 86,48,352),
PIZZA_PLAIN(2289, 2287,2305, 35, 143, 68,48,352),
//Bowl foods
BOWL_1(2003, 2001, 2005,25, 117, 58,68,392),
BOWL_2(4239, 4237, 4239,20, 52, 1,68,392),
BOWL_3(7078, 7076, 7090,13, 50, 60,68,392),
BOWL_4(7084, 1871, 7092,43, 60, 70,68,392),
BOWL_5(7082, 7080, 7094,57, 120, 80,68,392),
BOWL_STEW(2003, 2001, 2005,25, 117, 58,68,392),
BOWL_NETTLE(4239, 4237, 4239,20, 52, 1,68,392),
BOWL_EGG(7078, 7076, 7090,13, 50, 48,68,392),
BOWL_ONION(7084, 1871, 7092,43, 60, 77,68,392),
BOWL_MUSHROOM(7082, 7080, 7094,46, 60, 90,68,392),
/* Vegetables */
BAKED_POTATO(6701, 1942, 6699, 7, 15, 41, 108, 472),