Instructions Jenkins Doxygen

[fixed] Blank convo option with some mission givers 99/1799/1
authorMiztah <myztah@gmail.com>
Mon, 16 Jun 2014 21:37:45 +0000 (21:37 +0000)
committerMiztah <myztah@gmail.com>
Mon, 16 Jun 2014 21:37:45 +0000 (21:37 +0000)
Change-Id: I342e40d5db7f74af8fbf2ff0c9b8d1fc29f2d2ff

MMOCoreORB/bin/scripts/screenplays/themepark/conversations/mission_giver_conv_handler.lua

index 2c6edd0..8bec6bf 100644 (file)
@@ -176,7 +176,10 @@ function mission_giver_conv_handler:handleScreenNpc1(pConversationTemplate, pCon
 
        clonedScreen:addOption(stfFile .. ":player_1_" .. missionNumber, "accept")
        clonedScreen:addOption(stfFile .. ":player_2_" .. missionNumber, "npc_3_n")
-       clonedScreen:addOption(stfFile .. ":player_3_" .. missionNumber, "npc_4_n")
+       
+       if (self.themePark:isValidConvoString(stfFile, ":player_3_" .. missionNumber)) then
+               clonedScreen:addOption(stfFile .. ":player_3_" .. missionNumber, "npc_4_n")
+       end
 
        return pConversationScreen
 end