Merge branch 'master' of https://github.com/ProjectSWGCore/NGECore2

Author: Treeku

nge.backup

@@ -62,7 +62,8 @@ CREATE TABLE accounts (
     id integer NOT NULL,
     "user" character varying(16) NOT NULL,
     pass character varying(34) NOT NULL,
-    email character varying(32) NOT NULL
+    email character varying(32) NOT NULL,
+    gmflag boolean
 );
 
 

ngengine_public.jar

@@ -34,7 +34,15 @@ def run(core, actor, target, commandString):
 				#path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/'        
                                 #module = target.getTemplate().rpartition('/')[2].replace('shared_', '').replace('.iff', '')
                                 #core.scriptService.callScript(path, 'equip', module, core, actor, target)
-               
+		
+		if container == actor.getSlottedObject('appearance_inventory'):
+			actor.addObjectToAppearanceEquipList(target)
+			for object in replacedObjects:
+				actor.removeObjectFromAppearanceEquipList(object)
+		
+		if oldContainer == actor.getSlottedObject('appearance_inventory'):
+			actor.removeObjectFromAppearanceEquipList(target)
+		
                 if actor == oldContainer:
                         if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'):
                                 #path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/'        

scripts/commands/transferitemarmor.py

@@ -36,7 +36,14 @@ def run(core, actor, target, commandString):
 				#path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/'        
                                 #module = target.getTemplate().rpartition('/')[2].replace('shared_', '').replace('.iff', '')
                                 #core.scriptService.callScript(path, 'equip', module, core, actor, target)
-               
+               	if container == actor.getSlottedObject('appearance_inventory'):
+			actor.addObjectToAppearanceEquipList(target)
+			for object in replacedObjects:
+				actor.removeObjectFromAppearanceEquipList(object)
+		
+		if oldContainer == actor.getSlottedObject('appearance_inventory'):
+			actor.removeObjectFromAppearanceEquipList(target)
+
                 if actor == oldContainer:
                         if target.getTemplate().find('/wearables/') or target.getTemplate().find('/weapon/'):
                                 #path = 'scripts/' + target.getTemplate().rpartition('/')[0] + '/'        

scripts/commands/transferitemmisc.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/object/tangible/component/weapon/quest/blaster_power_handler_faux_bowcaster.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/object/tangible/component/weapon/quest/projectile_feed_mechanism_faux_bowcaster.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/object/tangible/component/weapon/quest/projectile_rifle_barrel_faux_bowcaster.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/object/tangible/container/quest/crafting_contract/armor_crate.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return

scripts/object/tangible/container/quest/crafting_contract/clothing_crate.py

@@ -0,0 +1,4 @@
+import sys
+
+def setup(core, object):
+	return