swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-08-27 16:56:48 -04:00
Code Issues Projects Releases Wiki Activity

Added code for reading the new roof column on Storyteller datatable.

Browse Source 
Storyteller objects can now be placed on player structure roofs if object is flagged as allowed on roofs.
When making a blueprint, objects inside buildings or on player structure roofs do not get added to the blueprint.
This commit is contained in:
Redacted by Stellabellum INC
2014-10-12 00:56:38 -07:00
parent 81b3d9210f
commit 63a3172b43
1 changed files with 29 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sku.0/sys.server/compiled/game/script/library/storyteller.scriptlib
Regular → Executable
+29 -3
View File
@@ -492,6 +492,17 @@ boolean allowTokenPlacementInInteriors(string tokenName)
return allowInInteriors == 1;
}
boolean allowTokenPlacementOnRoofs(obj_id token)
{
return allowTokenPlacementOnRoofs(getStaticItemName(token));
}
boolean allowTokenPlacementOnRoofs(string tokenName)
{
int allowOnRoofs = dataTableGetInt(STORYTELLER_DATATABLE, tokenName, "allow_roof");
return allowOnRoofs == 1;
}
obj_id getStorytellerBeingAssisted(obj_id player)
{
obj_id storytellerBeingAssisted = null;
@@ -787,11 +798,24 @@ boolean canDeployStorytellerToken(obj_id player, location here, string tokenName
// block storyteller object placement on player structure roofs and balconies
// unless the object is flagged as allowed in interiors
// UPDATE 9/14/14: Storyteller objects can now be placed on player structure
// roofs if the object is flagged as allowed on roofs
obj_id whatAmIStandingOn = getStandingOn(player);
if( isIdValid(whatAmIStandingOn) && player_structure.isBuilding(whatAmIStandingOn) )
{
sendSystemMessage(player, new string_id("storyteller", "placement_not_on_a_building"));
return false;
if( !allowTokenPlacementOnRoofs(tokenName) )
{
sendSystemMessage(player, new string_id("storyteller", "placement_not_on_a_building"));
return false;
}
else
{
if ( !player_structure.isAdmin(whatAmIStandingOn, player) && !player_structure.isAdmin(whatAmIStandingOn, storytellerBeingAssisted) )
{
sendSystemMessage(player, new string_id("storyteller", "placement_not_building_admin"));
return false;
}
}
}
// city or outpost
@@ -1015,9 +1039,11 @@ string[] recordBlueprintData(obj_id blueprint, obj_id[] storytellerObjects, obj_
string[] excludedTokens = { "st_fn_storyteller_vendor" };
boolean isExcludedToken = false;
location tokLoc = getLocation(object);
obj_id whatAmIStandingOn = getStandingOn(object);
for ( int q=0; q<excludedTokens.length; q++ )
{
if ( tokenName.equals(excludedTokens[q]) || storyteller.getTokenType(tokenName) == storyteller.OTHER )
if ( tokenName.equals(excludedTokens[q]) || storyteller.getTokenType(tokenName) == storyteller.OTHER || isIdValid(tokLoc.cell) || (isIdValid(whatAmIStandingOn) && player_structure.isBuilding(whatAmIStandingOn)) )
{
isExcludedToken = true;
}