Skip to content

Commit

Permalink
Merge pull request #1575 from Undercova/master
Browse files Browse the repository at this point in the history 
Content update
  • Loading branch information
@Undercova
Undercova committed Jun 30, 2024
2 parents 6722a59 + c0dc6ce commit baa1c2e
Show file tree
Hide file tree
Showing 7 changed files with 296 additions and 281 deletions.
6 changes: 3 additions & 3 deletions serverdata/conversation/tatooine_mos_eisley_bib_fortuna/start.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"npcMessage": {
"file": "conversation/bib_fortuna_mos_eisley",
"key": "s_195",
"comment": "I'm waiting for someone at the moment and it isn't you."
"file": "conversation/bib_newbie_quest_1",
"key": "bib_24",
"comment": "I don't have any work for you right now. Come back later."
},
"playerResponses": [],
"requirements": [],
Expand Down
4 changes: 2 additions & 2 deletions serverdata/conversation/tatooine_mos_eisley_cheated_gambler/hear.json
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"npcMessage": {
"file": "conversation/ep3_cheated_gambler",
"key": "s_347",
"comment": "What do you want? Just go away."
"key": "s_305",
"comment": "Well, at least I still have that."
},
"playerResponses": [],
"requirements": [],
Expand Down
14 changes: 14 additions & 0 deletions serverdata/cybernetics/cybernetics.sdb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
template comment hue protection condition procEffect reacEffect moveRateBuff throwRangeMod rangedRangeMod healingMod rangedAccuracyMod meleeDefMod meleeAccuracyMod commandoLegs specialCommand installCost repairCost removeCost
TEXT TEXT INTEGER FLOAT FLOAT TEXT TEXT TEXT INTEGER INTEGER INTEGER INTEGER INTEGER INTEGER INTEGER TEXT INTEGER INTEGER INTEGER
object/tangible/wearables/cybernetic/s01/cybernetic_s01_arm_l.iff death penalty 0 0 40000 0 1 1000
object/tangible/wearables/cybernetic/s01/cybernetic_s01_arm_r.iff death penalty 0 0 40000 0 1 1000
object/tangible/wearables/cybernetic/s01/cybernetic_s01_legs.iff death penalty 0 0 40000 0 1 1000
object/tangible/wearables/cybernetic/s02/cybernetic_s02_arm_l.iff lowered melee defense, increased melee accuracy 110 0.8 40000 cyborgStrengthBuff 5000 1 5000
object/tangible/wearables/cybernetic/s02/cybernetic_s02_arm_r.iff cyber_shock proc 110 0.8 40000 proc_cyber_shock cyborgLightning 5000 2 5000
object/tangible/wearables/cybernetic/s02/cybernetic_s02_legs.iff runspeed buff, low armor 110 0.8 40000 cyberneticLegs cyborgBurstRun 5000 3 5000
object/tangible/wearables/cybernetic/s03/cybernetic_s03_arm_l.iff increased healing mod, lowered accuracy 22 0.8 40000 cyborgRevive 5000 1 5000
object/tangible/wearables/cybernetic/s03/cybernetic_s03_arm_r.iff increased trap throw range, lower Other combat mods 119 0.95 40000 5000 2 5000
object/tangible/wearables/cybernetic/s04/cybernetic_s04_arm_r.iff Reverse Engineering Arm 1 0 40000 5000 2 5000
object/tangible/wearables/cybernetic/s05/cybernetic_s05_arm_l.iff increase range, increased ranged accuracy, lowered melee defense, lowered melee accuracy 38 0.8 40000 cyborgSureShot 5000 3 5000
object/tangible/wearables/cybernetic/s05/cybernetic_s05_arm_r.iff increased range, lowered accuracy 38 0.8 40000 cyborgCriticalSnipe 5000 1 5000
object/tangible/wearables/cybernetic/s05/cybernetic_s05_legs.iff fire heavy weapons from standing, lowered throw range, lowered accuracy, lowered defense 38 0.8 40000 cyborgKickDown 5000 2 5000
545 changes: 273 additions & 272 deletions serverdata/items/items_weapon_cu.sdb
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions serverdata/npc/npc_2.sdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -885,8 +885,8 @@ humanoid_crider_trant Crider Trant crider_trant humanoid - dressed_crider_trant.
humanoid_crimelord a crimelord crimelord humanoid - dressed_criminal_organized_human_female_01.iff;dressed_criminal_organized_human_male_01.iff;dressed_criminal_organized_twilek_female_01.iff;dressed_criminal_organized_twilek_male_01.iff Tatooine jabba hutt FALSE 1 1 0 - 2 1.8 group_ranged_carbine_kinetic_high humanoid_carbineer 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
humanoid_criminal a criminal criminal humanoid - dressed_criminal_thug_aqualish_female_01.iff;dressed_criminal_thug_aqualish_female_02.iff;dressed_criminal_thug_aqualish_male_01.iff;dressed_criminal_thug_aqualish_male_02.iff;dressed_criminal_thug_bothan_female_01.iff;dressed_criminal_thug_bothan_male_01.iff;dressed_criminal_thug_human_female_01.iff;dressed_criminal_thug_human_female_02.iff;dressed_criminal_thug_human_male_01.iff;dressed_criminal_thug_human_male_02.iff;dressed_criminal_thug_rodian_female_01.iff;dressed_criminal_thug_rodian_male_01.iff;dressed_criminal_thug_trandoshan_female_01.iff;dressed_criminal_thug_trandoshan_male_01.iff;dressed_criminal_thug_zabrak_female_01.iff;dressed_criminal_thug_zabrak_male_01.iff;dressed_crook_zabrak_female_01.iff;dressed_crook_zabrak_male_01.iff;dressed_desperado_bith_female_01.iff;dressed_desperado_bith_male_01.iff;dressed_goon_twk_female_01.iff;dressed_goon_twk_male_01.iff;dressed_hoodlum_zabrak_female_01.iff;dressed_hoodlum_zabrak_male_01.iff;dressed_hooligan_rodian_female_01.iff;dressed_hooligan_rodian_male_01.iff;dressed_mugger.iff;dressed_robber_human_female_01.iff;dressed_robber_human_male_01.iff;dressed_robber_twk_female_01.iff;dressed_robber_twk_male_01.iff;dressed_ruffian_zabrak_female_01.iff;dressed_villain_trandoshan_female_01.iff;dressed_villain_trandoshan_male_01.iff Global thug thug FALSE 1 1 0 - 2 1.8 melee_unarmed_default humanoid_pistoleer 6 6 FALSE - 30 junk_npc 5 schematic_common 0 - FALSE 0 none - none 0 - 0 - 0 - FALSE - 0.0 -
humanoid_cybernetic_specialist_corellia Aboo Aramflahad (Cybernetic Specialist) - humanoid - ep3/cyborg_engineer_corellia.iff Corellia 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 -
humanoid_cybernetic_specialist_naboo Aboo Aramflahad (Cybernetic Specialist) - humanoid - ep3/cyborg_engineer_naboo.iff Naboo 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 -
humanoid_cybernetic_specialist_tatooine Aboo Aramflahad (Cybernetic Specialist) - humanoid - ep3/cyborg_engineer_tatooine.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 -
humanoid_cybernetic_specialist_naboo Mindt F'abul (Cybernetic Specialist) - humanoid - ep3/cyborg_engineer_naboo.iff Naboo 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 -
humanoid_cybernetic_specialist_tatooine Doctor Nssktkslis (Cybernetic Doctor) - humanoid - ep3/cyborg_engineer_tatooine.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 -
humanoid_daclif_gallamby Daclif Gallamby (the Diktat) daclif_gallamby humanoid - dressed_daclif_gallamby.iff Corellia 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 -
humanoid_daiv_dekven Daiv Dekven - humanoid Dantooine Pirate Outpost Herald dressed_noble_human_male_02.iff Dantooine 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 -
humanoid_daktar_bloodmoon Daktar Bloodmoon daktar_bloodmoon humanoid - dressed_fs_village_enemy_daktar.iff Dathomir sith_shadow sith_shadow 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 -
Expand Down
2 changes: 1 addition & 1 deletion serverdata/spawn/common_naboo.sdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -590,7 +590,7 @@ spawn_naboo_587 NABOO nab_theed_hospital AREA 6 -12.9 0.3 -2.6 -179 1 a nomad hu
spawn_naboo_588 NABOO nab_theed_hospital AREA 6 -18.3 0.3 -2.6 -151 1 a rancher humanoid_farmer_rancher INVULNERABLE N 100 100 City Theed 1 IDLE 0 0 - npc_sitting_chair 600
spawn_naboo_589 NABOO nab_theed_hospital AREA 6 -25.6 0.3 9.8 180 1 an assassin humanoid_assassin INVULNERABLE N 100 100 City Theed 1 IDLE 0 0 - npc_sitting_chair 600
spawn_naboo_590 NABOO nab_theed_hospital AREA 6 -20.5 0.3 9.8 -178 1 an entertainer humanoid_entertainer INVULNERABLE N 100 100 City Theed 1 IDLE 0 0 - npc_sitting_chair 600
spawn_naboo_591 NABOO nab_theed_hospital AREA 10 26.8 7.3 0.2 0 1 Aboo Aramflahad (Cybernetic Specialist) humanoid_cybernetic_specialist_naboo INVULNERABLE N 100 100 City Theed 1 LOITER 5 0 - idle 600
spawn_naboo_591 NABOO nab_theed_hospital AREA 10 26.8 7.3 0.2 0 1 Mindt F'abul (Cybernetic Specialist) humanoid_cybernetic_specialist_naboo INVULNERABLE N 100 100 City Theed 1 IDLE 0 0 - idle 600
spawn_naboo_592 NABOO nab_theed_hotel1 AREA 10 -23.5 1.6 -17.2 0 1 an Event Promoter humanoid_event_promoter INVULNERABLE N 100 100 City Theed 1 IDLE 0 0 - idle 600
spawn_naboo_593 NABOO nab_theed_hotel2 AREA 10 -23.5 1.6 -17.2 0 1 an Event Promoter humanoid_event_promoter INVULNERABLE N 100 100 City Theed 1 IDLE 0 0 - idle 600
spawn_naboo_594 NABOO nab_theed_palace PATROL 3 9 12 69.6 92 1 an RSF Palace guard humanoid_rsf_palace_guard ATTACKABLE N 21 30 City Theed 1 PATROL 0 patrol_naboo_3900 column idle 600
Expand Down
2 changes: 1 addition & 1 deletion serverdata/spawn/common_tatooine.sdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ spawn_tatooine_707 TATOOINE tat_world PATROL 0 3214.1 5.0 -4868.8 77 1 an R3 uni
spawn_tatooine_708 TATOOINE tat_world PATROL 0 3497.9 5.0 -5038.1 -21 1 a hermit humanoid_hermit INVULNERABLE N 100 100 City Mos Eisley 1 PATROL 0 patrol_tatooine_6100 column idle 600
spawn_tatooine_709 TATOOINE tat_world PATROL 0 3209.6 5.0 -4518.2 125 1 a highwayman humanoid_highwayman INVULNERABLE N 100 100 City Mos Eisley 1 PATROL 0 patrol_tatooine_6200 column idle 600
spawn_tatooine_710 TATOOINE tat_world PATROL 0 3380.5 5.0 -5018.1 -54 1 a businessman humanoid_businessman INVULNERABLE N 100 100 City Mos Eisley 1 PATROL 0 patrol_tatooine_8400 column idle 600
spawn_tatooine_711 TATOOINE tat_mosentha_hospital AREA 10 26.8 7.3 0.2 -91 1 Aboo Aramflahad (Cybernetic Specialist) humanoid_cybernetic_specialist_tatooine INVULNERABLE N 100 100 City Mos Entha 1 IDLE 0 0 - idle 600
spawn_tatooine_711 TATOOINE tat_mosentha_hospital AREA 10 26.8 7.3 0.2 -91 1 Doctor Nssktkslis (Cybernetic Doctor) humanoid_cybernetic_specialist_tatooine INVULNERABLE N 100 100 City Mos Entha 1 IDLE 0 0 - idle 600
spawn_tatooine_712 TATOOINE tat_mosentha_hospital AREA 2 18.0 0.3 1.8 -159 1 a commoner humanoid_commoner INVULNERABLE N 100 100 City Mos Entha 1 IDLE 0 0 - conversation 600
spawn_tatooine_713 TATOOINE tat_mosentha_hospital AREA 2 22.0 0.3 -7.2 1 1 a medic humanoid_medic INVULNERABLE N 100 100 City Mos Entha 1 IDLE 0 0 - npc_use_terminal_high 600
spawn_tatooine_714 TATOOINE tat_mosentha_hospital AREA 2 17.2 0.3 -0.1 51 1 a medic humanoid_medic INVULNERABLE N 100 100 City Mos Entha 1 IDLE 0 0 - npc_sitting_chair 600
Expand Down

0 comments on commit baa1c2e

Please sign in to comment.