merge conflict

This commit is contained in:
CharonInferar
2014-04-30 19:58:18 +02:00
224 changed files with 1539 additions and 2312 deletions
+2 -1
View File
@@ -60,7 +60,8 @@ odb/chatRooms/je.info.*
odb/resourcehistory/je.info.*
odb/resourceroots/je.info.*
odb/resources/je.info.*
odb/auction/je.info.*
odb/auction/je.info.*
odb/bounties/je.info.*
# External tool builders
.externalToolBuilders/
+1 -1
View File
@@ -2,7 +2,7 @@ import sys
def setup():
return
def run(core, actor, target, commandString):
core.harvesterService.handleHarvesterActivateCommand(actor, target, commandString)
return
+1 -3
View File
@@ -2,9 +2,7 @@ import sys
def setup():
return
def run(core, actor, target, commandString):
core.harvesterService.handleHarvesterDeactivateCommand(actor, target, commandString)
return
+1 -3
View File
@@ -2,10 +2,8 @@ import sys
def setup():
return
def run(core, actor, target, commandString):
actor.sendSystemMessage('handleEmptyHarvester', 0)
core.harvesterService.handleEmptyHarvester(actor, target, commandString)
return
+1 -3
View File
@@ -2,9 +2,7 @@ import sys
def setup():
return
def run(core, actor, target, commandString):
core.harvesterService.handleHarvesterSelectResourceCommand(actor, target, commandString)
return
+2 -4
View File
@@ -3,7 +3,7 @@ from engine.resources.scene import Point3D
def setup():
return
def run(core, actor, target, commandString):
tarObj = core.objectService.getObject(actor.getTargetId())
container = actor.getContainer()
@@ -28,10 +28,8 @@ def run(core, actor, target, commandString):
elif parsedMsg[0] == "left":
core.simulationService.transform(tarObj, Point3D(float(parsedMsg[1]) * -0.01, 0, 0))
return
elif container.getTemplate() == "object/cell/shared_cell.iff":
actor.sendSystemMessage("You do not have permission to access that container!", 0)
return
return
+1 -1
View File
@@ -2,7 +2,7 @@ import sys
def setup():
return
def run(core, actor, target, commandString):
permissionType = 'Undetermined'
commandArgs = commandString.split(' ')
+8 -15
View File
@@ -1,32 +1,25 @@
import sys
import resources.objects.deed.Harvester_Deed
def setup():
return
def run(core, actor, target, commandString):
cmdArgs = commandString.split(" ")
deedId = long(cmdArgs[0])
deed = core.objectService.getObject(deedId)
if (actor.getAttachment('UsingHarvesterDeed') == '1'):
actor.setAttachment('UsingHarvesterDeed', '0');
if deed == actor:
deed = actor.getUseTarget()
if deed.getTemplate().startswith('object/tangible/deed/harvester_deed') is True or deed.getTemplate().startswith('object/tangible/deed/generator_deed') is True:
core.harvesterService.handlePlaceStructureCommand(actor, target, commandString)
return
positionX = float(cmdArgs[1])
positionZ = float(cmdArgs[2])
#positionY = core.terrainService.getHeight(actor.getPlanetId(), positionX, positionZ) + 2
rotation = float(cmdArgs[3])
#structureTemplate = deed.getAttachment("structureTemplate")
core.housingService.placeStructure(actor, deed, positionX, positionZ, rotation)
#building = core.objectService.createObject(structureTemplate, actor.getPlanet(), positionX, positionZ, positionY);
#core.simulationService.add(building, building.getPosition().x, building.getPosition().z);
return
return
+2 -1
View File
@@ -17,7 +17,8 @@ def run(core, actor, target, commandString):
if commandString != '' and commandString != faction:
if commandString == 'rebel' or commandString == 'imperial' or commandString == 'neutral':
actor.sendSystemMessage('@faction_recruiter:sui_resig_complete_in_5', 0)
if faction != 'neutral':
actor.sendSystemMessage('@faction_recruiter:sui_resig_complete_in_5', 0)
if actor.getFactionStatus() == FactionStatus.SpecialForces:
actor.setPvpStatus(PvpStatus.GoingCovert, True)
+1 -3
View File
@@ -2,9 +2,7 @@ import sys
def setup():
return
def run(core, actor, target, commandString):
core.harvesterService.handleHarvesterDeactivateCommand(actor, target, commandString)
return
+2 -4
View File
@@ -3,7 +3,7 @@ from engine.resources.scene import Point3D
def setup():
return
def run(core, actor, target, commandString):
tarObj = core.objectService.getObject(actor.getTargetId())
@@ -20,10 +20,8 @@ def run(core, actor, target, commandString):
elif parsedMsg[0] == "roll":
core.simulationService.transform(tarObj, float(parsedMsg[1]), Point3D(0, 0, 1)) # this is messed up ???
return
elif container.getTemplate() == "object/cell/shared_cell.iff":
actor.sendSystemMessage("You do not have permission to access that container!", 0)
return
return
+8 -3
View File
@@ -99,11 +99,9 @@ def run(core, actor, target, commandString):
if (actor.isInStealth()):
actor.setInStealth(False)
actor.setRadarVisible(True)
actor.sendSystemMessage('You are now visible to other players.', 0)
else:
actor.setInStealth(True)
actor.setRadarVisible(False)
actor.sendSystemMessage('You are now hidden from players. "Stealth Effect" is not implemented, however players still won\'t be able to see you. Type /setgodmode stealth again to be visible.', 0)
elif command == 'holoEmote' and arg1:
playerObject.setHoloEmote('holoemote_' + arg1)
@@ -114,5 +112,12 @@ def run(core, actor, target, commandString):
if playerObject.getGodLevel > 0:
actor.removeAbility("admin")
playerObject.setGodLevel(0)
elif command == 'setBounty' and arg1:
if not core.missionService.addToExistingBounty(actor, int(arg1)):
core.missionService.createNewBounty(actor, int(arg1))
actor.sendSystemMessage('Your bounty has been set to an additional ' + str(arg1) + ' credits.', 0)
return
return
+1 -4
View File
@@ -199,10 +199,7 @@ def handleFirstScreen(core, actor, npc, selection):
if selection == 1:
percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue()
outOfBand = OutOfBand()
prose1 = ProsePackage("conversation/faction_recruiter_imperial", 's_412',0,"percent,@conversation/faction_recruiter_imperial:s_412", "TO", str(100 - percent))
outOfBand.addProsePackage(prose1)
convSvc.sendConversationMessage(actor, npc, outOfBand)
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent)))
return
if selection == 2:
+4 -4
View File
@@ -44,8 +44,8 @@ def handlePickupStage(core, actor, npc, objective, mission):
return
core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'p')
objective.createDeliveryItem()
objective.update()
objective.createDeliveryItem(core, actor)
objective.update(core, actor)
return
def handleDeliveryStage(core, actor, npc, objective, mission):
@@ -56,7 +56,7 @@ def handleDeliveryStage(core, actor, npc, objective, mission):
core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 'r')
core.objectService.destroyObject(objective.getDeliveryObject())
objective.update()
objective.update(core, actor)
return
def handleCompletionStage(core, actor, npc, objective, mission):
@@ -66,5 +66,5 @@ def handleCompletionStage(core, actor, npc, objective, mission):
return
core.conversationService.sendStopConversation(actor, npc, mission.getMissionDescription(), 'm' + str(mission.getMissionId()) + 's')
objective.complete()
objective.complete(core, actor)
return
@@ -1,22 +1,9 @@
import sys
def addAbilities(core, actor, player):
if actor.getLevel() >= 26:
actor.addAbility("bh_dread_strike_1")
if actor.getLevel() >= 34:
actor.addAbility("bh_dread_strike_2")
if actor.getLevel() >= 48:
actor.addAbility("bh_dread_strike_3")
if actor.getLevel() >= 62:
actor.addAbility("bh_dread_strike_4")
if actor.getLevel() >= 76:
actor.addAbility("bh_dread_strike_5")
actor.addAbility("bh_dread_strike_1")
return
def removeAbilities(core, actor, player):
actor.removeAbility("bh_dread_strike_1")
actor.removeAbility("bh_dread_strike_2")
actor.removeAbility("bh_dread_strike_3")
actor.removeAbility("bh_dread_strike_4")
actor.removeAbility("bh_dread_strike_5")
return
+1 -17
View File
@@ -1,25 +1,9 @@
import sys
def addAbilities(core, actor, player):
if actor.getLevel() >= 26:
actor.addAbility("bh_fumble_1")
if actor.getLevel() >= 34:
actor.addAbility("bh_fumble_2")
if actor.getLevel() >= 48:
actor.addAbility("bh_fumble_3")
if actor.getLevel() >= 62:
actor.addAbility("bh_fumble_4")
if actor.getLevel() >= 76:
actor.addAbility("bh_fumble_5")
if actor.getLevel() >= 90:
actor.addAbility("bh_fumble_6")
actor.addAbility("bh_fumble_1")
return
def removeAbilities(core, actor, player):
actor.removeAbility("bh_fumble_1")
actor.removeAbility("bh_fumble_2")
actor.removeAbility("bh_fumble_3")
actor.removeAbility("bh_fumble_4")
actor.removeAbility("bh_fumble_5")
actor.removeAbility("bh_fumble_6")
return
@@ -2,13 +2,15 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_corellia_deed.iff", "object/building/player/city/shared_cityhall_corellia.iff", 0)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(400)
houseTemplate.setBaseMaintenanceRate(308)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
core.housingService.addHousingTemplate(houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_naboo_deed.iff", "object/building/player/city/shared_cityhall_naboo.iff", 0)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
@@ -10,6 +10,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(400)
houseTemplate.setBaseMaintenanceRate(308)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff", "object/building/player/city/shared_cityhall_tatooine.iff", 0)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
@@ -10,6 +10,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(400)
houseTemplate.setBaseMaintenanceRate(308)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,13 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_corellia_guild_deed.iff", "object/building/player/shared_player_guildhall_corellia_style_01.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(400)
houseTemplate.setBaseMaintenanceRate(100)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,8 +2,8 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_generic_guild_deed.iff", "object/building/player/shared_player_guildhall_generic_style_01.iff", 2)
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_generic_guild_deed.iff", "object/building/player/shared_player_guildhall_generic_style_01.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
houseTemplate.addPlaceablePlanet("tatooine")
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(400)
houseTemplate.setBaseMaintenanceRate(100)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_naboo_guild_deed.iff", "object/building/player/shared_player_guildhall_naboo_style_01.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
@@ -10,6 +10,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(400)
houseTemplate.setBaseMaintenanceRate(100)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_tatooine_guild_deed.iff", "object/building/player/shared_player_guildhall_tatooine_style_01.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
@@ -10,6 +10,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(400)
houseTemplate.setBaseMaintenanceRate(100)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_tatooine_guild_style_02_deed.iff", "object/building/player/shared_player_guildhall_tatooine_style_02.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(4), float(12.7)))
@@ -10,6 +10,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(400)
houseTemplate.setBaseMaintenanceRate(100)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
+3 -2
View File
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/tcg/series5/shared_structure_deed_player_house_atat.iff", "object/building/player/shared_player_house_atat.iff", 3)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-3.8), float(5.86), float(15.1)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(350)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,13 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_large_deed.iff", "object/building/player/shared_player_house_corellia_large_style_01.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(500)
houseTemplate.setBaseMaintenanceRate(26)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,12 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(500)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setDefaultItemLimit(500)
houseTemplate.setBaseMaintenanceRate(26)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,12 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_medium_deed.iff", "object/building/player/shared_player_house_corellia_medium_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3),float(2.26),float(7.7)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(18)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,12 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_medium_style_02_deed.iff", "object/building/player/shared_player_house_corellia_medium_style_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3), float(2.26), float(7.7)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(18)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,13 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_deed.iff", "object/building/player/shared_player_house_corellia_small_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,13 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_floor_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_01_floorplan_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,13 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,13 +2,14 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_corellia_house_small_style_02_floor_02_deed.iff", "object/building/player/shared_player_house_corellia_small_style_02_floorplan_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35)))
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,8 +2,8 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.iff", 2)
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_style_02_deed.iff", "object/building/player/shared_player_house_generic_large_style_02.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4)))
houseTemplate.addPlaceablePlanet("tatooine")
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(500)
houseTemplate.setBaseMaintenanceRate(26)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_deed.iff", "object/building/player/shared_player_house_generic_large_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(500)
houseTemplate.setBaseMaintenanceRate(26)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_window_s01_deed.iff", "object/building/player/shared_player_house_generic_large_window_s01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.7), float(3), float(9.1)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(500)
houseTemplate.setBaseMaintenanceRate(26)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_large_window_s02_deed.iff", "object/building/player/shared_player_house_generic_large_window_s02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(10.4), float(3), float(-11)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(500)
houseTemplate.setBaseMaintenanceRate(26)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_deed.iff", "object/building/player/shared_player_house_generic_medium_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3),float(2.26),float(7.7)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(18)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_style_02_deed.iff", "object/building/player/shared_player_house_generic_medium_style_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3), float(2.26), float(7.7)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(18)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_deed.iff", "object/building/player/shared_player_house_generic_medium_windowed.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(2.26), float(7.8)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(18)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_medium_windowed_s02_deed.iff", "object/building/player/shared_player_house_generic_medium_windowed_s02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(2.26), float(7.8)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(18)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_deed.iff", "object/building/player/shared_player_house_generic_small_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_floor_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_01_floorplan_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_style_02_floor_02_deed.iff", "object/building/player/shared_player_house_generic_small_style_02_floorplan_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.9), float(2.86), float(8.35)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_window_style_03_deed.iff", "object/building/player/shared_player_house_generic_small_window_style_03.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-6.6), float(2.36), float(6.3)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_generic_house_small_window_deed.iff", "object/building/player/shared_player_house_generic_small_windowed.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7.39), float(2.36), float(2)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
+3 -2
View File
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/tcg/series5/shared_structure_deed_player_house_hangar.iff", "object/building/player/shared_player_house_hangar.iff", 3)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(9.2), float(2.86), float(0.8)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(350)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_jabbas_sail_barge_deed.iff", "object/building/player/shared_player_house_jabbas_sail_barge.iff", 3)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(0), float(2.86), float(-3.5)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(350)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/tcg/series3/shared_structure_deed_jedi_meditation_room_deed.iff", "object/building/player/shared_player_house_jedi_meditation_room.iff", 3)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(0), float(2.86), float(-3.5)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(350)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
+3 -2
View File
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_mustafar_house_lg.iff", "object/building/player/shared_player_house_mustafar_lg.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(1.5), float(2.86), float(13.7)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_large_deed.iff", "object/building/player/shared_player_house_naboo_large_style_01.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-7), float(3), float(-15.5)))
@@ -10,6 +10,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(500)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_medium_deed.iff", "object/building/player/shared_player_house_naboo_medium_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-2.2),float(3),float(-11.5)))
@@ -10,5 +10,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(18)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_deed.iff", "object/building/player/shared_player_house_naboo_small_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2)))
@@ -10,5 +10,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(18)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_style_02_deed.iff", "object/building/player/shared_player_house_naboo_small_style_02.iff", 1)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(8.4),float(3),float(7.2)))
@@ -10,5 +10,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(100)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(18)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_naboo_house_small_window_deed.iff", "object/building/player/shared_player_house_naboo_small_window_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2)))
@@ -10,5 +10,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(18)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
+4 -3
View File
@@ -2,8 +2,8 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff", "object/building/player/shared_player_house_sandcrawler.iff", 3)
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/saga_system/rewards/shared_structure_deed_player_house_sandcrawler.iff", "object/building/player/shared_player_house_sandcrawler.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-8.75), float(3.86), float(1)))
houseTemplate.addPlaceablePlanet("tatooine")
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(350)
houseTemplate.setBaseMaintenanceRate(26)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/tcg/series3/shared_structure_deed_sith_meditation_room_deed.iff", "object/building/player/shared_player_house_sith_meditation_room.iff", 3)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3), float(2.86), float(5.7)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(350)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_large_deed.iff", "object/building/player/shared_player_house_tatooine_large_style_01.iff", 5)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-3), float(3), float(15.8)))
@@ -10,6 +10,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(500)
houseTemplate.setBaseMaintenanceRate(26)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_medium_deed.iff", "object/building/player/shared_player_house_tatooine_medium_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(4.3),float(2.26),float(12.5)))
@@ -10,5 +10,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(18)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(7.9)))
@@ -10,5 +10,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(8)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_style_02_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_02.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(8.2)))
@@ -10,5 +10,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(8)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_tatooine_house_small_deed.iff", "object/building/player/shared_player_house_tatooine_small_style_01.iff", 2)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-1.7),float(3),float(7.9)))
@@ -10,5 +10,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(8)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_player_house_tcg_8_bespin_house_deed.iff", "object/building/player/shared_player_house_tcg_8_bespin_house.iff", 3)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(0), float(2.86), float(-3.5)))
@@ -14,6 +14,7 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(350)
houseTemplate.setBaseMaintenanceRate(8)
core.housingService.addHousingTemplate(houseTemplate)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_01_deed.iff", "object/building/player/shared_player_merchant_tent_style_01.iff", 1)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5)))
@@ -14,5 +14,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(8)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_02_deed.iff", "object/building/player/shared_player_merchant_tent_style_02.iff", 1)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5)))
@@ -14,5 +14,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(8)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -2,7 +2,7 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
def setup(housingTemplates):
houseTemplate = HouseTemplate("object/tangible/deed/player_house_deed/shared_merchant_tent_style_03_deed.iff", "object/building/player/shared_player_merchant_tent_style_03.iff", 1)
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(3.5),float(-0.3),float(3.5)))
@@ -14,5 +14,6 @@ def setup(core):
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
houseTemplate.setBaseMaintenanceRate(8)
housingTemplates.put(houseTemplate.getDeedTemplate(), houseTemplate)
return
@@ -1,7 +1,6 @@
def itemTemplate():
return ['object/tangible/loot/creature_loot/collections/shared_jedi_holocron_01.iff']
return ['object/tangible/wearables/robe/shared_robe_jedi_light_s02.iff']
def customItemName():
@@ -5,9 +5,13 @@ from java.util import Vector
def addLairGroup(core):
spawnTemplate1 = LairSpawnTemplate(-1, 'tatooine_kreetle_lair_neutral_small', 5, 20)
spawnTemplate2 = LairSpawnTemplate(-1, 'tatooine_womprat_lair_neutral_small', 5, 15)
spawnTemplate3 = LairSpawnTemplate(-1, 'tatooine_rill_lair_neutral_small', 5, 15)
spawnTemplate4 = LairSpawnTemplate(-1, 'tatooine_worrt_lair_neutral_small', 5, 15)
spawnTemplates = Vector()
#spawnTemplates.add(spawnTemplate1)
spawnTemplates.add(spawnTemplate1)
spawnTemplates.add(spawnTemplate2)
spawnTemplates.add(spawnTemplate3)
spawnTemplates.add(spawnTemplate4)
core.spawnService.addLairGroup('tatooine_starter', spawnTemplates)
core.spawnService.addLairGroup('tatooine_starter', spawnTemplates)
return
@@ -1,6 +1,5 @@
import sys
def addSpawnArea(core):
core.spawnService.addLairSpawnArea('tatooine_starter', 3400, -4775, 2048, 'tatooine')
core.spawnService.addLairSpawnArea('tatooine_starter', 3730, -4655, 1024, 'tatooine')
return
+18 -3
View File
@@ -1,15 +1,30 @@
import sys
from services.spawn import MobileTemplate
from services.spawn import WeaponTemplate
from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('bantha')
mobileTemplate.setLevel(14)
mobileTemplate.setDifficulty(0)
mobileTemplate.setAttackRange(5)
mobileTemplate.setWeaponType(6)
mobileTemplate.setAttackSpeed(1.0)
templates = Vector()
templates.add('object/mobile/shared_bantha_hue.iff')
mobileTemplate.setCreatureName('bantha')
mobileTemplate.setTemplates(templates)
mobileTemplate.setLevel(14)
weaponTemplates = Vector()
weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
weaponTemplates.add(weapontemplate)
mobileTemplate.setWeaponTemplateVector(weaponTemplates)
attacks = Vector()
mobileTemplate.setDefaultAttack('creatureMeleeAttack')
mobileTemplate.setAttacks(attacks)
core.spawnService.addMobileTemplate('bantha', mobileTemplate)
core.spawnService.addMobileTemplate('bantha', mobileTemplate)
return
+17 -3
View File
@@ -1,16 +1,30 @@
import sys
from services.spawn import MobileTemplate
from services.spawn import WeaponTemplate
from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('dewback')
mobileTemplate.setLevel(17)
mobileTemplate.setDifficulty(0)
mobileTemplate.setAttackRange(5)
mobileTemplate.setWeaponType(6)
mobileTemplate.setAttackSpeed(1.0)
templates = Vector()
templates.add('object/mobile/shared_dewback.iff')
mobileTemplate.setCreatureName('dewback')
mobileTemplate.setTemplates(templates)
mobileTemplate.setLevel(17)
weaponTemplates = Vector()
weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
weaponTemplates.add(weapontemplate)
mobileTemplate.setWeaponTemplateVector(weaponTemplates)
attacks = Vector()
mobileTemplate.setDefaultAttack('creatureMeleeAttack')
mobileTemplate.setAttacks(attacks)
core.spawnService.addMobileTemplate('dewback', mobileTemplate)
return
+17 -6
View File
@@ -1,19 +1,30 @@
import sys
from services.spawn import MobileTemplate
from services.spawn import WeaponTemplate
from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('krayt_dragon')
mobileTemplate.setLevel(10)
mobileTemplate.setDifficulty(2)
mobileTemplate.setAttackRange(12)
mobileTemplate.setWeaponType(6)
mobileTemplate.setAttackSpeed(1.0)
templates = Vector()
templates.add('object/mobile/shared_krayt_dragon.iff')
mobileTemplate.setTemplates(templates)
mobileTemplate.setLevel(10)
mobileTemplate.setDifficulty(2)
weaponTemplates = Vector()
weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
weaponTemplates.add(weapontemplate)
mobileTemplate.setWeaponTemplateVector(weaponTemplates)
attacks = Vector()
mobileTemplate.setDefaultAttack('creatureMeleeAttack')
mobileTemplate.setAttacks(attacks)
mobileTemplate.setCreatureName('krayt_dragon')
mobileTemplate.setScale(2)
mobileTemplate.setAttackRange(12)
core.spawnService.addMobileTemplate('krayt_dragon', mobileTemplate)
return
@@ -1,19 +1,30 @@
import sys
from services.spawn import MobileTemplate
from services.spawn import WeaponTemplate
from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('krayt_dragon_ancient')
mobileTemplate.setLevel(90)
mobileTemplate.setDifficulty(2)
mobileTemplate.setAttackRange(12)
mobileTemplate.setWeaponType(6)
mobileTemplate.setAttackSpeed(1.0)
templates = Vector()
templates.add('object/mobile/shared_krayt_dragon.iff')
mobileTemplate.setTemplates(templates)
mobileTemplate.setLevel(90)
mobileTemplate.setDifficulty(2)
weaponTemplates = Vector()
weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
weaponTemplates.add(weapontemplate)
mobileTemplate.setWeaponTemplateVector(weaponTemplates)
attacks = Vector()
mobileTemplate.setDefaultAttack('creatureMeleeAttack')
mobileTemplate.setAttacks(attacks)
mobileTemplate.setCreatureName('krayt_dragon_ancient')
mobileTemplate.setScale(2)
mobileTemplate.setAttackRange(12)
core.spawnService.addMobileTemplate('krayt_dragon_ancient', mobileTemplate)
return
+17 -5
View File
@@ -1,18 +1,30 @@
import sys
from services.spawn import MobileTemplate
from services.spawn import WeaponTemplate
from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('kreetle')
mobileTemplate.setLevel(5)
mobileTemplate.setDifficulty(0)
mobileTemplate.setAttackRange(5)
mobileTemplate.setWeaponType(6)
mobileTemplate.setAttackSpeed(1.0)
templates = Vector()
templates.add('object/mobile/shared_kreetle.iff')
mobileTemplate.setCreatureName('kreetle')
mobileTemplate.setTemplates(templates)
mobileTemplate.setAttackRange(5)
mobileTemplate.setAttackSpeed(5)
mobileTemplate.setLevel(5)
weaponTemplates = Vector()
weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
weaponTemplates.add(weapontemplate)
mobileTemplate.setWeaponTemplateVector(weaponTemplates)
attacks = Vector()
mobileTemplate.setDefaultAttack('creatureMeleeAttack')
mobileTemplate.setAttacks(attacks)
core.spawnService.addMobileTemplate('kreetle', mobileTemplate)
return
+1 -1
View File
@@ -26,4 +26,4 @@ def addTemplate(core):
mobileTemplate.setAttacks(attacks)
core.spawnService.addMobileTemplate('tusken_raider', mobileTemplate)
return
+16 -8
View File
@@ -1,22 +1,30 @@
import sys
from services.spawn import MobileTemplate
from services.spawn import WeaponTemplate
from java.util import Vector
def addTemplate(core):
mobileTemplate = MobileTemplate()
mobileTemplate.setCreatureName('womprat')
mobileTemplate.setLevel(5)
mobileTemplate.setDifficulty(0)
mobileTemplate.setAttackRange(5)
mobileTemplate.setWeaponType(6)
mobileTemplate.setAttackSpeed(1.0)
templates = Vector()
templates.add('object/mobile/shared_womp_rat.iff')
mobileTemplate.setCreatureName('womprat')
mobileTemplate.setTemplates(templates)
mobileTemplate.setAttackRange(5)
mobileTemplate.setAttackSpeed(5)
mobileTemplate.setLevel(5)
mobileTemplate.setAttackRange(3)
mobileTemplate.setAttackSpeed(1.0)
mobileTemplate.setWeaponType(6)
weaponTemplates = Vector()
weapontemplate = WeaponTemplate('object/weapon/melee/unarmed/shared_unarmed_default.iff', 6, 1.0)
weaponTemplates.add(weapontemplate)
mobileTemplate.setWeaponTemplateVector(weaponTemplates)
attacks = Vector()
mobileTemplate.setDefaultAttack('creatureMeleeAttack')
mobileTemplate.setAttacks(attacks)
core.spawnService.addMobileTemplate('womprat', mobileTemplate)
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_smuggler')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_smuggler')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
+6
View File
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('junk_dealer_special')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('outbreak_junk_dealer')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('outbreak_junk_dealer')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('outbreak_junk_dealer')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('outbreak_junk_dealer')
return
@@ -1,4 +1,10 @@
import sys
from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation');
object.setAttachment('conversationFile','junk_dealer')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('outbreak_junk_dealer')
return
@@ -4,4 +4,7 @@ from resources.datatables import Options
def setup(core, object):
object.setAttachment('radial_filename', 'object/conversation')
object.setAttachment('conversationFile', 'respec')
object.setOptionsBitmask(Options.CONVERSABLE | Options.INVULNERABLE)
object.setStfFilename('mob/creature_names')
object.setStfName('respec_seller')
return

Some files were not shown because too many files have changed in this diff Show More