pets rare candy implementation & misc refactors by perappu · Pull Request #287 · ScuffedNewt/lorekeeper

perappu · 2026-05-06T17:42:32Z

Implementation of rare candy as an evolution-granting item
Make pets branch compatible with latest develop loot changes (and subsequently includes latest develop)
Better organizes pet loot dropdown & displays variants more clearly (sorts them together based on parent ID and displays parent name)
Significantly cut down on queries in various pet-related places, in general just a lot of query consolidation/clean up (I did try to keep an eye on page load times with debugbar to make sure it was actually helping)

the merge conflicts back into C&C might be mildly annoying on this one so feel free to just let me deal with it in a later PR lol, I have some stuff I need to PR there as well anyways

Bumps [sass](https://github.com/sass/dart-sass) from 1.94.0 to 1.94.2. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.94.0...1.94.2) --- updated-dependencies: - dependency-name: sass dependency-version: 1.94.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ent (lk-arpg#1366)

* feat: dynamic rewards * refactor: fix blade formatting * refactor: fix PHP styling * feat: polymorphic relations, fix power * refactor: fix blade formatting * chore: add credits * refactor: fix blade formatting * fix: forms not using correct widths when showRecipient is false but extra fields are provided * feat: feature parity with weight fields, same as loot tables * refactor: fix blade formatting * fix: correct support for multiple fields in one view * fix: allow data to be populated with multiple fields correctly by key value (or single field/value as needed) * fix: bug with loot table chances not updating, also propagate to rewards, fix value in exta fields * refactor: fix blade formatting * refactor: fix PHP styling * feat: update conversion command * refactor: fix PHP styling * refactor: fix blade formatting * fix: swap order to be consistent * refactor: fix blade formatting * chore: add more isset for view options * refactor: fix blade formatting --------- Co-authored-by: ScuffedNewt <ScuffedNewt@users.noreply.github.com>

* chore(deps-dev): update tinyMCE - update JS packages * refactor: fix blade formatting --------- Co-authored-by: itinerare <itinerare@users.noreply.github.com>

* chore(workflows): pull before committing lint changes * refactor: fix blade formatting --------- Co-authored-by: itinerare <itinerare@users.noreply.github.com>

…lk-arpg#1371) * Fix(blade-formatter): Hopefully? * refactor: fix blade formatting * Reversing edit * Blade formatter disabling in specific areas --------- Co-authored-by: SpeedyD <SpeedyD@users.noreply.github.com>

* fix(workflow): Pint errors out on php 8.1 * refactor: fix blade formatting * refactor: fix blade formatting --------- Co-authored-by: SpeedyD <SpeedyD@users.noreply.github.com>

* feat(shops): create takeUserAssets function * refactor: fix PHP styling * fix(shops): validate $contents against $selected in takeUserAssets * refactor: fix PHP styling * fix(shops): validate quantities of $selected and $contents match in takeUserAssets * refactor: fix PHP styling * fix(shops): remove $selected quantity validation, add comments indicating why * refactor: fix PHP styling --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

… item_id property (lk-arpg#1372) * fix(rewards): allow rewardable_id column to be null, fix non-existent item_id property * refactor: fix PHP styling * fix(rewards): add create/update rules for Reward model, actually display errors thrown by RewardService * refactor: fix PHP styling --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

* fix(shops): fix shop stock costs not being deleted alongside stock * refactor: fix PHP styling --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

…rpg#1375)

…lk-arpg#1376) Fix to make Universal Traits Index and All Traits Index show

) * fix: trait dropdown rendering on masterlist * refactor: fix blade formatting --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

* fix: remove extraneous code * refactor: fix PHP styling --------- Co-authored-by: ScuffedNewt <ScuffedNewt@users.noreply.github.com>

…k-arpg#1373) Updated hasUnlockedLimits function to include user parameter and modified the logic to check if the user has unlocked limits for the given object. Also prevents accidental transactions that could otherwise be triggered

Bumps [sass](https://github.com/sass/dart-sass) from 1.94.2 to 1.96.0. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.94.2...1.96.0) --- updated-dependencies: - dependency-name: sass dependency-version: 1.96.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

… trait dropdowns (lk-arpg#1367) * Feat(characters): Show only traits belonging to the character's species (or non-species specific traits) * Refresh trait on species change * refactor: fix blade formatting * refactor: fix PHP styling * refactor: fix blade formatting * Renaming function and route to Features Trait because that's the closest correct name * show_exlusively_species_traits_in_dropdown to reduce hyphens * Fixing the nit --------- Co-authored-by: SpeedyD <SpeedyD@users.noreply.github.com>

…1365) * support multiple subtypes for traits * rename whereHas $query variable * refactor getSubtypeFeatures to support multiple subtypes * refactor: fix blade formatting * refactor: fix PHP styling * change model relation to belongsToMany * add extension tracker file * refactor: fix blade formatting * small fixes * refactor: fix PHP styling * fix: show subtypes again * refactor: fix blade formatting * oops * fix: properly attach subtypes on feature creation * fix: properly allow setting 0 subtypes * fix: only include traits that include that subtype when viewing basics * refactor: fix PHP styling * fix: more subtype -> subtypes fixes * only show visible subtypes to user * refactor: fix PHP styling * refactor: fix PHP styling * fix: copy and paste error (I promise I made this) * fix: properly detach traits on deletion * fix: show species traits without subtype * refactor: fix PHP styling * feat: extra dropdown options * refactor: fix PHP styling * refactor: fix blade formatting * chore: remove console.logs * Update config/lorekeeper/extensions.php Co-authored-by: Mercury <63693594+itinerare@users.noreply.github.com> * update multiple trait subtypes in dropdown * move extension to credits page * fix logic in console command * refactor: fix PHP styling * refactor: fix PHP styling * fix: put those comments back where they belong * begone pesky period * fix another merge mistake (reverse sorting) * ...another merge mistake OTL * fix: only show visible subtypes to user * refactor: remove unneccesary implode/explode I swear to god * refactor: fix blade formatting --------- Co-authored-by: Draconizations <Draconizations@users.noreply.github.com> Co-authored-by: ScuffedNewt <scuffednewt@gmail.com> Co-authored-by: ScuffedNewt <ScuffedNewt@users.noreply.github.com> Co-authored-by: Mercury <63693594+itinerare@users.noreply.github.com>

…arpg#1379) * feat(loot): overhaul loot blades and consolidate duplicated code * refactor: fix blade formatting * refactor: fix PHP styling * feat: remove code added for blade rework but never used * chore: add more helpful comments * refactor: fix blade formatting * fix: missing {{ $prefix }} for loot-row-type and loot-row-select, missing listener for reward recipient * refactor: fix blade formatting * feat(loot): use recipient value to populate rewardable_id field, other refactors to allow for potential additional recipient types * fix(loot): missing $loot->rewardable_recipient * fix(prompts): rewardable_recipient missing from Submission.php * fix(loot): only show character ownable items when the recipient is a character * refactor: fix blade formatting * refactor: fix PHP styling --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

…1385)

Bumps [sass](https://github.com/sass/dart-sass) from 1.96.0 to 1.97.1. - [Release notes](https://github.com/sass/dart-sass/releases) - [Changelog](https://github.com/sass/dart-sass/blob/main/CHANGELOG.md) - [Commits](sass/dart-sass@1.96.0...1.97.1) --- updated-dependencies: - dependency-name: sass dependency-version: 1.97.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ing asset model (lk-arpg#1386)

* fix: box item tag missing rewardable_recipient * refactor: fix PHP styling --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

…1385)

* chore(deps-dev): bump lodash from 4.17.23 to 4.18.1 Bumps [lodash](https://github.com/lodash/lodash) from 4.17.23 to 4.18.1. - [Release notes](https://github.com/lodash/lodash/releases) - [Commits](lodash/lodash@4.17.23...4.18.1) --- updated-dependencies: - dependency-name: lodash dependency-version: 4.18.1 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): rebuild mix assets --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>

)

* chore(deps-dev): bump axios from 1.14.0 to 1.15.0 Bumps [axios](https://github.com/axios/axios) from 1.14.0 to 1.15.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.14.0...v1.15.0) --- updated-dependencies: - dependency-name: axios dependency-version: 1.15.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): rebuild mix assets --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>

Bumps [postcss](https://github.com/postcss/postcss) from 8.5.8 to 8.5.9. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.5.8...8.5.9) --- updated-dependencies: - dependency-name: postcss dependency-version: 8.5.9 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* fix: update socialiteproviders/deviantart to ^4.2 * fix: composer require removed the ^ on the version number

Bumps [postcss](https://github.com/postcss/postcss) from 8.5.9 to 8.5.10. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.5.9...8.5.10) --- updated-dependencies: - dependency-name: postcss dependency-version: 8.5.10 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* chore(deps-dev): bump axios from 1.15.0 to 1.15.1 Bumps [axios](https://github.com/axios/axios) from 1.15.0 to 1.15.1. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.15.0...v1.15.1) --- updated-dependencies: - dependency-name: axios dependency-version: 1.15.1 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): rebuild mix assets --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>

* feat(deps): add debugbar * fix: add back caret to socialite version

* fix: erroneous query generation on currency log search * fix: change character currency log query with() back to sender/recipient.rank

* chore(deps-dev): bump axios from 1.15.1 to 1.15.2 Bumps [axios](https://github.com/axios/axios) from 1.15.1 to 1.15.2. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.15.1...v1.15.2) --- updated-dependencies: - dependency-name: axios dependency-version: 1.15.2 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): rebuild mix assets --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>

Bumps [postcss](https://github.com/postcss/postcss) from 8.5.10 to 8.5.12. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.5.10...8.5.12) --- updated-dependencies: - dependency-name: postcss dependency-version: 8.5.12 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…lk-arpg#1402) * Feat(user): Limit Userpage Sublists to Characters * refactor: fix PHP styling --------- Co-authored-by: SpeedyD <SpeedyD@users.noreply.github.com>

…arpg#1455) * feat(images): update image handling to prevent dangling images, make delete calls non destructive, and other minor cleanups * fix: missed func definition

…1460) prevent alias login from expiring after the default cache expiration

* chore(deps-dev): bump axios from 1.15.2 to 1.16.0 Bumps [axios](https://github.com/axios/axios) from 1.15.2 to 1.16.0. - [Release notes](https://github.com/axios/axios/releases) - [Changelog](https://github.com/axios/axios/blob/v1.x/CHANGELOG.md) - [Commits](axios/axios@v1.15.2...v1.16.0) --- updated-dependencies: - dependency-name: axios dependency-version: 1.16.0 dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] <support@github.com> * chore(deps): rebuild mix assets --------- Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: dependabot[bot] <dependabot[bot]@users.noreply.github.com>

Bumps [postcss](https://github.com/postcss/postcss) from 8.5.12 to 8.5.13. - [Release notes](https://github.com/postcss/postcss/releases) - [Changelog](https://github.com/postcss/postcss/blob/main/CHANGELOG.md) - [Commits](postcss/postcss@8.5.12...8.5.13) --- updated-dependencies: - dependency-name: postcss dependency-version: 8.5.13 dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* refactor: optimize organized trait dropdown query * refactor: remove $appends and $with from subtype

dependabot Bot and others added 30 commits November 24, 2025 07:53

fix(world): only order all trait index by rarity if rarities are pres…

9d0af21

…ent (lk-arpg#1366)

refactor: fix blade formatting

fb10e07

chore(deps-dev): update tinyMCE (lk-arpg#1363)

ac1e205

* chore(deps-dev): update tinyMCE - update JS packages * refactor: fix blade formatting --------- Co-authored-by: itinerare <itinerare@users.noreply.github.com>

chore(workflows): pull before committing lint changes (lk-arpg#1369)

cfd3634

chore(workflows): pull before committing lint changes (lk-arpg#1370)

313c490

* chore(workflows): pull before committing lint changes * refactor: fix blade formatting --------- Co-authored-by: itinerare <itinerare@users.noreply.github.com>

refactor: fix blade formatting

51bf6b9

chore(workflows): use PHP 8.2 for pint (lk-arpg#1368)

c293c41

* fix(workflow): Pint errors out on php 8.1 * refactor: fix blade formatting * refactor: fix blade formatting --------- Co-authored-by: SpeedyD <SpeedyD@users.noreply.github.com>

chore: update from release/v3.0.0

57d45e2

fix(shops): delete shop stock costs alongside stock (lk-arpg#1374)

fca9869

* fix(shops): fix shop stock costs not being deleted alongside stock * refactor: fix PHP styling --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

fix: rewards references when attempting to delete item/currency (lk-a…

f4a4914

…rpg#1375)

fix(world): correctly output features to universal/all traits indices (…

9ef1356

…lk-arpg#1376) Fix to make Universal Traits Index and All Traits Index show

fix(browse): update trait dropdown rendering on masterlist (lk-arpg#1377

71f1b8a

) * fix: trait dropdown rendering on masterlist * refactor: fix blade formatting --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

fix(shops): remove extraneous queries, code (lk-arpg#1362)

4ef1625

* fix: remove extraneous code * refactor: fix PHP styling --------- Co-authored-by: ScuffedNewt <ScuffedNewt@users.noreply.github.com>

feat: add loot table grants (lk-arpg#1384)

63a1ff3

fix(users): get lowest existing rank when creating new user (lk-arpg#…

713f962

…1385)

fix(assetHelpers): improve raffle ticket, loot table checks when gett…

d453a31

…ing asset model (lk-arpg#1386)

fix(items): set rewardable_recipient for box item tag (lk-arpg#1388)

4b747cd

* fix: box item tag missing rewardable_recipient * refactor: fix PHP styling --------- Co-authored-by: perappu <perappu@users.noreply.github.com>

fix(users): get lowest existing rank when creating new user (lk-arpg#…

a70bc34

…1385)

fix: fix showRaffles check in loot select views (lk-arpg#1392)

355ba85

dependabot Bot and others added 30 commits April 6, 2026 08:48

refactor(submissions): optimize submissions viewable scope (lk-arpg#1439

1a4b1ec

)

chore: update from release/v3.0.0

770db0b

fix: update socialiteproviders/deviantart to ^4.2 (lk-arpg#1450)

c1d69d7

* fix: update socialiteproviders/deviantart to ^4.2 * fix: composer require removed the ^ on the version number

chore: update from main

6e80580

chore: update from release/v3.0.0

ae1f8cc

chore(deps): put back socialiteproviders/discord

445d9e0

chore: update from release/v3.0.0

253caad

chore(deps-dev): add debugbar (lk-arpg#1456)

a0a1a56

* feat(deps): add debugbar * fix: add back caret to socialite version

fix: erroneous query generation on currency log search (lk-arpg#1440)

80dc17f

* fix: erroneous query generation on currency log search * fix: change character currency log query with() back to sender/recipient.rank

feat(users): add option to limit profile sublists to owned characters (…

85d2d8a

…lk-arpg#1402) * Feat(user): Limit Userpage Sublists to Characters * refactor: fix PHP styling --------- Co-authored-by: SpeedyD <SpeedyD@users.noreply.github.com>

feat: clean and refactor image handling, prevent dangling images (lk-…

2f1d91a

…arpg#1455) * feat(images): update image handling to prevent dangling images, make delete calls non destructive, and other minor cleanups * fix: missed func definition

fix(users): enable 'remember me' option on login with alias (lk-arpg#…

c497e58

…1460) prevent alias login from expiring after the default cache expiration

chore: update from release/v3.0.0

fbaf1b3

refactor: optimize organized trait dropdown query (lk-arpg#1466)

62b4ec6

* refactor: optimize organized trait dropdown query * refactor: remove $appends and $with from subtype

feat: pet evolution implementation

3a9b59b

Merge remote-tracking branch 'lorekeeper/develop' into extension-pr/pets

1766897

feat: pets compatible with new loot, make pet loot dropdown nicer

f97bf0b

refactor: various optimizations

3058349

refactor: more query consolidation

b453d9a

Merge remote-tracking branch 'lorekeeper/develop' into extension-pr/pets

617158e

refactor: fix PHP styling

3f6bd59

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

pets rare candy implementation & misc refactors#287

pets rare candy implementation & misc refactors#287
perappu wants to merge 99 commits intoScuffedNewt:extension/petsfrom
perappu:extension-pr/pets

perappu commented May 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

Conversation

perappu commented May 6, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants