From 8bb2aa7f63c46f05b365e3a2e851df6a717f7998 Mon Sep 17 00:00:00 2001 From: Undercova Date: Wed, 13 Jan 2021 08:26:15 +0100 Subject: [PATCH] Updated conversation of WT receptionist to new format/layout Updated conversation of Barada to new format/layout Updated conversation of Niko to new format/layout Updated conversation of Purvis to new format/layout --- ...ine_dungeon_white_thranta_receptionist.sdb | 2 +- .../{start.json => default.json} | 2 +- .../handleBranch1/s_7.json | 17 ++++++++++++ .../s_12.json} | 0 .../start_condition_cargoDelivery2.json | 26 ++++++++++++++++++ .../tatooine_jabbas_palace_barada.sdb | 2 +- .../{start.json => default.json} | 0 .../handleBranch5/s_13.json | 27 +++++++++++++++++++ .../handleBranch5/s_40.json | 10 +++++++ .../handleBranch6/s_17.json | 27 +++++++++++++++++++ .../handleBranch6/s_36.json | 10 +++++++ .../handleBranch7/s_26.json | 27 +++++++++++++++++++ .../handleBranch7/s_34.json | 10 +++++++ .../handleBranch8/s_30.json | 10 +++++++ .../handleBranch8/s_32.json | 10 +++++++ .../start_condition_completedBarada.json | 10 +++++++ .../start_condition_completedPorcellus.json | 27 +++++++++++++++++++ .../start_condition_findingParts.json | 10 +++++++ .../start_condition_killingCompetition.json | 17 ++++++++++++ .../start_condition_readyToReturn.json | 17 ++++++++++++ .../tatooine_mos_eisley_dunir.sdb | 2 +- .../{start.json => default.json} | 0 .../{ => handleBranch1}/s_56.json | 0 .../{ => handleBranch1}/s_57.json | 4 +-- .../{ => handleBranch1}/s_58.json | 0 .../{ => handleBranch10}/s_53.json | 0 .../{ => handleBranch12}/s_35.json | 0 .../{ => handleBranch14}/s_36.json | 0 .../{ => handleBranch16}/s_82.json | 4 +-- .../{ => handleBranch17}/s_50.json | 2 +- .../{ => handleBranch17}/s_71.json | 2 +- .../{ => handleBranch18}/s_44.json | 4 +-- .../handleBranch19/s_50.json | 19 +++++++++++++ .../handleBranch19/s_71.json | 26 ++++++++++++++++++ .../{ => handleBranch20}/s_69.json | 0 .../{ => handleBranch21}/s_75.json | 0 .../{ => handleBranch4}/s_62.json | 0 .../{ => handleBranch4}/s_63.json | 0 .../{ => handleBranch7}/s_28.json | 2 +- .../{ => handleBranch8}/s_45.json | 2 +- .../{ => handleBranch9}/s_51.json | 2 +- ...=> start_condition_gotoDunirComplete.json} | 2 +- ...=> start_condition_nikoQuestComplete.json} | 2 +- ...k1.json => start_condition_sdOnTask1.json} | 2 +- ...k2.json => start_condition_sdOnTask2.json} | 2 +- ...n => start_condition_sdQuestComplete.json} | 6 ++--- ...n => start_condition_sdTaskCompleted.json} | 2 +- .../conversation/tatooine_mos_eisley_niko.sdb | 2 +- .../{start.json => default.json} | 0 .../{ => handleBranch10}/s_61.json | 2 +- .../{ => handleBranch11}/s_29.json | 2 +- .../handleBranch13/s_29.json | 19 +++++++++++++ .../{ => handleBranch14}/s_33.json | 2 +- .../{ => handleBranch15}/s_38.json | 2 +- .../{ => handleBranch16}/s_45.json | 0 .../{ => handleBranch3}/s_16.json | 2 +- .../{ => handleBranch4}/s_18.json | 2 +- .../{ => handleBranch5}/s_50.json | 2 +- .../{ => handleBranch6}/s_67.json | 0 .../{ => handleBranch8}/s_40.json | 0 ...=> start_condition_NPEHandoffAbandon.json} | 2 +- ...json => start_condition_OnNPEHandoff.json} | 2 +- ...son => start_condition_alreadyOnNiko.json} | 0 ...cker.json => start_condition_blocker.json} | 0 ...k.json => start_condition_nikoOnTask.json} | 2 +- ...=> start_condition_nikoQuestComplete.json} | 0 ... => start_condition_nikoTaskComplete.json} | 2 +- .../tatooine_mos_eisley_purvis.sdb | 2 +- .../{start.json => default.json} | 14 +++------- .../{ => handleBranch10}/s_229.json | 2 +- .../{ => handleBranch10}/s_237.json | 4 +-- .../{ => handleBranch11}/s_235.json | 0 .../{ => handleBranch12}/s_243.json | 2 +- .../{ => handleBranch12}/s_248.json | 0 .../{ => handleBranch15}/s_254.json | 4 +-- .../{ => handleBranch15}/s_256.json | 4 +-- .../{ => handleBranch15}/s_44.json | 0 .../{ => handleBranch16}/s_260.json | 4 +-- .../{ => handleBranch16}/s_272.json | 2 +- .../{ => handleBranch17}/s_264.json | 0 .../{ => handleBranch17}/s_268.json | 0 .../{ => handleBranch20}/s_276.json | 4 +-- .../{ => handleBranch5}/s_200.json | 4 +-- .../{ => handleBranch5}/s_203.json | 4 +-- .../{ => handleBranch6}/s_208.json | 4 +-- .../{ => handleBranch6}/s_67.json | 0 .../{ => handleBranch7}/s_213.json | 2 +- .../{ => handleBranch7}/s_69.json | 0 .../{ => handleBranch8}/s_219.json | 4 +-- .../{ => handleBranch9}/s_224.json | 4 +-- .../{ => handleBranch9}/s_250.json | 0 ...tart_condition_completedCombatQuests.json} | 0 ...=> start_condition_completedOneRecon.json} | 0 ...on => start_condition_completedRecon.json} | 4 +-- ...r.json => start_condition_goSeeMayor.json} | 9 +------ ... => start_condition_isOnCombatQuests.json} | 0 ...=> start_condition_needsACombatQuest.json} | 2 +- 97 files changed, 386 insertions(+), 82 deletions(-) rename serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/{start.json => default.json} (85%) create mode 100644 serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/handleBranch1/s_7.json rename serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/{no_appointment.json => handleBranch3/s_12.json} (100%) create mode 100644 serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/start_condition_cargoDelivery2.json rename serverdata/nge/conversation/tatooine_jabbas_palace_barada/{start.json => default.json} (100%) create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch5/s_13.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch5/s_40.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch6/s_17.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch6/s_36.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch7/s_26.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch7/s_34.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch8/s_30.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch8/s_32.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_completedBarada.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_completedPorcellus.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_findingParts.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_killingCompetition.json create mode 100644 serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_readyToReturn.json rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{start.json => default.json} (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch1}/s_56.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch1}/s_57.json (84%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch1}/s_58.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch10}/s_53.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch12}/s_35.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch14}/s_36.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch16}/s_82.json (85%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch17}/s_50.json (87%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch17}/s_71.json (89%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch18}/s_44.json (84%) create mode 100644 serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch19/s_50.json create mode 100644 serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch19/s_71.json rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch20}/s_69.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch21}/s_75.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch4}/s_62.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch4}/s_63.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch7}/s_28.json (87%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch8}/s_45.json (88%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{ => handleBranch9}/s_51.json (87%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{condition_gotoDunirComplete.json => start_condition_gotoDunirComplete.json} (85%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{condition_nikoQuestComplete.json => start_condition_nikoQuestComplete.json} (86%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{condition_sdOnTask1.json => start_condition_sdOnTask1.json} (86%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{condition_sdOnTask2.json => start_condition_sdOnTask2.json} (87%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{condition_sdQuestComplete.json => start_condition_sdQuestComplete.json} (80%) rename serverdata/nge/conversation/tatooine_mos_eisley_dunir/{condition_sdTaskCompleted.json => start_condition_sdTaskCompleted.json} (88%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{start.json => default.json} (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch10}/s_61.json (86%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch11}/s_29.json (88%) create mode 100644 serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch13/s_29.json rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch14}/s_33.json (87%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch15}/s_38.json (88%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch16}/s_45.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch3}/s_16.json (88%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch4}/s_18.json (90%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch5}/s_50.json (86%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch6}/s_67.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{ => handleBranch8}/s_40.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{condition_NPEHandoffAbandon.json => start_condition_NPEHandoffAbandon.json} (85%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{condition_OnNPEHandoff.json => start_condition_OnNPEHandoff.json} (87%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{condition_alreadyOnNiko.json => start_condition_alreadyOnNiko.json} (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{condition_blocker.json => start_condition_blocker.json} (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{condition_nikoOnTask.json => start_condition_nikoOnTask.json} (85%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{condition_nikoQuestComplete.json => start_condition_nikoQuestComplete.json} (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_niko/{condition_nikoTaskComplete.json => start_condition_nikoTaskComplete.json} (89%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{start.json => default.json} (72%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch10}/s_229.json (87%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch10}/s_237.json (83%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch11}/s_235.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch12}/s_243.json (84%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch12}/s_248.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch15}/s_254.json (84%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch15}/s_256.json (85%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch15}/s_44.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch16}/s_260.json (84%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch16}/s_272.json (87%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch17}/s_264.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch17}/s_268.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch20}/s_276.json (84%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch5}/s_200.json (83%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch5}/s_203.json (81%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch6}/s_208.json (84%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch6}/s_67.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch7}/s_213.json (84%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch7}/s_69.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch8}/s_219.json (82%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch9}/s_224.json (83%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{ => handleBranch9}/s_250.json (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{condition_completedCombatQuests.json => start_condition_completedCombatQuests.json} (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{condition_completedOneRecon.json => start_condition_completedOneRecon.json} (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{condition_completedRecon.json => start_condition_completedRecon.json} (85%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{condition_goSeeMayor.json => start_condition_goSeeMayor.json} (71%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{condition_isOnCombatQuests.json => start_condition_isOnCombatQuests.json} (100%) rename serverdata/nge/conversation/tatooine_mos_eisley_purvis/{condition_needsACombatQuest.json => start_condition_needsACombatQuest.json} (87%) diff --git a/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist.sdb b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist.sdb index acb5b9daa..a3235a603 100644 --- a/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist.sdb +++ b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist.sdb @@ -1,3 +1,3 @@ conversation_id conversation_file TEXT TEXT -tatooine_dungeon_white_thranta_receptionist tatooine_dungeon_white_thranta_receptionist/start \ No newline at end of file +tatooine_dungeon_white_thranta_receptionist tatooine_dungeon_white_thranta_receptionist/default \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/start.json b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/default.json similarity index 85% rename from serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/start.json rename to serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/default.json index e59156546..f664ae1cc 100644 --- a/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/start.json +++ b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/default.json @@ -11,7 +11,7 @@ "key": "s_12", "comment": "No, I don't." }, - "next": "tatooine_dungeon_white_thranta_receptionist/no_appointment" + "next": "tatooine_dungeon_white_thranta_receptionist/handleBranch3/s_12" }, ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/handleBranch1/s_7.json b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/handleBranch1/s_7.json new file mode 100644 index 000000000..756b02010 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/handleBranch1/s_7.json @@ -0,0 +1,17 @@ +{ + "npcMessage": { + "file": "conversation/tatooine_eisley_wh_receptionist", + "key": "s_8", + "comment": "I have that package right here. Here you go, and I have transmitted the pick up code to Dunir. Have a nice day!" + }, + "playerResponses": [], + "requirements": [], + "events": [ + { + "type": "npc_animation", + "args": { + "animation": "explain" + } + } + ] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/no_appointment.json b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/handleBranch3/s_12.json similarity index 100% rename from serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/no_appointment.json rename to serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/handleBranch3/s_12.json diff --git a/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/start_condition_cargoDelivery2.json b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/start_condition_cargoDelivery2.json new file mode 100644 index 000000000..6117e50e8 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_dungeon_white_thranta_receptionist/start_condition_cargoDelivery2.json @@ -0,0 +1,26 @@ +{ + "npcMessage": { + "file": "conversation/tatooine_eisley_wh_receptionist", + "key": "s_6", + "comment": "Hi, do you have an appointment?" + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/tatooine_eisley_wh_receptionist", + "key": "s_7", + "comment": "I am here to pick up a package for Dunir." + }, + "next": "tatooine_dungeon_white_thranta_receptionist/handleBranch1/s_7" + }, + ], + "requirements": [], + "events": [ + { + "type": "npc_animation", + "args": { + "animation": "greet" + } + } + ] +} diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada.sdb b/serverdata/nge/conversation/tatooine_jabbas_palace_barada.sdb index 19a1697e5..a5f19c798 100644 --- a/serverdata/nge/conversation/tatooine_jabbas_palace_barada.sdb +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada.sdb @@ -1,3 +1,3 @@ conversation_id conversation_file TEXT TEXT -tatooine_jabbas_palace_barada tatooine_jabbas_palace_barada/start \ No newline at end of file +tatooine_jabbas_palace_barada tatooine_jabbas_palace_barada/default \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/default.json similarity index 100% rename from serverdata/nge/conversation/tatooine_jabbas_palace_barada/start.json rename to serverdata/nge/conversation/tatooine_jabbas_palace_barada/default.json diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch5/s_13.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch5/s_13.json new file mode 100644 index 000000000..83b87902a --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch5/s_13.json @@ -0,0 +1,27 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_15", + "comment": "Good, good. Let's get started then. Valarian's racers are cheating. There's no way they're building better vehicles than me. Find out what they're doing." + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/barada", + "key": "s_17", + "comment": "Isn't pod racing illegal?" + }, + "next": "tatooine_jabbas_palace_barada/handleBranch6/s_17" + }, + { + "playerMessage": { + "file": "conversation/barada", + "key": "s_36", + "comment": "What do you need me to do?" + }, + "next": "tatooine_jabbas_palace_barada/handleBranch6/s_36" + } + ], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch5/s_40.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch5/s_40.json new file mode 100644 index 000000000..bade9365a --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch5/s_40.json @@ -0,0 +1,10 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_42", + "comment": "Then what are you standing around here for? It's dangerous here. I mean look at us. You might wanna find an exit." + }, + "playerResponses": [], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch6/s_17.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch6/s_17.json new file mode 100644 index 000000000..ce1a5d2d2 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch6/s_17.json @@ -0,0 +1,27 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_24", + "comment": "What are you, some kind of Imperial spy? Everything we do around here is illegal. Unless you really are an Imperial spy, in which case I was kidding. No, wait, Jabba's paid off the Imperials, so it doesn't matter. What were we talking about?" + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/barada", + "key": "s_26", + "comment": "Where do you hold these pod races?" + }, + "next": "tatooine_jabbas_palace_barada/handleBranch7/s_26" + }, + { + "playerMessage": { + "file": "conversation/barada", + "key": "s_34", + "comment": "I just need to know what to do." + }, + "next": "tatooine_jabbas_palace_barada/handleBranch7/s_34" + } + ], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch6/s_36.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch6/s_36.json new file mode 100644 index 000000000..fb2b23fd3 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch6/s_36.json @@ -0,0 +1,10 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_38", + "comment": "Find some of Valarian's pod racers and see what they have.Find some of Valarian's pod racers and see what they have." + }, + "playerResponses": [], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch7/s_26.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch7/s_26.json new file mode 100644 index 000000000..89c64f4a0 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch7/s_26.json @@ -0,0 +1,27 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_28", + "comment": "Don't concern yourself with everything at once. All you need to know is what I want you to do, and then I just need you to do it. + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/barada", + "key": "s_30", + "comment": "What should I do?" + }, + "next": "tatooine_jabbas_palace_barada/handleBranch8/s_30" + }, + { + "playerMessage": { + "file": "conversation/barada", + "key": "s_32", + "comment": "I don't like this. I'm leaving." + }, + "next": "tatooine_jabbas_palace_barada/handleBranch8/s_32" + } + ], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch7/s_34.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch7/s_34.json new file mode 100644 index 000000000..1136c2b0f --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch7/s_34.json @@ -0,0 +1,10 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_38", + "comment": "Find some of Valarian's pod racers and see what they have." + }, + "playerResponses": [], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch8/s_30.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch8/s_30.json new file mode 100644 index 000000000..1136c2b0f --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch8/s_30.json @@ -0,0 +1,10 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_38", + "comment": "Find some of Valarian's pod racers and see what they have." + }, + "playerResponses": [], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch8/s_32.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch8/s_32.json new file mode 100644 index 000000000..bade9365a --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/handleBranch8/s_32.json @@ -0,0 +1,10 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_42", + "comment": "Then what are you standing around here for? It's dangerous here. I mean look at us. You might wanna find an exit." + }, + "playerResponses": [], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_completedBarada.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_completedBarada.json new file mode 100644 index 000000000..e323a0476 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_completedBarada.json @@ -0,0 +1,10 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_4", + "comment": "I heard through the grapevine that Lady Valarian is really mad at the loss of her pod racer champion. Well done!" + }, + "playerResponses": [], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_completedPorcellus.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_completedPorcellus.json new file mode 100644 index 000000000..43ad1f1b6 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_completedPorcellus.json @@ -0,0 +1,27 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_11", + "comment": "Porcellus says you're good. He told you I needed help? I do. Someone with a steady hand and steady nerves. Is that you?" + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/barada", + "key": "s_13", + "comment": "Yeah, that's me." + }, + "next": "tatooine_jabbas_palace_barada/handleBranch5/s_13", + }, + { + "playerMessage": { + "file": "conversation/barada", + "key": "s_40", + "comment": "No. That's not me at all." + }, + "next": "tatooine_jabbas_palace_barada/handleBranch5/s_40" + } + ], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_findingParts.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_findingParts.json new file mode 100644 index 000000000..3c06e8705 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_findingParts.json @@ -0,0 +1,10 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_19", + "comment": "Have you found any more of those suspicious engine parts Valarian's been using?" + }, + "playerResponses": [], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_killingCompetition.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_killingCompetition.json new file mode 100644 index 000000000..5221d07f1 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_killingCompetition.json @@ -0,0 +1,17 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_20", + "comment": "I thought I sent you out to take care of our competition. You know, 'take care'...do I have to spell it out for you?" + }, + "playerResponses": [], + "requirements": [], + "events": [ + { + "type": "npc_animation", + "args": { + "animation": "point_away" + } + } + ] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_readyToReturn.json b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_readyToReturn.json new file mode 100644 index 000000000..41522c0e0 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_jabbas_palace_barada/start_condition_readyToReturn.json @@ -0,0 +1,17 @@ +{ + "npcMessage": { + "file": "conversation/barada", + "key": "s_23", + "comment": "This is fantastic. I'm going to give you this. It's a customization kit for your vehicle. We have hundreds of them lying around, so I don't really feel bad about giving you one. Oh, I should have kept that last part to myself, shouldn't I? Oh well. Hey, go see Bib Fortuna. He's got something to talk to you about." + }, + "playerResponses": [], + "requirements": [], + "events": [ + { + "type": "npc_animation", + "args": { + "animation": "heal_other" + } + } + ] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir.sdb b/serverdata/nge/conversation/tatooine_mos_eisley_dunir.sdb index a28659362..c0fefa940 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir.sdb +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir.sdb @@ -1,3 +1,3 @@ conversation_id conversation_file TEXT TEXT -tatooine_mos_eisley_dunir tatooine_mos_eisley_dunir/start \ No newline at end of file +tatooine_mos_eisley_dunir tatooine_mos_eisley_dunir/default \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/default.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/start.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/default.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_56.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch1/s_56.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_56.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch1/s_56.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_57.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch1/s_57.json similarity index 84% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_57.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch1/s_57.json index 54a4fbe69..d28f28a52 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_57.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch1/s_57.json @@ -11,7 +11,7 @@ "key": "s_62", "comment": "No, I just haven't been able to make time to talk to him yet." }, - "next": "tatooine_mos_eisley_dunir/s_62" + "next": "tatooine_mos_eisley_dunir/handleBranch4/s_62" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_63", "comment": "Yes, that would be helpful." }, - "next": "tatooine_mos_eisley_dunir/s_63" + "next": "tatooine_mos_eisley_dunir/handleBranch4/s_63" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_58.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch1/s_58.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_58.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch1/s_58.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_53.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch10/s_53.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_53.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch10/s_53.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_35.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch12/s_35.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_35.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch12/s_35.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_36.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch14/s_36.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_36.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch14/s_36.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_82.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch16/s_82.json similarity index 85% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_82.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch16/s_82.json index aa095bb3a..c637c8a9e 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_82.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch16/s_82.json @@ -11,7 +11,7 @@ "key": "s_50", "comment": "Ok, but you had better have my cash when I return." }, - "next": "tatooine_mos_eisley_dunir/s_50" + "next": "tatooine_mos_eisley_dunir/handleBranch19/s_50" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_71", "comment": "Maybe. What's in the package?" }, - "next": "tatooine_mos_eisley_dunir/s_71" + "next": "tatooine_mos_eisley_dunir/handleBranch19/s_71" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_50.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch17/s_50.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_50.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch17/s_50.json index e32031ca1..8f515ba98 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_50.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch17/s_50.json @@ -11,7 +11,7 @@ "key": "s_69", "comment": "Sure, let's do this then." }, - "next": "tatooine_mos_eisley_dunir/s_69" + "next": "tatooine_mos_eisley_dunir/handleBranch20/s_69" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_71.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch17/s_71.json similarity index 89% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_71.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch17/s_71.json index 0b5912dac..9c7b63350 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_71.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch17/s_71.json @@ -11,7 +11,7 @@ "key": "s_75", "comment": "Well then, I'll take care of it for you." }, - "next": "tatooine_mos_eisley_dunir/s_75" + "next": "tatooine_mos_eisley_dunir/handleBranch21/s_75" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_44.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch18/s_44.json similarity index 84% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_44.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch18/s_44.json index d2302b07c..e0397de8d 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_44.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch18/s_44.json @@ -11,7 +11,7 @@ "key": "s_50", "comment": "k, but you had better have my cash when I return." }, - "next": "tatooine_mos_eisley_dunir/s_50" + "next": "tatooine_mos_eisley_dunir/handleBranch19/s_50" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_71", "comment": "Maybe. What's in the package?" }, - "next": "tatooine_mos_eisley_dunir/s_71" + "next": "tatooine_mos_eisley_dunir/handleBranch19/s_71" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch19/s_50.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch19/s_50.json new file mode 100644 index 000000000..8f515ba98 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch19/s_50.json @@ -0,0 +1,19 @@ +{ + "npcMessage": { + "file": "conversation/tatooine_eisley_dunir", + "key": "s_67", + "comment": "Not a problem, I'll even drop it in your account when I get word it's been delivered. How does that sound?" + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/tatooine_eisley_dunir", + "key": "s_69", + "comment": "Sure, let's do this then." + }, + "next": "tatooine_mos_eisley_dunir/handleBranch20/s_69" + } + ], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch19/s_71.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch19/s_71.json new file mode 100644 index 000000000..9c7b63350 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch19/s_71.json @@ -0,0 +1,26 @@ +{ + "npcMessage": { + "file": "conversation/tatooine_eisley_dunir", + "key": "s_73", + "comment": "I don't have a clue, but I have been assured it contains nothing illegal or dangerous." + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/tatooine_eisley_dunir", + "key": "s_75", + "comment": "Well then, I'll take care of it for you." + }, + "next": "tatooine_mos_eisley_dunir/handleBranch21/s_75" + } + ], + "requirements": [], + "events": [ + { + "type": "npc_animation", + "args": { + "animation": "laugh" + } + } + ] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_69.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch20/s_69.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_69.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch20/s_69.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_75.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch21/s_75.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_75.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch21/s_75.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_62.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch4/s_62.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_62.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch4/s_62.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_63.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch4/s_63.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_63.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch4/s_63.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_28.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch7/s_28.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_28.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch7/s_28.json index 78b7809ce..2225e704e 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_28.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch7/s_28.json @@ -11,7 +11,7 @@ "key": "s_45", "comment": "Got any other jobs?" }, - "next": "tatooine_mos_eisley_dunir/s_45" + "next": "tatooine_mos_eisley_dunir/handleBranch8/s_45" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_45.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch8/s_45.json similarity index 88% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_45.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch8/s_45.json index c5e11b8fc..70631b9ab 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_45.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch8/s_45.json @@ -11,7 +11,7 @@ "key": "s_51", "comment": "Where can I find this Reimos?" }, - "next": "tatooine_mos_eisley_dunir/s_51" + "next": "tatooine_mos_eisley_dunir/handleBranch9/s_51" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_51.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch9/s_51.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_51.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch9/s_51.json index f63a7f87e..5e8b0052c 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/s_51.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/handleBranch9/s_51.json @@ -11,7 +11,7 @@ "key": "s_53", "comment": "Thanks." }, - "next": "tatooine_mos_eisley_dunir/s_53" + "next": "tatooine_mos_eisley_dunir/handleBranch10/s_53" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_gotoDunirComplete.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_gotoDunirComplete.json similarity index 85% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_gotoDunirComplete.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_gotoDunirComplete.json index 760e4a1a8..0f8028e3a 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_gotoDunirComplete.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_gotoDunirComplete.json @@ -11,7 +11,7 @@ "key": "s_82", "comment": "No, I need the information on the delivery again." }, - "next": "tatooine_mos_eisley_dunir/s_82" + "next": "tatooine_mos_eisley_dunir/handleBranch16/s_82" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_nikoQuestComplete.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_nikoQuestComplete.json similarity index 86% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_nikoQuestComplete.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_nikoQuestComplete.json index f41a06906..1159dd1d8 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_nikoQuestComplete.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_nikoQuestComplete.json @@ -11,7 +11,7 @@ "key": "s_44", "comment": "I'm always interested in credits; fast, slow or otherwise." }, - "next": "tatooine_mos_eisley_dunir/s_44" + "next": "tatooine_mos_eisley_dunir/handleBranch18/s_44" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdOnTask1.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdOnTask1.json similarity index 86% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdOnTask1.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdOnTask1.json index af835a167..b0acca70a 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdOnTask1.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdOnTask1.json @@ -11,7 +11,7 @@ "key": "s_36", "comment": "Going there now." }, - "next": "tatooine_mos_eisley_dunir/s_36" + "next": "tatooine_mos_eisley_dunir/handleBranch14/s_36" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdOnTask2.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdOnTask2.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdOnTask2.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdOnTask2.json index 61d5a900f..e81306430 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdOnTask2.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdOnTask2.json @@ -11,7 +11,7 @@ "key": "s_35", "comment": "I'm on my way." }, - "next": "tatooine_mos_eisley_dunir/s_35" + "next": "tatooine_mos_eisley_dunir/handleBranch12/s_35" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdQuestComplete.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdQuestComplete.json similarity index 80% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdQuestComplete.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdQuestComplete.json index 6dcd8e3d9..b6a0f640f 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdQuestComplete.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdQuestComplete.json @@ -11,7 +11,7 @@ "key": "s_56", "comment": "Yes, I am working for him." }, - "next": "tatooine_mos_eisley_dunir/s_56" + "next": "tatooine_mos_eisley_dunir/handleBranch1/s_56" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_58", "comment": "Yea, I've already completed what he needed me to do." }, - "next": "tatooine_mos_eisley_dunir/s_58" + "next": "tatooine_mos_eisley_dunir/handleBranch1/s_58" }, { "playerMessage": { @@ -27,7 +27,7 @@ "key": "s_57", "comment": "No, not yet." }, - "next": "tatooine_mos_eisley_dunir/s_57" + "next": "tatooine_mos_eisley_dunir/handleBranch1/s_57" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdTaskCompleted.json b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdTaskCompleted.json similarity index 88% rename from serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdTaskCompleted.json rename to serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdTaskCompleted.json index d43011e04..d97b4eb89 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_dunir/condition_sdTaskCompleted.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_dunir/start_condition_sdTaskCompleted.json @@ -11,7 +11,7 @@ "key": "s_28", "comment": "Thanks, now about that fee you promised me." }, - "next": "tatooine_mos_eisley_dunir/s_28" + "next": "tatooine_mos_eisley_dunir/handleBranch7/s_28" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko.sdb b/serverdata/nge/conversation/tatooine_mos_eisley_niko.sdb index daf4fa037..826523ba7 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko.sdb +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko.sdb @@ -1,3 +1,3 @@ conversation_id conversation_file TEXT TEXT -tatooine_mos_eisley_niko tatooine_mos_eisley_niko/start \ No newline at end of file +tatooine_mos_eisley_niko tatooine_mos_eisley_niko/default \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/start.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/default.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/start.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/default.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_61.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch10/s_61.json similarity index 86% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_61.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch10/s_61.json index 7ac1d5319..f4c33cc7b 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_61.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch10/s_61.json @@ -11,7 +11,7 @@ "key": "s_29", "comment": "What did they do?" }, - "next": "tatooine_mos_eisley_niko/s_29" + "next": "tatooine_mos_eisley_niko/handleBranch13/s_29" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_29.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch11/s_29.json similarity index 88% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_29.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch11/s_29.json index 143761e97..ca6b53b41 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_29.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch11/s_29.json @@ -11,7 +11,7 @@ "key": "s_33", "comment": "What about the gangers that have them?" }, - "next": "tatooine_mos_eisley_niko/s_33" + "next": "tatooine_mos_eisley_niko/handleBranch14/s_33" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch13/s_29.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch13/s_29.json new file mode 100644 index 000000000..ca6b53b41 --- /dev/null +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch13/s_29.json @@ -0,0 +1,19 @@ +{ + "npcMessage": { + "file": "conversation/tatooine_eisley_niko", + "key": "s_31", + "comment": "They killed one of Jabba's couriers and stole some valuable Old Republic coins. Jabba wants them back." + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/tatooine_eisley_niko", + "key": "s_33", + "comment": "What about the gangers that have them?" + }, + "next": "tatooine_mos_eisley_niko/handleBranch14/s_33" + } + ], + "requirements": [], + "events": [] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_33.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch14/s_33.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_33.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch14/s_33.json index ac9ee5fa9..d62ebcc54 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_33.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch14/s_33.json @@ -11,7 +11,7 @@ "key": "s_38", "comment": "You want me to kill them in cold blood?" }, - "next": "tatooine_mos_eisley_niko/s_38" + "next": "tatooine_mos_eisley_niko/handleBranch15/s_38" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_38.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch15/s_38.json similarity index 88% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_38.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch15/s_38.json index 39336af65..e3ceec673 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_38.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch15/s_38.json @@ -11,7 +11,7 @@ "key": "s_45", "comment": "I'll see if I can get your coins back." }, - "next": "tatooine_mos_eisley_niko/s_45" + "next": "tatooine_mos_eisley_niko/handleBranch16/s_45" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_45.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch16/s_45.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_45.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch16/s_45.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_16.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch3/s_16.json similarity index 88% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_16.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch3/s_16.json index d2f1c957a..5395bf368 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_16.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch3/s_16.json @@ -11,7 +11,7 @@ "key": "s_18", "comment": "So what if I refuse?" }, - "next": "tatooine_mos_eisley_niko/s_18" + "next": "tatooine_mos_eisley_niko/handleBranch4/s_18" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_18.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch4/s_18.json similarity index 90% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_18.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch4/s_18.json index 2c92938ac..dbadf9a41 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_18.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch4/s_18.json @@ -11,7 +11,7 @@ "key": "s_50", "comment": "This deal is getting worse all the time." }, - "next": "tatooine_mos_eisley_niko/s_50" + "next": "tatooine_mos_eisley_niko/handleBranch5/s_50" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_50.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch5/s_50.json similarity index 86% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_50.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch5/s_50.json index 814d7b138..37ed353c8 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_50.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch5/s_50.json @@ -11,7 +11,7 @@ "key": "s_67", "comment": "Got it." }, - "next": "tatooine_mos_eisley_niko/s_67" + "next": "tatooine_mos_eisley_niko/handleBranch6/s_67" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_67.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch6/s_67.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_67.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch6/s_67.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/s_40.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch8/s_40.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/s_40.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/handleBranch8/s_40.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_NPEHandoffAbandon.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_NPEHandoffAbandon.json similarity index 85% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_NPEHandoffAbandon.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_NPEHandoffAbandon.json index fd64eecd9..bad1db3fd 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_NPEHandoffAbandon.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_NPEHandoffAbandon.json @@ -11,7 +11,7 @@ "key": "s_61", "comment": "Just give me the details." }, - "next": "tatooine_mos_eisley_niko/s_61" + "next": "tatooine_mos_eisley_niko/handleBranch10/s_61" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_OnNPEHandoff.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_OnNPEHandoff.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_OnNPEHandoff.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_OnNPEHandoff.json index 86936b815..66b7c3f49 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_OnNPEHandoff.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_OnNPEHandoff.json @@ -11,7 +11,7 @@ "key": "s_29", "comment": "What did they do?" }, - "next": "tatooine_mos_eisley_niko/s_29" + "next": "tatooine_mos_eisley_niko/handleBranch13/s_29" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_alreadyOnNiko.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_alreadyOnNiko.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_alreadyOnNiko.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_alreadyOnNiko.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_blocker.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_blocker.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_blocker.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_blocker.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_nikoOnTask.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_nikoOnTask.json similarity index 85% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_nikoOnTask.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_nikoOnTask.json index 2e2ef911b..7a704783d 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_nikoOnTask.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_nikoOnTask.json @@ -11,7 +11,7 @@ "key": "s_40", "comment": "Not yet." }, - "next": "tatooine_mos_eisley_niko/s_40" + "next": "tatooine_mos_eisley_niko/handleBranch8/s_40" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_nikoQuestComplete.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_nikoQuestComplete.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_nikoQuestComplete.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_nikoQuestComplete.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_nikoTaskComplete.json b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_nikoTaskComplete.json similarity index 89% rename from serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_nikoTaskComplete.json rename to serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_nikoTaskComplete.json index 9d83f8216..4bee271ec 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_niko/condition_nikoTaskComplete.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_niko/start_condition_nikoTaskComplete.json @@ -11,7 +11,7 @@ "key": "s_16", "comment": "Deliveries? What am I supposed to deliver?" }, - "next": "tatooine_mos_eisley_niko/s_16" + "next": "tatooine_mos_eisley_niko/handleBranch3/s_16" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis.sdb b/serverdata/nge/conversation/tatooine_mos_eisley_purvis.sdb index 10ff72974..a4d4f841a 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis.sdb +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis.sdb @@ -1,3 +1,3 @@ conversation_id conversation_file TEXT TEXT -tatooine_mos_eisley_purvis tatooine_mos_eisley_purvis/start \ No newline at end of file +tatooine_mos_eisley_purvis tatooine_mos_eisley_purvis/default \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/default.json similarity index 72% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/start.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/default.json index 0e9905ef2..464cea100 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/default.json @@ -11,7 +11,7 @@ "key": "s_254", "comment": "Good, I'm looking for work." }, - "next": "tatooine_mos_eisley_purvis/s_254" + "next": "tatooine_mos_eisley_purvis/handleBranch15/s_254" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_256", "comment": "What is it you want me to do?" }, - "next": "tatooine_mos_eisley_purvis/s_256" + "next": "tatooine_mos_eisley_purvis/handleBranch15/s_256" }, { "playerMessage": { @@ -27,15 +27,7 @@ "key": "s_44", "comment": "You have me confused with someone else." }, - "next": "tatooine_mos_eisley_purvis/s_44" - }, - { - "playerMessage": { - "file": "conversation/e3_corvette", - "key": "s_18", - "comment": "SHORTCUT TO QUESTS !" - }, - "next": "tatooine_mos_eisley_purvis/condition_completedRecon" + "next": "tatooine_mos_eisley_purvis/handleBranch15/s_44" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_229.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch10/s_229.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_229.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch10/s_229.json index cbb7effef..589b9f2d3 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_229.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch10/s_229.json @@ -11,7 +11,7 @@ "key": "s_235", "comment": "Ok, fine. Yes, sir!" }, - "next": "tatooine_mos_eisley_purvis/s_235" + "next": "tatooine_mos_eisley_purvis/handleBranch11/s_235" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_237.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch10/s_237.json similarity index 83% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_237.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch10/s_237.json index 5a444096a..cec36725a 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_237.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch10/s_237.json @@ -11,7 +11,7 @@ "key": "s_243", "comment": "Well, I'm not saying it." }, - "next": "tatooine_mos_eisley_purvis/s_243" + "next": "tatooine_mos_eisley_purvis/handleBranch12/s_243" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_248", "comment": "Yes, sir!" }, - "next": "tatooine_mos_eisley_purvis/s_248" + "next": "tatooine_mos_eisley_purvis/handleBranch12/s_248" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_235.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch11/s_235.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_235.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch11/s_235.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_243.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch12/s_243.json similarity index 84% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_243.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch12/s_243.json index c32ef51cd..3dfafe8d1 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_243.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch12/s_243.json @@ -11,7 +11,7 @@ "key": "s_219", "comment": "I don't think so." }, - "next": "tatooine_mos_eisley_purvis/s_219" + "next": "tatooine_mos_eisley_purvis/handleBranch8/s_219" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_248.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch12/s_248.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_248.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch12/s_248.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_254.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch15/s_254.json similarity index 84% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_254.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch15/s_254.json index 23ad72c74..94b55d28f 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_254.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch15/s_254.json @@ -11,7 +11,7 @@ "key": "s_260", "comment": "Sounds simple enough." }, - "next": "tatooine_mos_eisley_purvis/s_260" + "next": "tatooine_mos_eisley_purvis/handleBranch16/s_260" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_272", "comment": "Can you explain a little more?" }, - "next": "tatooine_mos_eisley_purvis/s_272" + "next": "tatooine_mos_eisley_purvis/handleBranch16/s_272" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_256.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch15/s_256.json similarity index 85% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_256.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch15/s_256.json index c000338b8..4b06931fa 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_256.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch15/s_256.json @@ -11,7 +11,7 @@ "key": "s_260", "comment": "Sounds simple enough." }, - "next": "tatooine_mos_eisley_purvis/s_260" + "next": "tatooine_mos_eisley_purvis/handleBranch16/s_260" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_272", "comment": "Can you explain a little more?" }, - "next": "tatooine_mos_eisley_purvis/s_272" + "next": "tatooine_mos_eisley_purvis/handleBranch16/s_272" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_44.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch15/s_44.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_44.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch15/s_44.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_260.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch16/s_260.json similarity index 84% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_260.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch16/s_260.json index d38d17287..edd8f93d9 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_260.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch16/s_260.json @@ -11,7 +11,7 @@ "key": "s_264", "comment": "I'll do it." }, - "next": "tatooine_mos_eisley_purvis/s_264" + "next": "tatooine_mos_eisley_purvis/handleBranch17/s_264" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_268", "comment": "I think I'm busy right now." }, - "next": "tatooine_mos_eisley_purvis/s_268" + "next": "tatooine_mos_eisley_purvis/handleBranch17/s_268" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_272.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch16/s_272.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_272.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch16/s_272.json index 25098ad54..5dd34fd4f 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_272.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch16/s_272.json @@ -11,7 +11,7 @@ "key": "s_276", "comment": "That's it?" }, - "next": "tatooine_mos_eisley_purvis/s_276" + "next": "tatooine_mos_eisley_purvis/handleBranch20/s_276" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_264.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch17/s_264.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_264.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch17/s_264.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_268.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch17/s_268.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_268.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch17/s_268.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_276.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch20/s_276.json similarity index 84% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_276.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch20/s_276.json index 057caec96..30cf59fbf 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_276.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch20/s_276.json @@ -11,7 +11,7 @@ "key": "s_264", "comment": "I'll do it." }, - "next": "tatooine_mos_eisley_purvis/s_264" + "next": "tatooine_mos_eisley_purvis/handleBranch17/s_264" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_268", "comment": "I think I'm busy right now." }, - "next": "tatooine_mos_eisley_purvis/s_268" + "next": "tatooine_mos_eisley_purvis/handleBranch17/s_268" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_200.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch5/s_200.json similarity index 83% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_200.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch5/s_200.json index 6b59bc22f..ec1872611 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_200.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch5/s_200.json @@ -11,7 +11,7 @@ "key": "s_208", "comment": "Um...Yes, sir?" }, - "next": "tatooine_mos_eisley_purvis/s_208" + "next": "tatooine_mos_eisley_purvis/handleBranch6/s_208" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_67", "comment": "Yes, sir!" }, - "next": "tatooine_mos_eisley_purvis/s_67" + "next": "tatooine_mos_eisley_purvis/handleBranch6/s_67" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_203.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch5/s_203.json similarity index 81% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_203.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch5/s_203.json index 6b59bc22f..09440a1c7 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_203.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch5/s_203.json @@ -11,7 +11,7 @@ "key": "s_208", "comment": "Um...Yes, sir?" }, - "next": "tatooine_mos_eisley_purvis/s_208" + "next": "tatooine_mos_eisley_purvis/condition_completedRecon/s_208" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_67", "comment": "Yes, sir!" }, - "next": "tatooine_mos_eisley_purvis/s_67" + "next": "tatooine_mos_eisley_purvis/condition_completedRecon/s_67" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_208.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch6/s_208.json similarity index 84% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_208.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch6/s_208.json index 73d3713f4..0a7b96d1d 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_208.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch6/s_208.json @@ -11,7 +11,7 @@ "key": "s_213", "comment": "I'm not gonna say it." }, - "next": "tatooine_mos_eisley_purvis/s_213" + "next": "tatooine_mos_eisley_purvis/handleBranch7/s_213" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_69", "comment": "Yes, sir!" }, - "next": "tatooine_mos_eisley_purvis/s_69" + "next": "tatooine_mos_eisley_purvis/handleBranch7/s_69" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_67.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch6/s_67.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_67.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch6/s_67.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_213.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch7/s_213.json similarity index 84% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_213.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch7/s_213.json index c32ef51cd..3dfafe8d1 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_213.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch7/s_213.json @@ -11,7 +11,7 @@ "key": "s_219", "comment": "I don't think so." }, - "next": "tatooine_mos_eisley_purvis/s_219" + "next": "tatooine_mos_eisley_purvis/handleBranch8/s_219" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_69.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch7/s_69.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_69.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch7/s_69.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_219.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch8/s_219.json similarity index 82% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_219.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch8/s_219.json index bc8f6211d..b42284e7c 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_219.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch8/s_219.json @@ -11,7 +11,7 @@ "key": "s_224", "comment": "Doesn't matter to me." }, - "next": "tatooine_mos_eisley_purvis/s_224" + "next": "tatooine_mos_eisley_purvis/handleBranch9/s_224" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_250", "comment": "Fine. Yes, sir!" }, - "next": "tatooine_mos_eisley_purvis/s_250" + "next": "tatooine_mos_eisley_purvis/handleBranch9/s_250" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_224.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch9/s_224.json similarity index 83% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_224.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch9/s_224.json index f5af9bf3f..1598253a3 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_224.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch9/s_224.json @@ -11,7 +11,7 @@ "key": "s_229", "comment": "You think I'm just being mean?" }, - "next": "tatooine_mos_eisley_purvis/s_229" + "next": "tatooine_mos_eisley_purvis/handleBranch10/s_229" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_237", "comment": "Ok, I'll think about it." }, - "next": "tatooine_mos_eisley_purvis/s_237" + "next": "tatooine_mos_eisley_purvis/handleBranch10/s_237" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_250.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch9/s_250.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/s_250.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/handleBranch9/s_250.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_completedCombatQuests.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_completedCombatQuests.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_completedCombatQuests.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_completedCombatQuests.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_completedOneRecon.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_completedOneRecon.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_completedOneRecon.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_completedOneRecon.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_completedRecon.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_completedRecon.json similarity index 85% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_completedRecon.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_completedRecon.json index d5f7e3cf9..955fc3393 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_completedRecon.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_completedRecon.json @@ -11,7 +11,7 @@ "key": "s_200", "comment": "Battle? Seriously?" }, - "next": "tatooine_mos_eisley_purvis/s_200" + "next": "tatooine_mos_eisley_purvis/handleBranch5/s_200" }, { "playerMessage": { @@ -19,7 +19,7 @@ "key": "s_203", "comment": "I guess I'm ready for combat." }, - "next": "tatooine_mos_eisley_purvis/s_203" + "next": "tatooine_mos_eisley_purvis/handleBranch5/s_203" } ], "requirements": [], diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_goSeeMayor.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_goSeeMayor.json similarity index 71% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_goSeeMayor.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_goSeeMayor.json index c487baee7..de2952913 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_goSeeMayor.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_goSeeMayor.json @@ -6,12 +6,5 @@ }, "playerResponses": [], "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "thumbs_up" - } - } - ] + "events": [] } \ No newline at end of file diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_isOnCombatQuests.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_isOnCombatQuests.json similarity index 100% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_isOnCombatQuests.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_isOnCombatQuests.json diff --git a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_needsACombatQuest.json b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_needsACombatQuest.json similarity index 87% rename from serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_needsACombatQuest.json rename to serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_needsACombatQuest.json index 93b7292c7..f3be3b02a 100644 --- a/serverdata/nge/conversation/tatooine_mos_eisley_purvis/condition_needsACombatQuest.json +++ b/serverdata/nge/conversation/tatooine_mos_eisley_purvis/start_condition_needsACombatQuest.json @@ -10,7 +10,7 @@ { "type": "npc_animation", "args": { - "animation": "thumbs_up" + "animation": "point_accusingly" } } ]