Skip to content

add realm property to permit housing buys outside of primary instance #2

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

add realm property to permit housing buys outside of primary instance #2

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
0ff2e58
support realm property for buying housing on home realm outside of pr…
tgarove Sep 23, 2024
a9b60cb
revise housing instance restriction override RealmProperty to preserv…
tgarove Sep 25, 2024
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: 4 additions & 0 deletions Source/ACE.Entity/Enum/Properties/RealmPropertyBool.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,10 @@ all landblocks will use the parent realm instead. Any players with a homeworld u
[Description("If enabled, classical instances will be active regardless of the character's location. This is not recommended for realms other than true solo-self-found realms, and is considered an advanced feature.")]
[RealmPropertyBool(false)]
ClassicalInstances_EnableForAllLandblocks_Dangerous = 13,

[Description("If enabled, players can purchase houses in instances other than the primary instance.")]
[RealmPropertyBool(false)]
IgnoreHousingInstanceRestrictions = 14,
}

public static class RealmPropertyBoolExtensions
Expand Down
3 changes: 2 additions & 1 deletion Source/ACE.Server/Entity/Landblock.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1492,7 +1492,8 @@ public ushort? ShortInstanceID

public WorldRealm WorldRealm => WorldRealmID.HasValue ? RealmManager.GetRealm(WorldRealmID, includeRulesets: true) : null;
public bool IsPrimaryForWorldRealm => ShortInstanceID == 0;
public bool IsHomeInstanceForPlayer(Player player) => IsPrimaryForWorldRealm && player.HomeRealm == WorldRealmID;
public bool IsHomeRealmForPlayer(Player player) => player.HomeRealm == WorldRealmID;
public bool IsHomeInstanceForPlayer(Player player) => IsPrimaryForWorldRealm && IsHomeRealmForPlayer(player);

public class RealmShortcuts
{
Expand Down
19 changes: 14 additions & 5 deletions Source/ACE.Server/WorldObjects/Player_House.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,20 @@ public void HandleActionBuyHouse(ObjectGuid slumlord_id, List<uint> item_ids)
//Console.WriteLine($"\n{Name}.HandleActionBuyHouse()");
log.Info($"[HOUSE] {Name}.HandleActionBuyHouse()");

if (!CurrentLandblock.IsHomeInstanceForPlayer(this))
{
Session.Network.EnqueueSend(new GameMessageSystemChat("You may only purchase a house in your home realm.", ChatMessageType.Broadcast));
log.Info($"[HOUSE] {Name}.HandleActionBuyHouse(): Failed pre-purchase requirement - Not in home realm instance");
return;
if (RealmRuleset.GetProperty(RealmPropertyBool.IgnoreHousingInstanceRestrictions)){
if (!CurrentLandblock.IsHomeRealmForPlayer(this))
{
Session.Network.EnqueueSend(new GameMessageSystemChat("You may only purchase a house in your home realm.", ChatMessageType.Broadcast));
log.Info($"[HOUSE] {Name}.HandleActionBuyHouse(): Failed pre-purchase requirement - Not in home realm");
return;
}
}else{
if (!CurrentLandblock.IsHomeInstanceForPlayer(this))
{
Session.Network.EnqueueSend(new GameMessageSystemChat("You may only purchase a house in your home realm's primary instance.", ChatMessageType.Broadcast));
log.Info($"[HOUSE] {Name}.HandleActionBuyHouse(): Failed pre-purchase requirement - Not in home realm instance");
return;
}
}

// verify player doesn't already own a house
Expand Down