swg-source/dsrc
1
0
Fork 0
mirror of https://github.com/SWG-Source/dsrc.git synced 2026-01-17 00:05:07 -05:00
Code Issues Projects Releases Wiki Activity

Fixed broken strings for the Imperial General during invasions.

Browse Source
This commit is contained in:
Cekis
2020-11-09 02:15:01 -05:00
parent ea1fe98f67
commit 08fe7cdb07
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sku.0/sys.server/compiled/game/script/conversation/imperial_general.java
View File

@@ -625,12 +625,12 @@ public class imperial_general extends script.base_script
}
public int imperial_general_handleBranch12(obj_id player, obj_id npc, string_id response) throws InterruptedException
{
if (response.equals("s_23"))
if (response.equals("s_26"))
{
if (imperial_general_condition_isCombatPhase(player, npc))
{
imperial_general_action_grantEntertainerQuests(player, npc);
string_id message = new string_id(c_stringFile, "s_26");
string_id message = new string_id(c_stringFile, "s_157");
utils.removeScriptVar(player, "conversation.imperial_general.branchId");
npcEndConversationWithMessage(player, message);
return SCRIPT_CONTINUE;
@@ -1162,7 +1162,7 @@ public class imperial_general extends script.base_script
}
if (imperial_general_condition_isGeneralImpAndOffense(player, npc))
{
string_id message = new string_id(c_stringFile, "s_21");
string_id message = new string_id(c_stringFile, "s_23");
int numberOfResponses = 0;
boolean hasResponse = false;
boolean hasResponse0 = false;
@@ -1255,7 +1255,7 @@ public class imperial_general extends script.base_script
string_id responses[] = new string_id[numberOfResponses];
if (hasResponse0)
{
responses[responseIndex++] = new string_id(c_stringFile, "s_23");
responses[responseIndex++] = new string_id(c_stringFile, "s_26");
}
if (hasResponse1)
{