Skip to content

fix: return to neighborhood button will now take player to the correct neighborhood instead of the main one #57

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
alexjyong wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix: return to neighborhood button will now take player to the correct neighborhood instead of the main one #57

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
81ced68
fix: return to neighborhood button will now take player to the correc…
alexjyong Nov 13, 2025
4d42483
adjusting newline at end of file
alexjyong Nov 13, 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
29 changes: 23 additions & 6 deletions Client/Simitone/Simitone.Client/UI/Screens/TS1GameScreen.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@


using FSO.Client;
using FSO.Client.Debug;
using FSO.Client.UI.Controls;
Expand Down Expand Up @@ -56,6 +56,7 @@ public class TS1GameScreen : FSO.Client.UI.Framework.GameScreen
//for TS1 hybrid mode
public UINeighborhoodSelectionPanel TS1NeighPanel;
public FAMI ActiveFamily;
private ushort CurrentNeighborhoodMode = 4; // default to Normal/Old Town

public bool InLot
{
Expand Down Expand Up @@ -172,6 +173,16 @@ public VMAvatar SelectedAvatar
}
}

private ushort GetNeighborhoodModeFromHouse(short house)
{
// House number ranges match the lot types
if (house >= 21 && house <= 31) return 2; // Downtown
else if (house >= 40 && house <= 49) return 3; // Vacation
else if (house >= 81 && house <= 90) return 5; // Studiotown
else if (house >= 90 && house <= 99) return 7; // Magictown
else return 4; // Normal/Old Town (default)
}

public TS1GameScreen(NeighSelectionMode mode) : base()
{
Bg = new UISimitoneBg();
Expand All @@ -194,12 +205,17 @@ public void StartMoveIn(int familyID)
}

public void NeighSelection(NeighSelectionMode mode)
{
var nbd = (ushort)((mode == NeighSelectionMode.MoveInMagic) ? 7 : 4);
NeighSelection(nbd, mode != NeighSelectionMode.Normal);
}

public void NeighSelection(ushort neighborhoodMode, bool moveInMode = false)
{
Content.Get().Neighborhood.PreparePersonDataFromObject = PersonGeneratorHelper.PreparePersonDataFromObject;
Content.Get().Neighborhood.AddMissingNeighbors();
var nbd = (ushort)((mode == NeighSelectionMode.MoveInMagic) ? 7 : 4);
TS1NeighPanel = new UINeighborhoodSelectionPanel(nbd);
var switcher = new UINeighbourhoodSwitcher(TS1NeighPanel, nbd, mode != NeighSelectionMode.Normal);
TS1NeighPanel = new UINeighborhoodSelectionPanel(neighborhoodMode);
var switcher = new UINeighbourhoodSwitcher(TS1NeighPanel, neighborhoodMode, moveInMode);
TS1NeighPanel.OnHouseSelect += (house) =>
{
if (MoveInFamily != null)
Expand Down Expand Up @@ -232,6 +248,7 @@ public void NeighSelection(NeighSelectionMode mode)
public void PlayHouse(short house, UIElement switcher)
{
ActiveFamily = Content.Get().Neighborhood.GetFamilyForHouse((short)house);
CurrentNeighborhoodMode = GetNeighborhoodModeFromHouse(house);
InitializeLot(Content.Get().Neighborhood.GetHousePath(house), false);// "UserData/Houses/House21.iff"
Remove(TS1NeighPanel);
if (switcher != null) Remove(switcher);
Expand Down Expand Up @@ -880,7 +897,7 @@ public PNG GeneratePNG(Texture2D data)
public void ExitLot()
{
CleanupLastWorld();
NeighSelection(NeighSelectionMode.Normal);
NeighSelection(CurrentNeighborhoodMode);
Downtown = false;
SavedLot = null;
}
Expand All @@ -892,4 +909,4 @@ public enum NeighSelectionMode
MoveIn,
MoveInMagic
}
}
}
Loading