swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity

Companion for Cell Permission Updates

Browse Source
This commit is contained in:
AconiteX
2021-08-20 00:52:30 -04:00
parent b9bb323baa
commit 8da41b8686
3 changed files with 186 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

196
sku.0/sys.server/compiled/game/script/library/player_structure.java
View File

@@ -2,8 +2,7 @@ package script.library;
import script.*;
import java.util.StringTokenizer;
import java.util.Vector;
import java.util.*;
public class player_structure extends script.base_script
{
@@ -229,6 +228,7 @@ public class player_structure extends script.base_script
private static final int STRUCTURE_MAINTENANCE_HEARTBEAT = utils.getIntConfigSetting("GameServer", "maintenanceHeartbeat", 1800);
private static final boolean ENABLE_ABANDONED_STRUCTURES_SYSTEM = utils.checkConfigFlag("GameServer", "enableAbandonedHousePackup");
private static final boolean ALLOW_PACKING_ABANDONED_STRUCTURES = utils.checkConfigFlag("GameServer", "allowPlayersToPackAbandonedStructures");
public static final String VAR_ADMIN_ALL_CHARACTERS_ON_ACCOUNT = "player_structure.admin_all_characters";
public static obj_id createPlayerStructure(String template, obj_id owner, location loc, int rotation, dictionary deed_info) throws InterruptedException
{
@@ -1512,24 +1512,31 @@ public class player_structure extends script.base_script
return null;
}
String[] fullEntryList = permissionsGetAllowed(structure);
Vector filteredEntryList = new Vector();
filteredEntryList.setSize(0);
List<String> cleanEntryList = new ArrayList<>();
for (String entryItemString : fullEntryList) {
if (!isIdValid(utils.stringToObjId(entryItemString))) {
if ((entryItemString.toLowerCase()).contains("guild:")) {
if (findGuild(((entryItemString.substring(6)).toLowerCase()).trim()) > 0) {
utils.addElement(filteredEntryList, entryItemString);
}
} else {
utils.addElement(filteredEntryList, entryItemString);
}
for(String entry : fullEntryList)
{
if(entry.startsWith("guild:"))
{
cleanEntryList.add("guild:"+entry.substring(6));
continue;
}
if(entry.startsWith("city:"))
{
cleanEntryList.add("city:"+entry.substring(5));
continue;
}
if(entry.startsWith("faction:"))
{
cleanEntryList.add("faction:"+entry.substring(8));
continue;
}
if(!entry.startsWith("account:")) // do not show account: entries to players
{
cleanEntryList.add(entry);
}
}
String[] returnList = new String[0];
returnList = new String[filteredEntryList.size()];
filteredEntryList.toArray(returnList);
return returnList;
return cleanEntryList.toArray(new String[0]);
}
public static String[] getCompleteEntryList(obj_id structure) throws InterruptedException
{
@@ -1585,6 +1592,13 @@ public class player_structure extends script.base_script
}
public static boolean isNameOnAdminList(obj_id structure, String player_or_guild_name) throws InterruptedException
{
if(isAdminToAccountEnabled(structure))
{
if(getPlayerStationId(getPlayerIdFromFirstName(player_or_guild_name)) == getPlayerStationId(getOwner(structure)))
{
return true;
}
}
String[] admin_list = getAdminListRaw(structure);
if (admin_list != null)
{
@@ -2790,10 +2804,7 @@ public class player_structure extends script.base_script
String[] admin_list = getAdminListRaw(structure);
if (admin_list != null)
{
if (isNameOnRawList(admin_list, player_or_guild_name))
{
return true;
}
return isNameOnRawList(admin_list, player_or_guild_name);
}
return false;
}
@@ -2812,7 +2823,7 @@ public class player_structure extends script.base_script
return true;
}
String player_name = getPlayerName(player);
boolean admin = isAdmin(structure, player_name);
boolean admin = isAdmin(structure, player_name) || isAdminByAccountFlag(structure, player);
if (!admin)
{
if (isOwner(structure, player))
@@ -2824,6 +2835,14 @@ public class player_structure extends script.base_script
}
return admin;
}
public static boolean isAdminByAccountFlag(obj_id structure, obj_id player) throws InterruptedException
{
if(hasObjVar(structure, VAR_ADMIN_ALL_CHARACTERS_ON_ACCOUNT))
{
return (getPlayerStationId(getOwner(structure)) == getPlayerStationId(player));
}
return false;
}
public static boolean isVendor(obj_id structure, String player_name) throws InterruptedException
{
if (structure == null || structure == obj_id.NULL_ID)
@@ -3161,7 +3180,7 @@ public class player_structure extends script.base_script
if (guildId > 0) {
String guildAbbrev = guildGetAbbrev(guildId);
if ((guildAbbrev != null) && (!guildAbbrev.equals(""))) {
converted_list.add("Guild:" + guildAbbrev);
converted_list.add("Guild: " + guildAbbrev);
}
}
} else {
@@ -3254,8 +3273,11 @@ public class player_structure extends script.base_script
}
}
}
if ((player_or_guild_name.toLowerCase()).contains("guild:"))
// Check adds of special access groups (guild:, city:, faction:)
if (isSpecialAccessPermissionGroup(player_or_guild_name))
{
// Access groups cannot be added to the Admin List or a Hopper
if (objvar.equals(VAR_ADMIN_LIST) || objvar.equals(VAR_HOPPER_LIST))
{
if (verbose && isIdValid(admin))
@@ -3264,15 +3286,61 @@ public class player_structure extends script.base_script
}
return false;
}
if (findGuild(((player_or_guild_name.substring(6)).toLowerCase()).trim()) == 0)
// If adding a guild, make sure it exists
if(player_or_guild_name.contains("guild:"))
{
if (verbose && isIdValid(admin))
if (findGuild(((player_or_guild_name.substring(6)).toLowerCase()).trim()) == 0)
{
sendSystemMessageProse(admin, prose.getPackage(new string_id(STF_FILE, "modify_list_invalid_guild"), (player_or_guild_name.substring(6)).trim()));
if (verbose && isIdValid(admin))
{
sendSystemMessageProse(admin, prose.getPackage(new string_id(STF_FILE, "modify_list_invalid_guild"), (player_or_guild_name.substring(6)).trim()));
}
return false;
}
}
// If adding a city, make sure it exists
if(player_or_guild_name.contains("city:"))
{
if(findCityByName(player_or_guild_name.substring(5).toLowerCase().trim()) == 0)
{
if (verbose && isIdValid(admin))
{
sendSystemMessageTestingOnly(admin, "The City Name you entered is not valid.");
}
return false;
}
}
// If adding a faction, make sure it's actually a faction
if(player_or_guild_name.contains("faction:"))
{
if(!player_or_guild_name.equalsIgnoreCase("faction:imperial") &&
!player_or_guild_name.equalsIgnoreCase("faction:rebel"))
{
if(verbose && isIdValid(admin))
{
sendSystemMessageTestingOnly(admin, "Invalid entry. You must enter either \"faction:imperial\" or \"faction:rebel\"");
}
return false;
}
else
{
// replace the value with the hash code for processing in SRC
if(player_or_guild_name.toLowerCase().contains("imperial"))
{
player_or_guild_name = "faction:" + FACTION_HASH_IMPERIAL;
}
else
{
player_or_guild_name = "faction:" + FACTION_HASH_REBEL;
}
}
return false;
}
}
// Just trying to add a regular name
else
{
if (!isIdValid(utils.stringToObjId(player_or_guild_name)))
@@ -3288,6 +3356,7 @@ public class player_structure extends script.base_script
}
}
}
switch (objvar) {
case VAR_ENTER_LIST:
permissionsAddAllowed(structure, player_or_guild_name);
@@ -3302,10 +3371,17 @@ public class player_structure extends script.base_script
hopperListAddName(structure, player_or_guild_name);
break;
}
// Success message back to player
if (verbose && isIdValid(admin))
{
sendSystemMessageProse(admin, prose.getPackage(new string_id(STF_FILE, "player_added"), player_or_guild_name));
if(player_or_guild_name.contains("faction:"))
{
player_or_guild_name = player_or_guild_name.contains(String.valueOf(FACTION_HASH_IMPERIAL)) ? "The Imperial Faction" : "The Rebel Faction";
}
sendListChangeMessage(admin, player_or_guild_name, true);
}
if (objvar.equals(VAR_ADMIN_LIST))
{
if (isBuilding(structure))
@@ -3341,8 +3417,23 @@ public class player_structure extends script.base_script
}
}
}
// We are REMOVING an entry from the list
else
{
// need to do special handling for faction/account here because of how it's stored
if(player_or_guild_name.contains("faction:"))
{
if(player_or_guild_name.toLowerCase().contains("imperial"))
{
player_or_guild_name = "faction:" + FACTION_HASH_IMPERIAL;
}
else
{
player_or_guild_name = "faction:" + FACTION_HASH_REBEL;
}
}
switch (objvar) {
case VAR_ENTER_LIST:
permissionsRemoveAllowed(structure, player_or_guild_name);
@@ -3359,7 +3450,12 @@ public class player_structure extends script.base_script
}
if (verbose && isIdValid(admin))
{
sendSystemMessageProse(admin, prose.getPackage(new string_id(STF_FILE, "player_removed"), player_or_guild_name));
// reverse what we just did for displaying it back in a system message
if(player_or_guild_name.contains("faction:"))
{
player_or_guild_name = player_or_guild_name.contains(String.valueOf(FACTION_HASH_IMPERIAL)) ? "The Imperial Faction" : "The Rebel Faction";
}
sendListChangeMessage(admin, player_or_guild_name, false);
}
}
return true;
@@ -6921,4 +7017,44 @@ public class player_structure extends script.base_script
}
setObjVar(pcd, "module_data.maint_list.ids", new_struct_list);
}
public static void sendListChangeMessage(obj_id to, String type, boolean isAdd)
{
sendSystemMessageTestingOnly(to, type + (isAdd ? " was added to " : " was removed from ") + "the list successfully");
}
public static boolean isSpecialAccessPermissionGroup(String toCheck)
{
toCheck = toCheck.toLowerCase();
return toCheck.contains("guild:") || toCheck.contains("city:") || toCheck.contains("faction:");
}
public static boolean isAdminToAccountEnabled(obj_id structure) throws InterruptedException
{
return hasObjVar(structure, VAR_ADMIN_ALL_CHARACTERS_ON_ACCOUNT);
}
public static void addAccountToAdminList(obj_id structure, obj_id player) throws InterruptedException
{
if(!isIdValid(structure) || !isIdValid(player) || !isOwner(structure, player))
{
return;
}
setObjVar(structure, VAR_ADMIN_ALL_CHARACTERS_ON_ACCOUNT, getPlayerStationId(player));
permissionsAddAllowed(structure, "account:"+getPlayerStationId(player));
sendSystemMessageTestingOnly(player, "All characters on your account will now have entry and admin access to this structure. You can remove this access any time from the Structure Permissions menu.");
}
public static void removeAccountFromAdminList(obj_id structure, obj_id player) throws InterruptedException
{
if(!isIdValid(structure) || !isIdValid(player) || !isOwner(structure, player))
{
return;
}
removeObjVar(structure, VAR_ADMIN_ALL_CHARACTERS_ON_ACCOUNT);
permissionsRemoveAllowed(structure, "account:"+getPlayerStationId(player));
sendSystemMessageTestingOnly(player, "All characters on your account will no longer have entry or admin access to this structure. You will need to separately add your characters to the list if you wish for them to gain access.");
}
}

11
sku.0/sys.server/compiled/game/script/player/player_building.java
View File

@@ -232,11 +232,6 @@ public class player_building extends script.base_script
{
return SCRIPT_CONTINUE;
}
if (name.length() > 40)
{
sendSystemMessage(player, new string_id(STF, "permission_40_char"));
return SCRIPT_CONTINUE;
}
if (!player_structure.isInAdminRange(structure, self))
{
return SCRIPT_CONTINUE;
@@ -1755,10 +1750,10 @@ public class player_building extends script.base_script
if (st.hasMoreTokens())
{
target_str = st.nextToken();
if (target_str.length() > 40)
// fixup for tokenizer and city names
if(target_str.startsWith("city:"))
{
sendSystemMessage(self, new string_id(STF, "permission_40_char"));
return SCRIPT_CONTINUE;
target_str = params.substring(params.indexOf("city:", 1));
}
}
if ((target == null) || (target == obj_id.NULL_ID))

17
sku.0/sys.server/compiled/game/script/terminal/terminal_structure.java
View File

@@ -158,6 +158,11 @@ public class terminal_structure extends script.base_script
mi.addSubMenu(permissions_root, menu_info_types.SERVER_TERMINAL_PERMISSIONS_ENTER, SID_TERMINAL_PERMISSIONS_ENTER);
mi.addSubMenu(management_root, menu_info_types.SERVER_TERMINAL_MANAGEMENT_RESIDENCE, SID_TERMINAL_MANAGEMENT_RESIDENCE);
mi.addSubMenu(permissions_root, menu_info_types.SERVER_TERMINAL_PERMISSIONS_BANNED, SID_TERMINAL_PERMISSIONS_BANNED);
if(isStructureOwner)
{
String text = player_structure.isAdminToAccountEnabled(structure) ? "Remove Account as Admin" : "Add Account as Admin";
mi.addSubMenu(permissions_root, menu_info_types.SERVER_MENU25, new string_id(text));
}
if (areAllContentsLoaded(structure))
{
string_id privacyMenu_sid = SID_TERMINAL_MANAGEMENT_PRIVACY;
@@ -607,6 +612,18 @@ public class terminal_structure extends script.base_script
sendSystemMessageTestingOnly(player, "Fix attempt failed - Could not determine structure object.");
}
}
// player owner can add their entire account to the admin list with this toggle (does not show up on admin list, separate button)
else if (item == menu_info_types.SERVER_MENU25 && player_structure.isOwner(structure, player))
{
if(player_structure.isAdminToAccountEnabled(structure))
{
player_structure.removeAccountFromAdminList(structure, player);
}
else
{
player_structure.addAccountToAdminList(structure, player);
}
}
return SCRIPT_CONTINUE;
}
public int handleStorageRedeedChoice(obj_id self, dictionary params) throws InterruptedException