projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-09-21 06:13:13 -04:00
Code Issues Projects Releases Wiki Activity

Updated Housing service

Browse Source 
Housing service detects if new citizen builds structure
and adds him as citizen to the city
This commit is contained in:
CharonInferar
2014-04-24 14:10:46 +02:00
parent 982c4604b8
commit 5987b86a3d
22 changed files with 172 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/houses/player_cityhall_tatooine_style_01.py
-5
View File
@@ -2,13 +2,8 @@ import sys
from services.housing import HouseTemplate
from engine.resources.scene import Point3D
def setup(core):
<<<<<<< HEAD
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff", "object/building/player/city/shared_cityhall_tatooine.iff", 5)
=======
houseTemplate = HouseTemplate("object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff", "object/building/player/city/shared_cityhall_tatooine.iff", 0)
>>>>>>> upstream/master
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addPlaceablePlanet("tatooine")
scripts/houses/player_guildhall_corellia_style_01.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_corellia_guild_deed.iff", "object/building/player/shared_player_guildhall_corellia_style_01.iff", 5)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(400)
scripts/houses/player_guildhall_generic_style_01.py
-4
View File
@@ -5,11 +5,7 @@ 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)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
scripts/houses/player_guildhall_naboo_style_01.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_naboo_guild_deed.iff", "object/building/player/shared_player_guildhall_naboo_style_01.iff", 5)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("naboo")
houseTemplate.addPlaceablePlanet("rori")
houseTemplate.addPlaceablePlanet("dantooine")
scripts/houses/player_guildhall_tatooine_style_01.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
houseTemplate = HouseTemplate("object/tangible/deed/guild_deed/shared_tatooine_guild_deed.iff", "object/building/player/shared_player_guildhall_tatooine_style_01.iff", 5)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(18.4)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
scripts/houses/player_guildhall_tatooine_style_02.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
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)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.5), float(4), float(12.7)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("dantooine")
houseTemplate.addPlaceablePlanet("lok")
scripts/houses/player_house_corellia_large_style_01.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
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", 2)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(500)
scripts/houses/player_house_corellia_large_style_02.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
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", 2)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(500)
scripts/houses/player_house_corellia_medium_style_01.py
-5
View File
@@ -5,12 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
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)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
houseTemplate.addPlaceablePlanet("corellia")
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3),float(2.26),float(7.7)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
core.housingService.addHousingTemplate(houseTemplate)
scripts/houses/player_house_corellia_medium_style_02.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
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)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(5.3), float(2.26), float(7.7)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("talus")
houseTemplate.setDefaultItemLimit(200)
scripts/houses/player_house_generic_large_style_01.py
-4
View File
@@ -5,11 +5,7 @@ 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)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(6), float(3), float(13.4)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
scripts/houses/player_house_generic_large_style_02.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
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)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.4), float(3), float(9.1)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
scripts/houses/player_house_generic_large_window_s01.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
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)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(-13.7), float(3), float(9.1)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
scripts/houses/player_house_generic_large_window_s02.py
-4
View File
@@ -5,11 +5,7 @@ from engine.resources.scene import Point3D
def setup(core):
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)
<<<<<<< HEAD
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(1, 2, 3))
=======
houseTemplate.addBuildingSign("object/tangible/sign/player/shared_house_address.iff", Point3D(float(10.4), float(3), float(-11)))
>>>>>>> upstream/master
houseTemplate.addPlaceablePlanet("tatooine")
houseTemplate.addPlaceablePlanet("corellia")
houseTemplate.addPlaceablePlanet("naboo")
scripts/object/building/player/city/cityhall_tatooine.py
-13
View File
@@ -3,14 +3,6 @@ from engine.resources.scene import Point3D
from engine.resources.scene import Quaternion
def setup(core, object):
<<<<<<< HEAD
structureterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', Point3D(float(18.9), float(1.5), float(10)), Quaternion(float(1), float(1), float(1), float(0)),7)
#structureterminal.setAttachment('radial_filename', 'structure_management_terminal')
structureterminal.setAttachment('housing_parentstruct', object)
cityterminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city.iff', Point3D(float(0), float(2.6), float(0)), Quaternion(float(1), float(1), float(1), float(0)),3)
=======
sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -13.7, 3, 9.1, -1, 0, -1)
print(sign)
object.setAttachment("structureSign", sign)
@@ -23,11 +15,6 @@ def setup(core, object):
#cityterminal.setAttachment('housing_parentstruct', object)
city_vote_terminal = core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_city_vote.iff', Point3D(float(0), float(1.85), float(-8.5)), Quaternion(float(1), float(1), float(1), float(0)),3)
>>>>>>> upstream/master
#cityterminal.setAttachment('housing_parentstruct', object)
cityterminal.setAttachment('radial_filename', 'terminal/city_maintenance_terminal')
sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -7.39, 2.36, 2, -1, 0, -1)
object.setAttachment("structureSign", sign)
return
scripts/object/tangible/deed/city_deed/cityhall_tatooine_deed.py
-4
View File
@@ -5,11 +5,7 @@ def setup(core, object):
object.setConstructorTemplate('object/building/player/shared_construction_structure.iff')
object.setStructureTemplate('object/tangible/deed/city_deed/shared_cityhall_tatooine_deed.iff')
#object.setLotRequirement(5)
<<<<<<< HEAD
#object.setBMR(100)
=======
object.setBMR(308)
>>>>>>> upstream/master
return
def use(core, actor, object):
scripts/radial/terminal/city_maintenance_terminal.py
+10 -5
View File
@@ -70,7 +70,7 @@ def handleSelection(core, owner, target, option):
return
if option == 121:
if owner is not None:
handleCityInfo(core, owner, target, option)
handleCityRankInfo(core, owner, target, option)
return
if option == 122:
if owner is not None:
@@ -101,6 +101,11 @@ def setnameCallBack(owner, window, eventType, returnList):
def handleAdjustTaxes(core, owner, target, option):
playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner)
if playerCity.getRank()<2:
owner.sendSystemMessage('@city/city:no_rank_taxes', 0)
return
window = core.suiService.createSUIWindow('Script.listBox', owner, target, 0);
window.setProperty('bg.caption.lblTitle:Text', '@city/city:adjust_taxes_t')
window.setProperty('Prompt.lblPrompt:Text', '@city/city:adjust_taxes_d')
@@ -373,7 +378,7 @@ def setCityInfoCallBack(owner, window, eventType, returnList):
def handleRegisterMap(core, owner, target, option):
playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner)
if playerCity.getCityRank()<3:
if playerCity.getRank()<3:
owner.sendSystemMessage('@city/city:cant_register_rank', 0)
return
@@ -396,9 +401,9 @@ def setRegisterMapCallBack(owner, window, eventType, returnList):
def handleSpecialization(core, owner, target, option):
playerCity = main.NGECore.getInstance().playerCityService.getPlayerCity(owner)
#if playerCity.getCityRank()<3:
#owner.sendSystemMessage('@city/city:no_rank_spec', 0)
#return
if playerCity.getRank()<3:
owner.sendSystemMessage('@city/city:no_rank_spec', 0)
return
window = core.suiService.createSUIWindow('Script.listBox', owner, target, 0);
window.setProperty('bg.caption.lblTitle:Text', '@city/city:city_specs_t')