Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

quest/lamp fixes #5949

Merged
merged 2 commits into from
Aug 6, 2024
+14 −6
Merged

quest/lamp fixes #5949

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ce6d28e
quest fixes
nwjgit Jul 11, 2024
55bd7b0
fix
nwjgit Jul 11, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion src/lib/data/itemAliases.ts
View file
Original file line number Diff line number Diff line change
@@ -178,12 +178,15 @@ setItemAlias(2993, 'Chompy bird hat (dragon archer)');
setItemAlias(2994, 'Chompy bird hat (expert ogre dragon archer)');
setItemAlias(2995, 'Chompy bird hat (expert dragon archer)');

// Item aliases
// Achievement diary lamps
setItemAlias(11_137, 'Antique lamp 1');
setItemAlias(11_139, 'Antique lamp 2');
setItemAlias(11_141, 'Antique lamp 3');
setItemAlias(11_185, 'Antique lamp 4');

// Defender of varrock quest lamp
setItemAlias(28_820, 'Antique lamp (defender of varrock)');

// Dragonfire shields
setItemAlias(11_284, 'Uncharged dragonfire shield');
setItemAlias(11_283, 'Dragonfire shield');
5 changes: 2 additions & 3 deletions src/lib/minions/data/quests.ts
View file
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ export const quests: Quest[] = [
},
combatLevelReq: 50,
qpReq: 10,
rewards: new Bank().add(28_587).add(28_587).add(28_588).add(28_589).add(28_590).freeze(),
rewards: new Bank().add(28_587).add(28_588).add(28_589).add(28_590).freeze(),
calcTime: (user: MUser) => {
let duration = Time.Minute * 10;
if (user.combatLevel < 90) {
@@ -112,8 +112,7 @@ export const quests: Quest[] = [
},
combatLevelReq: 65,
qpReq: 20,
// Awaiting item update for the lamp to be added
// rewards: new Bank().add(28_820).freeze(),
rewards: new Bank().add(28_820).freeze(),
skillsRewards: {
smithing: 15_000,
hunter: 15_000
10 changes: 8 additions & 2 deletions src/mahoji/lib/abstracted_commands/lampCommand.ts
View file
Original file line number Diff line number Diff line change
@@ -84,13 +84,12 @@ export const XPLamps: IXPLamp[] = [
minimumLevel: 1,
allowedSkills: [SkillsEnum.Magic]
},
/* Needs OSJS Update
{
itemID: 28_820,
amount: 5000,
name: 'Antique lamp (defender of varrock)',
minimumLevel: 1
},*/
},
{
itemID: itemID('Antique lamp (easy ca)'),
amount: 5000,
@@ -149,6 +148,13 @@ export const Lampables: IXPObject[] = [
skills[skill] =
data.user.skillLevel(skill) *
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The combat skills for the 'dark relic' should be added to the XPLamps array where the 'dark relic' is defined, not in the Lampables array. This ensures the intended functionality is correctly implemented.

([
SkillsEnum.Attack,
SkillsEnum.Strength,
SkillsEnum.Defence,
SkillsEnum.Magic,
SkillsEnum.Ranged,
SkillsEnum.Hitpoints,
SkillsEnum.Prayer,
SkillsEnum.Mining,
SkillsEnum.Woodcutting,
SkillsEnum.Herblore,