Skip to content

Commit

Permalink
Merge pull request #1581 from Undercova/master
Browse files Browse the repository at this point in the history 
Content Update
  • Loading branch information
@Undercova
Undercova authored Jul 1, 2024
2 parents 3325681 + 623b07e commit e17537c
Show file tree
Hide file tree
Showing 10 changed files with 97 additions and 6 deletions.
3 changes: 3 additions & 0 deletions serverdata/conversation/cybernetics.sdb
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
conversation_id conversation_file
TEXT TEXT
cybernetics cybernetics/start
15 changes: 15 additions & 0 deletions serverdata/conversation/cybernetics/install.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"npcMessage": {
"file": "conversation/cyborg_install_naboo",
"key": "s_195",
"comment": "I see. I don't know where you got that, but I suppose I could go ahead and install it for you."
},
"playerResponses": [],
"requirements": [],
"events": [
{
"type": "show_sellable_items",
"args": {}
}
]
}
15 changes: 15 additions & 0 deletions serverdata/conversation/cybernetics/remove.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"npcMessage": {
"file": "conversation/cyborg_install_naboo",
"key": "s_42",
"comment": "What would you like for me to remove?"
},
"playerResponses": [],
"requirements": [],
"events": [
{
"type": "show_sellable_items",
"args": {}
}
]
}
15 changes: 15 additions & 0 deletions serverdata/conversation/cybernetics/repair.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
"npcMessage": {
"file": "conversation/cyborg_install_naboo",
"key": "s_46",
"comment": "I see. What do you need repaired?"
},
"playerResponses": [],
"requirements": [],
"events": [
{
"type": "show_sellable_items",
"args": {}
}
]
}
42 changes: 42 additions & 0 deletions serverdata/conversation/cybernetics/start.json
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"npcMessage": {
"file": "conversation/cyborg_install_naboo",
"key": "s_192",
"comment": "The Empire has banned the installation of cybernetic enhancements for non-emergency reasons. We don't have any cybernetic enhancements here that I could install."
},
"playerResponses": [
{
"playerMessage": {
"file": "conversation/cyborg_install_naboo",
"key": "s_34",
"comment": "Install cybernetics."
},
"next": "cybernetics/install"
},
{
"playerMessage": {
"file": "conversation/cyborg_install_naboo",
"key": "s_44",
"comment": "Repair cybernetics."
},
"next": "cybernetics/repair"
},
{
"playerMessage": {
"file": "conversation/cyborg_install_naboo",
"key": "s_40",
"comment": "Remove cybernetics."
},
"next": "cybernetics/remove"
}
],
"requirements": [],
"events": [
{
"type": "npc_animation",
"args": {
"animation": "survey"
}
}
]
}
1 change: 1 addition & 0 deletions serverdata/conversation/spawn_conversation_map.msdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ bartender.sdb TRUE
chassis_dealer.sdb TRUE
cloning_droid.sdb TRUE
commoner.sdb TRUE
cybernetics.sdb TRUE
junk_dealer.sdb TRUE
recruiter.sdb TRUE
droids.sdb TRUE
Expand Down
2 changes: 1 addition & 1 deletion serverdata/spawn/common_corellia.sdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ spawn_corellia_248 CORELLIA cor_coronet_hospital AREA 6 -15.1 0.3 10.0 -3 1 a me
spawn_corellia_249 CORELLIA cor_coronet_hospital AREA 6 -12.3 0.3 9.7 0 1 a medic humanoid_medic INVULNERABLE N 100 100 City Coronet 1 IDLE 0 0 - npc_sitting_chair 600
spawn_corellia_250 CORELLIA cor_coronet_hospital AREA 6 -12.4 0.3 -7.7 158 1 a medic humanoid_medic INVULNERABLE N 100 100 City Coronet 1 IDLE 0 0 - conversation 600
spawn_corellia_251 CORELLIA cor_coronet_hospital AREA 6 -13.1 0.3 -10.2 2 1 a traveller humanoid_traveller INVULNERABLE N 100 100 City Coronet 1 IDLE 0 0 - npc_sitting_chair 600
spawn_corellia_252 CORELLIA cor_coronet_hospital AREA 10 26.8 7.3 0.2 0 1 Aboo Aramflahad (Cybernetic Specialist) humanoid_cybernetic_specialist_corellia INVULNERABLE N 100 100 City Coronet 1 IDLE 0 0 - idle 600
spawn_corellia_252 CORELLIA cor_coronet_hospital AREA 10 26.8 7.3 0.2 0 1 Aboo Aramflahad (Cybernetic Specialist) humanoid_cybernetic_specialist_corellia INVULNERABLE N 100 100 City Coronet 1 IDLE 0 0 - idle cybernetics 600
spawn_corellia_253 CORELLIA cor_coronet_hotel AREA 4 7.4 1.0 -6.9 179 1 a businessman humanoid_businessman INVULNERABLE N 100 100 City Coronet 1 IDLE 0 0 - idle 600
spawn_corellia_254 CORELLIA cor_coronet_hotel AREA 4 7.4 1.0 -8.0 0 1 a Corellia Times investigator humanoid_corellia_times_investigator INVULNERABLE N 100 100 City Coronet 1 IDLE 0 0 - idle 600
spawn_corellia_255 CORELLIA cor_coronet_hotel AREA 5 24.3 1.3 10.0 -171 1 a bodyguard humanoid_bodyguard INVULNERABLE N 100 100 City Coronet 1 IDLE 0 0 - idle 600
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 Mindt F'abul (Cybernetic Specialist) humanoid_cybernetic_specialist_naboo INVULNERABLE N 100 100 City Theed 1 IDLE 0 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 cybernetics 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 Doctor Nssktkslis (Cybernetic Doctor) 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 cybernetics 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
6 changes: 3 additions & 3 deletions serverdata/spawn/instance_kashyyyk_myyydril.sdb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@ kashyyyk_myyydril_97 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 33 231.4 -123
kashyyyk_myyydril_98 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 33 230.4 -123.5 -235.9 -41 1 Kivvaaa (Patrol Leader) humanoid_kashyyyk_myyydril_kivvaaa INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_99 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 33 231.0 -123.4 -239.3 -41 1 Tala'oree (Patrol Squad) humanoid_kashyyyk_myyydril_talaoree INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_100 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 228.0 -123.1 -299.5 -57 1 Chasuli (Myyydril Villager) humanoid_kashyyyk_myyydril_chasuli INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_101 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 208.9 -122.8 -323.0 34 1 Compactor 3000 (Junk Collector) humanoid_kashyyyk_myyydril_compactor INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_101 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 208.9 -122.8 -323.0 34 1 Compactor 3000 (Junk Collector) humanoid_kashyyyk_myyydril_compactor INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle junk_dealer_wookiee 600
kashyyyk_myyydril_102 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 188.0 -123.3 -356.3 -52 1 Rhirren (Myyydril Guard) humanoid_kashyyyk_myyydril_greeter_guard INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_103 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 178.7 -117.3 -373.5 7 1 Echrhin Isdan (Mystic Shaman) humanoid_kashyyyk_myyydril_isdan INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_104 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 215.8 -123.5 -309.6 52 1 Ivesa (Myyydril Villager) humanoid_kashyyyk_myyydril_ivesa INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_105 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 108.0 -123.0 -308.0 160 1 Kallaarac (Myyydril Chief) humanoid_kashyyyk_myyydril_kallaarac INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_106 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 134.0 -155.0 -294.0 31 1 Doctor Kinesworthy (Cybernetics Doctor) humanoid_kashyyyk_myyydril_kinesworthy INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_106 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 134.0 -155.0 -294.0 31 1 Doctor Kinesworthy (Cybernetics Doctor) humanoid_kashyyyk_myyydril_kinesworthy INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle cybernetics 600
kashyyyk_myyydril_107 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 225.3 -110.4 -342.6 -138 1 Kirrir (Cantina Girl) humanoid_kashyyyk_myyydril_kirrir INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_108 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 114.4 -123.5 -319.0 -85 1 Ildisa (Myyydril Mystic) humanoid_kashyyyk_myyydril_mystic INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_109 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 34 224.4 -111.6 -354.0 -69 1 Nawika (Cantina Patron) humanoid_kashyyyk_myyydril_nawika INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
Expand Down Expand Up @@ -248,7 +248,7 @@ kashyyyk_myyydril_245 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 54 -295.9 -1
kashyyyk_myyydril_246 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 54 -324.8 -177.7 207.5 0 1 an urnsor'is thrasher creature_kashyyyk_urnsoris_thrasher AGGRESSIVE E 46 55 dungeon Myyydril Cave 1 TURN 0 0 - idle 600
kashyyyk_myyydril_247 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 54 -346.5 -163.8 207.8 0 1 an urnsor'is thrasher creature_kashyyyk_urnsoris_thrasher AGGRESSIVE E 46 55 dungeon Myyydril Cave 1 TURN 0 0 - idle 600
kashyyyk_myyydril_248 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 55 -361.0 -145.0 169.0 12 1 Model 3-NIi droid_myyydril_model_3nli_lorn_servant INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_249 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 57 -217.7 -92.8 149.2 -87 1 Treun Lorn (Cybernetic Doctor) humanoid_kashyyyk_myyydril_lorn INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle 600
kashyyyk_myyydril_249 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 57 -217.7 -92.8 149.2 -87 1 Treun Lorn (Cybernetic Doctor) humanoid_kashyyyk_myyydril_lorn INVULNERABLE N 100 100 dungeon Myyydril Cave 1 IDLE 0 0 - idle cybernetics 600
kashyyyk_myyydril_250 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 6 33.7 -22.9 -63.9 0 1 an uwari beetle creature_kashyyyk_beetle_uwari AGGRESSIVE N 46 55 dungeon Myyydril Cave 1 TURN 0 0 - idle 600
kashyyyk_myyydril_251 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 61 -163.8 -66.1 56.3 0 1 a forgotten creation droid_forgotten_creation AGGRESSIVE E 46 55 dungeon Myyydril Cave 1 TURN 0 0 - idle 600
kashyyyk_myyydril_252 KASHYYYK_POB_DUNGEONS kas_pob_myyydril_1 AREA 61 -143.4 -68.1 49.8 0 1 a forgotten creation droid_forgotten_creation AGGRESSIVE E 46 55 dungeon Myyydril Cave 1 TURN 0 0 - idle 600
Expand Down

0 comments on commit e17537c

Please sign in to comment.