From e2084ae9348faf510a9aaa8956e289e9897175bb Mon Sep 17 00:00:00 2001 From: Undercova PSWG Date: Mon, 2 Sep 2019 01:46:14 +0000 Subject: [PATCH 1/2] Added Light (rebel) and Dark (imperial) Jedi to NPC database for GCW combat --- serverdata/npc/npc_humanoid_1.sdb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/serverdata/npc/npc_humanoid_1.sdb b/serverdata/npc/npc_humanoid_1.sdb index 9be995e17..80b139053 100644 --- a/serverdata/npc/npc_humanoid_1.sdb +++ b/serverdata/npc/npc_humanoid_1.sdb @@ -391,6 +391,8 @@ coa3_warehouse_guard a warehouse guard coa3_warehouse_guard humanoid - dressed_c coa3_warehouse_thug a warehouse thug coa3_warehouse_thug humanoid - dressed_criminal_smuggler_human_female_01.iff;dressed_criminal_smuggler_human_male_01.iff;dressed_criminal_slicer_human_female_01.iff;dressed_criminal_slicer_human_male_01.iff;dressed_criminal_pirate_human_female_01.iff;dressed_criminal_pirate_human_male_01.iff;dressed_criminal_assassin_human_female_01.iff;dressed_criminal_assassin_human_male_01.iff Global warehouse jabba FALSE 1 1 0 - 2 1.8 melee_unarmed humanoid_commoner - - 6 6 FALSE - 75 npc 0 - 0 - 0 - - 0 - FALSE 0 - 0 - 0 - 0 - FALSE - 0.0 - col_antaria_wellos Antaria Wellos (a melodramatic Jedi) col_jedi_robe_jinsu_taker humanoid - jedi_robe_jinsu_taker.iff Rori jedi robe collection - FALSE 1 1 0 - 2 1.8 melee_jedi_light prof_jedi - - 6 6 FALSE - 75 npc 0 - 0 - 0 - - 0 - FALSE 0 - 0 - 0 - 0 - FALSE - 0.0 - col_breano_umakk Bre'ano Umakk (a Jedi) col_jedi_robe_light_jedi humanoid - jedi_robe_light_jedi.iff Dantooine col_jedi_robe_light - FALSE 1 1 0 - 2 1.8 melee_jedi_statue_quest_light col_jedi_statue_light melee_jedi_dark_ranged col_jedi_statue_light 18 6 FALSE - 75 npc 0 - 0 - 0 - - 0 - FALSE 0 - 0 - 0 - 0 - FALSE - 0.0 - +jedi_light Light Jedi - humanoid - jedi_robe_light_jedi.iff;dressed_dressed_padawan_female_human_01.iff;dressed_dressed_padawan_female_human_02.iff;dressed_padawan_female_bothan_01.iff;dressed_padawan_female_bothan_02.iff;dressed_padawan_female_ith_01.iff;dressed_padawan_female_ith_02.iff;dressed_padawan_female_trn_01.iff;dressed_padawan_female_trn_02.iff;dressed_padawan_female_wke_01.iff;dressed_padawan_female_wke_02.iff;dressed_padawan_female_wke_03.iff;dressed_padawan_female_wke_04.iff;dressed_padawan_male_bothan_01.iff;dressed_padawan_male_bothan_02.iff;dressed_padawan_male_human_01.iff;dressed_padawan_male_human_02.iff;dressed_padawan_male_ith_01.iff;dressed_padawan_male_ith_02.iff;dressed_padawan_male_sul_01.iff;dressed_padawan_male_sul_02.iff;dressed_padawan_male_trn_01.iff;dressed_padawan_wke_01.iff;dressed_padawan_wke_02.iff;dressed_padawan_wke_03.iff Global rebel rebel FALSE 1 1 0 - 2 1.8 melee_jedi_statue_quest_light col_jedi_statue_light melee_jedi_dark_ranged col_jedi_statue_light 16 6 FALSE - 75 npc 0 - 0 - 0 - - 0 - FALSE 0 - 0 - 0 - 0 - FALSE - 0.0 - +jedi_dark Dark Jedi - humanoid - jedi_robe_dark_jedi.iff;dressed_dark_side_savage.iff;dressed_forsaken_force_drifter.iff;dressed_force_trained_archaist.iff;dressed_force_sensitive_crypt_crawler.iff;dressed_dark_jedi_human_female_01.iff;dressed_dark_jedi_human_male_01.iff;som/som_dark_jedi_minion_1.iff;som/som_dark_jedi_minion_2.iff;som/som_dark_jedi_minion_3.iff;som/som_dark_jedi_minion_4.iff;som/som_dark_jedi_minion_5.iff;som/som_dark_jedi_minion_6.iff;som/som_dark_jedi_minion_7.iff;som/som_dark_jedi_minion_8.iff Global imperial imperial FALSE 1 1 0 - 2 1.8 melee_jedi_statue_quest_dark col_jedi_statue_dark melee_jedi_dark_ranged col_jedi_statue_dark 16 6 FALSE - 75 npc 0 - 0 - 0 - - 0 - FALSE 0 - 0 - 0 - 0 - FALSE - 0.0 - col_matarmeno_krahnn Matarmeno Krahnn (an adventuresome Jedi) col_jedi_robe_giver humanoid - jedi_robe_collection_giver.iff Corellia jedi robe collection - FALSE 1 1 0 - 2 1.8 melee_jedi_light prof_jedi - - 6 6 FALSE - 75 npc 0 - 0 - 0 - - 0 - FALSE 0 - 0 - 0 - 0 - FALSE - 0.0 - col_quillara_adeen Quillara Adeen (a Dark Jedi) col_jedi_robe_dark_jedi humanoid - jedi_robe_dark_jedi.iff Yavin4 col_jedi_robe_dark - FALSE 1 1 0 - 2 1.8 melee_jedi_statue_quest_dark col_jedi_statue_dark melee_jedi_dark_ranged col_jedi_statue_dark 18 6 FALSE - 75 npc 0 - 0 - 0 - - 0 - FALSE 0 - 0 - 0 - 0 - FALSE - 0.0 - col_wilfred_quelsh Lt. Col. Wilfred Quelsh (a retired CorSec officer) corellia_retired_officer humanoid - dressed_noble_fat_human_male_02.iff Naboo townsperson townsperson FALSE 1 1 0 - 2 1.8 melee_unarmed prof_officer ranged_pirate_pistol prof_officer 6 6 FALSE - 75 npc 0 - 0 - 0 - - 0 - FALSE 0 - 0 - 0 - 0 - FALSE - 0.0 - From 954ea3fa491b702a8aae84739121d87bb176ba77 Mon Sep 17 00:00:00 2001 From: Undercova PSWG Date: Mon, 2 Sep 2019 01:47:55 +0000 Subject: [PATCH 2/2] Added Light and Dark Jedi to POI Jedi Temple Ruins (Dantooine) for faction combat testing --- serverdata/spawn/common_dantooine.sdb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/serverdata/spawn/common_dantooine.sdb b/serverdata/spawn/common_dantooine.sdb index a72a638f3..2be064800 100644 --- a/serverdata/spawn/common_dantooine.sdb +++ b/serverdata/spawn/common_dantooine.sdb @@ -623,4 +623,6 @@ spawn_dan_620 DANTOOINE dan_warren AREA 84 91.8 -52.0 11.1 0 1 a Teraud loyalist spawn_dan_621 DANTOOINE dan_warren AREA 84 87.5 -52.0 10.9 0 1 a Teraud loyalist commander warren_teraud_loyalist_commander AGGRESSIVE B 50 55 POI The Warren 1 LOITER 2 0 - idle 0 0 0 600 spawn_dan_622 DANTOOINE dan_warren AREA 87 118.4 -52.0 39.4 179 1 Bors Teraud warren_bors_teraud AGGRESSIVE B 50 55 POI The Warren 1 IDLE 0 0 - idle 0 0 0 600 spawn_dan_623 DANTOOINE dan_warren AREA 9 -10.0 -20.0 -59.9 101 1 Phy Hudgen (an escaped worker) phy_hudgen INVULNERABLE N 100 100 POI The Warren 1 IDLE 0 0 - idle 0 0 0 600 -spawn_dan_624 DANTOOINE dan_world AREA 0 -462.1 15.5 -3800.0 0 1 O'Evitt Piboi (an escapee) oevitt_piboi INVULNERABLE N 100 100 POI The Warren 1 TURN 0 0 - idle 0 0 0 600 \ No newline at end of file +spawn_dan_624 DANTOOINE dan_world AREA 0 -462.1 15.5 -3800.0 0 1 O'Evitt Piboi (an escapee) oevitt_piboi INVULNERABLE N 100 100 POI The Warren 1 TURN 0 0 - idle 0 0 0 600 +spawn_dan_625 DANTOOINE dan_world AREA 0 4190.5 9.0 5215.4 113 1 Dark Jedi jedi_dark ATTACKABLE B 50 55 POI Jedi Temple Ruins 2 IDLE 0 0 - idle 0 0 0 10 +spawn_dan_626 DANTOOINE dan_world AREA 0 4195.8 9.0 5210.3 -66 1 Light Jedi jedi_light ATTACKABLE B 50 55 POI Jedi Temple Ruins 2 IDLE 0 0 - idle 0 0 0 10 \ No newline at end of file