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

Add: Summoning Pouch updates, Karamja and Brimhaven misc fixes

Browse Source
This commit is contained in:
skelsoft
2021-06-28 04:03:34 +00:00
committed by Ceikry
parent 32c0016020
commit a85584ea82
4 changed files with 399 additions and 165 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/data/configs/item_configs.json
+234
View File
File diff suppressed because it is too large Load Diff
Server/data/configs/shops.json
+3 -3
View File
@@ -375,7 +375,7 @@
"general_store": "false", "general_store": "false",
"id": "43", "id": "43",
"title": "Davon's Amulet Store", "title": "Davon's Amulet Store",
"stock": "{1718,0}-{1727,1}-{1729,0}-{1725,0}-{1731,0}" "stock": "{1718,0}-{1727,0}-{1729,0}-{1725,0}-{1731,0}"
}, },
{ {
"npcs": "2356", "npcs": "2356",
@@ -1508,8 +1508,8 @@
"currency": "995", "currency": "995",
"general_store": "false", "general_store": "false",
"id": "170", "id": "170",
"title": "The Shrimps and Parrot", "title": "The Shrimp and Parrot",
"stock": "{347,5}-{339,5}-{379,5}-{373,6}-{3144,0}" "stock": "{347,5}-{339,5}-{379,3}-{373,2}-{3144,3}"
}, },
{ {
"npcs": "747", "npcs": "747",
Server/src/main/java/core/game/content/dialogue/AlfonseWaiterDialogue.java
+2 -2
View File
@@ -37,7 +37,7 @@ public final class AlfonseWaiterDialogue extends DialoguePlugin {
@Override @Override
public boolean open(Object... args) { public boolean open(Object... args) {
npc = (NPC) args[0]; npc = (NPC) args[0];
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Welcome to the Shrimps and Parrot.", "Would you like to order, sir?"); interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "Welcome to the Shrimp and Parrot.", "Would you like to order, sir?");
stage = 0; stage = 0;
return true; return true;
} }
@@ -73,7 +73,7 @@ public final class AlfonseWaiterDialogue extends DialoguePlugin {
end(); end();
break; break;
case 30: case 30:
interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "We buy directly off Lubufu, a local fisherman. He", "seems to have a monopoly over Karambwan sale."); interpreter.sendDialogues(npc, FacialExpression.HALF_GUILTY, "We buy directly off Lubufu, a local fisherman. He", "seems to have a monopoly over Karambwan sales.");
stage = 31; stage = 31;
break; break;
case 31: case 31:
Server/src/main/java/core/game/node/entity/skill/cooking/CookingRewrite.kt
+1 -1
View File
@@ -53,7 +53,7 @@ class CookingRewrite : InteractionListener() {
} }
companion object { companion object {
val COOKING_OBJs = intArrayOf(24313,21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426, 40110) val COOKING_OBJs = intArrayOf(24313,21302, 13528, 13529, 13533, 13531, 13536, 13539, 13542, 2728, 2729, 2730, 2731, 2732, 2859, 3038, 3039, 3769, 3775, 4265, 4266, 5249, 5499, 5631, 5632, 5981, 9682, 10433, 11404, 11405, 11406, 12102, 12796, 13337, 13881, 14169, 14919, 15156, 20000, 20001, 21620, 21792, 22713, 22714, 23046, 24283, 24284, 25155, 25156, 25465, 25730, 27297, 29139, 30017, 32099, 33500, 34495, 34546, 36973, 37597, 37629, 37726, 114, 4172, 5275, 8750, 16893, 22154, 34410, 34565, 114, 9085, 9086, 9087, 12269, 15398, 25440, 25441, 2724, 2725, 2726, 4618, 4650, 5165, 6093, 6094, 6095, 6096, 8712, 9374, 9439, 9440, 9441, 10824, 17640, 17641, 17642, 17643, 18039, 21795, 24285, 24329, 27251, 33498, 35449, 36815, 36816, 37426, 40110)
@JvmStatic @JvmStatic
fun cook(player: Player, `object`: Scenery?, initial: Int, product: Int, amount: Int) { fun cook(player: Player, `object`: Scenery?, initial: Int, product: Int, amount: Int) {