Skip to content
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.

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

DungeonManager #430

Merged
merged 32 commits into from
Sep 27, 2024
Merged

DungeonManager #430

merged 32 commits into from
Sep 27, 2024

Conversation

probablykory
Copy link
Contributor

Adding a new DungeonManager to Jotunn, allowing devs to add custom dungeon rooms to Valheim.

Copy link
Member

@MSchmoecker MSchmoecker left a comment

Choose a reason for hiding this comment

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

This are my first comments reading the code, overall pretty good.

The DungeonGeneratorTheme helper looks fine too me.

probablykory and others added 24 commits September 20, 2024 20:30
…onstructor functions to use new RoomConfig.ApplyConfig method
…iececonfig.cs

# Conflicts:
#	JotunnLib/Entities/CustomRoom.cs
…will parse a custom Theme value to string or attempt to parse vanilla Theme value to string
…7. Add method GetCustomRoomTheme to retrieve and return a new Room Theme, which was added to list of Room Themes.
…ad. Add IsCustomTheme flag. Combine GetCustomRoomTheme and GetVanillaRoomTheme functions.
@probablykory
Copy link
Contributor Author

Rebased my branch to latest dev & Cherrypicked warp's PR changes. I've got more changes pending, but wanted to get these up.

Fully removed Theme properties from RoomConfig & CustomRoom
Formalized and documented static helpers in CustomRoom
Several adjustments in DungeonManager to drive room selection without the Theme properties.
Added a warning to DungeonManager.OnDungeonGeneratorSetupAvailableRooms to note when a generator has no defined themename and a Room.Theme.None value.
@@ -251,7 +256,7 @@ private void OnZoneSystemSetupLocations()

var env = kvp.Value;
env.FixReferences(true);
UnityEngine.Object.Instantiate<GameObject>(env, DungeonRoomContainer.transform);
UnityEngine.Object.Instantiate<GameObject>(env); // Intentionally omitting DungeonRoomContainer.transform
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The env gameobject needs to be enabled in order for the component awakes to run.

@MSchmoecker MSchmoecker merged commit bfc6206 into Valheim-Modding:dev Sep 27, 2024
1 check passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants