Skip to content

Commit

Permalink
fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
gc committed Nov 23, 2024
1 parent 28b6d73 commit 1a846c6
Show file tree
Hide file tree
Showing 9 changed files with 193 additions and 187 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,4 +55,4 @@ wiki.xml

.pnpm-store
*.tsbuildinfo
/coverage
*/coverage
356 changes: 180 additions & 176 deletions docs/src/content/docs/getting-started/wiki.md

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions docs/src/content/docs/osb/Skills/mining.md
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,13 @@ The only other thing unidentified minerals can be used to purchase are:
| --- | --- | --- |
| [[6983]] | 125,000 | Yes |
| [[6975]] | 93,000 | Yes |
| [[6975]] | 83,000 | No |
| [[6975]] | 84,000 | No |
| [[440]] | 82,000 | Yes |
| [[6983]] | 66,000 | No |
| [[440]] | 58,000 | No |
| [[442]] | 58,000 | Yes |
| [[442]] | 53,000 | No |
| [[453]] | 44,000 | Yes |
| [[453]] | 45,000 | Yes |
| [[444]] | 42,000 | Yes |
| [[444]] | 40,000 | No |
| [[453]] | 38,000 | No |
Expand All @@ -126,7 +126,7 @@ The only other thing unidentified minerals can be used to purchase are:
| [[447]] | 30,000 | No |
| [[21347]] | 22,000 | Yes |
| [[21347]] | 22,000 | No |
| [[449]] | 19,000 | Yes |
| [[449]] | 20,000 | Yes |
| [[449]] | 19,000 | No |
| [[436]] | 19,000 | No |
| [[438]] | 19,000 | No |
Expand Down
2 changes: 1 addition & 1 deletion src/lib/poh/index.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { PlayerOwnedHouse } from '@prisma/client';
import { objectEntries } from 'e';
import { Bank } from 'oldschooljs';

Expand All @@ -18,7 +19,6 @@ import { SpellbookAltars } from './objects/spellbook_altars';
import { Teleports } from './objects/teleports';
import { Thrones } from './objects/thrones';
import { Torches } from './objects/torches';
import type { PlayerOwnedHouse } from '.prisma/client';

export const HOUSE_WIDTH = 585;
export const TOP_FLOOR_Y = 118;
Expand Down
2 changes: 1 addition & 1 deletion src/lib/pohImage.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import * as fs from 'node:fs';
import path from 'node:path';
import type { PlayerOwnedHouse } from '@prisma/client';
import { objectEntries, randInt } from 'e';

import { DUNGEON_FLOOR_Y, GROUND_FLOOR_Y, HOUSE_WIDTH, Placeholders, TOP_FLOOR_Y } from './poh';
Expand All @@ -13,7 +14,6 @@ import {
loadImage
} from './util/canvasUtil';
import { getActivityOfUser } from './util/minionIsBusy';
import type { PlayerOwnedHouse } from '.prisma/client';

const CONSTRUCTION_IMG_DIR = './src/lib/poh/images';
const FOLDERS = [
Expand Down
2 changes: 1 addition & 1 deletion src/lib/util/giveaway.ts
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import type { Giveaway } from '@prisma/client';
import type { MessageEditOptions } from 'discord.js';
import { time, userMention } from 'discord.js';
import { Time, debounce, noOp, randArrItem } from 'e';
Expand All @@ -9,7 +10,6 @@ import { Events } from '../constants';
import { channelIsSendable } from '../util';
import { logError } from './logError';
import { sendToChannelID } from './webhook';
import type { Giveaway } from '.prisma/client';

async function refundGiveaway(creator: MUser, loot: Bank) {
await transactItems({
Expand Down
3 changes: 2 additions & 1 deletion src/lib/util/taskGroupFromActivity.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import type { activity_type_enum } from '@prisma/client';

import { ActivityGroup } from '../constants';
import type { activity_type_enum } from '.prisma/client';

export function taskGroupFromActivity(type: activity_type_enum): ActivityGroup {
switch (type) {
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/migrateUser.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,12 @@ import {
type Activity,
type Bingo,
type BingoParticipant,
type BotItemSell,
type BuyCommandTransaction,
type CommandUsage,
type EconomyTransaction,
type FarmedCrop,
type GEListing,
type GearPreset,
type Giveaway,
type HistoricalData,
Expand All @@ -17,6 +19,7 @@ import {
type Prisma,
type ReclaimableItem,
type SlayerTask,
type StashUnit,
type UserStats,
type XPGain,
type activity_type_enum,
Expand Down Expand Up @@ -58,7 +61,6 @@ import { updateClientGPTrackSetting, userStatsUpdate } from '../../src/mahoji/ma
import { calculateResultOfLMSGames, getUsersLMSStats } from '../../src/tasks/minions/minigames/lmsActivity';
import type { TestUser } from './util';
import { createTestUser, mockClient, mockedId } from './util';
import type { BotItemSell, GEListing, StashUnit } from '.prisma/client';

interface TestCommand {
name: string;
Expand Down
3 changes: 1 addition & 2 deletions tests/integration/util.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { CommandRunOptions } from '@oldschoolgg/toolkit/util';
import type { Activity, GearSetupType, Prisma } from '@prisma/client';
import type { Activity, ClientStorage, GearSetupType, Prisma, User, UserStats } from '@prisma/client';
import { objectKeys, randInt, shuffleArr, uniqueArr } from 'e';
import { Bank, type EMonster, Monsters } from 'oldschooljs';

Expand All @@ -22,7 +22,6 @@ import { minionKCommand } from '../../src/mahoji/commands/k';
import { giveMaxStats } from '../../src/mahoji/commands/testpotato';
import { ironmanCommand } from '../../src/mahoji/lib/abstracted_commands/ironmanCommand';
import type { OSBMahojiCommand } from '../../src/mahoji/lib/util';
import type { ClientStorage, User, UserStats } from '.prisma/client';

const commandRunOptions = (userID: string): Omit<CommandRunOptions, 'options'> => ({
userID,
Expand Down

0 comments on commit 1a846c6

Please sign in to comment.