Instructions Jenkins Doxygen

[fixed]Correct trainer should spawn in the tutorial - 1/2 of Mantis 2409 23/1323/1
authorPete <elpete@swgemu.com>
Fri, 10 Jan 2014 04:14:37 +0000 (22:14 -0600)
committerPete <elpete@swgemu.com>
Fri, 10 Jan 2014 04:14:37 +0000 (22:14 -0600)
Change-Id: I72dcf77efb432118998c2f97e27b55560662bf78

MMOCoreORB/bin/scripts/screenplays/themepark/tutorial.lua

index c1c6235..68f33aa 100644 (file)
@@ -620,23 +620,24 @@ function TutorialScreenPlay:spawnObjects(creatureObject)
          -- crafting_artisan_novice
          -- combat_marksman_novice
          -- combat_brawler_novice
-       if (player:hasSkill("social_entertainer_novice") == 1) then
+
+       if (player:hasSkill("social_entertainer_novice")) then
                trainerTemplate = "trainer_entertainer"
                player:removeSkill("social_entertainer_novice")
                writeData(creature:getObjectID() .. ":tutorial:skill", 0)
-       elseif (player:hasSkill("outdoors_scout_novice") == 1) then
+       elseif (player:hasSkill("outdoors_scout_novice")) then
                trainerTemplate = "trainer_scout"
                player:removeSkill("outdoors_scout_novice")
                writeData(creature:getObjectID() .. ":tutorial:skill", 1)
-       elseif (player:hasSkill("science_medic_novice") == 1) then
+       elseif (player:hasSkill("science_medic_novice")) then
                trainerTemplate = "trainer_medic"
                player:removeSkill("science_medic_novice")
                writeData(creature:getObjectID() .. ":tutorial:skill", 2)
-       elseif (player:hasSkill("crafting_artisan_novice") == 1) then
+       elseif (player:hasSkill("crafting_artisan_novice")) then
                trainerTemplate = "trainer_artisan"
                player:removeSkill("crafting_artisan_novice")
                writeData(creature:getObjectID() .. ":tutorial:skill", 3)
-       elseif (player:hasSkill("combat_marksman_novice") == 1) then
+       elseif (player:hasSkill("combat_marksman_novice")) then
                trainerTemplate = "trainer_marksman"
                player:removeSkill("combat_marksman_novice")
                writeData(creature:getObjectID() .. ":tutorial:skill", 4)
@@ -3027,4 +3028,4 @@ function TutorialScreenPlay:refugee6(creatureObject)
        
        local refugee = getSceneObject(readData(player:getObjectID() .. ":tutorial:refugee3"))
        spatialChat(refugee, "@newbie_tutorial/newbie_convo:refugee4")
-end
\ No newline at end of file
+end