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

Added drop tables for wandering earth elemental and earth elemental

Browse source 
Fixed evergreen trees rewarding multiple logs per spawn
Adjusted suqah stats
Removed Ancient staff from mummy drop table (we need desert treasure quest first, and it's not a normal drop)
This commit is contained in:
MatthewGould123 2022-08-31 07:24:50 +00:00 • committed by Ryan
parent c8f6f9cb59
commit 7d662d8ab0
3 changed files with 148 additions and 395 deletions
Download patch file Download diff file Expand all files Collapse all files

128
Server/data/configs/drop_tables.json
View file

@ -14629,12 +14629,6 @@
"id": "1185", "id": "1185",
"maxAmount": "1" "maxAmount": "1"
}, },
{
"minAmount": "1",
"weight": "5.0",
"id": "4675",
"maxAmount": "1"
},
{ {
"minAmount": "1", "minAmount": "1",
"weight": "50.0", "weight": "50.0",
@ -63646,14 +63640,62 @@
"main": [ "main": [
{ {
"minAmount": "1", "minAmount": "1",
"weight": "1.0", "weight": "2.0",
"id": "0", "id": "565",
"maxAmount": "2"
},
{
"minAmount": "1",
"weight": "3.0",
"id": "560",
"maxAmount": "1" "maxAmount": "1"
}, },
{
"minAmount": "1",
"weight": "6.0",
"id": "563",
"maxAmount": "1"
},
{
"minAmount": "2",
"weight": "12.0",
"id": "562",
"maxAmount": "2"
},
{
"minAmount": "15",
"weight": "12.0",
"id": "557",
"maxAmount": "20"
},
{
"minAmount": "1",
"weight": "10.0",
"id": "1440",
"maxAmount": "1"
},
{
"minAmount": "2",
"weight": "10.0",
"id": "561",
"maxAmount": "2"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1385",
"maxAmount": "1"
},
{
"minAmount": "14",
"weight": "45.0",
"id": "617",
"maxAmount": "42"
},
{ {
"minAmount": "1", "minAmount": "1",
"weight": "1.0", "weight": "1.0",
"id": "0", "id": "31",
"maxAmount": "1" "maxAmount": "1"
} }
] ]
@ -63690,5 +63732,73 @@
"maxAmount": "1" "maxAmount": "1"
} }
] ]
},
{
"default": [],
"charm": [],
"ids": "1020",
"description": "Wandering earth elemental",
"main": [
{
"minAmount": "1",
"weight": "1.0",
"id": "31",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "2.0",
"id": "565",
"maxAmount": "2"
},
{
"minAmount": "1",
"weight": "3.0",
"id": "560",
"maxAmount": "1"
},
{
"minAmount": "1",
"weight": "6.0",
"id": "563",
"maxAmount": "1"
},
{
"minAmount": "2",
"weight": "12.0",
"id": "562",
"maxAmount": "2"
},
{
"minAmount": "15",
"weight": "12.0",
"id": "557",
"maxAmount": "20"
},
{
"minAmount": "1",
"weight": "10.0",
"id": "1440",
"maxAmount": "1"
},
{
"minAmount": "2",
"weight": "10.0",
"id": "561",
"maxAmount": "2"
},
{
"minAmount": "1",
"weight": "5.0",
"id": "1385",
"maxAmount": "1"
},
{
"minAmount": "14",
"weight": "45.0",
"id": "617",
"maxAmount": "42"
}
]
} }
] ]

406
Server/data/configs/npc_configs.json
View file

@ -38029,49 +38029,16 @@
"defence_animation": "4384", "defence_animation": "4384",
"death_animation": "4389", "death_animation": "4389",
"name": "Suqah", "name": "Suqah",
"defence_level": "1", "defence_level": "95",
"safespot": null, "safespot": null,
"lifepoints": "105", "lifepoints": "105",
"strength_level": "1", "strength_level": "95",
"id": "4527",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4528",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4529", "id": "4529",
"aggressive": "true", "aggressive": "true",
"clue_level": "2", "clue_level": "2",
"bonuses": "0,0,0,0,0,50,70,70,90,50,0,0,0,0,0",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "95"
}, },
{ {
"melee_animation": "4388", "melee_animation": "4388",
@ -38080,15 +38047,16 @@
"defence_animation": "4385", "defence_animation": "4385",
"death_animation": "4389", "death_animation": "4389",
"name": "Suqah", "name": "Suqah",
"defence_level": "1", "defence_level": "95",
"safespot": null, "safespot": null,
"lifepoints": "105", "lifepoints": "105",
"strength_level": "1", "strength_level": "95",
"id": "4530", "id": "4530",
"aggressive": "true", "aggressive": "true",
"clue_level": "2", "clue_level": "2",
"bonuses": "0,0,0,0,0,50,70,70,90,50,0,0,0,0,0",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "95"
}, },
{ {
"melee_animation": "4388", "melee_animation": "4388",
@ -38097,15 +38065,16 @@
"defence_animation": "4385", "defence_animation": "4385",
"death_animation": "4389", "death_animation": "4389",
"name": "Suqah", "name": "Suqah",
"defence_level": "1", "defence_level": "95",
"safespot": null, "safespot": null,
"lifepoints": "105", "lifepoints": "105",
"strength_level": "1", "strength_level": "95",
"id": "4531", "id": "4531",
"aggressive": "true", "aggressive": "true",
"clue_level": "2", "clue_level": "2",
"bonuses": "0,0,0,0,0,50,70,70,70,50,0,0,0,0,0",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "95"
}, },
{ {
"melee_animation": "4388", "melee_animation": "4388",
@ -38114,32 +38083,16 @@
"defence_animation": "4384", "defence_animation": "4384",
"death_animation": "4389", "death_animation": "4389",
"name": "Suqah", "name": "Suqah",
"defence_level": "1", "defence_level": "95",
"safespot": null, "safespot": null,
"lifepoints": "105", "lifepoints": "105",
"strength_level": "1", "strength_level": "95",
"id": "4532",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4533", "id": "4533",
"aggressive": "true", "aggressive": "true",
"clue_level": "2", "clue_level": "2",
"bonuses": "0,0,0,0,0,50,70,70,90,50,0,0,0,0,0",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "95"
}, },
{ {
"examine": "His beard seems to have a life of its own.", "examine": "His beard seems to have a life of its own.",
@ -95736,125 +95689,6 @@
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "1"
}, },
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4527",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4528",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4529",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4385",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4530",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4385",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4531",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4532",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4533",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{ {
"examine": "I always wondered what that job description actually meant...", "examine": "I always wondered what that job description actually meant...",
"melee_animation": "0", "melee_animation": "0",
@ -145030,117 +144864,16 @@
"defence_animation": "4384", "defence_animation": "4384",
"death_animation": "4389", "death_animation": "4389",
"name": "Suqah", "name": "Suqah",
"defence_level": "1", "defence_level": "95",
"safespot": null, "safespot": null,
"lifepoints": "105", "lifepoints": "105",
"strength_level": "1", "strength_level": "95",
"id": "4527",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4528",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4529",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4385",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4530",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4385",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4531",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4532", "id": "4532",
"aggressive": "true", "aggressive": "true",
"clue_level": "2", "clue_level": "2",
"bonuses": "0,0,0,0,0,50,70,70,90,50,0,0,0,0,0",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "95"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4533",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
}, },
{ {
"examine": "I always wondered what that job description actually meant...", "examine": "I always wondered what that job description actually meant...",
@ -194387,15 +194120,16 @@
"defence_animation": "4384", "defence_animation": "4384",
"death_animation": "4389", "death_animation": "4389",
"name": "Suqah", "name": "Suqah",
"defence_level": "1", "defence_level": "95",
"safespot": null, "safespot": null,
"lifepoints": "105", "lifepoints": "105",
"strength_level": "1", "strength_level": "95",
"id": "4527", "id": "4527",
"aggressive": "true", "aggressive": "true",
"clue_level": "2", "clue_level": "2",
"bonuses": "0,0,0,0,0,50,70,70,90,50,0,0,0,0,0",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "95"
}, },
{ {
"melee_animation": "4388", "melee_animation": "4388",
@ -194404,100 +194138,16 @@
"defence_animation": "4384", "defence_animation": "4384",
"death_animation": "4389", "death_animation": "4389",
"name": "Suqah", "name": "Suqah",
"defence_level": "1", "defence_level": "95",
"safespot": null, "safespot": null,
"lifepoints": "105", "lifepoints": "105",
"strength_level": "1", "strength_level": "95",
"id": "4528", "id": "4528",
"aggressive": "true", "aggressive": "true",
"clue_level": "2", "clue_level": "2",
"bonuses": "0,0,0,0,0,50,70,70,90,50,0,0,0,0,0",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "95"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4529",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4385",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4530",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4385",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4531",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4532",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
},
{
"melee_animation": "4388",
"attack_speed": "5",
"respawn_delay": "60",
"defence_animation": "4384",
"death_animation": "4389",
"name": "Suqah",
"defence_level": "1",
"safespot": null,
"lifepoints": "105",
"strength_level": "1",
"id": "4533",
"aggressive": "true",
"clue_level": "2",
"range_level": "1",
"attack_level": "1"
}, },
{ {
"examine": "I always wondered what that job description actually meant...", "examine": "I always wondered what that job description actually meant...",

9
Server/src/main/java/core/game/node/entity/skill/gather/woodcutting/WoodcuttingSkillPulse.java
View file

@ -143,13 +143,6 @@ public class WoodcuttingSkillPulse extends Pulse {
return false; return false;
} }
// If player is in donator zone
/* if (player.getLocation().getRegionId() == 12102) {
player.getAntiMacroHandler().fireEvent("tree spirit");
return true;
}
*/
// 20% chance to auto burn logs when using "inferno adze" item // 20% chance to auto burn logs when using "inferno adze" item
if (SkillingTool.getHatchet(player).getId() == 13661 && RandomFunction.random(100) < 25) { if (SkillingTool.getHatchet(player).getId() == 13661 && RandomFunction.random(100) < 25) {
player.sendMessage("You chop some logs. The heat of the inferno adze incinerates them."); player.sendMessage("You chop some logs. The heat of the inferno adze incinerates them.");
@ -202,7 +195,7 @@ public class WoodcuttingSkillPulse extends Pulse {
//OSRS: https://oldschool.runescape.wiki/w/Woodcutting scroll down to the mechanics section //OSRS: https://oldschool.runescape.wiki/w/Woodcutting scroll down to the mechanics section
//RS3 : https://runescape.wiki/w/Woodcutting scroll down to the mechanics section, and expand the tree felling chances table //RS3 : https://runescape.wiki/w/Woodcutting scroll down to the mechanics section, and expand the tree felling chances table
if (resource.getRespawnRate() > 0) { if (resource.getRespawnRate() > 0) {
if (RandomFunction.roll(8) || resource.identifier == 1 || resource.identifier == 2 || resource.identifier == 6) { if (RandomFunction.roll(8) || resource.identifier == 1 || resource.identifier == 2 || resource.identifier == 3 || resource.identifier == 6) {
if (resource.isFarming()) { if (resource.isFarming()) {
FarmingPatch fPatch = FarmingPatch.forObject(node.asScenery()); FarmingPatch fPatch = FarmingPatch.forObject(node.asScenery());
if(fPatch != null) { if(fPatch != null) {