From 357bc8f43ec6e9462efefc578e6a90cc4e251daf Mon Sep 17 00:00:00 2001 From: Mads Boddum Date: Wed, 6 Apr 2016 08:54:18 +0200 Subject: [PATCH] Mood animation is now set on NPCs --- src/services/spawn/SpawnerService.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/services/spawn/SpawnerService.java b/src/services/spawn/SpawnerService.java index 6fa44a65b..6b0eb2eb8 100644 --- a/src/services/spawn/SpawnerService.java +++ b/src/services/spawn/SpawnerService.java @@ -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; }