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

obj: use(core, actor, obj) & destroy(core, obj)

Browse Source 
Object scripts can now define:

use(core, actor, object)

destroy(core, object)

This will be useful for, for example, making a pcd vehicle spawn in the
datapad upon the use of a deed before destroying itself, or making a
lifeday tree spawn another tree upon its destruction.
This commit is contained in:
Treeku
2013-11-16 23:15:26 +00:00
parent a5385ce4da
commit b6fc2edfe3
2 changed files with 52 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/object/ObjectService.java
+50 -12
View File
@@ -264,6 +264,9 @@ public class ObjectService implements INetworkDispatch {
}
public void destroyObject(SWGObject object) {
if (object == null) {
return;
}
if (object instanceof TangibleObject &&
((TangibleObject) object).getRespawnTime() > 0) {
@@ -283,6 +286,20 @@ public class ObjectService implements INetworkDispatch {
}, ((TangibleObject) object).getRespawnTime(), TimeUnit.SECONDS);
}
String filePath = "scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", "") + object.getTemplate().split("shared_" , 2)[1].replace(".iff", "") + ".py";
if (FileUtilities.doesFileExist(filePath)) {
PyObject method = core.scriptService.getMethod("scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", ""), object.getTemplate().split("shared_" , 2)[1].replace(".iff", ""), "destroy");
if (method != null && method.isCallable()) {
method.__call__(Py.java2py(core), Py.java2py(object));
}
}
if (object == null) {
return;
}
object.viewChildren(object, true, true, new Traverser() {
@Override
public void process(SWGObject obj) {
@@ -363,7 +380,23 @@ public class ObjectService implements INetworkDispatch {
}
public void useObject(CreatureObject creature, SWGObject object) {
if (object == null) {
return;
}
String filePath = "scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", "") + object.getTemplate().split("shared_" , 2)[1].replace(".iff", "") + ".py";
if (FileUtilities.doesFileExist(filePath)) {
PyObject method = core.scriptService.getMethod("scripts/" + object.getTemplate().split("shared_" , 2)[0].replace("shared_", ""), object.getTemplate().split("shared_" , 2)[1].replace(".iff", ""), "useObject");
if (method != null && method.isCallable()) {
method.__call__(Py.java2py(core), Py.java2py(creature), Py.java2py(object));
}
}
}
public void insertTimedEventBindings(ScheduledExecutorService executor) {
}
@@ -472,22 +505,27 @@ public class ObjectService implements INetworkDispatch {
});
objControllerOpcodes.put(ObjControllerOpcodes.USE_STATIC_OBJECT, new INetworkRemoteEvent() {
objControllerOpcodes.put(ObjControllerOpcodes.USE_OBJECT, new INetworkRemoteEvent() {
@Override
public void handlePacket(IoSession session, IoBuffer buffer) throws Exception {
buffer.order(ByteOrder.LITTLE_ENDIAN);
CreatureObject creature = (CreatureObject) getObject(buffer.getLong());
if (creature == null || creature.getClient() == null) return;
buffer.skip(4);
SWGObject object = getObject(buffer.getLong());
if (object == null) return;
String filePath = "scripts/" + object.getTemplate().split(".")[0] + ".py";
if (!FileUtilities.doesFileExist(filePath)) {
PyObject method = core.scriptService.getMethod(filePath.substring(0, filePath.lastIndexOf("/")), filePath.substring(filePath.lastIndexOf("/") + 1).split(".")[0], "useStaticObject");
if (method != null && method.isCallable()) {
method.__call__(Py.java2py(core), Py.java2py(creature), Py.java2py(object));
}
if (creature == null || creature.getClient() == null) {
return;
}
buffer.skip(4);
SWGObject object = getObject(buffer.getLong());
if (object == null) {
return;
}
useObject(creature, object);
}
});