Skip to content

Commit 9f66789

Browse files
authored
Merge pull request #1723 from Undercova/master
Content update
2 parents a9e7df2 + 66b5a1e commit 9f66789

202 files changed

Lines changed: 9130 additions & 8684 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
buildout_id terrain building_name cell_id template x y z heading x_1 y_1 z_1 radius active comment
22
INTEGER PRIMARY KEY TEXT TEXT INTEGER TEXT REAL REAL REAL REAL REAL REAL REAL REAL BOOLEAN TEXT
33
buildout_cloning_001 KASHYYYK_HUNTING kas_hunting_world 0 object/mobile/ep3/ep3_rodian_camp_doctor_01.iff 560.9 23.5 520.6 -69 0 0 0 128 TRUE Cloning
4-
buildout_cloning_002 KASHYYYK_DEAD_FOREST kas_dead_f_world 0 object/mobile/ep3/ep3_wookiee_spirit_healer_01.iff 80.2 29.4 -475.9 22 0 0 0 128 TRUE Cloning
4+
buildout_cloning_002 KASHYYYK_DEAD_FOREST kas_dead_f_world 0 object/mobile/ep3/wookiee_spirit_healer_01.iff 80.2 29.4 -475.9 22 0 0 0 128 TRUE Cloning
55
buildout_cloning_003 KASHYYYK_DEAD_FOREST kas_dead_f_world 0 object/static/structure/general/cloning_tube.iff 94.6 29.4 -473.3 -49 0 0 0 128 TRUE Cloning

serverdata/cloning/cloning_respawn.sdb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ object/building/general/ep3_trando_slave_camp_bunker.iff 288 -15 -761 - STANDARD
2222
object/building/kashyyyk/thm_kash_myyydril_caverns.iff -4 -4 -12 hall1 STANDARD kashyyyk_myyydril 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2323
object/tangible/spawning/kashyyyk/bocctyyy_bet_control_object.iff 13.5 0.9 -19.3 - STANDARD kashyyyk_bocctyyy 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2424
object/tangible/spawning/kashyyyk/hracca_control_object.iff -33 0.7 -11 - STANDARD kashyyyk_hracca 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
25-
object/mobile/ep3/ep3_wookiee_spirit_healer_01.iff -3.5 3 0 - STANDARD kashyyyk_forest 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
25+
object/mobile/ep3/wookiee_spirit_healer_01.iff -3.5 3 0 - STANDARD kashyyyk_forest 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2626
object/mobile/ep3/ep3_rodian_camp_doctor_01.iff 2 0 -2 - STANDARD kashyyyk_hunting 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2727
object/tangible/spawning/kashyyyk/rryatt_trail_control_object.iff 2.1 1 24.4 - STANDARD kashyyyk_rryatt_trail 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0
2828
object/mobile/ep3/ep3_criss_nepomi.iff -2 0 1.6 - STANDARD kashyyyk_kachirho 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0

serverdata/faction/faction_datatable.sdb

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ cor_swoop TRUE TRUE FALSE - TRUE smashball - 1
2222
corsec TRUE TRUE FALSE - TRUE afarathu;followers_of_lord_nyax;monumenter;rogue_corsec;lost_aqualish;flail beldonnas_league 1
2323
dantari_raiders TRUE TRUE FALSE - TRUE kunga_tribe;mokk_tribe;janta_tribe - 1
2424
dark_jedi_kenobi FALSE TRUE FALSE - FALSE - - 1
25+
dark_jedi_sentinel FALSE TRUE FALSE - TRUE rebel imperial 1
26+
dathomir_scavenger FALSE TRUE FALSE - TRUE - - 1
2527
death_watch FALSE TRUE FALSE - FALSE death_watch_special - 1
2628
death_watch_special FALSE FALSE FALSE - FALSE - - 1
2729
desert_demon TRUE TRUE FALSE - TRUE swoop - 1
@@ -42,6 +44,7 @@ garyn TRUE TRUE FALSE - TRUE police - 1
4244
geonosian_crazed_monster FALSE TRUE FALSE - FALSE - geonosian_mad_bunker 1
4345
geonosian_crazy FALSE TRUE FALSE - FALSE geonosian_mad_bunker;geonosian_crazed_monster - 1
4446
geonosian_mad_bunker FALSE TRUE FALSE - FALSE - geonosian_crazed_monster 1
47+
ghent FALSE FALSE FALSE - TRUE - - 1
4548
gondula_tribe TRUE TRUE FALSE - TRUE donkuwah_tribe;korga_tribe;pubam;endor_marauder panshee_tribe 1
4649
gorax FALSE TRUE FALSE - TRUE gondula_tribe;panshee_tribe - 1
4750
gungan TRUE TRUE FALSE - TRUE plasma_thief;swamp_rat;borvo;Imperial - 1
@@ -53,12 +56,14 @@ imperialcitizen FALSE FALSE FALSE - FALSE - - 1
5356
jabba TRUE TRUE FALSE - TRUE valarian;borvo;police hutt 1
5457
janta_tribe TRUE TRUE FALSE - TRUE kunga_tribe;dantari_raiders - 1
5558
jawa TRUE TRUE FALSE - TRUE tusken_raider - 1
59+
jinda_tribe FALSE FALSE FALSE - TRUE - - 1
5660
kashyyyk TRUE TRUE FALSE - TRUE - - 1
5761
kashyyyk_resistance FALSE TRUE TRUE - FALSE hsskor - 1
5862
kobola TRUE TRUE FALSE - TRUE narmle;spice_collective - 1
5963
korga_tribe TRUE TRUE FALSE - TRUE gondula_tribe;panshee_tribe - 1
6064
kunga_tribe TRUE TRUE FALSE - TRUE mokk_tribe;dantari_raiders - 1
6165
liberation_party TRUE TRUE FALSE - TRUE fed_dub;corsec - 1
66+
light_jedi_sentinel FALSE FALSE FALSE - TRUE imperial rebel 1
6267
lok_mercenaries TRUE TRUE FALSE - TRUE bloodrazor;canyon_corsair - 1
6368
lost_aqualish TRUE TRUE FALSE - TRUE beldonnas_league;fed_dub;corsec - 1
6469
marauder TRUE TRUE FALSE - TRUE - - 1

serverdata/npc/npc_2.sdb

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -537,6 +537,14 @@ humanoid_abagga_creel Abagga Creel (a businesswoman) corellia_abagga_creel human
537537
humanoid_abo Abo - humanoid - dressed_mercenary_messanger_rod_m.iff Tatooine townsperson - FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_brawler 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
538538
humanoid_acic_ugadie Acic Ugadie - humanoid - jawa_male.iff Tatooine jawa jawa FALSE 0.95 1.05 0 - 2 1.8 melee_unarmed_default humanoid_brawler 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
539539
humanoid_administrator_nillika Administrator Nillika - humanoid - dressed_combatmedic_trainer_human_male_01.iff Tatooine townsperson townsperson FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_brawler 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
540+
humanoid_afarathu_brute an Afarathu brute afarathu_cult_brute humanoid - dressed_selonian_f_01.iff;dressed_selonian_f_02.iff;dressed_selonian_f_03.iff;dressed_selonian_f_04.iff;dressed_selonian_f_05.iff;dressed_selonian_f_06.iff;dressed_selonian_f_07.iff;dressed_selonian_f_08.iff;dressed_selonian_f_09.iff;dressed_selonian_f_10.iff;dressed_selonian_f_11.iff;dressed_selonian_f_12.iff;dressed_selonian_m_01.iff;dressed_selonian_m_02.iff;dressed_selonian_m_03.iff;dressed_selonian_m_04.iff;dressed_selonian_m_05.iff;dressed_selonian_m_06.iff;dressed_selonian_m_07.iff;dressed_selonian_m_08.iff;dressed_selonian_m_09.iff;dressed_selonian_m_10.iff;dressed_selonian_m_11.iff;dressed_selonian_m_12.iff Corellia afarathu afarathu FALSE 0.8 1.2 0 - 2 1.8 melee_sword_02 humanoid_swordsman 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
541+
humanoid_afarathu_cult_bodyguard an Afarathu cult bodyguard afarathu_cult_bodyguard humanoid - dressed_selonian_f_01.iff;dressed_selonian_f_02.iff;dressed_selonian_f_03.iff;dressed_selonian_f_04.iff;dressed_selonian_f_05.iff;dressed_selonian_f_06.iff;dressed_selonian_f_07.iff;dressed_selonian_f_08.iff;dressed_selonian_f_09.iff;dressed_selonian_f_10.iff;dressed_selonian_f_11.iff;dressed_selonian_f_12.iff;dressed_selonian_m_01.iff;dressed_selonian_m_02.iff;dressed_selonian_m_03.iff;dressed_selonian_m_04.iff;dressed_selonian_m_05.iff;dressed_selonian_m_06.iff;dressed_selonian_m_07.iff;dressed_selonian_m_08.iff;dressed_selonian_m_09.iff;dressed_selonian_m_10.iff;dressed_selonian_m_11.iff;dressed_selonian_m_12.iff Corellia afarathu afarathu FALSE 1.2 1.4 0 - 2 1.8 melee_sword_acid humanoid_swordsman 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
542+
humanoid_afarathu_cult_follower an Afarathu cult follower afarathu_cult_follower humanoid - dressed_selonian_f_01.iff;dressed_selonian_f_02.iff;dressed_selonian_f_03.iff;dressed_selonian_f_04.iff;dressed_selonian_f_05.iff;dressed_selonian_f_06.iff;dressed_selonian_f_07.iff;dressed_selonian_f_08.iff;dressed_selonian_f_09.iff;dressed_selonian_f_10.iff;dressed_selonian_f_11.iff;dressed_selonian_f_12.iff;dressed_selonian_m_01.iff;dressed_selonian_m_02.iff;dressed_selonian_m_03.iff;dressed_selonian_m_04.iff;dressed_selonian_m_05.iff;dressed_selonian_m_06.iff;dressed_selonian_m_07.iff;dressed_selonian_m_08.iff;dressed_selonian_m_09.iff;dressed_selonian_m_10.iff;dressed_selonian_m_11.iff;dressed_selonian_m_12.iff Corellia afarathu afarathu FALSE 1 1.4 0 - 2 1.8 melee_sword_01 humanoid_swordsman 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
543+
humanoid_afarathu_cult_leader an Afarathu cult leader afarathu_cult_leader humanoid - dressed_selonian_f_01.iff;dressed_selonian_f_02.iff;dressed_selonian_f_03.iff;dressed_selonian_f_04.iff;dressed_selonian_f_05.iff;dressed_selonian_f_06.iff;dressed_selonian_f_07.iff;dressed_selonian_f_08.iff;dressed_selonian_f_09.iff;dressed_selonian_f_10.iff;dressed_selonian_f_11.iff;dressed_selonian_f_12.iff;dressed_selonian_m_01.iff;dressed_selonian_m_02.iff;dressed_selonian_m_03.iff;dressed_selonian_m_04.iff;dressed_selonian_m_05.iff;dressed_selonian_m_06.iff;dressed_selonian_m_07.iff;dressed_selonian_m_08.iff;dressed_selonian_m_09.iff;dressed_selonian_m_10.iff;dressed_selonian_m_11.iff;dressed_selonian_m_12.iff Corellia afarathu afarathu FALSE 1.4 1.8 0 - 2 1.8 melee_sword_acid humanoid_swordsman 6 6 FALSE - 50 junk_npc 15 schematic_common 10 component_clothing FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
544+
humanoid_afarathu_hellion an Afarathu hellion afarathu_cult_hellion humanoid - dressed_selonian_f_01.iff;dressed_selonian_f_02.iff;dressed_selonian_f_03.iff;dressed_selonian_f_04.iff;dressed_selonian_f_05.iff;dressed_selonian_f_06.iff;dressed_selonian_f_07.iff;dressed_selonian_f_08.iff;dressed_selonian_f_09.iff;dressed_selonian_f_10.iff;dressed_selonian_f_11.iff;dressed_selonian_f_12.iff;dressed_selonian_m_01.iff;dressed_selonian_m_02.iff;dressed_selonian_m_03.iff;dressed_selonian_m_04.iff;dressed_selonian_m_05.iff;dressed_selonian_m_06.iff;dressed_selonian_m_07.iff;dressed_selonian_m_08.iff;dressed_selonian_m_09.iff;dressed_selonian_m_10.iff;dressed_selonian_m_11.iff;dressed_selonian_m_12.iff Corellia afarathu afarathu FALSE 0.8 1.2 0 - 2 1.8 melee_sword_01 humanoid_swordsman 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
545+
humanoid_afarathu_ruffian an Afarathu ruffian afarathu_cult_ruffian humanoid - dressed_selonian_f_01.iff;dressed_selonian_f_02.iff;dressed_selonian_f_03.iff;dressed_selonian_f_04.iff;dressed_selonian_f_05.iff;dressed_selonian_f_06.iff;dressed_selonian_f_07.iff;dressed_selonian_f_08.iff;dressed_selonian_f_09.iff;dressed_selonian_f_10.iff;dressed_selonian_f_11.iff;dressed_selonian_f_12.iff;dressed_selonian_m_01.iff;dressed_selonian_m_02.iff;dressed_selonian_m_03.iff;dressed_selonian_m_04.iff;dressed_selonian_m_05.iff;dressed_selonian_m_06.iff;dressed_selonian_m_07.iff;dressed_selonian_m_08.iff;dressed_selonian_m_09.iff;dressed_selonian_m_10.iff;dressed_selonian_m_11.iff;dressed_selonian_m_12.iff Corellia afarathu afarathu FALSE 0.8 1.2 0 - 2 1.8 melee_sword_01 humanoid_swordsman 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
546+
humanoid_afarathu_savage an Afarathu savage afarathu_cult_savage humanoid - dressed_selonian_f_01.iff;dressed_selonian_f_02.iff;dressed_selonian_f_03.iff;dressed_selonian_f_04.iff;dressed_selonian_f_05.iff;dressed_selonian_f_06.iff;dressed_selonian_f_07.iff;dressed_selonian_f_08.iff;dressed_selonian_f_09.iff;dressed_selonian_f_10.iff;dressed_selonian_f_11.iff;dressed_selonian_f_12.iff;dressed_selonian_m_01.iff;dressed_selonian_m_02.iff;dressed_selonian_m_03.iff;dressed_selonian_m_04.iff;dressed_selonian_m_05.iff;dressed_selonian_m_06.iff;dressed_selonian_m_07.iff;dressed_selonian_m_08.iff;dressed_selonian_m_09.iff;dressed_selonian_m_10.iff;dressed_selonian_m_11.iff;dressed_selonian_m_12.iff Corellia afarathu afarathu FALSE 0.8 1.2 0 - 2 1.8 melee_sword_01 humanoid_swordsman 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
547+
humanoid_afarathu_zealot an Afarathu cult zealot afarathu_cult_zealot humanoid - dressed_selonian_f_01.iff;dressed_selonian_f_02.iff;dressed_selonian_f_03.iff;dressed_selonian_f_04.iff;dressed_selonian_f_05.iff;dressed_selonian_f_06.iff;dressed_selonian_f_07.iff;dressed_selonian_f_08.iff;dressed_selonian_f_09.iff;dressed_selonian_f_10.iff;dressed_selonian_f_11.iff;dressed_selonian_f_12.iff;dressed_selonian_m_01.iff;dressed_selonian_m_02.iff;dressed_selonian_m_03.iff;dressed_selonian_m_04.iff;dressed_selonian_m_05.iff;dressed_selonian_m_06.iff;dressed_selonian_m_07.iff;dressed_selonian_m_08.iff;dressed_selonian_m_09.iff;dressed_selonian_m_10.iff;dressed_selonian_m_11.iff;dressed_selonian_m_12.iff Corellia afarathu afarathu FALSE 1 1.4 0 - 2 1.8 melee_sword_01 humanoid_swordsman 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
540548
humanoid_agent_jornal_savas Agent Jornel Savas cor_droid_bunker_cornel_savas humanoid - corsec_jornel_savas.iff Corellia townsperson - FALSE 1 1 0 - 2 1.8 group_ranged_pistol_energy_high humanoid_pistoleer 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
541549
humanoid_agtor Agtor - humanoid - gamorrean.iff Tatooine jabba jabba FALSE 1 1 0 - 2 1.8 melee_2h_sword_battleaxe humanoid_swordsman ranged_grenade_proton thrown 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
542550
humanoid_ajuva_vanasterin Ajuva Vanasterin ajuva_vanasterin humanoid - dressed_ajuva_vanasterin.iff Rori townsperson - FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_brawler 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
@@ -732,7 +740,7 @@ humanoid_clone_durge_01 Durge clone_relics_durge_01 humanoid - ep3/ep3_clone_rel
732740
humanoid_clone_durge_02 Durge clone_relics_durge_02 humanoid - ep3/ep3_clone_relics_durge.iff Naboo clone_relics_durge_droid - FALSE 1.4 1.4 0 - 2 1.8 melee_unarmed_default humanoid_brawler 6 12 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
733741
humanoid_clone_ikvizi Ikvizi clone_relics_ikvizi humanoid - ep3/ep3_clone_relics_geonosian_ikvizi.iff Kashyyyk townsperson townsperson FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_brawler 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
734742
humanoid_clone_imperial_admiral_krieg Admiral Krieg clone_relics_admiral_krieg humanoid - ep3/ep3_clone_relics_admiral_krieg.iff Kashyyyk imperial imperial FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_brawler ranged_grenade_imperial_detonator thrown 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
735-
humanoid_clone_imperial_darth_vader Darth Vader clone_relics_darth_vader humanoid - darth_vader.iff Kashyyyk imperial imperial FALSE 1.2 1.2 0 - 2 1.8 melee_lightsaber_vader humanoid_jedi ranged_grenade_imperial_detonator thrown 6 6 FALSE - 30 junk_npc 15 schematic_common 10 robe_dark_knight FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
743+
humanoid_clone_imperial_darth_vader Darth Vader clone_relics_darth_vader humanoid - darth_vader.iff Kashyyyk imperial imperial FALSE 1.2 1.2 0 - 2 1.8 melee_lightsaber_vader humanoid_jedi ranged_grenade_imperial_detonator thrown 6 6 FALSE - 50 junk_npc 30 schematic_common 25 robe_dark_knight FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
736744
humanoid_clone_imperial_major_raev Major Raev clone_relics_major_raev humanoid - ep3/ep3_clone_relics_major_raev.iff Naboo imperial imperial FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_brawler ranged_grenade_imperial_detonator thrown 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
737745
humanoid_clone_imperial_palpatine_hologram Emperor Palpatine Hologram clone_relics_emperor_palpatine humanoid Avenging Mort quest - Hologram ep3/palpatine_hologram.iff Naboo imperial imperial FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_brawler 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
738746
humanoid_clone_jawl Jawl clone_relics_jawl humanoid - ep3/ep3_clone_relics_jawl.iff Tatooine jabba jabba FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_brawler 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -

0 commit comments

Comments
 (0)