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

Jump to bottom

Fix dt items for tames #5684

Closed
wants to merge 9,404 commits into from
Closed

Fix dt items for tames #5684

wants to merge 9,404 commits into from

Conversation

themrrobert
Copy link
Contributor

Description:

Fixes DT one-of drops for tames

Changes:

updates tames to call effects and pass it's CL

Other checks:

  • I have tested all my changes thoroughly.

themrrobert and others added 30 commits October 24, 2023 17:13
@themrrobert
Add tertiary toggle for /finish (oldschoolgg#5464)
12b1a89
@themrrobert
Merge branch 'master' into bso
6bd614d 
# Conflicts:
#	src/lib/MUser.ts
#	src/lib/minions/data/killableMonsters/index.ts
#	src/mahoji/commands/buy.ts
#	src/mahoji/commands/k.ts
#	src/tasks/minions/monsterActivity.ts
@themrrobert
Fix BSO /finish tob + tob hm bugs (oldschoolgg#5466)
be28065
@dependabot
Bump get-func-name from 2.0.0 to 2.0.2 (oldschoolgg#5468)
4cd5700 
Bumps [get-func-name](https://github.com/chaijs/get-func-name) from 2.0.0 to 2.0.2.
- [Release notes](https://github.com/chaijs/get-func-name/releases)
- [Commits](https://github.com/chaijs/get-func-name/commits/v2.0.2)

---
updated-dependencies:
- dependency-name: get-func-name
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@nwjgit
Fix cox mass return message (oldschoolgg#5467)
236a959
@gc
Add more stats to data command (oldschoolgg#5475)
03c5155
@dependabot
Bump tough-cookie from 4.1.2 to 4.1.3 (oldschoolgg#5473)
ffb9937 
Bumps [tough-cookie](https://github.com/salesforce/tough-cookie) from 4.1.2 to 4.1.3.
- [Release notes](https://github.com/salesforce/tough-cookie/releases)
- [Changelog](https://github.com/salesforce/tough-cookie/blob/master/CHANGELOG.md)
- [Commits](salesforce/tough-cookie@v4.1.2...v4.1.3)

---
updated-dependencies:
- dependency-name: tough-cookie
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump semver from 5.7.1 to 5.7.2 (oldschoolgg#5470)
df8930e 
Bumps [semver](https://github.com/npm/node-semver) from 5.7.1 to 5.7.2.
- [Release notes](https://github.com/npm/node-semver/releases)
- [Changelog](https://github.com/npm/node-semver/blob/v5.7.2/CHANGELOG.md)
- [Commits](npm/node-semver@v5.7.1...v5.7.2)

---
updated-dependencies:
- dependency-name: semver
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump word-wrap from 1.2.3 to 1.2.5 (oldschoolgg#5469)
94f81a2 
Bumps [word-wrap](https://github.com/jonschlinkert/word-wrap) from 1.2.3 to 1.2.5.
- [Release notes](https://github.com/jonschlinkert/word-wrap/releases)
- [Commits](jonschlinkert/word-wrap@1.2.3...1.2.5)

---
updated-dependencies:
- dependency-name: word-wrap
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump postcss from 8.4.21 to 8.4.31 (oldschoolgg#5472)
034b00b 
Bumps [postcss](https://github.com/postcss/postcss) from 8.4.21 to 8.4.31.
- [Release notes](https://github.com/postcss/postcss/releases)
- [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md)
- [Commits](postcss/postcss@8.4.21...8.4.31)

---
updated-dependencies:
- dependency-name: postcss
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump vite from 4.1.1 to 4.5.0 (oldschoolgg#5471)
6b8f788 
Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 4.1.1 to 4.5.0.
- [Release notes](https://github.com/vitejs/vite/releases)
- [Changelog](https://github.com/vitejs/vite/blob/main/packages/vite/CHANGELOG.md)
- [Commits](https://github.com/vitejs/vite/commits/v4.5.0/packages/vite)

---
updated-dependencies:
- dependency-name: vite
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@gc
Add more box spawn challenges
03310f4
@themrrobert
Fix Monster Drop box spawn (oldschoolgg#5484)
1ee4503
@themrrobert
Add migrate_user command (oldschoolgg#5483)
c2e0486
@themrrobert
Merge branch 'master' into bso
7736af3 
# Conflicts:
#	prisma/schema.prisma
#	src/lib/tickers.ts
#	src/mahoji/commands/admin.ts
#	src/mahoji/commands/rp.ts
#	src/tasks/minions/minigames/raidsActivity.ts
@themrrobert
BSO Specific User Migration changes
cfcadf1
@themrrobert
Remove unused functions
ca2fa12
@themrrobert
Remove unused functions
c177c53
@themrrobert
BSO Fixes
47ddcc7
@themrrobert
Migrate user improvements (oldschoolgg#5486)
b369826 
* Remove activities + most command calls

* Dramatically improve speed of migrate user test
@themrrobert
Merge branch 'master' into bso
d777fc1 
# Conflicts:
#	tests/integration/migrateUser.test.ts
@themrrobert
Fix more tests with MigrateUser (oldschoolgg#5487)
36a2225
@gc
Add 2 new global tiles (oldschoolgg#5488)
8320bf5
@gc
Track comp cape % in historical data
7996c23
@gc
Add global mastery lb
97424dd
@gc
Make data chart a bit easier to read
e0f425d
@gc
Partially remove halloween event
18f859b
@gc
Make some halloween items ge-tradeable
3ad0c17
@gc
Add hween2023 cl
ffa9472
@gc
Add casper to discontinued pets cl
8941df0
themrrobert and others added 19 commits February 2, 2024 18:19
@themrrobert
Update snapshots for tests
df51415
@themrrobert
Fix missing activity on calcMaxTripLength
e2b7e99
@themrrobert
Fix gear presets - double equip bug, and edit improvements (oldschool…
5431e06 
…gg#5647)

* Fix edit gear preset so it doesn't wipe everything not specified

* Dont allow gearpresets to equip 2h and weapon/shield, and force unequip if so.

* Add / update tests

* Allow removal of items via gearpresets edit

* Make global presets autocomplete filter by input.
@themrrobert
Fix 'permanent busy' bug that occurs after deleting a pending interac…
d7c3321 
…tion (oldschoolgg#5607)
@nwjgit
Change how Black Mask drops to fix CL issues (Remove from loot filter) (
e19758b 
oldschoolgg#5639)
@themrrobert
Fix guthixian cache activity - increment minigame score. (oldschoolgg…
96fb3f5 
…#5651)
@themrrobert
Merge branch 'master' into bso
73cd948 
# Conflicts:
#	src/lib/bankImage.ts
#	src/lib/clues/clueUtils.ts
#	src/lib/constants.ts
#	src/lib/data/creatablesTable.txt
#	src/lib/data/filterables.ts
#	src/mahoji/commands/config.ts
#	src/mahoji/commands/mix.ts
#	src/mahoji/commands/smith.ts
#	src/mahoji/lib/abstracted_commands/gauntletCommand.ts
#	src/mahoji/lib/abstracted_commands/nightmareCommand.ts
#	src/mahoji/lib/events.ts
#	src/tasks/minions/farmingActivity.ts
#	src/tasks/minions/minigames/tobActivity.ts
#	tests/integration/util.ts
#	tests/unit/util.test.ts
@themrrobert
Merge issues
9769787
@nwjgit
Guthixian Caches CL Fix (oldschoolgg#5653)
85a6330
@I-am-TURBO
Ping if not enough energy for div trip (oldschoolgg#5655)
f88d50c
@themrrobert
First wave of "Works from Bank" poll results (oldschoolgg#5659)
f524f3c 
* Invention master cape from bank

* Skilling outfits

* A few skilling items

* Misc skilling items / master skillcapes

* Some dwarven gear
@themrrobert
Goldsmith gaunts from bank
cd41971
@nwjgit
Change Kills/KC to Completions for minigame strings (oldschoolgg#5654)
7deb2a9
@themrrobert
Farming Fixes - Don't use Invention unless harvesting, correct check …
3b1c269 
…for Mysterious trees. (oldschoolgg#5666)

* Only use invention on harvest; correct myst tree check

* Remove obsolete tormented skull check
@themrrobert
More skilling items from bank
890ba05
@nwjgit
Add guthix cache stats cmd (oldschoolgg#5665)
2f90235
@nwjgit
Fix BSO Inferno cl (oldschoolgg#5669)
a8dfb1b
@nwjgit
Fix for dt tablets (oldschoolgg#5667)
7998ba1
@themrrobert
Fix dt items for tames
4df1961
@themrrobert themrrobert added Type: Bug Something isn't working BSO Bot School Old labels Feb 11, 2024
@themrrobert themrrobert self-assigned this Feb 11, 2024
@nwjgit
Copy link
Contributor

nwjgit commented Feb 11, 2024 •
edited
Loading

Muspah also uses the effect for charged ice if you wanted to add that in aswell.

I haven't had time to fix it but your PR looks alot better than my solution here: #5578 Vlad draken loot is still an issue aswell if you wanted to look at Magna's feedback. No worries if not, I can always just piggy back off your work here.

@nwjgit nwjgit closed this Mar 6, 2024
@nwjgit
Copy link
Contributor

nwjgit commented Mar 6, 2024

sorry closed the wrong one

@nwjgit nwjgit reopened this Mar 6, 2024
gc
gc reviewed May 2, 2024
View reviewed changes
src/lib/minions/types.ts
@@ -113,8 +113,9 @@ export interface KillableMonster {
effect?: (opts: {
messages: string[];
user: MUser;
tame?: Tame;
Copy link
Collaborator

Choose a reason for hiding this comment

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

Change to use MTame, so you can do tame.totalLoot instead of new Bank(tame.max_total_loot as ItemBank). Merge at your discretion when its ready.

@nwjgit nwjgit mentioned this pull request Jun 20, 2024
Open
@gc gc closed this Dec 17, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gc gc gc left review comments

Assignees

@themrrobert themrrobert

Labels
BSO Bot School Old Type: Bug Something isn't working
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
9 participants
@themrrobert @nwjgit @gc @TastyPumPum @I-am-TURBO @Redquaker @Superwhammybar @ghosts-are-spooky @Lajnux