Add Functionality to the Blackmarket#400
Open
SalleeMatthew wants to merge 7 commits intoCybertownRevival:masterfrom
Open
Add Functionality to the Blackmarket#400SalleeMatthew wants to merge 7 commits intoCybertownRevival:masterfrom
SalleeMatthew wants to merge 7 commits intoCybertownRevival:masterfrom
Conversation
Added functionality to the blackmarket. Removed unnecessary code from Flea Market to get rid of warnings. Added shared object functionality to plaza so mina's avatar will load in 3d.
Contributor
There was a problem hiding this comment.
Pull request overview
Adds “blackmarket” parity with existing fleamarket tooling across the SPA and API, plus updates VRML world files to support shared objects/zone behavior (notably for the “enter” world).
Changes:
- SPA: enable 3D drop/properties menus and admin-check calls for the
blackmarketplace. - API: introduce
/api/blackmarket/can_adminand aBlackMarketServicerole-based admin check; wire blackmarket admin permissions into object-instance actions. - Worlds: refactor blackmarket VRML shared-object handling and add shared-zone/proto declarations to
enter; remove BlaxxunZone/SharedZone definitions fromfleamarket.
Reviewed changes
Copilot reviewed 12 out of 12 changed files in this pull request and generated 2 comments.
Show a summary per file
| File | Description |
|---|---|
| spa/src/components/Chat.vue | Adds blackmarket handling in 3D menu visibility + admin-check request. |
| spa/assets/worlds/fleamarket/vrml/fleamarket.wrl | Removes BlaxxunZone/SharedZone-related VRML definitions. |
| spa/assets/worlds/enter/vrml/enter.wrl | Adds shared-zone/shared-object EXTERNPROTO/PROTO declarations. |
| spa/assets/worlds/blackmarket/vrml/blackmarket.wrl | Switches to shared_xite EXTERNPROTOs and cleans up embedded SharedObject proto code; adds SharedZone. |
| api/src/services/index.ts | Exports the new BlackMarketService. |
| api/src/services/blackmarket/blackmarket.service.ts | Adds role-based admin check for blackmarket staff roles. |
| api/src/routes/index.ts | Exports blackmarket routes. |
| api/src/routes/blackmarket.routes.ts | Adds /can_admin endpoint routing for blackmarket. |
| api/src/controllers/object-instance.controller.ts | Extends fleamarket admin logic to include blackmarket for object placement/pickup/drop rules. |
| api/src/controllers/index.ts | Exports blackmarket controller. |
| api/src/controllers/blackmarket.controller.ts | Implements /can_admin controller action mirroring fleamarket. |
| api/src/api.ts | Mounts /api/blackmarket routes. |
Comments suppressed due to low confidence (1)
spa/assets/worlds/fleamarket/vrml/fleamarket.wrl:128
- This change removes the BlaxxunZone/SharedZone definitions from the fleamarket world. Many other worlds define
DEF SharedZone BlaxxunZone { ... }to enable shared avatars/events/objects; without it, fleamarket may no longer participate in the shared-zone features. If fleamarket still needs shared avatars/events, consider restoring aBlaxxunZonePROTO +DEF SharedZone ...consistent with other world files.
PROTO Booth[
field MFString number "15"
field SFString description "Booth 15"
]{
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
Removed comments that were referencing other files not related to the blackmarket.
…tr_2 into Add-Black-Market
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Added functionality to the Blackmarket.
Removed unnecessary code from Flea Market to get rid of warnings.
Added shared object functionality to plaza so mina's avatar will load in 3d.