mirror of
https://github.com/ProjectSWGCore/NGECore2.git
synced 2026-08-03 04:16:19 -04:00
Merge pull request #700 from tacef/master
Updated Rebel and imperial Recruiter Conversation
This commit is contained in:
CharonInferar
@@ -28,99 +28,41 @@ def startConversation(core, actor, npc):
|
||||
core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_444')
|
||||
return
|
||||
elif actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial':
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_414')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_428')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_85')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_414'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_428'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_85'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen)
|
||||
|
||||
return
|
||||
elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.OnLeave:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_80')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_49')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_410')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_324')
|
||||
outOfBand4 = OutOfBand()
|
||||
outOfBand4.addProsePackage(prose4)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
option3 = ConversationOption(outOfBand4, 1)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_80'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
options.add(option3)
|
||||
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen)
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_49'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_410'), 1))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_324'), 2))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen)
|
||||
|
||||
return
|
||||
elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_310')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_49')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_410')
|
||||
outOfBand4 = OutOfBand()
|
||||
outOfBand4.addProsePackage(prose4)
|
||||
prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_324')
|
||||
outOfBand5 = OutOfBand()
|
||||
outOfBand5.addProsePackage(prose5)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand4, 1)
|
||||
option4 = ConversationOption(outOfBand5, 1)
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_310'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
options.add(option4)
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_49'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_410'), 1))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_324'), 2))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen)
|
||||
|
||||
return
|
||||
elif actor.getFactionStatus() == FactionStatus.SpecialForces:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_310')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_49')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_410')
|
||||
outOfBand4 = OutOfBand()
|
||||
outOfBand4.addProsePackage(prose4)
|
||||
prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_324')
|
||||
outOfBand5 = OutOfBand()
|
||||
outOfBand5.addProsePackage(prose5)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand4, 1)
|
||||
option4 = ConversationOption(outOfBand5, 1)
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_310'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
options.add(option4)
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_49'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_410'), 1))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_324'), 2))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFirstScreen)
|
||||
|
||||
return
|
||||
@@ -135,28 +77,14 @@ def handleFirstScreen(core, actor, npc, selection):
|
||||
convSvc = core.conversationService
|
||||
if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial':
|
||||
if selection == 0:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_432')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_434')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_440')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_432'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_434'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_440'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen)
|
||||
return
|
||||
|
||||
|
||||
|
||||
if selection == 1:
|
||||
return
|
||||
|
||||
@@ -166,145 +94,67 @@ def handleFirstScreen(core, actor, npc, selection):
|
||||
return
|
||||
elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.OnLeave:
|
||||
if selection == 0:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_50')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_97')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_93')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_88')
|
||||
outOfBand4 = OutOfBand()
|
||||
outOfBand4.addProsePackage(prose4)
|
||||
prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_55')
|
||||
outOfBand5 = OutOfBand()
|
||||
outOfBand5.addProsePackage(prose5)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
option3 = ConversationOption(outOfBand4, 1)
|
||||
option4 = ConversationOption(outOfBand5, 1)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_50'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
options.add(option3)
|
||||
options.add(option4)
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_97'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_93'), 1))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_88'), 2))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_55'), 3))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen)
|
||||
return
|
||||
|
||||
return
|
||||
if selection == 1:
|
||||
percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue()
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent)))
|
||||
return
|
||||
|
||||
if selection == 2:
|
||||
return
|
||||
return
|
||||
elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant:
|
||||
if selection == 0:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_50')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_74')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_93')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_88')
|
||||
outOfBand4 = OutOfBand()
|
||||
outOfBand4.addProsePackage(prose4)
|
||||
prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_55')
|
||||
outOfBand5 = OutOfBand()
|
||||
outOfBand5.addProsePackage(prose5)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
option3 = ConversationOption(outOfBand4, 1)
|
||||
option4 = ConversationOption(outOfBand5, 1)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('conversation/faction_recruiter_imperial', 's_55'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
options.add(option3)
|
||||
options.add(option4)
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_74'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_93'), 1))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_88'), 2))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_55'), 3))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen)
|
||||
|
||||
return
|
||||
|
||||
if selection == 1:
|
||||
percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue()
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent)))
|
||||
return
|
||||
|
||||
if selection == 2:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_92')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_96')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_90'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_92'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_96'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen)
|
||||
|
||||
return
|
||||
return
|
||||
elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.SpecialForces:
|
||||
if selection == 0:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_50')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_74')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_97')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
prose4 = ProsePackage('conversation/faction_recruiter_imperial', 's_88')
|
||||
outOfBand4 = OutOfBand()
|
||||
outOfBand4.addProsePackage(prose4)
|
||||
prose5 = ProsePackage('conversation/faction_recruiter_imperial', 's_55')
|
||||
outOfBand5 = OutOfBand()
|
||||
outOfBand5.addProsePackage(prose5)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
option3 = ConversationOption(outOfBand4, 1)
|
||||
option4 = ConversationOption(outOfBand5, 1)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_50'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
options.add(option3)
|
||||
options.add(option4)
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_74'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_97'), 1))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_88'), 2))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_55'), 3))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleSecondScreen)
|
||||
|
||||
return
|
||||
|
||||
if selection == 1:
|
||||
percent = core.guildService.getGuildObject().getCurrentServerGCWTotalPercentMap().get(actor.getPlanet().getName()).getPercent().intValue()
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage("@conversation/faction_recruiter_imperial:s_412", percent, "TO", str(100 - percent)))
|
||||
return
|
||||
|
||||
if selection == 2:
|
||||
|
||||
return
|
||||
return
|
||||
|
||||
@@ -315,79 +165,40 @@ def handleSecondScreen(core, actor, npc, selection):
|
||||
|
||||
if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial':
|
||||
if selection == 0:
|
||||
actor.setFaction('imperial')
|
||||
actor.setFactionStatus(FactionStatus.OnLeave)
|
||||
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_116')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_438')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
|
||||
core.factionService.join(actor, 'imperial')
|
||||
core.factionService.changeFactionStatus(actor, FactionStatus.OnLeave)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_116'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
|
||||
|
||||
core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_100')
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_438'), 0))
|
||||
core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_100')
|
||||
|
||||
return
|
||||
if selection ==1:
|
||||
if selection == 1:
|
||||
core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_442')
|
||||
return
|
||||
return
|
||||
elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.OnLeave:
|
||||
if selection == 0:
|
||||
actor.setFactionStatus(FactionStatus.Combatant)
|
||||
core.factionService.changeFactionStatus(actor, FactionStatus.Combatant)
|
||||
core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_300')
|
||||
return
|
||||
|
||||
if selection == 1:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_64')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_66')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_302')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_64'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_66'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_302'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFourthScreen)
|
||||
return
|
||||
if selection == 2:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_92')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_96')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_90'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
|
||||
options.add(ConversationOption(outOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_92'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_96'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen)
|
||||
return
|
||||
if selection == 3:
|
||||
@@ -396,148 +207,63 @@ def handleSecondScreen(core, actor, npc, selection):
|
||||
return
|
||||
elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.Combatant:
|
||||
if selection == 0:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_76')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_79')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_70')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
|
||||
core.factionService.changeFactionStatus(actor, FactionStatus.SpecialForces)
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_76'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
|
||||
options.add(ConversationOption(outOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_79'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_70'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFithScreen)
|
||||
return
|
||||
|
||||
if selection == 1:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_64')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_66')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_302')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_64'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
|
||||
options.add(ConversationOption(outOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_66'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_302'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFourthScreen)
|
||||
|
||||
return
|
||||
if selection == 2:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_92')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_96')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_90'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_92'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_96'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen)
|
||||
|
||||
return
|
||||
if selection == 3:
|
||||
return
|
||||
return
|
||||
elif actor.getFaction() == 'imperial' and actor.getFactionStatus() == FactionStatus.SpecialForces:
|
||||
if selection == 0:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_76')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_79')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_70')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('conversation/faction_recruiter_imperial:s_76'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_79'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_70'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleFithScreen)
|
||||
|
||||
return
|
||||
|
||||
if selection == 1:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_54')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_56')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_84')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_54'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_56'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_84'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleSixthScreen)
|
||||
|
||||
return
|
||||
if selection == 2:
|
||||
prose = ProsePackage('conversation/faction_recruiter_imperial', 's_90')
|
||||
outOfBand = OutOfBand()
|
||||
outOfBand.addProsePackage(prose)
|
||||
convSvc.sendConversationMessage(actor, npc, outOfBand)
|
||||
prose2 = ProsePackage('conversation/faction_recruiter_imperial', 's_92')
|
||||
outOfBand2 = OutOfBand()
|
||||
outOfBand2.addProsePackage(prose2)
|
||||
prose3 = ProsePackage('conversation/faction_recruiter_imperial', 's_96')
|
||||
outOfBand3 = OutOfBand()
|
||||
outOfBand3.addProsePackage(prose3)
|
||||
option1 = ConversationOption(outOfBand2, 0)
|
||||
option2 = ConversationOption(outOfBand3, 1)
|
||||
|
||||
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_90'))
|
||||
|
||||
options = Vector()
|
||||
options.add(option1)
|
||||
options.add(option2)
|
||||
|
||||
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_92'), 0))
|
||||
options.add(ConversationOption(OutOfBand.ProsePackage('@conversation/faction_recruiter_imperial:s_96'), 1))
|
||||
convSvc.sendConversationOptions(actor, npc, options, handleThirdScreen)
|
||||
|
||||
return
|
||||
if selection == 3:
|
||||
return
|
||||
@@ -546,7 +272,7 @@ def handleSecondScreen(core, actor, npc, selection):
|
||||
def handleThirdScreen(core, actor, npc, selection):
|
||||
if selection == 0:
|
||||
core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_94')
|
||||
actor.setFaction('')
|
||||
core.factionService.resign(actor)
|
||||
return
|
||||
|
||||
if selection == 1:
|
||||
@@ -556,7 +282,7 @@ def handleThirdScreen(core, actor, npc, selection):
|
||||
|
||||
def handleFourthScreen(core, actor, npc, selection):
|
||||
if selection == 0:
|
||||
actor.setFactionStatus(FactionStatus.SpecialForces)
|
||||
core.factionService.changeFactionStatus(actor, FactionStatus.Combatant)
|
||||
core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_68')
|
||||
return
|
||||
if selection == 1:
|
||||
@@ -566,7 +292,7 @@ def handleFourthScreen(core, actor, npc, selection):
|
||||
|
||||
def handleFithScreen(core, actor, npc, selection):
|
||||
if selection == 0:
|
||||
actor.setFactionStatus(FactionStatus.OnLeave);
|
||||
core.factionService.changeFactionStatus(actor, FactionStatus.OnLeave)
|
||||
core.conversationService.sendStopConversation(actor, npc, 'conversation/faction_recruiter_imperial', 's_82')
|
||||
return
|
||||
|
||||
|
||||
@@ -161,9 +161,8 @@ def handleSecondScreen(core, actor, npc, selection):
|
||||
|
||||
if actor.getFaction() != 'rebel' and actor.getFaction() != 'imperial':
|
||||
if selection == 0:
|
||||
actor.setFaction('rebel')
|
||||
actor.setFactionStatus(FactionStatus.OnLeave)
|
||||
actor.updatePvpStatus()
|
||||
core.factionService.join(actor, 'rebel')
|
||||
core.factionService.changeFactionStatus(actor, FactionStatus.OnLeave)
|
||||
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_rebel:s_99'))
|
||||
|
||||
@@ -205,6 +204,7 @@ def handleSecondScreen(core, actor, npc, selection):
|
||||
return
|
||||
elif actor.getFaction() == 'rebel' and actor.getFactionStatus() == FactionStatus.Combatant:
|
||||
if selection == 0:
|
||||
core.factionService.changeFactionStatus(actor, FactionStatus.SpecialForces)
|
||||
convSvc.sendConversationMessage(actor, npc, OutOfBand.ProsePackage('@conversation/faction_recruiter_rebel:s_88'))
|
||||
|
||||
options = Vector()
|
||||
|
||||
@@ -397,7 +397,7 @@ public class FactionService implements INetworkDispatch {
|
||||
|
||||
scheduler.schedule(() -> {
|
||||
actor.setFaction(faction);
|
||||
actor.setFactionStatus(FactionStatus.Combatant);
|
||||
actor.setFactionStatus(FactionStatus.OnLeave);
|
||||
actor.setPvpBitmask(0);
|
||||
PlayerObject player = ((PlayerObject) actor.getSlottedObject("ghost"));
|
||||
if (player != null) {
|
||||
|
||||
Reference in New Issue
Block a user