projectswg/Holocore
1
0
Fork 0
mirror of https://github.com/ProjectSWGCore/Holocore.git synced 2026-10-18 08:02:56 -04:00
Code Issues Projects Releases Wiki Activity

Mood animation is now set on NPCs

Browse Source
This commit is contained in:
Mads Boddum
2016-04-06 08:54:18 +02:00
parent 96ab44a0e3
commit 357bc8f43e
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/services/spawn/SpawnerService.java
+6 -4
View File
@@ -40,6 +40,7 @@ import resources.control.Intent;
import resources.control.Service;
import resources.objects.building.BuildingObject;
import resources.objects.SWGObject;
import resources.objects.creature.CreatureObject;
import resources.server_info.Log;
import resources.server_info.RelationalDatabase;
import resources.server_info.RelationalServerFactory;
@@ -50,7 +51,7 @@ import services.objects.ObjectManager;
public final class SpawnerService extends Service {
private static final String GET_ALL_SPAWNERS_SQL = "SELECT static.x, static.y, static.z, static.heading, " // static columns
+ "static.spawner_type, static.cell_id, static.active, " // more static columns
+ "static.spawner_type, static.cell_id, static.active, static.mood, " // more static columns
+ "buildings.object_id AS building_id, buildings.terrain_name AS building_terrain, " // building columns
+ "creatures.iff_template AS iff, creatures.creature_name " // creature columns
+ "FROM static, buildings, creatures "
@@ -138,12 +139,13 @@ public final class SpawnerService extends Service {
SWGObject egg = objectManager.createObject(parent, spawnerType.getObjectTemplate(), loc, false);
spawners.add(new Spawner(egg));
}
createNPC(parent, loc, set.getString("iff"), set.getString("creature_name"));
createNPC(parent, loc, set.getString("iff"), set.getString("creature_name"), set.getString("mood"));
}
private boolean createNPC(SWGObject parent, Location loc, String iff, String name) {
SWGObject object = objectManager.createObject(parent, createTemplate(getRandomIff(iff)), loc, false);
private boolean createNPC(SWGObject parent, Location loc, String iff, String name, String moodAnimation) {
CreatureObject object = (CreatureObject) objectManager.createObject(parent, createTemplate(getRandomIff(iff)), loc, false);
object.setName(getCreatureName(name));
object.setMoodAnimation(moodAnimation);
return true;
}