From 13008dec0fe4e810db5752de7d836f1de01f62da Mon Sep 17 00:00:00 2001 From: Undercova Date: Wed, 3 Mar 2021 07:44:19 +0100 Subject: [PATCH] Adjusted CLs of all Restuss NPCs Recruiter conversation is now much cleaner and less bulky than before Rori patrol updated New characters now get neutral faction assigned --- .../nge/conversation/recruiter_imperial.sdb | 8 +-- .../imperial_combatant_change.json | 42 ------------ .../imperial_combatant_downgrade.json | 34 ---------- .../imperial_combatant_downgrade_decline.json | 18 ----- .../imperial_combatant_start.json | 49 -------------- .../imperial_combatant_upgrade.json | 33 ---------- ...cepted.json => imperial_go_combatant.json} | 15 +++-- ..._accept.json => imperial_go_on_leave.json} | 15 ++++- ..._resigned.json => imperial_go_resign.json} | 9 ++- ...d.json => imperial_go_special_forces.json} | 15 ++++- .../imperial_on_leave_start.json | 47 -------------- .../imperial_on_leave_stay.json | 25 ------- .../imperial_on_leave_upgrade.json | 34 ---------- .../imperial_on_leave_upgrade_accept.json | 26 -------- .../imperial_on_leave_upgrade_decline.json | 17 ----- .../recruiter_imperial/imperial_resign.json | 26 -------- ...plies.json => imperial_show_supplies.json} | 21 +++++- .../imperial_special_forces_change.json | 34 ---------- .../imperial_special_forces_downgrade.json | 33 ---------- ...ial_special_forces_downgrade_accepted.json | 18 ----- .../imperial_special_forces_start.json | 49 -------------- .../imperial_special_forces_supplies.json | 25 ------- ...eutral_selected.json => neutral_join.json} | 9 ++- .../recruiter_imperial/start_imperial.json | 65 +++++++++++++++++++ ...{neutral_start.json => start_neutral.json} | 2 +- ...opposite_faction.json => start_rebel.json} | 6 ++ .../nge/conversation/recruiter_rebel.sdb | 8 +-- ...eutral_selected.json => neutral_join.json} | 0 .../rebel_combatant_change.json | 42 ------------ .../rebel_combatant_downgrade.json | 34 ---------- .../rebel_combatant_downgrade_accept.json | 24 ------- .../rebel_combatant_downgrade_decline.json | 18 ----- .../rebel_combatant_downgrade_declined.json | 18 ----- .../rebel_combatant_supplies.json | 40 ------------ .../rebel_combatant_upgrade.json | 33 ---------- ...ebel_join.json => rebel_go_combatant.json} | 12 +++- ...e_accepted.json => rebel_go_on_leave.json} | 6 -- ...bel_resigned.json => rebel_go_resign.json} | 0 ...pted.json => rebel_go_special_forces.json} | 15 ++++- .../recruiter_rebel/rebel_on_leave_start.json | 47 -------------- .../recruiter_rebel/rebel_on_leave_stay.json | 25 ------- .../rebel_on_leave_upgrade.json | 34 ---------- .../rebel_on_leave_upgrade_accept.json | 45 ------------- .../rebel_on_leave_upgrade_accepted.json | 17 ----- .../rebel_on_leave_upgrade_decline.json | 17 ----- .../recruiter_rebel/rebel_resign.json | 26 -------- ...supplies.json => rebel_show_supplies.json} | 19 +++++- .../rebel_special_forces_change.json | 34 ---------- .../rebel_special_forces_downgrade.json | 33 ---------- ...bel_special_forces_downgrade_accepted.json | 24 ------- .../rebel_special_forces_start.json | 49 -------------- .../recruiter_rebel/rebel_start.json | 40 ------------ ...osite_faction.json => start_imperial.json} | 0 ...{neutral_start.json => start_neutral.json} | 2 +- ..._combatant_start.json => start_rebel.json} | 32 +++++---- serverdata/nge/patrol/patrol_rori.sdb | 11 ++-- serverdata/nge/spawn/gcw_restuss_phase_1.sdb | 26 ++++---- .../objects/swg/tangible/TangibleObject.java | 4 +- 58 files changed, 234 insertions(+), 1176 deletions(-) delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_combatant_change.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade_decline.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_combatant_start.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_combatant_upgrade.json rename serverdata/nge/conversation/recruiter_imperial/{imperial_on_leave_upgrade_accepted.json => imperial_go_combatant.json} (69%) rename serverdata/nge/conversation/recruiter_imperial/{imperial_combatant_downgrade_accept.json => imperial_go_on_leave.json} (60%) rename serverdata/nge/conversation/recruiter_imperial/{imperial_resigned.json => imperial_go_resign.json} (81%) rename serverdata/nge/conversation/recruiter_imperial/{imperial_combatant_upgrade_accepted.json => imperial_go_special_forces.json} (69%) delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_start.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_stay.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_accept.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_decline.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_resign.json rename serverdata/nge/conversation/recruiter_imperial/{imperial_combatant_supplies.json => imperial_show_supplies.json} (57%) delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_change.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_downgrade.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_downgrade_accepted.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_start.json delete mode 100644 serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_supplies.json rename serverdata/nge/conversation/recruiter_imperial/{neutral_selected.json => neutral_join.json} (83%) create mode 100644 serverdata/nge/conversation/recruiter_imperial/start_imperial.json rename serverdata/nge/conversation/recruiter_imperial/{neutral_start.json => start_neutral.json} (92%) rename serverdata/nge/conversation/recruiter_imperial/{imperial_opposite_faction.json => start_rebel.json} (82%) rename serverdata/nge/conversation/recruiter_rebel/{neutral_selected.json => neutral_join.json} (100%) delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_combatant_change.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_accept.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_decline.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_declined.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_combatant_supplies.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_combatant_upgrade.json rename serverdata/nge/conversation/recruiter_rebel/{rebel_join.json => rebel_go_combatant.json} (57%) rename serverdata/nge/conversation/recruiter_rebel/{rebel_combatant_downgrade_accepted.json => rebel_go_on_leave.json} (82%) rename serverdata/nge/conversation/recruiter_rebel/{rebel_resigned.json => rebel_go_resign.json} (100%) rename serverdata/nge/conversation/recruiter_rebel/{rebel_combatant_upgrade_accepted.json => rebel_go_special_forces.json} (70%) delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_start.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_stay.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_accept.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_accepted.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_decline.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_resign.json rename serverdata/nge/conversation/recruiter_rebel/{rebel_special_forces_supplies.json => rebel_show_supplies.json} (63%) delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_change.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_downgrade.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_downgrade_accepted.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_start.json delete mode 100644 serverdata/nge/conversation/recruiter_rebel/rebel_start.json rename serverdata/nge/conversation/recruiter_rebel/{rebel_opposite_faction.json => start_imperial.json} (100%) rename serverdata/nge/conversation/recruiter_rebel/{neutral_start.json => start_neutral.json} (93%) rename serverdata/nge/conversation/recruiter_rebel/{rebel_combatant_start.json => start_rebel.json} (53%) diff --git a/serverdata/nge/conversation/recruiter_imperial.sdb b/serverdata/nge/conversation/recruiter_imperial.sdb index b1463250f..6d5b27aec 100644 --- a/serverdata/nge/conversation/recruiter_imperial.sdb +++ b/serverdata/nge/conversation/recruiter_imperial.sdb @@ -1,7 +1,5 @@ conversation_id conversation_file TEXT TEXT -recruiter_imperial recruiter_imperial/neutral_start -recruiter_imperial recruiter_imperial/imperial_opposite_faction -recruiter_imperial recruiter_imperial/imperial_on_leave_start -recruiter_imperial recruiter_imperial/imperial_combatant_start -recruiter_imperial recruiter_imperial/imperial_special_forces_start +recruiter_imperial recruiter_imperial/start_neutral +recruiter_imperial recruiter_imperial/start_rebel +recruiter_imperial recruiter_imperial/start_imperial \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_change.json b/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_change.json deleted file mode 100644 index 045d735f1..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_change.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_50", - "comment": "What kind of change were you considering?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_93", - "comment": "Special Forces" - }, - "next": "recruiter_imperial/imperial_combatant_upgrade" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_74", - "comment": "I would like to use my personal leave time." - }, - "next": "recruiter_imperial/imperial_combatant_downgrade" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_88", - "comment": "I believe it is time to end my tour of duty. I would like to resign." - }, - "next": "recruiter_imperial/imperial_resign" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "nod" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade.json b/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade.json deleted file mode 100644 index 66f98e01a..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_76", - "comment": "Are you certain that this is what you want to do? You may be missing out on some important battles. Going on leave means that you will not be recognized as a member of the Imperial military and will be ignored by the Rebel Alliance." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_55", - "comment": "On second thought, I think I'll stay as I am." - }, - "next": "recruiter_imperial/imperial_combatant_downgrade_decline" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_79", - "comment": "I am certain." - }, - "next": "recruiter_imperial/imperial_combatant_downgrade_accept" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "rub_chin_thoughtful" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade_decline.json b/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade_decline.json deleted file mode 100644 index 9d0e9641f..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade_decline.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_86", - "comment": "Your sense of duty is admirable. Long live the Emperor!" - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "salute1" - } - } - ] -} - diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_start.json b/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_start.json deleted file mode 100644 index 1c8de894a..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_start.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_310", - "comment": "Greetings, soldier. What may I do for you?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_324", - "comment": "I am looking to requisition some supplies." - }, - "next": "recruiter_imperial/imperial_combatant_supplies" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_49", - "comment": "I would like to make a change to my military status." - }, - "next": "recruiter_imperial/imperial_combatant_change" - } - ], - "requirements": [ - { - "type": "faction_name", - "args": { - "faction": "imperial" - } - }, - { - "type": "faction_status", - "args": { - "statuses": [ - "combatant" - ] - } - } - ], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "salute2" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_upgrade.json b/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_upgrade.json deleted file mode 100644 index 435387090..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_upgrade.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_64", - "comment": "Special Forces is recruiting. Would you like to submit your application? This means that you will be authorized to hunt the Rebel 'special forces', as they like to call themselves." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_66", - "comment": "Yes, I want to join Special Forces, sir!" - }, - "next": "recruiter_imperial/imperial_combatant_upgrade_accepted" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_55", - "comment": "On second thought, I think I'll stay as I am." - } - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "nod" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_accepted.json b/serverdata/nge/conversation/recruiter_imperial/imperial_go_combatant.json similarity index 69% rename from serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_accepted.json rename to serverdata/nge/conversation/recruiter_imperial/imperial_go_combatant.json index b9d120b63..f0a7d40cb 100644 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_accepted.json +++ b/serverdata/nge/conversation/recruiter_imperial/imperial_go_combatant.json @@ -5,14 +5,21 @@ "comment": "Your sense of duty is admirable. Long live the Emperor!" }, "playerResponses": [], - "requirements": [], - "events": [ + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "imperial" + } + }, { "type": "faction_status", "args": { - "faction": "combatant" + "statuses": ["special_forces","on_leave"] } - }, + } + ], + "events": [ { "type": "npc_animation", "args": { diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade_accept.json b/serverdata/nge/conversation/recruiter_imperial/imperial_go_on_leave.json similarity index 60% rename from serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade_accept.json rename to serverdata/nge/conversation/recruiter_imperial/imperial_go_on_leave.json index 6fc8ca554..ac1408729 100644 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_downgrade_accept.json +++ b/serverdata/nge/conversation/recruiter_imperial/imperial_go_on_leave.json @@ -5,7 +5,20 @@ "comment": "I need to process your paperwork. You will officially be on leave in 5 minutes." }, "playerResponses": [], - "requirements": [], + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "imperial" + } + }, + { + "type": "faction_status", + "args": { + "statuses": ["combatant","special_forces"] + } + } + ], "events": [ { "type": "npc_animation", diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_resigned.json b/serverdata/nge/conversation/recruiter_imperial/imperial_go_resign.json similarity index 81% rename from serverdata/nge/conversation/recruiter_imperial/imperial_resigned.json rename to serverdata/nge/conversation/recruiter_imperial/imperial_go_resign.json index 4fe55eef7..77347f8db 100644 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_resigned.json +++ b/serverdata/nge/conversation/recruiter_imperial/imperial_go_resign.json @@ -5,7 +5,14 @@ "comment": "So be it. I'll put the paperwork through. We will watch you closely to make sure that you don't cross any lines, citizen." }, "playerResponses": [], - "requirements": [], + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "imperial" + } + } + ], "events": [ { "type": "faction_change", diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_upgrade_accepted.json b/serverdata/nge/conversation/recruiter_imperial/imperial_go_special_forces.json similarity index 69% rename from serverdata/nge/conversation/recruiter_imperial/imperial_combatant_upgrade_accepted.json rename to serverdata/nge/conversation/recruiter_imperial/imperial_go_special_forces.json index 2999fca77..9afc4e9e9 100644 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_upgrade_accepted.json +++ b/serverdata/nge/conversation/recruiter_imperial/imperial_go_special_forces.json @@ -13,7 +13,20 @@ } } ], - "requirements": [], + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "imperial" + } + }, + { + "type": "faction_status", + "args": { + "statuses": ["combatant","on_leave"] + } + } + ], "events": [ { "type": "npc_animation", diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_start.json b/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_start.json deleted file mode 100644 index d59fb3990..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_start.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_80", - "comment": "Hello, soldier. Are you ready to resume active duty?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_115", - "comment": "Yes. I want to be a part of the Empire!" - }, - "next": "recruiter_imperial/imperial_on_leave_upgrade" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_55", - "comment": "On second thought, I think I'll stay as I am." - }, - "next": "recruiter_imperial/imperial_on_leave_stay" - }, - ], - "requirements": [ - { - "type": "faction_name", - "args": { - "faction": "imperial" - } - }, - { - "type": "faction_status", - "args": { - "statuses": "on_leave" - } - } - ], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "nod" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_stay.json b/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_stay.json deleted file mode 100644 index 247c84b53..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_stay.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_304", - "comment": "Don't waste my time. Come back to duty when you are serious about your responsibilities." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_84", - "comment": "I will stay active. I know that the war effort needs me." - } - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "dismiss" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade.json b/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade.json deleted file mode 100644 index 99c0e92f5..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_432", - "comment": "Joining the military is a big commitment. Are you sure that you are ready? You realize that those upstart rebels will attack you on sight? Not the so-called 'special forces' but their main troops." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_434", - "comment": "Absolutely. It would be a great honor to serve the Empire." - }, - "next": "recruiter_imperial/imperial_on_leave_upgrade_accept", - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_440", - "comment": "Perhaps I should think about it a bit longer." - }, - "next": "recruiter_imperial/imperial_on_leave_upgrade_decline" - }, - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "nod" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_accept.json b/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_accept.json deleted file mode 100644 index b6441c266..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_accept.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_432", - "comment": "Joining the military is a big commitment. Are you sure that you are ready? You realize that those upstart rebels will attack you on sight? Not the so-called 'special forces' but their main troops." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_79", - "comment": "I am certain." - }, - "next": "recruiter_imperial/imperial_on_leave_upgrade_accepted", - }, - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "explain" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_decline.json b/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_decline.json deleted file mode 100644 index d128b6934..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_on_leave_upgrade_decline.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_442", - "comment": "Stop wasting my time. If you are serious, come back and talk to me." - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "gesticulate_wildly" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_resign.json b/serverdata/nge/conversation/recruiter_imperial/imperial_resign.json deleted file mode 100644 index af669299d..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_resign.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_76", - "comment": "Are you certain that this is what you want to do? You may be missing out on some important battles. Going on leave means that you will not be recognized as a member of the Imperial military and will be ignored by the Rebel Alliance." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_79", - "comment": "I am certain." - }, - "next": "recruiter_imperial/imperial_resigned" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "point_accusingly" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_supplies.json b/serverdata/nge/conversation/recruiter_imperial/imperial_show_supplies.json similarity index 57% rename from serverdata/nge/conversation/recruiter_imperial/imperial_combatant_supplies.json rename to serverdata/nge/conversation/recruiter_imperial/imperial_show_supplies.json index c6d5c3e0e..70e437156 100644 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_combatant_supplies.json +++ b/serverdata/nge/conversation/recruiter_imperial/imperial_show_supplies.json @@ -13,13 +13,30 @@ } } ], - "requirements": [], + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "imperial" + } + }, + { + "type": "faction_status", + "args": { + "statuses": ["combatant","special_forces"] + } + } + ], "events": [ { "type": "npc_animation", "args": { - "animation": "explain" + "animation": "explain" } + }, + { + "type": "show_sellable_items", + "args": {} } ] } \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_change.json b/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_change.json deleted file mode 100644 index 41fee495e..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_change.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_50", - "comment": "What kind of change were you considering?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_49", - "comment": "I would like to make a change to my military status." - }, - "next": "recruiter_imperial/imperial_special_forces_downgrade" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_88", - "comment": "I believe it is time to end my tour of duty. I would like to resign." - }, - "next": "recruiter_imperial/imperial_resign" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "rub_chin_thoughtful" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_downgrade.json b/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_downgrade.json deleted file mode 100644 index 3f5dba4ae..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_downgrade.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_90", - "comment": "I beg your pardon? You would leave the greatest opportunity of your life? You must be mad...or a traitor. " - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_324", - "comment": "I will stay active. I know that the war effort needs me." - } - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_79", - "comment": "I am certain." - }, - "next": "recruiter_imperial/imperial_special_forces_downgrade_accepted" - }, - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "pound_fist_palm" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_downgrade_accepted.json b/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_downgrade_accepted.json deleted file mode 100644 index 080755e54..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_downgrade_accepted.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_58", - "comment": "Give me a moment to change your status and alert your superior. This process will take approximately 5 minutes." - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "heal_other" - } - } - ] -} - diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_start.json b/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_start.json deleted file mode 100644 index 4d3fbb5ae..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_start.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_310", - "comment": "Greetings, soldier. What may I do for you?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_324", - "comment": "I am looking to requisition some supplies." - }, - "next": "recruiter_imperial/imperial_special_forces_supplies" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_49", - "comment": "I would like to make a change to my military status." - }, - "next": "recruiter_imperial/imperial_special_forces_change" - }, - ], - "requirements": [ - { - "type": "faction_name", - "args": { - "faction": "imperial" - } - }, - { - "type": "faction_status", - "args": { - "statuses": [ - "special_forces" - ] - } - } - ], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "salute2" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_supplies.json b/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_supplies.json deleted file mode 100644 index 4d8ae5681..000000000 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_special_forces_supplies.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_326", - "comment": "Very well. I will show you what is available." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_438", - "comment": "Thank you, sir." - }, - }, - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "explain" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/neutral_selected.json b/serverdata/nge/conversation/recruiter_imperial/neutral_join.json similarity index 83% rename from serverdata/nge/conversation/recruiter_imperial/neutral_selected.json rename to serverdata/nge/conversation/recruiter_imperial/neutral_join.json index 882c9bd85..b9a455aef 100644 --- a/serverdata/nge/conversation/recruiter_imperial/neutral_selected.json +++ b/serverdata/nge/conversation/recruiter_imperial/neutral_join.json @@ -13,7 +13,14 @@ } } ], - "requirements": [], + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "neutral" + } + } + ], "events": [ { "type": "faction_change", diff --git a/serverdata/nge/conversation/recruiter_imperial/start_imperial.json b/serverdata/nge/conversation/recruiter_imperial/start_imperial.json new file mode 100644 index 000000000..431a641e3 --- /dev/null +++ b/serverdata/nge/conversation/recruiter_imperial/start_imperial.json @@ -0,0 +1,65 @@ +{ + "npcMessage": { + "file": "conversation/faction_recruiter_imperial", + "key": "s_310", + "comment": "Greetings, soldier. What may I do for you?" + }, + "playerResponses": [ + { + "playerMessage": { + "file": "conversation/faction_recruiter_imperial", + "key": "s_324", + "comment": "I am looking to requisition some supplies." + }, + "next": "recruiter_imperial/imperial_show_supplies" + }, + { + "playerMessage": { + "file": "conversation/faction_recruiter_imperial", + "key": "s_93", + "comment": "Special Forces" + }, + "next": "recruiter_imperial/imperial_go_special_forces" + }, + { + "playerMessage": { + "file": "conversation/faction_recruiter_imperial", + "key": "s_97", + "comment": "Combatant" + }, + "next": "recruiter_imperial/imperial_go_combatant" + }, + { + "playerMessage": { + "file": "conversation/faction_recruiter_imperial", + "key": "s_74", + "comment": "I would like to use my personal leave time." + }, + "next": "recruiter_imperial/imperial_go_on_leave" + }, + { + "playerMessage": { + "file": "conversation/faction_recruiter_imperial", + "key": "s_88", + "comment": "I believe it is time to end my tour of duty. I would like to resign." + }, + "next": "recruiter_imperial/imperial_go_resign" + } + ], + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "imperial" + } + } + ], + "events": [ + { + "type": "npc_animation", + "args": { + "animation": "salute2" + } + } + ] +} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_imperial/neutral_start.json b/serverdata/nge/conversation/recruiter_imperial/start_neutral.json similarity index 92% rename from serverdata/nge/conversation/recruiter_imperial/neutral_start.json rename to serverdata/nge/conversation/recruiter_imperial/start_neutral.json index 027fadf1b..ee4fd133b 100644 --- a/serverdata/nge/conversation/recruiter_imperial/neutral_start.json +++ b/serverdata/nge/conversation/recruiter_imperial/start_neutral.json @@ -11,7 +11,7 @@ "key": "s_115", "comment": "Yes. I want to be a part of the Empire!" }, - "next": "recruiter_imperial/neutral_selected" + "next": "recruiter_imperial/neutral_join" } ], "requirements": [ diff --git a/serverdata/nge/conversation/recruiter_imperial/imperial_opposite_faction.json b/serverdata/nge/conversation/recruiter_imperial/start_rebel.json similarity index 82% rename from serverdata/nge/conversation/recruiter_imperial/imperial_opposite_faction.json rename to serverdata/nge/conversation/recruiter_imperial/start_rebel.json index ed8b9b71e..85efab938 100644 --- a/serverdata/nge/conversation/recruiter_imperial/imperial_opposite_faction.json +++ b/serverdata/nge/conversation/recruiter_imperial/start_rebel.json @@ -19,6 +19,12 @@ "args": { "animation": "backhand_threaten" } + }, + { + "type": "player_animation", + "args": { + "animation": "nod" + } } ] } \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel.sdb b/serverdata/nge/conversation/recruiter_rebel.sdb index ca0184724..d8b1cd9fb 100644 --- a/serverdata/nge/conversation/recruiter_rebel.sdb +++ b/serverdata/nge/conversation/recruiter_rebel.sdb @@ -1,7 +1,5 @@ conversation_id conversation_file TEXT TEXT -recruiter_rebel recruiter_rebel/neutral_start -recruiter_rebel recruiter_rebel/rebel_opposite_faction -recruiter_rebel recruiter_rebel/rebel_on_leave_start -recruiter_rebel recruiter_rebel/rebel_combatant_start -recruiter_rebel recruiter_rebel/rebel_special_forces_start \ No newline at end of file +recruiter_rebel recruiter_rebel/start_neutral +recruiter_rebel recruiter_rebel/start_imperial +recruiter_rebel recruiter_rebel/start_rebel \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/neutral_selected.json b/serverdata/nge/conversation/recruiter_rebel/neutral_join.json similarity index 100% rename from serverdata/nge/conversation/recruiter_rebel/neutral_selected.json rename to serverdata/nge/conversation/recruiter_rebel/neutral_join.json diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_change.json b/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_change.json deleted file mode 100644 index d542c8f7b..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_change.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_50", - "comment": "What kind of change were you considering?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_93", - "comment": "Special Forces" - }, - "next": "recruiter_rebel/rebel_combatant_upgrade" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_86", - "comment": "I need to go on leave for a time." - }, - "next": "recruiter_rebel/rebel_combatant_downgrade" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_74", - "comment": "This is all too much for me. I would like to resign completely." - }, - "next": "recruiter_rebel/rebel_resign" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "nod" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade.json b/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade.json deleted file mode 100644 index 4003594aa..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_76", - "comment": "How could you turn your back on people trying to win freedom from tyranny? We need everyone we can get! Won't you reconsider?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_55", - "comment": "On second thought, I don't think I'll make a change." - }, - "next": "recruiter_rebel/rebel_combatant_downgrade_decline" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_78", - "comment": "I'm sure. I have had enough war. I want out." - }, - "next": "recruiter_rebel/rebel_combatant_downgrade_accept" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "rub_chin_thoughtful" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_accept.json b/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_accept.json deleted file mode 100644 index 018a1fdd2..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_accept.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_92", - "comment": "It will take me some time to process, but you will be on leave beginning in 5 minutes. " - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "faction_change", - "args": { - "statuses": "on_leave" - } - }, - { - "type": "npc_animation", - "args": { - "animation": "heal_other" - } - } - ] -} - diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_decline.json b/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_decline.json deleted file mode 100644 index ca2310b87..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_decline.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_84", - "comment": "Doubt is understandable, but have faith. We are on the right side. No one wants to cater to a tyrant. Down with the Empire!" - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "salute1" - } - } - ] -} - diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_declined.json b/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_declined.json deleted file mode 100644 index 58d9f02a2..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_declined.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_96", - "comment": "I wish all of our soldiers had your dedication. I salute you!" - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "salute1" - } - } - ] -} - diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_supplies.json b/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_supplies.json deleted file mode 100644 index 632ef059a..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_supplies.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_250", - "comment": "As you wish. I will show you what is available." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_358", - "comment": "Thank you very much." - } - } - ], - "requirements": [ - { - "type": "faction_name", - "args": { - "faction": "rebel" - } - }, - { - "type": "faction_status", - "args": { - "statuses": [ - "combatant" - ] - } - } - ], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "explain" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_upgrade.json b/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_upgrade.json deleted file mode 100644 index 5f1f6f4d9..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_upgrade.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_64", - "comment": "We can use good people in Special Forces. As a member of the Special Forces, you will be able to attack and be attacked by Imperial Special Forces members. Does this interest you?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_66", - "comment": "Yes. I want to hunt Imperial Special Forces. Sign me up!" - }, - "next": "recruiter_rebel/rebel_combatant_upgrade_accepted" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_70", - "comment": "Actually, maybe it isn't for me after all. Never mind." - } - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "nod" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_join.json b/serverdata/nge/conversation/recruiter_rebel/rebel_go_combatant.json similarity index 57% rename from serverdata/nge/conversation/recruiter_rebel/rebel_join.json rename to serverdata/nge/conversation/recruiter_rebel/rebel_go_combatant.json index d5458bcd2..d83d06fd8 100644 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_join.json +++ b/serverdata/nge/conversation/recruiter_rebel/rebel_go_combatant.json @@ -1,7 +1,7 @@ { "npcMessage": { - "file": "conversation/faction_recruiter_imperial", - "key": "s_308", + "file": "conversation/faction_recruiter_rebel", + "key": "s_356", "comment": "Superb! Welcome to the Rebellion! " }, "playerResponses": [], @@ -11,13 +11,19 @@ "args": { "faction": "rebel" } + }, + { + "type": "faction_status", + "args": { + "statuses": ["special_forces","on_leave"] + } } ], "events": [ { "type": "npc_animation", "args": { - "animation": "gesticulate_wildly" + "animation": "salute1" } } ] diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_accepted.json b/serverdata/nge/conversation/recruiter_rebel/rebel_go_on_leave.json similarity index 82% rename from serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_accepted.json rename to serverdata/nge/conversation/recruiter_rebel/rebel_go_on_leave.json index ba6348fcd..740f7864f 100644 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_downgrade_accepted.json +++ b/serverdata/nge/conversation/recruiter_rebel/rebel_go_on_leave.json @@ -7,12 +7,6 @@ "playerResponses": [], "requirements": [], "events": [ - { - "type": "faction_status", - "args": { - "statuses": "on_leave" - } - }, { "type": "npc_animation", "args": { diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_resigned.json b/serverdata/nge/conversation/recruiter_rebel/rebel_go_resign.json similarity index 100% rename from serverdata/nge/conversation/recruiter_rebel/rebel_resigned.json rename to serverdata/nge/conversation/recruiter_rebel/rebel_go_resign.json diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_upgrade_accepted.json b/serverdata/nge/conversation/recruiter_rebel/rebel_go_special_forces.json similarity index 70% rename from serverdata/nge/conversation/recruiter_rebel/rebel_combatant_upgrade_accepted.json rename to serverdata/nge/conversation/recruiter_rebel/rebel_go_special_forces.json index 704e1d111..829295f84 100644 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_upgrade_accepted.json +++ b/serverdata/nge/conversation/recruiter_rebel/rebel_go_special_forces.json @@ -13,7 +13,20 @@ } } ], - "requirements": [], + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "rebel" + } + }, + { + "type": "faction_status", + "args": { + "statuses": ["combatant","on_leave"] + } + } + ], "events": [ { "type": "npc_animation", diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_start.json b/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_start.json deleted file mode 100644 index 1ed7b443b..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_start.json +++ /dev/null @@ -1,47 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_216", - "comment": "Hello friend. Ready to get back to some real work?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_218", - "comment": "I am ready to get back to my duties." - }, - "next": "recruiter_rebel/imperial_on_leave_upgrade" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_226", - "comment": "Actually, I think I like being on leave. " - }, - "next": "recruiter_rebel/imperial_on_leave_stay" - }, - ], - "requirements": [ - { - "type": "faction_name", - "args": { - "faction": "rebel" - } - }, - { - "type": "faction_status", - "args": { - "faction": "on_leave" - } - } - ], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "nod" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_stay.json b/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_stay.json deleted file mode 100644 index e646cb498..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_stay.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_362", - "comment": "We only want serious, committed candidates. If you change your mind, talk to me then." - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_226", - "comment": "Actually, I think I like being on leave. " - } - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "dismiss" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade.json b/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade.json deleted file mode 100644 index 47e33f7b1..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_220", - "comment": "Good to hear! I just want to make sure that you are serious about returning. You really want to come off leave? Remember that most of the Imperials will attack you on sight. " - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_56", - "comment": "Yes please. I would like to return to combatant status and not fight the Imperial Special Forces." - }, - "next": "recruiter_rebel/rebel_on_leave_upgrade_accept", - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_55", - "comment": "On second thought, I don't think I'll make a change." - }, - "next": "recruiter_rebel/rebel_on_leave_upgrade_decline" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "nod" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_accept.json b/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_accept.json deleted file mode 100644 index 386bd9f8a..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_accept.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_352", - "comment": "This is not a decision to be taken lightly. Rebels are hunted across the galaxy. If you join us, while you are an active combatant, Imperials will attack you on sight but Imperial Special Forces will leave you alone. Are you ready for that?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_354", - "comment": "That doesn't scare me. Down with the Emperor!" - }, - "next": "recruiter_rebel/rebel_on_leave_upgrade_accepted", - }, - ], - "requirements": [ - { - "type": "faction_name", - "args": { - "faction": "rebel" - } - }, - { - "type": "faction_status", - "args": { - "faction": "on_leave" - } - } - ], - "events": [ - { - "type": "faction_status_change", - "args": { - "faction": "combatant" - } - }, - { - "type": "npc_animation", - "args": { - "animation": "explain" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_accepted.json b/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_accepted.json deleted file mode 100644 index b9a7d740a..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_accepted.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_356", - "comment": "Superb! Welcome to the Rebellion! " - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "salute1" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_decline.json b/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_decline.json deleted file mode 100644 index 0ec321a2c..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_on_leave_upgrade_decline.json +++ /dev/null @@ -1,17 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_362", - "comment": "We only want serious, committed candidates. If you change your mind, talk to me then." - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "pound_fist_palm" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_resign.json b/serverdata/nge/conversation/recruiter_rebel/rebel_resign.json deleted file mode 100644 index 9bd9e35dc..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_resign.json +++ /dev/null @@ -1,26 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_76", - "comment": "How could you turn your back on people trying to win freedom from tyranny? We need everyone we can get! Won't you reconsider?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_78", - "comment": "I'm sure. I have had enough war. I want out." - }, - "next": "recruiter_rebel/rebel_resigned" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "point_accusingly" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_supplies.json b/serverdata/nge/conversation/recruiter_rebel/rebel_show_supplies.json similarity index 63% rename from serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_supplies.json rename to serverdata/nge/conversation/recruiter_rebel/rebel_show_supplies.json index cbcff5d13..e5bab7bb0 100644 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_supplies.json +++ b/serverdata/nge/conversation/recruiter_rebel/rebel_show_supplies.json @@ -13,13 +13,30 @@ } } ], - "requirements": [], + "requirements": [ + { + "type": "faction_name", + "args": { + "faction": "rebel" + } + }, + { + "type": "faction_status", + "args": { + "statuses": ["combatant","special_forces"] + } + } + ], "events": [ { "type": "npc_animation", "args": { "animation": "explain" } + }, + { + "type": "show_sellable_items", + "args": {} } ] } \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_change.json b/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_change.json deleted file mode 100644 index ab7413139..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_change.json +++ /dev/null @@ -1,34 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_50", - "comment": "What kind of change were you considering?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_49", - "comment": "I would like to make a change to my military status." - }, - "next": "recruiter_rebel/rebel_special_forces_downgrade" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_74", - "comment": "This is all too much for me. I would like to resign completely." - }, - "next": "recruiter_rebel/rebel_resign" - } - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "rub_chin_thoughtful" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_downgrade.json b/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_downgrade.json deleted file mode 100644 index 9dbc0729d..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_downgrade.json +++ /dev/null @@ -1,33 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_76", - "comment": "How could you turn your back on people trying to win freedom from tyranny? We need everyone we can get! Won't you reconsider?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_82", - "comment": "You are right. It was a momentary lapse. I will stay with the Rebellion." - } - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_87", - "comment": "Yes." - }, - "next": "recruiter_rebel/rebel_special_forces_downgrade_accepted" - }, - ], - "requirements": [], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "pound_fist_palm" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_downgrade_accepted.json b/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_downgrade_accepted.json deleted file mode 100644 index 1577259ab..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_downgrade_accepted.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_58", - "comment": "That's a shame. It will take some time to push the paperwork through for approval. Your status will change in about 5 minutes." - }, - "playerResponses": [], - "requirements": [], - "events": [ - { - "type": "faction_change", - "args": { - "statuses": "combatant" - } - }, - { - "type": "npc_animation", - "args": { - "animation": "heal_other" - } - } - ] -} - diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_start.json b/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_start.json deleted file mode 100644 index 4ca88aaa3..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_special_forces_start.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_330", - "comment": "How are we doing in the war against the Imperial tyrants?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_248", - "comment": "I need supplies. Do you have anything available?" - }, - "next": "recruiter_rebel/rebel_special_forces_supplies" - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_49", - "comment": "I would like to make a change to my military status." - }, - "next": "recruiter_rebel/rebel_special_forces_change" - }, - ], - "requirements": [ - { - "type": "faction_name", - "args": { - "faction": "rebel" - } - }, - { - "type": "faction_status", - "args": { - "statuses": [ - "special_forces" - ] - } - } - ], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "salute2" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_start.json b/serverdata/nge/conversation/recruiter_rebel/rebel_start.json deleted file mode 100644 index ea4b1155e..000000000 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_start.json +++ /dev/null @@ -1,40 +0,0 @@ -{ - "npcMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_334", - "comment": "Hello friend. Is there something that I can do for you? Are you interested in helping free the peoples of the galaxy?" - }, - "playerResponses": [ - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_70", - "comment": "Actually, maybe it isn't for me after all. Never mind." - } - }, - { - "playerMessage": { - "file": "conversation/faction_recruiter_rebel", - "key": "s_114", - "comment": "Yes., I want to be a part of the Alliance!" - }, - "next": "recruiter_rebel/rebel_join" - }, - ], - "requirements": [ - { - "type": "faction_name", - "args": { - "faction": "neutral" - } - } - ], - "events": [ - { - "type": "npc_animation", - "args": { - "animation": "greet" - } - } - ] -} \ No newline at end of file diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_opposite_faction.json b/serverdata/nge/conversation/recruiter_rebel/start_imperial.json similarity index 100% rename from serverdata/nge/conversation/recruiter_rebel/rebel_opposite_faction.json rename to serverdata/nge/conversation/recruiter_rebel/start_imperial.json diff --git a/serverdata/nge/conversation/recruiter_rebel/neutral_start.json b/serverdata/nge/conversation/recruiter_rebel/start_neutral.json similarity index 93% rename from serverdata/nge/conversation/recruiter_rebel/neutral_start.json rename to serverdata/nge/conversation/recruiter_rebel/start_neutral.json index 0c9c6a692..4c7fa2cc6 100644 --- a/serverdata/nge/conversation/recruiter_rebel/neutral_start.json +++ b/serverdata/nge/conversation/recruiter_rebel/start_neutral.json @@ -11,7 +11,7 @@ "key": "s_114", "comment": "Yes. I want to be a part of the Alliance!" }, - "next": "recruiter_rebel/neutral_selected" + "next": "recruiter_rebel/neutral_join" } ], "requirements": [ diff --git a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_start.json b/serverdata/nge/conversation/recruiter_rebel/start_rebel.json similarity index 53% rename from serverdata/nge/conversation/recruiter_rebel/rebel_combatant_start.json rename to serverdata/nge/conversation/recruiter_rebel/start_rebel.json index 39f309ab3..fb624521a 100644 --- a/serverdata/nge/conversation/recruiter_rebel/rebel_combatant_start.json +++ b/serverdata/nge/conversation/recruiter_rebel/start_rebel.json @@ -11,15 +11,31 @@ "key": "s_248", "comment": "I need supplies. Do you have anything available?" }, - "next": "recruiter_rebel/rebel_combatant_supplies" + "next": "recruiter_rebel/rebel_show_supplies" }, { "playerMessage": { "file": "conversation/faction_recruiter_rebel", - "key": "s_49", - "comment": "I would like to make a change to my military status." + "key": "s_93", + "comment": "Special Forces" }, - "next": "recruiter_rebel/rebel_combatant_change" + "next": "recruiter_rebel/rebel_go_special_forces" + }, + { + "playerMessage": { + "file": "conversation/faction_recruiter_rebel", + "key": "s_86", + "comment": "I need to go on leave for a time." + }, + "next": "recruiter_rebel/rebel_go_on_leave" + }, + { + "playerMessage": { + "file": "conversation/faction_recruiter_rebel", + "key": "s_74", + "comment": "This is all too much for me. I would like to resign completely." + }, + "next": "recruiter_rebel/rebel_go_resign" } ], "requirements": [ @@ -28,14 +44,6 @@ "args": { "faction": "rebel" } - }, - { - "type": "faction_status", - "args": { - "statuses": [ - "combatant" - ] - } } ], "events": [ diff --git a/serverdata/nge/patrol/patrol_rori.sdb b/serverdata/nge/patrol/patrol_rori.sdb index 1997891bc..a9ad66e8c 100644 --- a/serverdata/nge/patrol/patrol_rori.sdb +++ b/serverdata/nge/patrol/patrol_rori.sdb @@ -68,12 +68,11 @@ patrol_ror_1307 patrol_ror_1300 RORI ror_world 0 5588.3 80.1 5665.6 0 patrol_ror_1308 patrol_ror_1300 RORI ror_world 0 5549.8 80.0 5666.1 0 patrol_ror_1309 patrol_ror_1300 RORI ror_world 0 5503.5 80.0 5666.5 0 patrol_ror_1310 patrol_ror_1300 RORI ror_world 0 5453.5 80.0 5668.2 0 -patrol_ror_1311 patrol_ror_1300 RORI ror_world 0 5453.5 80.0 5668.2 0 -patrol_ror_1312 patrol_ror_1300 RORI ror_world 0 5409.3 80.0 5664.1 0 -patrol_ror_1313 patrol_ror_1300 RORI ror_world 0 5381.1 80.0 5652.2 0 -patrol_ror_1314 patrol_ror_1300 RORI ror_world 0 5355.0 80.0 5632.2 0 -patrol_ror_1315 patrol_ror_1300 RORI ror_world 0 5330.4 80.0 5628.0 0 -patrol_ror_1316 patrol_ror_1300 RORI ror_world 0 5314.5 80.0 5654.5 300 +patrol_ror_1311 patrol_ror_1300 RORI ror_world 0 5409.3 80.0 5664.1 0 +patrol_ror_1312 patrol_ror_1300 RORI ror_world 0 5381.1 80.0 5652.2 0 +patrol_ror_1313 patrol_ror_1300 RORI ror_world 0 5355.0 80.0 5632.2 0 +patrol_ror_1314 patrol_ror_1300 RORI ror_world 0 5330.4 80.0 5628.0 0 +patrol_ror_1315 patrol_ror_1300 RORI ror_world 0 5314.5 80.0 5654.5 300 patrol_ror_1400 patrol_ror_1400 FLIP RORI ror_world 0 5930.5 81.0 5625.2 0 Restuss - Stormtroopers group #2 patrol_ror_1401 patrol_ror_1400 RORI ror_world 0 5913.1 81.0 5612.0 0 patrol_ror_1402 patrol_ror_1400 RORI ror_world 0 5871.3 80.5 5616.0 0 diff --git a/serverdata/nge/spawn/gcw_restuss_phase_1.sdb b/serverdata/nge/spawn/gcw_restuss_phase_1.sdb index 4e3476ae1..6559d3244 100644 --- a/serverdata/nge/spawn/gcw_restuss_phase_1.sdb +++ b/serverdata/nge/spawn/gcw_restuss_phase_1.sdb @@ -5,19 +5,19 @@ spawn_gcw_restuss_2 RORI ror_world AREA 0 5280.1 80.0 6134.1 90 0 a Rebel recrui spawn_gcw_restuss_3 RORI ror_world AREA 0 5918.9 81.0 5643.2 -98 0 Lieutenant Gregor humanoid_imperial_restuss_lt_gregor INVULNERABLE N 100 100 GCW GCW - Restuss 1 IDLE 0 0 - idle rori_restuss_imperial_lt_gregor 600 spawn_gcw_restuss_4 RORI ror_world AREA 0 5917.5 81.0 5645.9 -124 0 Captain Exov humanoid_imperial_restuss_captain_exov INVULNERABLE N 100 100 GCW GCW - Restuss 1 IDLE 0 0 - idle rori_restuss_imperial_captain_exov 600 spawn_gcw_restuss_5 RORI ror_world AREA 0 5916.0 81.0 5648.3 -127 0 Captain Roth humanoid_imperial_restuss_captain_roth INVULNERABLE N 100 100 GCW GCW - Restuss 1 IDLE 0 0 - idle rori_restuss_imperial_captain_roth 600 -spawn_gcw_restuss_6 RORI ror_world PATROL 0 5905.7 81.0 5642.0 -90 0 a Stormtrooper humanoid_imperial_restuss_stormtrooper AGGRESSIVE E 80 90 GCW GCW - Restuss 10 PATROL 0 patrol_ror_1300 column idle 5 -spawn_gcw_restuss_7 RORI ror_world PATROL 0 5930.5 81.0 5625.2 -135 0 a Stormtrooper humanoid_imperial_restuss_stormtrooper AGGRESSIVE E 80 90 GCW GCW - Restuss 10 PATROL 0 patrol_ror_1400 column idle 5 -spawn_gcw_restuss_8 RORI ror_world PATROL 0 5972.7 81.0 5508.9 -88 0 an AT-ST vehicle_imperial_restuss_atst AGGRESSIVE B 80 90 GCW GCW - Restuss 1 PATROL 0 patrol_ror_1500 column idle 5 -spawn_gcw_restuss_9 RORI ror_world PATROL 0 5909.1 81.0 5572.3 -101 0 Urban Assault Dark Trooper droid_imperial_restuss_dark_trooper_urban_assault AGGRESSIVE E 85 90 GCW GCW - Restuss 10 PATROL 0 patrol_ror_1600 column idle 5 -spawn_gcw_restuss_10 RORI ror_world AREA 0 5367.3 80.0 5753.3 0 0 a Dark Trooper droid_imperial_dark_trooper AGGRESSIVE E 80 90 GCW GCW - Restuss 6 LOITER 20 0 - idle 60 -spawn_gcw_restuss_11 RORI ror_world AREA 0 5386.2 80.0 5575.4 0 0 Imperial Supply Specialist humanoid_imperial_restuss_load_lifter_ambush AGGRESSIVE E 80 90 GCW GCW - Restuss 5 LOITER 10 0 - idle 60 +spawn_gcw_restuss_6 RORI ror_world PATROL 0 5905.7 81.0 5642.0 -90 0 a Stormtrooper humanoid_imperial_restuss_stormtrooper AGGRESSIVE N 80 90 GCW GCW - Restuss 10 PATROL 0 patrol_ror_1300 column idle 5 +spawn_gcw_restuss_7 RORI ror_world PATROL 0 5930.5 81.0 5625.2 -135 0 a Stormtrooper humanoid_imperial_restuss_stormtrooper AGGRESSIVE N 80 90 GCW GCW - Restuss 10 PATROL 0 patrol_ror_1400 column idle 5 +spawn_gcw_restuss_8 RORI ror_world PATROL 0 5972.7 81.0 5508.9 -88 0 an AT-ST vehicle_imperial_restuss_atst AGGRESSIVE B 70 75 GCW GCW - Restuss 1 PATROL 0 patrol_ror_1500 column idle 5 +spawn_gcw_restuss_9 RORI ror_world PATROL 0 5909.1 81.0 5572.3 -101 0 Urban Assault Dark Trooper droid_imperial_restuss_dark_trooper_urban_assault AGGRESSIVE N 80 90 GCW GCW - Restuss 10 PATROL 0 patrol_ror_1600 column idle 5 +spawn_gcw_restuss_10 RORI ror_world AREA 0 5367.3 80.0 5753.3 0 0 a Dark Trooper droid_imperial_dark_trooper AGGRESSIVE N 80 90 GCW GCW - Restuss 6 LOITER 20 0 - idle 60 +spawn_gcw_restuss_11 RORI ror_world AREA 0 5386.2 80.0 5575.4 0 0 Imperial Supply Specialist humanoid_imperial_restuss_load_lifter_ambush AGGRESSIVE N 80 90 GCW GCW - Restuss 5 LOITER 10 0 - idle 60 spawn_gcw_restuss_12 RORI ror_world AREA 0 4780.3 80.0 5897.7 142 0 Captain Klork humanoid_rebel_restuss_captain_klork INVULNERABLE N 100 100 GCW GCW - Restuss 1 IDLE 0 0 - idle rori_restuss_rebel_captain_klork 600 spawn_gcw_restuss_13 RORI ror_world AREA 0 4778.1 80.0 5895.9 134 0 Captain Redding humanoid_rebel_restuss_captain_redding INVULNERABLE N 100 100 GCW GCW - Restuss 1 IDLE 0 0 - idle rori_restuss_rebel_captain_redding 600 spawn_gcw_restuss_14 RORI ror_world AREA 0 4776.6 80.0 5894.1 121 0 Lieutenant Olvog humanoid_rebel_restuss_lt_olvog INVULNERABLE N 100 100 GCW GCW - Restuss 1 IDLE 0 0 - idle rori_restuss_rebel_lt_olvog 600 -spawn_gcw_restuss_15 RORI ror_world AREA 0 5252.7 80 5553.7 -10 0 Alliance Supply Specialist humanoid_rebel_restuss_load_lifter_ambush AGGRESSIVE E 80 90 GCW GCW - Restuss 3 LOITER 10 0 - idle 60 -spawn_gcw_restuss_16 RORI ror_world AREA 0 5204.4 80 5634.3 -74 0 a Rebel commando humanoid_rebel_commando AGGRESSIVE E 80 90 GCW GCW - Restuss 5 LOITER 10 0 - idle 60 -spawn_gcw_restuss_17 RORI ror_world AREA 0 5104.8 80 5746.9 89 0 a Rebel commando humanoid_rebel_commando AGGRESSIVE E 80 90 GCW GCW - Restuss 6 LOITER 10 0 - idle 60 -spawn_gcw_restuss_18 RORI ror_world AREA 0 5162.4 80 5747.5 89 0 a Rebel commando humanoid_rebel_commando AGGRESSIVE E 80 90 GCW GCW - Restuss 5 LOITER 10 0 - idle 60 -spawn_gcw_restuss_19 RORI ror_world PATROL 0 4788.3 80.0 5775.7 0 0 Rebel Elite Commando humanoid_rebel_restuss_elite_commando AGGRESSIVE E 80 90 GCW GCW - Restuss 15 PATROL 0 patrol_ror_1700 column idle 5 -spawn_gcw_restuss_20 RORI ror_world PATROL 0 4839.5 80.0 5817.6 0 0 Rebel Elite Commando humanoid_rebel_restuss_elite_commando AGGRESSIVE E 80 90 GCW GCW - Restuss 15 PATROL 0 patrol_ror_1800 column idle 5 -spawn_gcw_restuss_21 RORI ror_world PATROL 0 4786.8 80.0 5895.6 0 0 Rebel Elite Commando humanoid_rebel_restuss_elite_commando AGGRESSIVE E 80 90 GCW GCW - Restuss 15 PATROL 0 patrol_ror_1900 column idle 5 \ No newline at end of file +spawn_gcw_restuss_15 RORI ror_world AREA 0 5252.7 80 5553.7 -10 0 Alliance Supply Specialist humanoid_rebel_restuss_load_lifter_ambush AGGRESSIVE N 80 90 GCW GCW - Restuss 3 LOITER 10 0 - idle 60 +spawn_gcw_restuss_16 RORI ror_world AREA 0 5204.4 80 5634.3 -74 0 a Rebel commando humanoid_rebel_commando AGGRESSIVE N 80 90 GCW GCW - Restuss 5 LOITER 10 0 - idle 60 +spawn_gcw_restuss_17 RORI ror_world AREA 0 5104.8 80 5746.9 89 0 a Rebel commando humanoid_rebel_commando AGGRESSIVE N 80 90 GCW GCW - Restuss 6 LOITER 10 0 - idle 60 +spawn_gcw_restuss_18 RORI ror_world AREA 0 5162.4 80 5747.5 89 0 a Rebel commando humanoid_rebel_commando AGGRESSIVE N 80 90 GCW GCW - Restuss 5 LOITER 10 0 - idle 60 +spawn_gcw_restuss_19 RORI ror_world PATROL 0 4788.3 80.0 5775.7 0 0 Rebel Elite Commando humanoid_rebel_restuss_elite_commando AGGRESSIVE N 80 90 GCW GCW - Restuss 15 PATROL 0 patrol_ror_1700 column idle 5 +spawn_gcw_restuss_20 RORI ror_world PATROL 0 4839.5 80.0 5817.6 0 0 Rebel Elite Commando humanoid_rebel_restuss_elite_commando AGGRESSIVE N 80 90 GCW GCW - Restuss 15 PATROL 0 patrol_ror_1800 column idle 5 +spawn_gcw_restuss_21 RORI ror_world PATROL 0 4786.8 80.0 5895.6 0 0 Rebel Elite Commando humanoid_rebel_restuss_elite_commando AGGRESSIVE N 80 90 GCW GCW - Restuss 15 PATROL 0 patrol_ror_1900 column idle 5 \ No newline at end of file diff --git a/src/main/java/com/projectswg/holocore/resources/support/objects/swg/tangible/TangibleObject.java b/src/main/java/com/projectswg/holocore/resources/support/objects/swg/tangible/TangibleObject.java index 2f4db31b5..ce4c6a4ec 100644 --- a/src/main/java/com/projectswg/holocore/resources/support/objects/swg/tangible/TangibleObject.java +++ b/src/main/java/com/projectswg/holocore/resources/support/objects/swg/tangible/TangibleObject.java @@ -61,8 +61,8 @@ public class TangibleObject extends SWGObject { private boolean inCombat = false; private int condition = 0; private Set pvpFlags = EnumSet.noneOf(PvpFlag.class); - private PvpStatus pvpStatus = PvpStatus.COMBATANT; - private Faction faction = null; + private PvpStatus pvpStatus = PvpStatus.COMBATANT; + private Faction faction = ServerData.INSTANCE.getFactions().getFaction(PvpFaction.NEUTRAL.name().toLowerCase(Locale.US)); private boolean visibleGmOnly = true; private byte [] objectEffects = new byte[0]; private int optionFlags = 0;