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

Merge remote-tracking branch 'origin/master' into LootSystem

Browse Source 
Conflicts:
	src/main/NGECore.java
	src/services/DevService.java
This commit is contained in:
CharonInferar
2014-04-10 00:38:13 +02:00
parent 118d622c6d 80066d910d
commit abe8d6475f
22 changed files with 580 additions and 1776 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/object/building/player/player_house_generic_small_style_01.py
+5
View File
@@ -1,4 +1,9 @@
import sys
def setup(core, object):
sign = core.objectService.createChildObject(object, 'object/tangible/sign/player/shared_house_address.iff', -7.39, 2.36, 2, -1, 0, -1)
print(sign)
object.setAttachment("structureSign", sign)
core.objectService.createChildObject(object, 'object/tangible/terminal/shared_terminal_player_structure.iff', -5, 0.74, -1.81, 0.707107, -0.707107, 1)
return
scripts/object/tangible/deed/player_house_deed/generic_house_small_deed.py
+4
View File
@@ -1,4 +1,8 @@
import sys
def setup(core, object):
object.setAttachment('radial_filename', 'structureDeed');
return
def use(core, actor, object):
return