From 408e09dce45ec9f4e7522937c1154a33313e9f0e Mon Sep 17 00:00:00 2001 From: Cekis Date: Mon, 1 Aug 2016 08:18:26 +0100 Subject: [PATCH] Fixed issues with what Nitra Vendallan was wearing - including added hair and boots. --- .../poi_spawner/tatooine/anchorhead_cantina.tab | 2 +- .../mobile/dressed_tatooine_nitra_vendallan.tpf | 2 +- .../script/npc/static_npc/nitra_vendallan.java | 16 ++++++---------- 3 files changed, 8 insertions(+), 12 deletions(-) mode change 100644 => 100755 sku.0/sys.server/compiled/game/object/mobile/dressed_tatooine_nitra_vendallan.tpf mode change 100644 => 100755 sku.0/sys.server/compiled/game/script/npc/static_npc/nitra_vendallan.java diff --git a/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/anchorhead_cantina.tab b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/anchorhead_cantina.tab index 60d397981..fac6c0c3e 100755 --- a/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/anchorhead_cantina.tab +++ b/sku.0/sys.server/compiled/game/datatables/spawning/poi_spawner/tatooine/anchorhead_cantina.tab @@ -1,5 +1,5 @@ spawns name room loc_x loc_y loc_z yaw script mood animation_mood respawn_time spawn_objvar special_room special_room_script room_objvar room_objvar_name room_objvar_value s s s f f f f s s s i s s s s s s -object/mobile/tatooine_npc/nitra_vendallan.iff livingroom1 -2.953 0.4083 -9.3071 -129 npc.static_quest.quest_convo 300 string:quest_table=nitra_vendallan +nitra_vendallan livingroom1 -2.953 0.4083 -9.3071 51 npc.static_quest.quest_convo 300 string:quest_table=nitra_vendallan rebel_recruiter hall1 -6.2201 -3.9662 -6.589 90 300 rebel_recruiter world 69.6872 52 -5349.47 3 300 diff --git a/sku.0/sys.server/compiled/game/object/mobile/dressed_tatooine_nitra_vendallan.tpf b/sku.0/sys.server/compiled/game/object/mobile/dressed_tatooine_nitra_vendallan.tpf old mode 100644 new mode 100755 index feecc3f9e..69e0a5714 --- a/sku.0/sys.server/compiled/game/object/mobile/dressed_tatooine_nitra_vendallan.tpf +++ b/sku.0/sys.server/compiled/game/object/mobile/dressed_tatooine_nitra_vendallan.tpf @@ -8,5 +8,5 @@ nameGeneratorType = "human" @class object_template 0 -sharedTemplate = "object/mobile/shared_dressed_tatooine_nitra_vendallan.iff" +sharedTemplate = "object/mobile/tatooine_npc/shared_nitra_vendallan.iff" diff --git a/sku.0/sys.server/compiled/game/script/npc/static_npc/nitra_vendallan.java b/sku.0/sys.server/compiled/game/script/npc/static_npc/nitra_vendallan.java old mode 100644 new mode 100755 index 67f807808..71ad421c2 --- a/sku.0/sys.server/compiled/game/script/npc/static_npc/nitra_vendallan.java +++ b/sku.0/sys.server/compiled/game/script/npc/static_npc/nitra_vendallan.java @@ -1,16 +1,9 @@ package script.npc.static_npc; -import script.*; -import script.base_class.*; -import script.combat_engine.*; -import java.util.Arrays; -import java.util.Hashtable; -import java.util.Vector; -import script.base_script; - import script.library.ai_lib; -import script.library.hue; import script.library.colors; +import script.library.hue; +import script.obj_id; public class nitra_vendallan extends script.base_script { @@ -21,11 +14,14 @@ public class nitra_vendallan extends script.base_script { obj_id shirt = createObject("object/tangible/wearables/shirt/shirt_s07.iff", self, ""); obj_id pants = createObject("object/tangible/wearables/pants/pants_s12.iff", self, ""); - obj_id shoes = createObject("object/tangible/wearables/shoes/shoes_s03.iff", self, ""); + obj_id shoes = createObject("object/tangible/wearables/boots/boots_s12.iff", self, ""); obj_id vest = createObject("object/tangible/wearables/vest/vest_s05.iff", self, ""); + obj_id hair = createObject("object/tangible/hair/human/hair_human_female_s08.iff", self, ""); hue.setColor(shirt, 1, colors.GREEN); hue.setColor(shirt, 1, colors.YELLOW); hue.setColor(vest, 1, colors.ORANGE); + hue.setColor(shoes, 1, colors.BLACK); + hue.setColor(hair, 1, colors.BEIGE); ai_lib.setDefaultCalmBehavior(self, ai_lib.BEHAVIOR_SENTINEL); setName(self, "Nitra Vendallan"); return SCRIPT_CONTINUE;