Skip to content

Develop #950

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

Merged
WALLOFJUSTICE merged 2 commits into from
Feb 19, 2026
Merged

Develop #950

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
094a939
* map hashes update
Feb 19, 2026
5601c57
Merge pull request #949 from WALLOFJUSTICE/dev25-rc
WALLOFJUSTICE Feb 19, 2026
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
28 changes: 14 additions & 14 deletions src/files.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -942,7 +942,7 @@ std::unordered_map<std::string, int> mapHashes = {
{ "labyrinth32e.lmp", 26968 },
{ "labyrinth_lockb00.lmp", 214460 },
{ "labyrinth_lockb00a.lmp", 30301 },
{ "labyrinth_lockb00b.lmp", 54237 },
{ "labyrinth_lockb00b.lmp", 33105 },
{ "labyrinth_lockb00c.lmp", 54237 },
{ "labyrinth_lockb00d.lmp", 54237 },
{ "labyrinth_lockb00e.lmp", 41517 },
Expand Down Expand Up @@ -973,7 +973,7 @@ std::unordered_map<std::string, int> mapHashes = {
{ "labyrinth_locks01.lmp", 31629 },
{ "labyrinth_locks01a.lmp", 3013 },
{ "labyrinth_locks01b.lmp", 781 },
{ "labyrinth_locks01c.lmp", 781 },
{ "labyrinth_locks01c.lmp", 1207 },
{ "labyrinth_locks01d.lmp", 2469 },
{ "labyrinth_locks01e.lmp", 2651 },
{ "labyrinthsecret.lmp", 73135 },
Expand Down Expand Up @@ -1494,11 +1494,11 @@ std::unordered_map<std::string, int> mapHashes = {
{ "ruins_locks00d.lmp", 764 },
{ "ruins_locks00e.lmp", 335 },
{ "ruins_locks01.lmp", 507264 },
{ "ruins_locks01a.lmp", 5360 },
{ "ruins_locks01b.lmp", 6936 },
{ "ruins_locks01c.lmp", 4618 },
{ "ruins_locks01d.lmp", 4618 },
{ "ruins_locks01e.lmp", 4618 },
{ "ruins_locks01a.lmp", 4613 },
{ "ruins_locks01b.lmp", 3245 },
{ "ruins_locks01c.lmp", 5355 },
{ "ruins_locks01d.lmp", 5355 },
{ "ruins_locks01e.lmp", 5355 },
{ "ruinssecret.lmp", 66694 },
{ "sanctum.lmp", 6476194 },
{ "shop-roomgen00.lmp", 11844 },
Expand Down Expand Up @@ -1776,11 +1776,11 @@ std::unordered_map<std::string, int> mapHashes = {
{ "swamp_locks00d.lmp", 6773 },
{ "swamp_locks00e.lmp", 8390 },
{ "swamp_locks01.lmp", 50531 },
{ "swamp_locks01a.lmp", 883 },
{ "swamp_locks01b.lmp", 883 },
{ "swamp_locks01c.lmp", 883 },
{ "swamp_locks01d.lmp", 883 },
{ "swamp_locks01e.lmp", 883 },
{ "swamp_locks01a.lmp", 2809 },
{ "swamp_locks01b.lmp", 2809 },
{ "swamp_locks01c.lmp", 2809 },
{ "swamp_locks01d.lmp", 2809 },
{ "swamp_locks01e.lmp", 2809 },
{ "swampsecret.lmp", 24027 },
{ "swamptolabyrinth.lmp", 213824 },
{ "temple.lmp", 7248698 },
Expand Down Expand Up @@ -1980,7 +1980,7 @@ std::unordered_map<std::string, int> mapHashes = {
{ "underworld30d.lmp", 49543 },
{ "underworld30e.lmp", 46600 },
{ "underworld_lockg00.lmp", 66751 },
{ "underworld_lockg00a.lmp", 4372 },
{ "underworld_lockg00a.lmp", 3164 },
{ "underworld_lockg00b.lmp", 3164 },
{ "underworld_lockg00c.lmp", 4743 },
{ "underworld_lockg00d.lmp", 4743 },
Expand All @@ -2002,7 +2002,7 @@ std::unordered_map<std::string, int> mapHashes = {
{ "underworld_locks01a.lmp", 2231 },
{ "underworld_locks01b.lmp", 2111 },
{ "underworld_locks01c.lmp", 2231 },
{ "underworld_locks01d.lmp", 2885 },
{ "underworld_locks01d.lmp", 2141 },
{ "underworld_locks01e.lmp", 2987 },
{ "warpzone.lmp", 3133088 }
};
Expand Down
6 changes: 5 additions & 1 deletion src/interface/consolecommand.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5339,7 +5339,11 @@ namespace ConsoleCommands {
coord += (std::to_string(y));
coord += ("], ");

if ( entity->sprite == 9 )
if ( entity->sprite == 21 )
{
printlog("Map: %s Chest: Locked: %d Mimic: %d", f.c_str(), entity->chestLocked, entity->chestMimicChance);
}
else if ( entity->sprite == 9 )
{
loot.push_back(coord + "gold");
}
Expand Down
2 changes: 1 addition & 1 deletion src/mod_tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,7 +838,7 @@ void IRCHandler_t::handleMessage(std::string& msg)
#endif // !NINTENDO

Uint32 ItemTooltips_t::itemsJsonHashRead = 0;
const Uint32 ItemTooltips_t::kItemsJsonHash = 1443175221;
const Uint32 ItemTooltips_t::kItemsJsonHash = 2516917045;

void ItemTooltips_t::setSpellValueIfKeyPresent(ItemTooltips_t::spellItem_t& t, rapidjson::Value::ConstMemberIterator item_itr, Uint32& hash, Uint32& hashShift, const char* key, int& toSet)
{
Expand Down