projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-10-12 02:13:48 -04:00
Code Issues Projects Releases Wiki Activity

Cleanup

Browse Source
This commit is contained in:
CharonInferar
2014-04-12 21:52:08 +02:00
parent 81f77b06dd
commit 18c184ea79
3 changed files with 20 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
options.cfg
+2 -2
View File
@@ -1,3 +1,3 @@
LOAD.SNAPSHOT_OBJECTS=0
LOAD.BUILDOUT_OBJECTS=0
LOAD.SNAPSHOT_OBJECTS=1
LOAD.BUILDOUT_OBJECTS=1
LOAD.RESOURCE.SYSTEM=1
scripts/radial/structure_management_terminal.py
+1 -3
View File
@@ -2,14 +2,12 @@ from resources.common import RadialOptions
from protocol.swg import ResourceListForSurveyMessage
from services.sui.SUIService import MessageBoxType
from services.sui.SUIWindow import Trigger
from tools import JythonUtilities
from java.util import Vector
import sys
def createRadial(core, owner, target, radials):
#(byte parentId, short optionId, byte optionType, String description)
radials.clear()
owner.sendSystemMessage('target template ' + target.getTemplate(),1)
radials.add(RadialOptions(0, 7, 0, 'Examine'))
radials.add(RadialOptions(0, 78, 0, '@player_structure:management'))
radials.add(RadialOptions(0, 117, 0, '@player_structure:permissions'))
@@ -18,7 +16,7 @@ def createRadial(core, owner, target, radials):
radials.add(RadialOptions(2, 129, 0, '@player_structure:management_pay'))
radials.add(RadialOptions(2, 50, 0, '@base_player:set_name'))
radials.add(RadialOptions(2, 127, 0, '@player_structure:management_residence'))
#radials.add(RadialOptions(2, 125, 0, '@player_structure:management_privacy : ' + core.housingService.fetchPrivacyString(target)))
radials.add(RadialOptions(2, 125, 0, '@player_structure:management_privacy : ' + core.housingService.fetchPrivacyString(target)))
radials.add(RadialOptions(2, 171, 0, '@player_structure:find_items_find_all_house_items'))
radials.add(RadialOptions(2, 173, 0, '@player_structure:move_first_item'))
radials.add(RadialOptions(2, 174, 0, '@player_structure:find_items_search_for_house_items'))
src/services/housing/HousingService.java
+17 -20
View File
@@ -70,11 +70,11 @@ public class HousingService implements INetworkDispatch {
public void enterStructureMode(CreatureObject actor, TangibleObject deed)
{
// if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, actor.getWorldPosition().x, actor.getWorldPosition().z))
// {
// actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf
// return;
// }
if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, actor.getWorldPosition().x, actor.getWorldPosition().z))
{
actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf
return;
}
if(housingTemplates.containsKey(deed.getTemplate()))
{
@@ -91,18 +91,18 @@ public class HousingService implements INetworkDispatch {
int structureLotCost = houseTemplate.getLotCost();
String structureTemplate = houseTemplate.getBuildingTemplate();
// if(!houseTemplate.canBePlacedOn(actor.getPlanet().getName()))
// {
// actor.sendSystemMessage("You may not place this structure on this planet.", (byte) 0); // should probably load this from an stf
// return;
// }
//
// if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, positionX, positionZ))
// {
// actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf
// return;
// }
//
if(!houseTemplate.canBePlacedOn(actor.getPlanet().getName()))
{
actor.sendSystemMessage("You may not place this structure on this planet.", (byte) 0); // should probably load this from an stf
return;
}
if(!actor.getClient().isGM() && !core.terrainService.canBuildAtPosition(actor, positionX, positionZ))
{
actor.sendSystemMessage("You may not place a structure here.", (byte) 0); // should probably load this from an stf
return;
}
// Lot stuff
if(!actor.getPlayerObject().deductLots(structureLotCost))
{
@@ -753,9 +753,6 @@ public class HousingService implements INetworkDispatch {
return building.getPrivacyString();
}
public String fetchStringFromCastedClass(SWGObject object, String classToCastTo, String methodName){
return tools.JythonUtilities.fetchStringFromCastedClass(object,classToCastTo,methodName);
}
@Override
public void insertOpcodes(Map<Integer, INetworkRemoteEvent> arg0,