Skip to content

Commit

Permalink
Merge pull request #108 from Supamiu/dec13update
Browse files Browse the repository at this point in the history
Dec13 Update
  • Loading branch information
fayaine authored Dec 13, 2023
2 parents 20fb44e + 860e646 commit dc2b57f
Show file tree
Hide file tree
Showing 12 changed files with 96 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ export class RosterService extends FirestoreStorage<Roster> {
EbonyCubeLevel2: 0,
EbonyCubeLevel3: 0,
EbonyCubeLevel4: 0,
EbonyCubeLevel5: 0,
platinumFields: 0
};
}
Expand Down
8 changes: 4 additions & 4 deletions apps/client/src/app/core/tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,12 @@ export const tasks = [
shared: true,
partySize: 8
}),
createTask(`Ivory Tower`, 1600, TaskFrequency.WEEKLY, TaskScope.CHARACTER, 4, 9999, "abyssal-dungeon.webp", {
shared: true,
partySize: 4
}),

// Weekly Roster
createTask(`Ghostship`, 460, TaskFrequency.WEEKLY, TaskScope.ROSTER, 1, 9999, "ghostship.png", {
daysFilter: [2, 4, 6],
canEditDaysFilter: false
}),
createTask(`South Vern Chaos Line Dungeon`, 1340, TaskFrequency.WEEKLY, TaskScope.ROSTER, 2, 9999, "dungeon.webp"),
createTask("Challenge Guardian", 302, TaskFrequency.WEEKLY, TaskScope.ROSTER, 3, 9999, "guardian.png", {
shared: true,
Expand Down
7 changes: 7 additions & 0 deletions apps/client/src/app/data/tickets.ts
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,13 @@ export const tickets: {tier?: number, icon: string, rarity: ItemRarity, key: key
key: "EbonyCubeLevel4",
name: "Ebony Cube Level 4"
},
{
tier: 3,
icon: 'ebony1610.png',
rarity: ItemRarity.LEGENDARY,
key: "EbonyCubeLevel5",
name: "Ebony Cube Level 5"
},
{
icon: 'platinum_fields.png',
rarity: ItemRarity.LEGENDARY,
Expand Down
1 change: 1 addition & 0 deletions apps/client/src/app/model/character/character.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ export interface Character {
EbonyCubeLevel2: number;
EbonyCubeLevel3: number;
EbonyCubeLevel4: number;
EbonyCubeLevel5: number;
platinumFields: number;
};
}
2 changes: 1 addition & 1 deletion apps/client/src/app/model/lostark-task.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { TaskFrequency } from "./task-frequency";
import { TaskScope } from "./task-scope";
import { DataModel } from "../core/database/data-model";

export const TASKS_VERSION = 45;
export const TASKS_VERSION = 46;

export interface LostarkTask extends DataModel {
authorId?: string;
Expand Down
76 changes: 76 additions & 0 deletions apps/client/src/app/pages/gold-planner/gold-tasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,82 @@ export const goldTasks: GoldTask[] = [
completionId: "T3.L9.3",
chestId: "AkkanH3",
overrideMinIlvl: 1600
},
{
name: "Ivory Tower Normal Gate 1",
goldReward: 1500,
taskName: "Ivory Tower",
chestPrice: 700,
completionId: "T3.L10.1",
chestId: "IvoryTowerN1",
overrideMinIlvl: 1600,
overrideMaxIlvl: 1620
},
{
name: "Ivory Tower Normal Gate 2",
goldReward: 1750,
taskName: "Ivory Tower",
chestPrice: 800,
completionId: "T3.L10.2",
chestId: "IvoryTowerN2",
overrideMinIlvl: 1600,
overrideMaxIlvl: 1620
},
{
name: "Ivory Tower Normal Gate 3",
goldReward: 2500,
taskName: "Ivory Tower",
chestPrice: 900,
completionId: "T3.L10.3",
chestId: "IvoryTowerN3",
overrideMinIlvl: 1600,
overrideMaxIlvl: 1620
},
{
name: "Ivory Tower Normal Gate 4",
goldReward: 3250,
taskName: "Ivory Tower",
chestPrice: 1100,
completionId: "T3.L10.4",
chestId: "IvoryTowerN4",
overrideMinIlvl: 1600,
overrideMaxIlvl: 1620
},
{
name: "Ivory Tower Hard Gate 1",
goldReward: 2000,
taskName: "Ivory Tower",
chestPrice: 1000,
completionId: "T3.L11.1",
chestId: "IvoryTowerH1",
overrideMinIlvl: 1620
},
{
name: "Ivory Tower Hard Gate 2",
goldReward: 2500,
taskName: "Ivory Tower",
chestPrice: 1000,
completionId: "T3.L11.2",
chestId: "IvoryTowerH2",
overrideMinIlvl: 1620
},
{
name: "Ivory Tower Hard Gate 3",
goldReward: 4000,
taskName: "Ivory Tower",
chestPrice: 1500,
completionId: "T3.L11.3",
chestId: "IvoryTowerH3",
overrideMinIlvl: 1620
},
{
name: "Ivory Tower Hard Gate 4",
goldReward: 6000,
taskName: "Ivory Tower",
chestPrice: 2000,
completionId: "T3.L11.4",
chestId: "IvoryTowerH4",
overrideMinIlvl: 1620
}

];
6 changes: 5 additions & 1 deletion apps/client/src/app/pages/party-planner/subtasks.ts
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ export const subtasks: Subtask[] = [
{ id: `kungelanium`, name: `Kungelanium`, parentName: "Guardian", banner: 'guardians/monster_info_28.png', minIlvl: 1460 },
{ id: `caliligos`, name: `Caliligos`, parentName: "Guardian", banner: 'guardians/monster_info_16.png', minIlvl: 1490 },
{ id: `hanumatan`, name: `Hanumatan`, parentName: "Guardian", banner: 'guardians/monster_info_29.png', minIlvl: 1540 },
{ id: `sonavel`, name: `Sonavel`, parentName: "Guardian", banner: 'guardians/monster_info_09.png', minIlvl: 1580 },
{ id: `sonavel`, name: `Sonavel`, parentName: "Guardian", banner: 'guardians/monster_info_30.png', minIlvl: 1580 },
{ id: `gargadeth`, name: `Gargadeth`, parentName: "Guardian", banner: 'guardians/monster_info_31.png', minIlvl: 1610 },

// T3 Abyss
{ id: `aira's-oculus-normal`, name: `Aira's Oculus (Normal)`, parentName: "Aira's Oculus", banner: "abyss_dungeons/abyss_dg_09.png", minIlvl: 1325 },
Expand Down Expand Up @@ -64,4 +65,7 @@ export const subtasks: Subtask[] = [
{ id: `akkan-normal`, name: `Akkan Normal`, parentName: "Akkan", minIlvl: 1580 },
{ id: `akkan-hard`, name: `Akkan Hard`, parentName: "Akkan", minIlvl: 1600 },

//Ivory Tower Difficulties
{ id: `ivory-tower-normal`, name: `Ivory Tower Normal`, parentName: "Ivory Tower", minIlvl: 1600 },
{ id: `ivory-tower-hard`, name: `Ivory Tower Hard`, parentName: "Ivory Tower", minIlvl: 1620 },
];
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ export class RosterComponent {
EbonyCubeLevel2: 0,
EbonyCubeLevel3: 0,
EbonyCubeLevel4: 0,
EbonyCubeLevel5: 0,
platinumFields: 0
}
});
Expand Down
Binary file added apps/client/src/assets/icons/ebony1610.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit dc2b57f

Please sign in to comment.