Skip to content

Custom level generation #750

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

Open
thicco-catto wants to merge 36 commits into
base: main
Choose a base branch
from
Open

Custom level generation #750

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
8b17521
Reset room list function
thicco-catto Nov 2, 2025
7c047e1
Added bool parameter
thicco-catto Nov 2, 2025
ea8320c
Added callback enum
thicco-catto Nov 2, 2025
d2bf067
Merge branch 'TeamREPENTOGON:main' into level-gen
thicco-catto Nov 3, 2025
2490b78
Added RNG parameter to callback
thicco-catto Nov 3, 2025
8f8c157
Added dungeon generator controller
thicco-catto Nov 4, 2025
f9fb019
Removed test functions and fixed final boss not set
thicco-catto Nov 4, 2025
f65b5f5
Callback triggers for more dungeon types
thicco-catto Nov 4, 2025
d313242
Filter by generation type
thicco-catto Nov 4, 2025
e2f77b4
Moved custom callback to appropiate file
thicco-catto Nov 5, 2025
32e508d
Fixed return values for lua functions
thicco-catto Nov 5, 2025
1feba7f
Renamed lua functions
thicco-catto Nov 5, 2025
bfab985
PlaceRoom returns the room
thicco-catto Nov 6, 2025
845072c
Generator returns bool
thicco-catto Nov 6, 2025
c2cc975
Dungeon generator has own RNG
thicco-catto Nov 7, 2025
47dbdd9
Refactored floor generation
thicco-catto Nov 7, 2025
7d5ce08
Moved implementations to source file
thicco-catto Nov 7, 2025
57a718d
Added room shape check and swapped col/row
thicco-catto Nov 7, 2025
05c839a
Added door validation
thicco-catto Nov 7, 2025
9a7e37e
Added shape field to DungeonGeneratorRoom
thicco-catto Nov 7, 2025
40605fd
Added PlaceDefaultStartingRoom
thicco-catto Nov 7, 2025
797a52d
Fixed constructors
thicco-catto Nov 7, 2025
8ad7897
Added dungeon type param to callback
thicco-catto Nov 7, 2025
2e6f9f4
Changed some pointers to references
thicco-catto Nov 7, 2025
e1b7d98
Changed resetLilPortalRoom param
thicco-catto Nov 8, 2025
bd2415e
Removed unnecesary include
thicco-catto Nov 8, 2025
52c50b5
Use bitset to check room placement
thicco-catto Nov 8, 2025
c308a3e
Created utils file and generation type enum
thicco-catto Nov 8, 2025
0bbb155
Enum is passed as number to callback
thicco-catto Nov 8, 2025
d89ff98
DungeonGenerator now holds index for final boss
thicco-catto Nov 8, 2025
fc5098b
Removed some debug logs
thicco-catto Nov 8, 2025
6edd184
Refactored DungeonGenerator to use LevelGenerator
thicco-catto Nov 9, 2025
2c37191
Removed ununsed fields
thicco-catto Nov 10, 2025
86ff2bb
Added BlockIndex function
thicco-catto Nov 11, 2025
062d157
Changed optional return
thicco-catto Nov 11, 2025
4732779
Added custom callback logic
thicco-catto Nov 11, 2025
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
4 changes: 2 additions & 2 deletions libzhl/functions/Level.zhl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
__thiscall void Level::SetStage(int stageid,int alt);

"538bdc83ec0883e4f883c404558b6b??896c24??8bec6aff68????????64a1????????505383ec68a1????????33c58945??5657508d45??64a3????????8bf9897d??8b0d":
__thiscall void Level::Init(bool unkinitStartRoom);
__thiscall void Level::Init(bool resetLilPortalRoom);

"518b89????????e8":
__thiscall void Level::Update();

"558bec6aff68????????64a1????????5081ecc0000000a1????????33c58945??535657508d45??64a3????????8bc1":
__thiscall void Level::reset_room_list(bool unkinitStartRoom);
__thiscall void Level::reset_room_list(bool resetLilPortalRoom);

"558bec6aff68????????64a1????????5083ec2c535657a1????????33c5508d45??64a3????????8bd98b45":
__thiscall void Level::ChangeRoom(int targetRoomIDX, int dimension);
Expand Down
18 changes: 9 additions & 9 deletions repentogon/LuaInterfaces/CustomCallbacks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5651,7 +5651,7 @@ HOOK_STATIC(LuaEngine, PostEntityKill, (Entity* ent) -> void, __stdcall) {


//MC_PRE_GENERATE_DUNGEON(1340)
bool ProcessGenerateDungeonCallback(Level* level, RNG& rng, int dungeonType) {
bool ProcessGenerateDungeonCallback(Level* level, RNG& rng, DungeonGenerationType dungeonType) {
const int callbackId = 1340;
if (!CallbackState.test(callbackId - 1000)) {
return false;
Expand All @@ -5664,10 +5664,10 @@ bool ProcessGenerateDungeonCallback(Level* level, RNG& rng, int dungeonType) {
DungeonGenerator generator(&rng);
lua::LuaResults results = lua::LuaCaller(L)
.push(callbackId)
.push(dungeonType)
.push((int)dungeonType)
.push(&generator, lua::metatables::DungeonGeneratorMT)
.push(&rng, lua::Metatables::RNG)
.push(dungeonType)
.push((int)dungeonType)
.call(1);

if (results || !lua_isboolean(L, -1) || !lua_toboolean(L, -1))
Comment thread
ConnorForan marked this conversation as resolved.
Expand All @@ -5682,7 +5682,7 @@ bool ProcessGenerateDungeonCallback(Level* level, RNG& rng, int dungeonType) {

HOOK_METHOD(Level, generate_dungeon, (RNG* rng) -> void)
{
bool skip = ProcessGenerateDungeonCallback(this, *rng, 0);
bool skip = ProcessGenerateDungeonCallback(this, *rng, DEFAULT);
if (skip) {
return;
Copy link
Copy Markdown
Collaborator

@ConnorForan ConnorForan Mar 1, 2026

Choose a reason for hiding this comment

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

I think we need to call generate_mirror_world here, for the appropriate stages. In theory it should just do what it normally does and flips the main layout... Guess we'll find out if it works.

Copy link
Copy Markdown
Collaborator

@ConnorForan ConnorForan Mar 1, 2026

Choose a reason for hiding this comment

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

We'll need to confirm if there's anything else we need to do here since we're skipping the vanilla code, like anything the game changes or sets that isnt directly tied to the LevelGenerator portion.

I'll need to defer to Guantol for that, though.

}
Expand All @@ -5691,7 +5691,7 @@ HOOK_METHOD(Level, generate_dungeon, (RNG* rng) -> void)
}

HOOK_METHOD(Level, generate_blue_womb, () -> void) {
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, 1);
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, BLUE_WOMB);
if (skip) {
return;
}
Expand All @@ -5700,7 +5700,7 @@ HOOK_METHOD(Level, generate_blue_womb, () -> void) {
}

HOOK_METHOD(Level, generate_backwards_dungeon, () -> void) {
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, 2);
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, BACKWARDS);
if (skip) {
return;
}
Expand All @@ -5709,7 +5709,7 @@ HOOK_METHOD(Level, generate_backwards_dungeon, () -> void) {
}

HOOK_METHOD(Level, generate_home_dungeon, () -> void) {
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, 3);
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, HOME);
if (skip) {
return;
}
Expand All @@ -5718,7 +5718,7 @@ HOOK_METHOD(Level, generate_home_dungeon, () -> void) {
}

HOOK_METHOD(Level, generate_redkey_dungeon, () -> void) {
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, 4);
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, RED_REDEMPTION);
if (skip) {
return;
}
Expand All @@ -5727,7 +5727,7 @@ HOOK_METHOD(Level, generate_redkey_dungeon, () -> void) {
}

HOOK_METHOD(Level, generate_greed_dungeon, () -> void) {
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, 5);
bool skip = ProcessGenerateDungeonCallback(this, g_Game->_generationRNG, GREED);
if (skip) {
return;
}
Expand Down
Loading