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

Significant Stronghold of Security immersion improvements

Browse Source 
Added the command ::jingle to play music jingles by id
This commit is contained in:
Zerken
2023-03-08 03:28:10 +00:00
committed by Ryan
parent ff18f69dd0
commit 55c619bf87
5 changed files with 142 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Server/data/configs/music_configs.json
+16
View File
@@ -1437,6 +1437,10 @@
"id": "532", "id": "532",
"borders": "{1984,4416,2047,4479}" "borders": "{1984,4416,2047,4479}"
}, },
{
"id": "537",
"borders": "{1856,5185,1917,5246}"
},
{ {
"id": "542", "id": "542",
"borders": "{3072,9280,3135,9343}" "borders": "{3072,9280,3135,9343}"
@@ -1449,6 +1453,18 @@
"id": "555", "id": "555",
"borders": "" "borders": ""
}, },
{
"id": "558",
"borders": "{1985,5185,2047,5247}"
},
{
"id": "559",
"borders": "{2116,5247,2172,5308}"
},
{
"id": "560",
"borders": "{2305,5186,2366,5247}"
},
{ {
"id": "569", "id": "569",
"borders": "{3200,9984,3263,10047}" "borders": "{3200,9984,3263,10047}"
Server/data/configs/npc_configs.json
+71 -33
View File
@@ -5534,6 +5534,7 @@
"examine": "Dead but not gone.", "examine": "Dead but not gone.",
"melee_animation": "390", "melee_animation": "390",
"range_animation": "0", "range_animation": "0",
"combat_audio": "511,439,438",
"respawn_delay": "50", "respawn_delay": "50",
"defence_animation": "0", "defence_animation": "0",
"weakness": "9", "weakness": "9",
@@ -5552,6 +5553,7 @@
"examine": "Dead but not gone.", "examine": "Dead but not gone.",
"melee_animation": "390", "melee_animation": "390",
"range_animation": "0", "range_animation": "0",
"combat_audio": "511,439,438",
"respawn_delay": "50", "respawn_delay": "50",
"defence_animation": "0", "defence_animation": "0",
"weakness": "9", "weakness": "9",
@@ -5570,6 +5572,7 @@
"examine": "Dead but not gone.", "examine": "Dead but not gone.",
"melee_animation": "390", "melee_animation": "390",
"range_animation": "0", "range_animation": "0",
"combat_audio": "511,439,438",
"respawn_delay": "50", "respawn_delay": "50",
"defence_animation": "0", "defence_animation": "0",
"weakness": "9", "weakness": "9",
@@ -5589,6 +5592,7 @@
"slayer_task": "73", "slayer_task": "73",
"melee_animation": "390", "melee_animation": "390",
"range_animation": "0", "range_animation": "0",
"combat_audio": "511,439,438",
"respawn_delay": "50", "respawn_delay": "50",
"defence_animation": "0", "defence_animation": "0",
"weakness": "9", "weakness": "9",
@@ -5609,6 +5613,7 @@
"slayer_task": "73", "slayer_task": "73",
"melee_animation": "390", "melee_animation": "390",
"range_animation": "0", "range_animation": "0",
"combat_audio": "511,439,438",
"magic_level": "1", "magic_level": "1",
"respawn_delay": "50", "respawn_delay": "50",
"defence_animation": "0", "defence_animation": "0",
@@ -36901,10 +36906,11 @@
"attack_level": "1" "attack_level": "1"
}, },
{ {
"examine": "A bony ghost.", "examine": "A boney ghost.",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"attack_speed": "6", "combat_audio": "924,926,925",
"attack_speed": "4",
"defence_animation": "404", "defence_animation": "404",
"slayer_exp": "60", "slayer_exp": "60",
"magic_animation": "422", "magic_animation": "422",
@@ -36921,10 +36927,11 @@
"attack_level": "50" "attack_level": "50"
}, },
{ {
"examine": "A bony ghost.", "examine": "A boney ghost.",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"attack_speed": "6", "combat_audio": "924,926,925",
"attack_speed": "4",
"defence_animation": "404", "defence_animation": "404",
"slayer_exp": "60", "slayer_exp": "60",
"magic_animation": "422", "magic_animation": "422",
@@ -36941,10 +36948,11 @@
"attack_level": "50" "attack_level": "50"
}, },
{ {
"examine": "A bony ghost.", "examine": "A boney ghost.",
"melee_animation": "422", "melee_animation": "422",
"range_animation": "422", "range_animation": "422",
"attack_speed": "6", "combat_audio": "924,926,925",
"attack_speed": "4",
"defence_animation": "404", "defence_animation": "404",
"slayer_exp": "60", "slayer_exp": "60",
"magic_animation": "422", "magic_animation": "422",
@@ -37006,6 +37014,7 @@
"slayer_task": "34", "slayer_task": "34",
"melee_animation": "1184", "melee_animation": "1184",
"range_animation": "1184", "range_animation": "1184",
"combat_audio": "571,573,572",
"attack_speed": "3", "attack_speed": "3",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "1186", "defence_animation": "1186",
@@ -37028,6 +37037,7 @@
"examine": "I don't think insect repellent will work.", "examine": "I don't think insect repellent will work.",
"melee_animation": "1184", "melee_animation": "1184",
"range_animation": "1184", "range_animation": "1184",
"combat_audio": "571,573,572",
"attack_speed": "3", "attack_speed": "3",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "1186", "defence_animation": "1186",
@@ -37049,6 +37059,7 @@
"examine": "I don't think insect repellent will work.", "examine": "I don't think insect repellent will work.",
"melee_animation": "1184", "melee_animation": "1184",
"range_animation": "1184", "range_animation": "1184",
"combat_audio": "571,573,572",
"attack_speed": "3", "attack_speed": "3",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "1186", "defence_animation": "1186",
@@ -37067,10 +37078,10 @@
"attack_level": "100" "attack_level": "100"
}, },
{ {
"examine": "The walking dead.", "examine": "Dead man walking.",
"melee_animation": "5568", "melee_animation": "5568",
"range_animation": "5568", "range_animation": "5568",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5567", "defence_animation": "5567",
@@ -37083,15 +37094,16 @@
"lifepoints": "23", "lifepoints": "23",
"strength_level": "1", "strength_level": "1",
"id": "4392", "id": "4392",
"aggressive": "true",
"bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25", "bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25",
"range_level": "1", "range_level": "1",
"attack_level": "24" "attack_level": "24"
}, },
{ {
"examine": "Dead (wo)man walking.", "examine": "Dead man walking.",
"melee_animation": "5578", "melee_animation": "5578",
"range_animation": "5578", "range_animation": "5578",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5579", "defence_animation": "5579",
@@ -37110,10 +37122,10 @@
"attack_level": "35" "attack_level": "35"
}, },
{ {
"examine": "Could his name be \"Lurch\"?", "examine": "Dead man walking.",
"melee_animation": "5578", "melee_animation": "5578",
"range_animation": "5578", "range_animation": "5578",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5579", "defence_animation": "5579",
@@ -37126,6 +37138,7 @@
"lifepoints": "40", "lifepoints": "40",
"strength_level": "1", "strength_level": "1",
"id": "4394", "id": "4394",
"aggressive": "true",
"bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45", "bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45",
"range_level": "1", "range_level": "1",
"attack_level": "47" "attack_level": "47"
@@ -37134,8 +37147,11 @@
"examine": "Overgrown vermin.", "examine": "Overgrown vermin.",
"slayer_task": "67", "slayer_task": "67",
"combat_audio": "703,705,704", "combat_audio": "703,705,704",
"melee_animation": "4933",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "4934",
"weakness": "9", "weakness": "9",
"death_animation": "4935",
"name": "Giant rat", "name": "Giant rat",
"defence_level": "23", "defence_level": "23",
"safespot": null, "safespot": null,
@@ -37151,7 +37167,7 @@
"examine": "A popular dwarven delicacy.", "examine": "A popular dwarven delicacy.",
"melee_animation": "2705", "melee_animation": "2705",
"range_animation": "2705", "range_animation": "2705",
"combat_audio": "3102,3104,3103", "combat_audio": "710,713,711",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "2706", "defence_animation": "2706",
"magic_animation": "2705", "magic_animation": "2705",
@@ -37168,6 +37184,7 @@
{ {
"examine": "Big Cow-like... But cows don't have serpent tails!", "examine": "Big Cow-like... But cows don't have serpent tails!",
"melee_animation": "4271", "melee_animation": "4271",
"combat_audio": "511,330,329",
"attack_speed": "5", "attack_speed": "5",
"magic_level": "38", "magic_level": "38",
"spell_id": "7", "spell_id": "7",
@@ -37191,6 +37208,7 @@
{ {
"examine": "Big Cow-like... But cows don't have serpent tails!", "examine": "Big Cow-like... But cows don't have serpent tails!",
"melee_animation": "4271", "melee_animation": "4271",
"combat_audio": "511,330,329",
"attack_speed": "5", "attack_speed": "5",
"magic_level": "38", "magic_level": "38",
"spell_id": "7", "spell_id": "7",
@@ -37214,6 +37232,7 @@
{ {
"examine": "Big Cow-like... But cows don't have serpent tails!", "examine": "Big Cow-like... But cows don't have serpent tails!",
"melee_animation": "4271", "melee_animation": "4271",
"combat_audio": "511,330,329",
"attack_speed": "5", "attack_speed": "5",
"magic_level": "45", "magic_level": "45",
"spell_id": "7", "spell_id": "7",
@@ -37255,6 +37274,7 @@
}, },
{ {
"melee_animation": "6249", "melee_animation": "6249",
"combat_audio": "3604,3609,3608",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "6250", "defence_animation": "6250",
"death_animation": "6251", "death_animation": "6251",
@@ -37264,7 +37284,7 @@
"lifepoints": "22", "lifepoints": "22",
"strength_level": "1", "strength_level": "1",
"id": "4401", "id": "4401",
"aggressive": "true", "aggressive": "false",
"range_level": "1", "range_level": "1",
"attack_level": "1" "attack_level": "1"
}, },
@@ -37387,7 +37407,7 @@
"examine": "An ugly green creature.", "examine": "An ugly green creature.",
"melee_animation": "6185", "melee_animation": "6185",
"range_animation": "6185", "range_animation": "6185",
"combat_audio": "469,472,471", "combat_audio": "3520,472,471",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "6183", "defence_animation": "6183",
"slayer_exp": "5", "slayer_exp": "5",
@@ -37408,7 +37428,7 @@
"examine": "An ugly green creature.", "examine": "An ugly green creature.",
"melee_animation": "6185", "melee_animation": "6185",
"range_animation": "6185", "range_animation": "6185",
"combat_audio": "469,472,471", "combat_audio": "3520,472,471",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "6183", "defence_animation": "6183",
"slayer_exp": "16", "slayer_exp": "16",
@@ -37429,7 +37449,7 @@
"examine": "An ugly green creature.", "examine": "An ugly green creature.",
"melee_animation": "6185", "melee_animation": "6185",
"range_animation": "6185", "range_animation": "6185",
"combat_audio": "469,472,471", "combat_audio": "3520,472,471",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "6183", "defence_animation": "6183",
"slayer_exp": "7", "slayer_exp": "7",
@@ -37450,7 +37470,7 @@
"examine": "An ugly green creature.", "examine": "An ugly green creature.",
"melee_animation": "6185", "melee_animation": "6185",
"range_animation": "6185", "range_animation": "6185",
"combat_audio": "469,472,471", "combat_audio": "3520,472,471",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "6183", "defence_animation": "6183",
"magic_animation": "6185", "magic_animation": "6185",
@@ -37470,7 +37490,7 @@
"examine": "An ugly green creature.", "examine": "An ugly green creature.",
"melee_animation": "6185", "melee_animation": "6185",
"range_animation": "6185", "range_animation": "6185",
"combat_audio": "469,472,471", "combat_audio": "3520,472,471",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "6183", "defence_animation": "6183",
"magic_animation": "6185", "magic_animation": "6185",
@@ -37490,7 +37510,7 @@
"examine": "An ugly green creature.", "examine": "An ugly green creature.",
"melee_animation": "6185", "melee_animation": "6185",
"range_animation": "6185", "range_animation": "6185",
"combat_audio": "469,472,471", "combat_audio": "3520,472,471",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "6183", "defence_animation": "6183",
"magic_animation": "6185", "magic_animation": "6185",
@@ -37553,7 +37573,7 @@
"slayer_task": "67", "slayer_task": "67",
"melee_animation": "2705", "melee_animation": "2705",
"range_animation": "2705", "range_animation": "2705",
"combat_audio": "3102,3104,3103", "combat_audio": "710,713,711",
"attack_speed": "4", "attack_speed": "4",
"magic_level": "1", "magic_level": "1",
"respawn_delay": "3", "respawn_delay": "3",
@@ -42781,7 +42801,10 @@
{ {
"examine": "Overgrown vermin.", "examine": "Overgrown vermin.",
"combat_audio": "703,705,704", "combat_audio": "703,705,704",
"melee_animation": "4933",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "4934",
"death_animation": "4935",
"name": "Giant rat", "name": "Giant rat",
"defence_level": "23", "defence_level": "23",
"safespot": null, "safespot": null,
@@ -42797,8 +42820,11 @@
"examine": "Overgrown vermin.", "examine": "Overgrown vermin.",
"slayer_task": "67", "slayer_task": "67",
"combat_audio": "703,705,704", "combat_audio": "703,705,704",
"melee_animation": "4933",
"attack_speed": "5", "attack_speed": "5",
"defence_animation": "4934",
"weakness": "9", "weakness": "9",
"death_animation": "4935",
"name": "Giant rat", "name": "Giant rat",
"defence_level": "23", "defence_level": "23",
"safespot": null, "safespot": null,
@@ -45514,6 +45540,7 @@
"attack_level": "1" "attack_level": "1"
}, },
{ {
"examine": "",
"melee_animation": "5568", "melee_animation": "5568",
"combat_audio": "931,923,922", "combat_audio": "931,923,922",
"respawn_delay": "60", "respawn_delay": "60",
@@ -46133,10 +46160,10 @@
"attack_level": "80" "attack_level": "80"
}, },
{ {
"examine": "Examine not added", "examine": "Dead man walking.",
"melee_animation": "5568", "melee_animation": "5568",
"range_animation": "5568", "range_animation": "5568",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5567", "defence_animation": "5567",
@@ -46149,15 +46176,16 @@
"lifepoints": "23", "lifepoints": "23",
"strength_level": "1", "strength_level": "1",
"id": "5375", "id": "5375",
"aggressive": "true",
"bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25", "bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25",
"range_level": "1", "range_level": "1",
"attack_level": "25" "attack_level": "25"
}, },
{ {
"examine": "Examine not added", "examine": "Dead man walking.",
"melee_animation": "5568", "melee_animation": "5568",
"range_animation": "5568", "range_animation": "5568",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5567", "defence_animation": "5567",
@@ -46170,15 +46198,16 @@
"lifepoints": "23", "lifepoints": "23",
"strength_level": "1", "strength_level": "1",
"id": "5376", "id": "5376",
"aggressive": "true",
"bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25", "bonuses": "15,25,25,25,25,25,25,15,15,25,25,25,25,25,25",
"range_level": "1", "range_level": "1",
"attack_level": "25" "attack_level": "25"
}, },
{ {
"examine": "Examine not added", "examine": "Dead man walking.",
"melee_animation": "5578", "melee_animation": "5578",
"range_animation": "5578", "range_animation": "5578",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5579", "defence_animation": "5579",
@@ -46191,15 +46220,16 @@
"lifepoints": "30", "lifepoints": "30",
"strength_level": "1", "strength_level": "1",
"id": "5377", "id": "5377",
"aggressive": "true",
"bonuses": "15,25,28,28,25,28,28,15,15,28,25,25,25,25,25", "bonuses": "15,25,28,28,25,28,28,15,15,28,25,25,25,25,25",
"range_level": "1", "range_level": "1",
"attack_level": "38" "attack_level": "38"
}, },
{ {
"examine": "Examine not added", "examine": "Dead man walking.",
"melee_animation": "5578", "melee_animation": "5578",
"range_animation": "5578", "range_animation": "5578",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5579", "defence_animation": "5579",
@@ -46212,15 +46242,16 @@
"lifepoints": "30", "lifepoints": "30",
"strength_level": "1", "strength_level": "1",
"id": "5378", "id": "5378",
"aggressive": "true",
"bonuses": "15,25,28,28,25,28,28,15,15,28,25,25,25,25,25", "bonuses": "15,25,28,28,25,28,28,15,15,28,25,25,25,25,25",
"range_level": "1", "range_level": "1",
"attack_level": "38" "attack_level": "38"
}, },
{ {
"examine": "Examine not added", "examine": "The walking dead.",
"melee_animation": "5578", "melee_animation": "5578",
"range_animation": "5578", "range_animation": "5578",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5579", "defence_animation": "5579",
@@ -46233,15 +46264,16 @@
"lifepoints": "40", "lifepoints": "40",
"strength_level": "1", "strength_level": "1",
"id": "5379", "id": "5379",
"aggressive": "true",
"bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45", "bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45",
"range_level": "1", "range_level": "1",
"attack_level": "47" "attack_level": "47"
}, },
{ {
"examine": "Examine not added", "examine": "The walking dead.",
"melee_animation": "5578", "melee_animation": "5578",
"range_animation": "5578", "range_animation": "5578",
"combat_audio": "931,923,922", "combat_audio": "918,923,922",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "30", "respawn_delay": "30",
"defence_animation": "5579", "defence_animation": "5579",
@@ -46254,6 +46286,7 @@
"lifepoints": "40", "lifepoints": "40",
"strength_level": "1", "strength_level": "1",
"id": "5380", "id": "5380",
"aggressive": "true",
"bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45", "bonuses": "35,45,45,45,45,45,45,35,35,45,45,45,45,45,45",
"range_level": "1", "range_level": "1",
"attack_level": "47" "attack_level": "47"
@@ -69359,6 +69392,7 @@
"safespot": null, "safespot": null,
"lifepoints": "10", "lifepoints": "10",
"combat_audio": "774,775,777", "combat_audio": "774,775,777",
"melee_animation": "5485",
"strength_level": "1", "strength_level": "1",
"id": "3705", "id": "3705",
"range_level": "1", "range_level": "1",
@@ -69366,6 +69400,7 @@
}, },
{ {
"combat_audio": "774,775,777", "combat_audio": "774,775,777",
"melee_animation": "5485",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "5513", "defence_animation": "5513",
@@ -69404,6 +69439,7 @@
}, },
{ {
"combat_audio": "774,775,777", "combat_audio": "774,775,777",
"melee_animation": "5485",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "5513", "defence_animation": "5513",
@@ -69669,6 +69705,7 @@
{ {
"examine": "Could do with gaining a few pounds.", "examine": "Could do with gaining a few pounds.",
"combat_audio": "774,775,777", "combat_audio": "774,775,777",
"melee_animation": "5485",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "5513", "defence_animation": "5513",
@@ -69686,6 +69723,7 @@
{ {
"examine": "Could do with gaining a few pounds.", "examine": "Could do with gaining a few pounds.",
"combat_audio": "774,775,777", "combat_audio": "774,775,777",
"melee_animation": "5485",
"attack_speed": "5", "attack_speed": "5",
"respawn_delay": "60", "respawn_delay": "60",
"defence_animation": "5513", "defence_animation": "5513",
Server/data/configs/npc_spawns.json
+12 -12
View File
@@ -6393,11 +6393,11 @@
}, },
{ {
"npc_id": "4381", "npc_id": "4381",
"loc_data": "{2361,5241,0,0,1}-{2358,5240,0,0,1}-{2362,5239,0,0,1}-{2364,5240,0,0,1}-{2364,5242,0,0,1}" "loc_data": "{2361,5241,0,1,1}-{2358,5240,0,1,1}-{2362,5239,0,1,1}-{2364,5240,0,1,1}-{2364,5242,0,1,1}-{2357,5242,0,1,1}-{2356,5240,0,1,1}-{2356,5242,0,1,1}-{2360,5243,0,1,1}"
}, },
{ {
"npc_id": "4382", "npc_id": "4382",
"loc_data": "{3162,3716,0,0,0}-{3175,3717,0,0,0}-{3161,3727,0,0,0}-{2304,5160,0,0,2}-{2324,5210,0,0,2}-{2322,5201,0,0,7}-{2324,5210,0,0,2}-{2322,5201,0,0,7}-{2327,5205,0,0,7}-{2328,5200,0,0,7}-{2326,5198,0,0,7}-{2331,5198,0,0,4}-{2333,5201,0,0,4}-{2333,5199,0,0,2}" "loc_data": "{3162,3716,0,1,0}-{3175,3717,0,1,0}-{3161,3727,0,1,0}-{2304,5160,0,0,2}-{2324,5210,0,1,2}-{2322,5201,0,1,7}-{2324,5210,0,1,2}-{2322,5201,0,1,7}-{2327,5205,0,1,7}-{2328,5200,0,1,7}-{2326,5198,0,1,7}-{2331,5198,0,1,4}-{2333,5201,0,1,4}-{2333,5199,0,1,2}"
}, },
{ {
"npc_id": "4383", "npc_id": "4383",
@@ -6421,19 +6421,19 @@
}, },
{ {
"npc_id": "4388", "npc_id": "4388",
"loc_data": "{2305,5231,0,0,2}-{2312,5225,0,0,2}-{2314,5240,0,0,2}-{2310,5241,0,0,2}-{2308,5246,0,0,2}-{2309,5245,0,0,2}-{2315,5237,0,0,2}" "loc_data": "{2305,5231,0,1,2}-{2312,5225,0,1,2}-{2314,5240,0,1,2}-{2310,5241,0,1,2}-{2308,5246,0,1,2}-{2309,5245,0,1,2}-{2315,5237,0,1,2}"
}, },
{ {
"npc_id": "4389", "npc_id": "4389",
"loc_data": "{2013,5238,0,1,0}" "loc_data": "{2013,5238,0,1,0}-{2043,5233,0,1,0}-{2041,5231,0,1,0}--{2029,5233,0,1,0}-{2020,5238,0,1,0}"
}, },
{ {
"npc_id": "4390", "npc_id": "4390",
"loc_data": "{1984,5160,0,1,2}-{2040,5190,0,1,3}-{2044,5187,0,1,2}-{2042,5191,0,1,1}-{2045,5190,0,1,7}-{2041,5187,0,1,2}" "loc_data": "{1984,5160,0,1,2}-{2040,5190,0,1,3}-{2044,5187,0,1,2}-{2042,5191,0,1,1}-{2045,5190,0,1,7}-{2041,5187,0,1,2}-{2045,5186,0,1,2}-{2044,5188,0,1,2}-{2042,5192,0,1,2}"
}, },
{ {
"npc_id": "4391", "npc_id": "4391",
"loc_data": "{1952,5192,0,1,2}-{1993,5240,0,1,4}-{1991,5235,0,1,4}-{1990,5240,0,1,3}-{1989,5237,0,1,6}-{2009,5202,0,1,1}-{2005,5199,0,1,3}" "loc_data": "{1952,5192,0,1,2}-{1993,5240,0,1,4}-{1991,5235,0,1,4}-{1990,5240,0,1,3}-{1989,5237,0,1,6}-{2009,5202,0,1,1}-{2005,5199,0,1,3}-{1994,5236,0,1,6}-{1991,5242,0,1,6}-{2007,5201,0,1,6}-{2009,5201,0,1,6}-{2004,5197,0,1,6}-{2004,5207,0,1,6}-{2006,5205,0,1,6}"
}, },
{ {
"npc_id": "4392", "npc_id": "4392",
@@ -6441,7 +6441,7 @@
}, },
{ {
"npc_id": "4393", "npc_id": "4393",
"loc_data": "{2045,5222,0,1,4}-{1944,5152,0,1,2}-{1993,5190,0,1,6}-{1993,5190,0,1,4}-{2044,5216,0,1,4}-{2008,5203,0,1,1}-{2006,5208,0,1,1}-{2037,5214,0,1,3}-{2037,5210,0,1,1}" "loc_data": "{2045,5222,0,1,4}-{1944,5152,0,1,2}-{1993,5190,0,1,6}-{1993,5190,0,1,4}-{2044,5216,0,1,4}-{2008,5203,0,1,1}-{2006,5208,0,1,1}-{2037,5214,0,1,3}-{2037,5210,0,1,1}-{2043,5217,0,1,1}-{2040,5214,0,1,1}-{2042,5217,0,1,1}-{2038,5214,0,1,1}-{2041,5218,0,1,1}"
}, },
{ {
"npc_id": "4394", "npc_id": "4394",
@@ -6449,7 +6449,7 @@
}, },
{ {
"npc_id": "4395", "npc_id": "4395",
"loc_data": "{2016,5237,0,1,7}-{1988,5190,0,1,2}-{2039,5216,0,1,6}" "loc_data": "{2016,5237,0,1,7}-{1988,5190,0,1,2}-{2039,5216,0,1,6}-{2017,5238,0,1,6}"
}, },
{ {
"npc_id": "4396", "npc_id": "4396",
@@ -6469,7 +6469,7 @@
}, },
{ {
"npc_id": "4400", "npc_id": "4400",
"loc_data": "{3018,10313,0,1,4}-{3016,10315,0,1,4}-{3018,10322,0,1,4}-{3024,10326,0,1,3}-{3030,10332,0,1,4}-{3029,10337,0,1,6}-{3034,10342,0,1,3}-{2072,5200,0,1,7}-{2130,5267,0,1,7}-{2140,5252,0,1,5}-{2141,5252,0,1,1}-{2142,5252,0,1,0}-{2148,5255,0,1,3}-{2125,5270,0,1,1}-{2148,5257,0,1,1}-{2117,5274,0,1,4}-{2146,5307,0,1,2}-{2145,5305,0,1,5}-{2152,5307,0,1,4}-{2148,5252,0,1,0}-{2142,5262,0,1,3}-{2124,5275,0,1,4}-{2121,5276,0,1,3}-{2148,5304,0,1,0}-{2146,5305,0,1,5}-{2148,5304,0,1,1}-{2151,5304,0,1,6}-{2145,5306,0,1,3}-{2134,5272,0,1,6}" "loc_data": "{3018,10313,0,1,4}-{3016,10315,0,1,4}-{3018,10322,0,1,4}-{3024,10326,0,1,3}-{3030,10332,0,1,4}-{3029,10337,0,1,6}-{3034,10342,0,1,3}-{2072,5200,0,1,7}-{2130,5267,0,1,7}-{2140,5252,0,1,5}-{2141,5252,0,1,1}-{2142,5252,0,1,0}-{2148,5255,0,1,3}-{2125,5270,0,1,1}-{2148,5257,0,1,1}-{2117,5274,0,1,4}-{2146,5307,0,1,2}-{2145,5305,0,1,5}-{2152,5307,0,1,4}-{2148,5252,0,1,0}-{2142,5262,0,1,3}-{2124,5275,0,1,4}-{2121,5276,0,1,3}-{2148,5304,0,1,0}-{2146,5305,0,1,5}-{2148,5304,0,1,1}-{2151,5304,0,1,6}-{2145,5306,0,1,3}-{2134,5272,0,1,6}-{2151,5307,0,1,6}-{2151,5308,0,1,6}-{2149,5307,0,1,6}-{2150,5308,0,1,6}-{2150,5305,0,1,6}-{2153,5307,0,1,6}-{2152,5305,0,1,6}-{2128,5272,0,1,6}-{2129,5272,0,1,6}-{2124,5271,0,1,6}-{2124,5272,0,1,6}-{2122,5272,0,1,6}-{2121,5275,0,1,6}"
}, },
{ {
"npc_id": "4401", "npc_id": "4401",
@@ -7073,7 +7073,7 @@
}, },
{ {
"npc_id": "4944", "npc_id": "4944",
"loc_data": "{2042,5213,0,1,5}-{2020,5236,0,1,2}-{1944,5152,0,1,2}-{2041,5216,0,1,0}" "loc_data": "{2042,5213,0,1,5}-{2020,5236,0,1,2}-{1944,5152,0,1,2}-{1993,5188,0,1,2}-{1994,5191,0,1,2}"
}, },
{ {
"npc_id": "4945", "npc_id": "4945",
@@ -7633,7 +7633,7 @@
}, },
{ {
"npc_id": "5377", "npc_id": "5377",
"loc_data": "{2004,5189,0,1,3}-{2002,5207,0,1,3}-{2009,5199,0,1,5}-{2004,5203,0,1,6}" "loc_data": "{2004,5189,0,1,3}-{2002,5207,0,1,3}-{2009,5199,0,1,5}-{2004,5203,0,1,6}-{1989,5192,0,1,6}-{1988,5187,0,1,6}"
}, },
{ {
"npc_id": "5378", "npc_id": "5378",
@@ -7645,7 +7645,7 @@
}, },
{ {
"npc_id": "5380", "npc_id": "5380",
"loc_data": "{1952,5192,0,1,2}-{2028,5192,0,1,0}" "loc_data": "{1952,5192,0,1,2}-{2028,5192,0,1,0}-{2031,5186,0,1,0}-{2027,5194,0,1,0}--{2021,5188,0,1,0}"
}, },
{ {
"npc_id": "5383", "npc_id": "5383",
Server/src/main/content/region/misthalin/barbvillage/stronghold/StrongHoldSecurityPlugin.java
+28 -6
View File
@@ -13,6 +13,7 @@ import core.game.interaction.OptionHandler;
import core.game.node.Node; import core.game.node.Node;
import core.game.node.entity.Entity; import core.game.node.entity.Entity;
import core.game.node.entity.player.Player; import core.game.node.entity.player.Player;
import core.game.node.entity.player.link.music.MusicPlayer;
import core.game.node.item.Item; import core.game.node.item.Item;
import core.game.node.scenery.Scenery; import core.game.node.scenery.Scenery;
import core.game.system.task.Pulse; import core.game.system.task.Pulse;
@@ -22,10 +23,14 @@ import core.game.world.map.zone.MapZone;
import core.game.world.map.zone.ZoneBorders; import core.game.world.map.zone.ZoneBorders;
import core.game.world.map.zone.ZoneBuilder; import core.game.world.map.zone.ZoneBuilder;
import core.game.world.update.flag.context.Animation; import core.game.world.update.flag.context.Animation;
import core.net.packet.PacketRepository;
import core.net.packet.context.MusicContext;
import core.net.packet.out.MusicPacket;
import core.plugin.Plugin; import core.plugin.Plugin;
import core.plugin.ClassScanner; import core.plugin.ClassScanner;
import core.plugin.Initializable; import core.plugin.Initializable;
import core.tools.RandomFunction; import core.tools.RandomFunction;
import org.rs09.consts.Sounds;
/** /**
* Handles the strong hold of security. * Handles the strong hold of security.
@@ -122,22 +127,38 @@ public final class StrongHoldSecurityPlugin extends MapZone implements Plugin<Ob
case 16149:// fourth ladder going down. case 16149:// fourth ladder going down.
openComponent(player, Location.create(2042, 5245, 0)); openComponent(player, Location.create(2042, 5245, 0));
return true; return true;
case 16135:// claim gift of piece. case 16135:// Gift of Peace 1st level
case 16118:// claim box of health. if (player.getSavedData().getGlobalData().hasStrongholdReward(1)) {
if (player.getSavedData().getGlobalData().hasStrongholdReward(target.getId() == 16135 ? 1 : 3)) {
player.getDialogueInterpreter().open(70099, "You have already claimed your reward from this level."); player.getDialogueInterpreter().open(70099, "You have already claimed your reward from this level.");
} else { } else {
player.getDialogueInterpreter().open(target.getId() == 16118 ? 96878 : 54678); player.getAudioManager().send(Sounds.DOOR_CREAK_61);
PacketRepository.send(MusicPacket.class, new MusicContext(player, 157, true));
player.getDialogueInterpreter().open(54678);
} }
return true; return true;
case 16077:// grain of plenty case 16118:// Box of health 3rd level
if (player.getSavedData().getGlobalData().hasStrongholdReward(3)) {
player.getDialogueInterpreter().open(70099, "You have already claimed your reward from this level.");
} else {
player.getAudioManager().send(Sounds.DOOR_CREAK_61);
PacketRepository.send(MusicPacket.class, new MusicContext(player, 177, true));
player.getDialogueInterpreter().open(96878);
}
return true;
case 16077:// Grain of Plenty 2nd level
if (player.getSavedData().getGlobalData().hasStrongholdReward(2)) { if (player.getSavedData().getGlobalData().hasStrongholdReward(2)) {
player.getDialogueInterpreter().open(70099, "You have already claimed your reward from this level."); player.getDialogueInterpreter().open(70099, "You have already claimed your reward from this level.");
} else { } else {
player.getAudioManager().send(Sounds.DOOR_CREAK_61);
PacketRepository.send(MusicPacket.class, new MusicContext(player, 179, true));
player.getDialogueInterpreter().open(56875); player.getDialogueInterpreter().open(56875);
} }
return true; return true;
case 16047:// cradle case 16047:// Cradle of Life 4th level
if (!player.getSavedData().getGlobalData().hasStrongholdReward(4)) {
PacketRepository.send(MusicPacket.class, new MusicContext(player, 158, true));
}
player.getAudioManager().send(Sounds.SOS_CHOIR_1246);
player.getDialogueInterpreter().open(96873); player.getDialogueInterpreter().open(96873);
return true; return true;
case 16152:// skeleton case 16152:// skeleton
@@ -216,6 +237,7 @@ public final class StrongHoldSecurityPlugin extends MapZone implements Plugin<Ob
private static void openDoor(final Player player, final Scenery object) { private static void openDoor(final Player player, final Scenery object) {
player.lock(3); player.lock(3);
player.animate(Animation.create(4282)); player.animate(Animation.create(4282));
player.getAudioManager().send(Sounds.SOS_THROUGH_DOOR_2858);
GameWorld.getPulser().submit(new Pulse(1, player) { GameWorld.getPulser().submit(new Pulse(1, player) {
int counter; int counter;
Server/src/main/core/game/system/command/sets/MusicCommandSet.kt
+15 -2
View File
@@ -1,12 +1,11 @@
package core.game.system.command.sets package core.game.system.command.sets
import core.game.node.entity.player.link.music.MusicEntry import core.game.node.entity.player.link.music.MusicEntry
import core.game.system.command.Privilege
import core.net.packet.PacketRepository import core.net.packet.PacketRepository
import core.net.packet.context.MusicContext import core.net.packet.context.MusicContext
import core.net.packet.out.MusicPacket import core.net.packet.out.MusicPacket
import core.plugin.Initializable import core.plugin.Initializable
import core.game.system.command.Command
import core.game.system.command.Privilege
@Initializable @Initializable
class MusicCommandSet : CommandSet(Privilege.STANDARD){ class MusicCommandSet : CommandSet(Privilege.STANDARD){
@@ -26,6 +25,20 @@ class MusicCommandSet : CommandSet(Privilege.STANDARD){
player.musicPlayer.play(MusicEntry.forId(id!!)) player.musicPlayer.play(MusicEntry.forId(id!!))
notify(player,"Now playing song $id") notify(player,"Now playing song $id")
} }
/**
* Command that lets you play a specific jingle
*/
define("playjingle"){player,args ->
if(args.size < 2){
reject(player,"Usage: ::playjingle jingleID")
}
val id = args[1].toIntOrNull()
if(id == null){
reject(player,"Please use a valid integer for the jingle id.")
}
PacketRepository.send(MusicPacket::class.java, MusicContext(player, id!!, true))
notify(player,"Now playing jingle $id")
}
/** /**
* Command that lets you play a song via the ID instead of the song name * Command that lets you play a song via the ID instead of the song name