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

fixing this once and for all #5681

Closed
wants to merge 13 commits into from
Closed

fixing this once and for all #5681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
18b9e5c
bv of all `Herbi` that we're 10k now 1m, Rudolph is a pet now, doopy …
I-am-TURBO Feb 10, 2024
919d495
lin
I-am-TURBO Feb 10, 2024
9ed6b7c
- Removed `tradeable: true` & `tradeable_on_ge: true` from Balloon ca…
I-am-TURBO Feb 15, 2024
e0f978e
lin
I-am-TURBO Feb 15, 2024
9c1d446
fixed mistakes
I-am-TURBO Feb 15, 2024
2bf5cb9
lint
I-am-TURBO Feb 15, 2024
d1b79b9
Added back `cantBeSacrificed: true` to buggy & divine dominion pets
I-am-TURBO Feb 19, 2024
740aa97
- Added back `cantBeSacrificed: true` to buggy & divine dominion pets
I-am-TURBO Feb 19, 2024
5338ac4
added `isDiscontinued: true` to Casper, Mini Mortimer, Doopy & Rudolph
I-am-TURBO Feb 19, 2024
4f9f7dc
1
I-am-TURBO Feb 19, 2024
01c951c
adding package-lock
I-am-TURBO Feb 19, 2024
46268ed
Delete package-lock.json
I-am-TURBO Feb 19, 2024
ba61fa8
Delete yarn.lock
I-am-TURBO Feb 19, 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
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"chokidar": "^3.5.3",
"deep-equal": "^2.2.2",
"deepmerge": "^4.3.1",
"discord.js": "^14.13.0",
"discord.js": "^14.12.1",
"dotenv": "^16.0.3",
"dotenv-cli": "^7.1.0",
"e": "^0.2.33",
Expand All @@ -46,6 +46,7 @@
"lodash": "^4.17.21",
"lru-cache": "^8.0.0",
"mahoji": "^0.0.7",
"make": "^0.0.0",
"murmurhash": "^2.0.1",
"node-cron": "^3.0.2",
"node-fetch": "^2.6.7",
Expand Down
65 changes: 41 additions & 24 deletions src/lib/customItems/customItems.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4831,20 +4831,21 @@ setCustomItem(
cantDropFromMysteryBoxes: true
}
},
10_000
1_000_000
);

setCustomItem(
70_291,
'Baby yaga house',
'Herbi',
{
tradeable: true,
tradeable_on_ge: true,
customItemData: {
cantDropFromMysteryBoxes: true,
isSuperUntradeable: true
cantDropFromMysteryBoxes: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand Down Expand Up @@ -6337,18 +6338,21 @@ setCustomItem(
cantDropFromMysteryBoxes: true
}
},
10_000
1_000_000
);

setCustomItem(
70_438,
'Crush',
'Herbi',
{
tradeable: true,
tradeable_on_ge: true,
customItemData: {
cantDropFromMysteryBoxes: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -6360,7 +6364,7 @@ setCustomItem(
cantDropFromMysteryBoxes: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -6372,7 +6376,7 @@ setCustomItem(
cantDropFromMysteryBoxes: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand Down Expand Up @@ -7447,7 +7451,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -7461,7 +7465,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -7475,7 +7479,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -7489,7 +7493,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -7503,7 +7507,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -7517,7 +7521,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -7531,7 +7535,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -7545,7 +7549,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand All @@ -7559,7 +7563,7 @@ setCustomItem(
isSuperUntradeable: true
}
},
10_000
1_000_000
);

setCustomItem(
Expand Down Expand Up @@ -8398,7 +8402,7 @@ setCustomItem(
setCustomItem(
71_572,
'Skip',
'Coal',
'Herbi',
{
customItemData: {
cantDropFromMysteryBoxes: true
Expand Down Expand Up @@ -9273,8 +9277,11 @@ setCustomItem(
'Mini mortimer',
'Herbi',
{
tradeable: true,
tradeable_on_ge: true,
customItemData: {
cantDropFromMysteryBoxes: true
cantDropFromMysteryBoxes: true,
isDiscontinued: true
}
},
1_000_000
Expand All @@ -9285,9 +9292,11 @@ setCustomItem(
'Doopy',
'Herbi',
{
tradeable: true,
tradeable_on_ge: true,
customItemData: {
cantDropFromMysteryBoxes: true,
isSuperUntradeable: true
isDiscontinued: true
}
},
1_000_000
Expand Down Expand Up @@ -9323,8 +9332,11 @@ setCustomItem(
'Casper',
'Herbi',
{
tradeable: true,
tradeable_on_ge: true,
customItemData: {
cantDropFromMysteryBoxes: true
cantDropFromMysteryBoxes: true,
isDiscontinued: true
}
},
1_000_000
Expand Down Expand Up @@ -9422,6 +9434,8 @@ setCustomItem(
'Echo',
'Herbi',
{
tradeable: true,
tradeable_on_ge: true,
customItemData: {
cantDropFromMysteryBoxes: true
}
Expand Down Expand Up @@ -10147,13 +10161,16 @@ setCustomItem(
setCustomItem(
72_044,
'Rudolph',
'Coal',
'Herbi',
{
tradeable: true,
tradeable_on_ge: true,
customItemData: {
cantDropFromMysteryBoxes: true
cantDropFromMysteryBoxes: true,
isDiscontinued: true
}
},
1
1_000_000
);

setCustomItem(
Expand Down
28 changes: 13 additions & 15 deletions src/lib/customItems/pets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -418,6 +418,19 @@ setCustomItem(
1_000_000
);

setCustomItem(
52_687,
'Balloon cat',
'Herbi',
{
customItemData: {
cantDropFromMysteryBoxes: true,
isSuperUntradeable: true
}
},
1_000_000
);

/**
* Recolors
*/
Expand Down Expand Up @@ -591,18 +604,3 @@ setCustomItem(
},
1_000_000
);

setCustomItem(
52_687,
'Balloon cat',
'Herbi',
{
tradeable_on_ge: true,
tradeable: true,
customItemData: {
cantDropFromMysteryBoxes: true,
isSuperUntradeable: true
}
},
1_000_000
);
Loading
Loading