2009Scape/Server
1
0
Fork 1
mirror of https://gitlab.com/2009scape/2009scape.git synced 2025-12-16 03:20:19 -07:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into 'master'

Browse source 
Fix: Misc fixes, examine cleanup

See merge request 2009scape/2009scape!236
This commit is contained in:
Ceikry 2021-08-26 21:57:38 +00:00
commit 15cc641f63
5 changed files with 357 additions and 355 deletions
Download patch file Download diff file Expand all files Collapse all files

50
Server/data/configs/item_configs.json
View file

@ -46116,7 +46116,7 @@
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"ge_buy_limit": "10", "ge_buy_limit": "10",
"examine": "\tGuthan the Infested's platebody armour.", "examine": "Guthan the Infested's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -46371,7 +46371,7 @@
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"ge_buy_limit": "10", "ge_buy_limit": "10",
"examine": "\tTorag the Corrupted's platebody armour.", "examine": "Torag the Corrupted's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -48202,7 +48202,7 @@
}, },
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"examine": "\tGuthan the Infested's platebody armour.", "examine": "Guthan the Infested's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -48218,7 +48218,7 @@
}, },
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"examine": "\tGuthan the Infested's platebody armour.", "examine": "Guthan the Infested's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -48234,7 +48234,7 @@
}, },
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"examine": "\tGuthan the Infested's platebody armour.", "examine": "Guthan the Infested's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -48250,7 +48250,7 @@
}, },
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"examine": "\tGuthan the Infested's platebody armour.", "examine": "Guthan the Infested's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -48267,7 +48267,7 @@
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"ge_buy_limit": "10", "ge_buy_limit": "10",
"examine": "\tGuthan the Infested's platebody armour.", "examine": "Guthan the Infested's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -49000,7 +49000,7 @@
}, },
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"examine": "\tTorag the Corrupted's platebody armour.", "examine": "Torag the Corrupted's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -49016,7 +49016,7 @@
}, },
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"examine": "\tTorag the Corrupted's platebody armour.", "examine": "Torag the Corrupted's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -49032,7 +49032,7 @@
}, },
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"examine": "\tTorag the Corrupted's platebody armour.", "examine": "Torag the Corrupted's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -49048,7 +49048,7 @@
}, },
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"examine": "\tTorag the Corrupted's platebody armour.", "examine": "Torag the Corrupted's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -49065,7 +49065,7 @@
{ {
"requirements": "{1,70}", "requirements": "{1,70}",
"ge_buy_limit": "10", "ge_buy_limit": "10",
"examine": "\tTorag the Corrupted's platebody armour.", "examine": "Torag the Corrupted's platebody armour.",
"durability": null, "durability": null,
"low_alchemy": "112000", "low_alchemy": "112000",
"high_alchemy": "168000", "high_alchemy": "168000",
@ -68784,7 +68784,7 @@
{ {
"shop_price": "54", "shop_price": "54",
"ge_buy_limit": "1000", "ge_buy_limit": "1000",
"examine": "\tStill needs two more ingredients.", "examine": "Still needs two more ingredients.",
"grand_exchange_price": "77", "grand_exchange_price": "77",
"durability": null, "durability": null,
"name": "Part mud pie", "name": "Part mud pie",
@ -110850,21 +110850,21 @@
"id": "12184" "id": "12184"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely blue plumage.Owl: A fantastic saradomin owl.", "examine": "A fantastic saradomin owl.",
"durability": null, "durability": null,
"name": "Saradomin owl", "name": "Saradomin owl",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12185" "id": "12185"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely red plumage.Hawk: A stately zamorak hawk.", "examine": "A stately zamorak hawk.",
"durability": null, "durability": null,
"name": "Zamorak hawk", "name": "Zamorak hawk",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12186" "id": "12186"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely green plumage.Raptor: An impressive Guthix raptor.", "examine": "An impressive Guthix raptor.",
"durability": null, "durability": null,
"name": "Guthix raptor", "name": "Guthix raptor",
"archery_ticket_price": "0", "archery_ticket_price": "0",
@ -112506,63 +112506,63 @@
"id": "12502" "id": "12502"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely blue plumage.Owl: A fantastic saradomin owl.", "examine": "A fluffy chick.",
"durability": null, "durability": null,
"name": "Saradomin chick", "name": "Saradomin chick",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12503" "id": "12503"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely blue plumage.Owl: A fantastic saradomin owl.", "examine": "Lovely blue plumage.",
"durability": null, "durability": null,
"name": "Saradomin bird", "name": "Saradomin bird",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12504" "id": "12504"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely blue plumage.Owl: A fantastic saradomin owl.", "examine": "A fantastic saradomin owl.",
"durability": null, "durability": null,
"name": "Saradomin owl", "name": "Saradomin owl",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12505" "id": "12505"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely red plumage.Hawk: A stately zamorak hawk.", "examine": "A fluffy chick.",
"durability": null, "durability": null,
"name": "Zamorak chick", "name": "Zamorak chick",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12506" "id": "12506"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely red plumage.Hawk: A stately zamorak hawk.", "examine": "Lovely red plumage.",
"durability": null, "durability": null,
"name": "Zamorak bird", "name": "Zamorak bird",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12507" "id": "12507"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely red plumage.Hawk: A stately zamorak hawk.", "examine": "A stately zamorak hawk.",
"durability": null, "durability": null,
"name": "Zamorak hawk", "name": "Zamorak hawk",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12508" "id": "12508"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely green plumage.Raptor: An impressive Guthix raptor.", "examine": "A fluffy chick.",
"durability": null, "durability": null,
"name": "Guthix chick", "name": "Guthix chick",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12509" "id": "12509"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely green plumage.Raptor: An impressive Guthix raptor.", "examine": "Lovely green plumage.",
"durability": null, "durability": null,
"name": "Guthix bird", "name": "Guthix bird",
"archery_ticket_price": "0", "archery_ticket_price": "0",
"id": "12510" "id": "12510"
}, },
{ {
"examine": "Chick: A fluffy chick.Bird: Lovely green plumage.Raptor: An impressive Guthix raptor.", "examine": "An impressive Guthix raptor.",
"durability": null, "durability": null,
"name": "Guthix raptor", "name": "Guthix raptor",
"archery_ticket_price": "0", "archery_ticket_price": "0",

2
Server/data/configs/npc_spawns.json
View file

@ -349,7 +349,7 @@
}, },
{ {
"npc_id": "108", "npc_id": "108",
"loc_data": "{2941,9779,0,1,0}-{2934,9776,0,1,0}-{2934,9768,0,1,0}-{2934,9757,0,1,0}-{2930,9752,0,1,0}" "loc_data": "{2941,9779,0,1,0}-{2934,9776,0,1,0}-{2934,9768,0,1,0}-{2934,9757,0,1,0}-{2930,9752,0,1,0}-{2732,3225,0,1,0}-{2729,3224,0,1,0}-{2719,3223,0,1,0}-{2722,3220,0,1,0}-{2724,3216,0,1,0}-{2721,3213,0,1,0}-{2713,3217,0,1,0}"
}, },
{ {
"npc_id": "109", "npc_id": "109",

1
Server/src/main/java/core/game/content/consumable/Consumables.java
View file

@ -330,6 +330,7 @@ public enum Consumables {
MAGIC_ESS(new Potion(new int[] {11491, 11489}, new SkillEffect(Skills.MAGIC,3,0))), MAGIC_ESS(new Potion(new int[] {11491, 11489}, new SkillEffect(Skills.MAGIC,3,0))),
SANFEW(new Potion(new int[] {10925, 10927, 10929, 10931}, new MultiEffect(new RestoreEffect(8,0.25), new PrayerEffect(8,0.25), new RemoveStateEffect(EntityState.POISONED.ordinal()), new RemoveStateEffect("disease")))), SANFEW(new Potion(new int[] {10925, 10927, 10929, 10931}, new MultiEffect(new RestoreEffect(8,0.25), new PrayerEffect(8,0.25), new RemoveStateEffect(EntityState.POISONED.ordinal()), new RemoveStateEffect("disease")))),
SUPER_ENERGY(new Potion(new int[] {3016, 3018, 3020, 3022}, new EnergyEffect(20))), SUPER_ENERGY(new Potion(new int[] {3016, 3018, 3020, 3022}, new EnergyEffect(20))),
BLAMISH_OIL(new FakeConsumable(1582, new String[] {"You know... I'd really rather not."})),
/** Barbarian Mixes */ /** Barbarian Mixes */
PRAYERMIX(new BarbarianMix(new int[] {11467, 11465}, new MultiEffect(new PrayerEffect(7, 0.25), new HealingEffect(6)))), PRAYERMIX(new BarbarianMix(new int[] {11467, 11465}, new MultiEffect(new PrayerEffect(7, 0.25), new HealingEffect(6)))),

4
Server/src/main/java/core/game/interaction/item/GodBookPlugin.java
View file

@ -162,12 +162,12 @@ public class GodBookPlugin extends OptionHandler {
/** /**
* The partnership messages. * The partnership messages.
*/ */
private static final String[][] PARTNERSHIPS = new String[][] { { "In the name of Saradomin,", "protector of us all,", " I now join you in the eyes of Saradomin." }, { "Light and dark,", "day and night,", "Balance arises from constrast.", "I unify thee in the name of Guthix." }, { "May your union not be harmonious,", "but may your conflicts make you stronger,", "in Zamorak's name,", "now two are one." } }; private static final String[][] PARTNERSHIPS = new String[][] { { "In the name of Saradomin,", "protector of us all,", " I now join you in the eyes of Saradomin." }, { "Light and dark,", "day and night,", "Balance arises from contrast.", "I unify thee in the name of Guthix." }, { "May your union not be harmonious,", "but may your conflicts make you stronger,", "in Zamorak's name,", "now two are one." } };
/** /**
* The last rite messages. * The last rite messages.
*/ */
private static final String[][] LAST_RITES = new String[][] { { "Thy cause was false,", "thy skills did lack;", "See you in Lumbridge when you get back." }, { "Thy death was not in vain,", "For it brought some balance to the world.", "May guthix bring thee rest." }, { "The weak deserve to die,", "so the strong may flourish.", "This is the creed of Zamorak." } }; private static final String[][] LAST_RITES = new String[][] { { "Thy cause was false,", "thy skills did lack;", "See you in Lumbridge when you get back." }, { "Thy death was not in vain,", "For it brought some balance to the world.", "May Guthix bring thee rest." }, { "The weak deserve to die,", "so the strong may flourish.", "This is the creed of Zamorak." } };
/** /**
* The blessing messages. * The blessing messages.

3
Server/src/main/java/core/game/node/entity/skill/herblore/FinishedPotion.java
View file

@ -35,7 +35,8 @@ public enum FinishedPotion {
STRONG_WEAPON_POISON(UnfinishedPotion.STRONG_WEAPON_POISON, new Item(223), 73, 165, new Item(5937)), STRONG_WEAPON_POISON(UnfinishedPotion.STRONG_WEAPON_POISON, new Item(223), 73, 165, new Item(5937)),
SUPER_STRONG_WEAPON_POISON(UnfinishedPotion.SUPER_STRONG_WEAPON_POISON, new Item(6018), 82, 190, new Item(5940)), SUPER_STRONG_WEAPON_POISON(UnfinishedPotion.SUPER_STRONG_WEAPON_POISON, new Item(6018), 82, 190, new Item(5940)),
STRONG_ANTIPOISON(UnfinishedPotion.STRONG_ANTIPOISON, new Item(6049), 68, 155, new Item(5945)), STRONG_ANTIPOISON(UnfinishedPotion.STRONG_ANTIPOISON, new Item(6049), 68, 155, new Item(5945)),
SUPER_STRONG_ANTIPOISON(UnfinishedPotion.SUPER_STRONG_ANTIPOISON, new Item(6051), 79, 177.5, new Item(5954)); SUPER_STRONG_ANTIPOISON(UnfinishedPotion.SUPER_STRONG_ANTIPOISON, new Item(6051), 79, 177.5, new Item(5954)),
BLAMISH_OIL(UnfinishedPotion.HARRALANDER, new Item(1581), 25, 80, new Item(1582));
/** /**
* Represents the unfinished potion. * Represents the unfinished potion.