Repository navigation
fix(illusion-temple): make the Scroll of Blood (13/51) the ticket again and give 13/50 back to the Illusion Sorcerer Covenant - #1473
Merged
sven-n merged 10 commits intoNov 16, 2026
Conversation
Up to standards ✅🟢 Issues
|
| Metric | Results |
|---|---|
| Complexity | 32 |
| Duplication | 43 |
NEW Get contextual insights on your PRs based on Codacy's metrics, along with PR and Jira context, without leaving GitHub. Enable AI reviewer
TIP This summary will be updated as you push new changes.
Mosch0512
marked this pull request as draft
November 10, 2026 16:08
Contributor
|
I wondered why the Lorencia barmaid had empty slots 😄 |
Contributor
Author
|
true ^^ explains a lot ^^ |
The Illusion Temple event (MUnique#893) swapped the items 13/50 and 13/51, taking the Illusion Sorcerer Covenant for the ticket. In the original game and the client, the Old Scroll (13/49) and the Illusion Sorcerer Covenant (13/50, 1x2) drop from monsters, the chaos goblin combines them into the Scroll of Blood (13/51, 2x2), and the Scroll of Blood is the ticket. - The data initialization creates the original items again, and the crafting gives the Scroll of Blood from an Old Scroll and a Covenant. - Version 3 of the illusion temple update no longer swaps the numbers of a database with the original numbering. A database with the swapped data gets the original data back without renumbering: the name, size and drop settings of the two definitions are swapped, the drop item groups move, seeded temple definitions point at 13/51 and merchant items at 13/50. Owned items keep their number, so what the client shows stays what they are.
… Scroll of Blood to 13/51 The restoration turns 13/50 into the Illusion Sorcerer Covenant. Only seeded temple definitions with their default id and ticket level moved to the ticket 13/51, so a temple with an own id or ticket level ended up on the covenant: it accepted the dropped covenant and refused the crafted Scroll of Blood. Now every mini game definition which references 13/50 of the swapped data, which is the Scroll of Blood there, moves to 13/51 and keeps its id and ticket level. A ticket of another item stays.
…restores Server owners read the description to decide whether an update overwrites their customizations. It now says that the update gives swapped items 13/50 and 13/51 their original data back, with the drop item groups, temple tickets and merchant items.
…rsion two's ticket move The remark said version 3 replaces the ticket binding repair of version 2, but the restoration still points the temples which reference 13/50 at 13/51.
…s version A later version of the update would otherwise break the test of the restoration.
…inition Brings back the instance and count checks of the earlier binding test: the temple definitions and item definitions are the same objects after the update.
…fails without one An item whose definition became bigger, like the Scroll of Blood (1x2 to 2x2), no longer fits at its slot. Loading the storage moves it or its neighbour to a free place; without a free place it throws, which keeps the character out of the game.
…temple of its level accepts The crafting found its result by the name "Scroll of Blood", while the temples reference their ticket item. That's how the two drifted apart in MUnique#893. Now the crafting takes the ticket item of the illusion temple whose ticket level is the level of the ingredients, and only falls back to the name without such a temple. An owner who selects another ticket item gets it from the crafting too.
… as it is When only one of the two items has the swapped name, because the server owner renamed the other, the restoration changes neither: the data of one item alone can't be swapped. Update plug-ins have no logger, so the description, which the owner reads before applying the update, says it, and a test covers it.
…s to 13/50 and 13/51 The restoration moves the seeded references (drop item groups, temple tickets, merchant items). References which the owner added, in craftings, quests, item drops or plug-in settings, can mean either item, so they stay; the description of the update tells the owner to check them.
Mosch0512
force-pushed
the
fix/illusion-temple-ticket-items
branch
from
November 15, 2026 20:13
0560096 to
9a0b68e
Compare
Mosch0512
marked this pull request as ready for review
November 16, 2026 17:28
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.
Why
#893 (merged with #974, commit c659924 "Add an update plugin to bring existing databases up to date") swapped the items 13/50 and 13/51, because it took the Illusion Sorcerer Covenant for the ticket. It's the other way around: in the original game, the Old Scroll (13/49, 1x1) and the Illusion Sorcerer Covenant (13/50, 1x2) drop from monsters, the chaos goblin combines them (with a Jewel of Chaos and zen) into the Scroll of Blood (13/51, 2x2) of their level, and the Scroll of Blood is the entry ticket.
Evidence:
_enum.hdefinesITEM_OLD_SCROLL = ITEM_HELPER + 49,ITEM_ILLUSION_SORCERER_COVENANT = ITEM_HELPER + 50andITEM_SCROLL_OF_BLOOD = ITEM_HELPER + 51. The temple entry window only acceptsITEM_SCROLL_OF_BLOOD(CursedTempleEnter.cppL124, L146), and right-clickingITEM_SCROLL_OF_BLOODasks for the opening state of the temple (InventoryActionController.cppL849), which ourMiniGameOpeningStateRequestHandlerPlugInalready mentions.gameserver/IllusionTempleEvent.cpp: the entry checksMAKE_ITEMNUM(13, 51)with the comment 피의 두루마리 ("Scroll of Blood") at L282, L375 and L547. The Scroll of Blood mix (comment 환영 사원 피의 두루마리 조합, "Illusion Temple Scroll of Blood mix") checksMAKE_ITEMNUM(13, 49)(낡은 두루마리, Old Scroll, L1388) andMAKE_ITEMNUM(13, 50)(환영교단의 서, Covenant of Illusion, L1397) and createsMAKE_ITEMNUM(13, 51)(L1318).git log -L38,42:src/Persistence/Initialization/VersionSeasonSix/Items/EventTicketItems.cs): 13/50 Illusion Sorcerer Covenant 1x2 with drop levels, 13/51 Scroll of Blood 2x2.IllusionTempleTicketCraftingmade the "Scroll of Blood" from "Old Scroll" and "Illusion Sorcerer Covenant" from 2020 (e64809c) until 2c6a2a9.ItemRules.csstill comments 13/50 as Illusion Sorcerer Covenant and 13/51 as Scroll of Blood, and Lumen the Barmaid still sells 13/50 as "Illusion Sorcerer Covenant" in five 1x2 slots next to each other.What the swap does now:
What
IllusionTempleTicketCraftingcreates the Scroll of Blood from an Old Scroll and an Illusion Sorcerer Covenant, as before Illusion Temple Mini Game - Event #893. It now takes the result from the ticket item of the illusion temple of that level (MiniGameDefinition.TicketItem), and only falls back to the name "Scroll of Blood" without such a temple, so the crafting and the temples can't drift apart again, also when a server owner selects another ticket item.IllusionTempleDataUpdatePlugIngets version 3 (same GUID,UpdatedAt2026-11-08, following rule 4 of the coding rules). It no longer swaps the numbers of a database which has the original numbering, and its version 2 repair of the temple ticket bindings, which pointed the temples at the covenant, is replaced by a restoration of the items. The restoration runs for every installed version (a database without the update also gets the content of version 1, as before) and only acts when 13/51 is named "Illusion Sorcerer Covenant" and 13/50 "Scroll of Blood" (neutral language), i.e. on databases which got the swap through version 1 or 2 or were initialized with the data of Illusion Temple Mini Game - Event #893. It then:Owned items on databases which got version 1's renumbering: Scrolls of Blood owned before that update were moved to 13/50 by it. The client already shows them as Illusion Sorcerer Covenants; with this change they are covenants on the server too (they can be combined into a ticket with an Old Scroll).
Risk for owned tickets: the Scroll of Blood grows from 1x2 to 2x2 on the server. An owned ticket whose cells to the right are taken by another item, or which lies in the rightmost column, doesn't fit at its slot anymore. When the inventory (or the vault, when it's opened) is loaded,
Storagemoves an item which doesn't fit to the first free place where it fits, so in most cases the ticket or its neighbour just moves. Only if the storage has no free place for it, the item is put into the waiting items of the character (#1487) and gets into the inventory as soon as there is room, so the character still enters the game and the vault still opens. The client already draws these tickets 2x2, so the affected players already see the overlap. This change doesn't move item positions in the database.Testing
dotnet buildoftests/MUnique.OpenMU.Persistence.Initialization.Testsandtests/MUnique.OpenMU.Testswith-p:ci=true.dotnet test --no-build -p:ci=true:MUnique.OpenMU.Persistence.Initialization.Tests: 884 passed, 12 skipped (the database/manual ones), 1 failed:Season6ItemCountsPerProfilefails on master too (feat(items): add the talisman of resurrection #1461, feat(items): add the lucky coin exchange of delgado #1464 and feat(items): add the gladiator's honor #1471 each raised the expected default count to 244, together they add 3 items)MUnique.OpenMU.Tests: 3101 passed, 0 failed, 2 skippedIllusionTempleTicketItemsTest,IllusionTempleDataTest),IllusionTempleDataUpdatePlugInno longer swaps a configuration with the original numbering (installed version 0, 1 and 2), and restores a configuration which version 1 renumbered,IllusionTempleTicketCraftingTest),StorageTest); the inventory and the vault put such an item into the waiting items instead (feat(items): an item which finds no place when its storage is loaded waits for space in the inventory #1487,WaitingItemsTest).