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

Feature/load savegame - Items and player location #55

Merged
merged 14 commits into from
Jun 29, 2024
Merged

Conversation

JaXt0r
Copy link
Contributor

@JaXt0r JaXt0r commented Jun 23, 2024

Please test now, but merge only after #39

I implemented loading of a SaveGame. We can now load original G1 save games.

To Test:

  1. Play G1 where you removed an item and put an item to another location.
  2. Save the game.
  3. Open Gothic-UnZENity and seek the "Load Save Game" button on main menu
  4. Select the element
  5. Check if your spawning spot is correct.
  6. Check if the item changes on your game are the same like when you saved it in G1
  7. Please also traverse
    1. into the Old Mine and see if it loads (there was a crash before, when the world wasn't in the save game. Should work now.)
    2. Back into main world. Did you spawn where you expect to be after coming back?

Out-of-scope:

  • Loading of NPCs is currently disabled as there are more elements to do before we load them properly. I create another ticket for it.

@JaXt0r JaXt0r linked an issue Jun 23, 2024 that may be closed by this pull request
4 tasks
@JaXt0r JaXt0r marked this pull request as ready for review June 25, 2024 13:47
@Tyroonis
Copy link

@JaXt0r
Where do I have to put the savegame?

@Tyroonis
Copy link

Looks good.

One Hint:
I put down a stack of 3 beers in the original.
In VR it is only 1

Here the Savegame:
savegame2.zip

@JaXt0r
Copy link
Contributor Author

JaXt0r commented Jun 27, 2024

@Tyroonis I see your point now: You put 3x beer onto the floor but when you pick it up in VR, you have only 1 item in you hand. For this PR, it's no issue, because we still hold the mesh in our hands. Once we have an inventory, we need to store, that we have 3x beer instead of one. We are already discussing with Luis about it (might be a missing amount variable) and will add it later.

If the loading is fine for you and also world switching worked, then please give it an approved.

# Conflicts:
#	Assets/Gothic-UnZENity-Core/Scripts/Context/IInteractionAdapter.cs
#	Assets/Gothic-UnZENity-HVR/Scripts/HVRInteractionAdapter.cs
#	Assets/Gothic-UnZENity-XRIT/Scripts/XRITInteractionAdapter.cs
Copy link

@Tyroonis Tyroonis left a comment

Choose a reason for hiding this comment

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

Everything works so far.

Please create an issue for the amount problem.

@JaXt0r
Copy link
Contributor Author

JaXt0r commented Jun 27, 2024

Thanks ticket is created: #59

@JaXt0r
Copy link
Contributor Author

JaXt0r commented Jun 28, 2024

Merge conflicts I need to resolve:

  • Tools/FeatureFlagTool.cs - Removed. Nothing to do. Ticket exists already.
  • Caches/TextureCache.cs - zkTexture usage change.
  • Creator/NpcCreator.cs
  • Creator/WorldCreator.cs
  • Debugging/FeatureFlags.cs - Removed. I need to merge the "saveSlot" and "LoadSaveGame" flag.
  • Globals/GameData.cs
  • Manager/GUZSceneManager.cs
  • Player/Menu/MenuManager.cs
  • Player/Menu/TextureMenu.cs

# Conflicts:
#	Assets/Gothic-UnZENity-Core/Editor/Scripts/Tools/FeatureFlagTool.cs
#	Assets/Gothic-UnZENity-Core/Scripts/Caches/TextureCache.cs
#	Assets/Gothic-UnZENity-Core/Scripts/Creator/NpcCreator.cs
#	Assets/Gothic-UnZENity-Core/Scripts/Creator/WorldCreator.cs
#	Assets/Gothic-UnZENity-Core/Scripts/Debugging/FeatureFlags.cs
#	Assets/Gothic-UnZENity-Core/Scripts/Globals/GameData.cs
#	Assets/Gothic-UnZENity-Core/Scripts/Manager/GUZSceneManager.cs
#	Assets/Gothic-UnZENity-Core/Scripts/Player/Menu/MenuManager.cs
#	Assets/Gothic-UnZENity-Core/Scripts/Player/Menu/TextureMenu.cs
# Conflicts:
#	Assets/Gothic-UnZENity-Core/Scripts/Creator/NpcCreator.cs
@JaXt0r JaXt0r merged commit 2abe4e8 into main Jun 29, 2024
@JaXt0r JaXt0r deleted the feature/load-savegame branch June 29, 2024 08:15
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.

Implement G1 savegame loading - Items + Hero position
2 participants