projectswg/NGECore2
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/NGECore2.git synced 2026-08-02 03:15:52 -04:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Waverunner
2014-08-10 13:06:22 -04:00
parent df8d6e64cb be29cd025e
commit d192dbea93
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/object/tangible/npe/npe_uniform_box.py
+1 -1
View File
@@ -79,7 +79,7 @@ def use(core, actor, object):
pants = core.objectService.createObject('object/tangible/wearables/pants/shared_pants_s08.iff', actor.getPlanet(), 'item_medic_pants_02_01')
shirt = core.objectService.createObject('object/tangible/wearables/shirt/shared_shirt_s27.iff', actor.getPlanet(), 'item_medic_shirt_02_01')
vest = core.objectService.createObject('object/tangible/wearables/vest/shared_vest_s05.iff', actor.getPlanet(), 'item_medic_vest_02_01')
items.add(shoes)
items.add(boots)
items.add(pants)
items.add(shirt)
items.add(vest)
scripts/object/tangible/wearables/shirt/item_trader_shirt_02_01.py
+3 -3
View File
@@ -2,9 +2,9 @@ import sys
def setup(core, object):
object.setStfFilename('static_item_n')
object.setStfName('item_medic_shirt_02_01')
object.setStfName('item_trader_shirt_02_01')
object.setDetailFilename('static_item_d')
object.setDetailName('item_medic_shirt_02_01')
object.setDetailName('item_trader_shirt_02_01')
object.setIntAttribute('cat_stat_mod_bonus.@stat_n:agility_modified', 3)
object.setStringAttribute('class_required', 'Medic')
object.setStringAttribute('class_required', 'Trader')
return
src/services/object/ObjectService.java
+4 -3
View File
@@ -605,9 +605,10 @@ public class ObjectService implements INetworkDispatch {
@Override
public void run() {
try {
CreatureObject newObject = NGECore.getInstance().spawnService.spawnCreature(Template, 0, planet.getName(), cellId, spawnPosition.x, spawnPosition.y, spawnPosition.z, orientation.w, orientation.x, orientation.y, orientation.z, level);
AIActor newAIActor = (AIActor)newObject.getAttachment("AI");
newAIActor.cloneActor(((AIActor) object.getAttachment("AI")));
// Commented for now until found where the respawn is always set to 60 for any NPC
// CreatureObject newObject = NGECore.getInstance().spawnService.spawnCreature(Template, 0, planet.getName(), cellId, spawnPosition.x, spawnPosition.y, spawnPosition.z, orientation.w, orientation.x, orientation.y, orientation.z, level);
// AIActor newAIActor = (AIActor)newObject.getAttachment("AI");
// newAIActor.cloneActor(((AIActor) object.getAttachment("AI")));
//object.setAttachment("AI", null);
} catch (Exception e) {
e.printStackTrace();