Fixed Master Gunfighter Perk Always Available

[Pieter Boelen]

@Levis, why is the Master Gunfighter perk visible in the Jean Lafitte storyline?
Considering this init entry, I don't think it should be:

  //JRH BB6 ->
   ChrPerksList.list.GunFighter.descr = "perkGunFighter";
   ChrPerksList.list.GunFighter.condition.GunProfessional = true;
   ChrPerksList.list.GunFighter.condition.BasicDefence = true;
   ChrPerksList.list.GunFighter.condition.IronWill = true;
   ChrPerksList.list.GunFighter.disable.StorylineVar = "GUNFIGHTER_PERK";
   ChrPerksList.list.GunFighter.cost = 1; // Levis
  //<-- JRH

Additionally, we really don't want it to be there either. It should be in the Woodes Rogers storyline only.

 

[Pieter Boelen]

Also checked in Bartolomeu storyline and it is there as well. Confirmed bug.

 

[Levis]

reply because of your changes here:

case "iRealismMode":
                if(REALISTIC_ABILITIES == 1 && iRealismMode>=sti(GetAttributeValue(arCur)))        { return false; } // PB: To allow REALISTIC_ABILITIES to override the Realism Mode
            break;
           
            case "REALISTIC_ABILITIES":
                if(REALISTIC_ABILITIES == 1 && iRealismMode == 0)                                { return true;  } // PB: To ensure Arcade Game Mode does override the Build Default
                if(REALISTIC_ABILITIES >= sti(GetAttributeValue(arCur)))                        { return false; }
            break;
           
            case "StorylineVar":
                if(sti(GetStorylineVar(FindCurrentStoryline(), GetAttributeValue(arCur))) < 1)    { return false; }
            break;

It returns on the realistic abilities already.

 

[Pieter Boelen]

Wha? But... how?

For testing, I just replaced that section with this:

    switch(needName)
     {
/*       case "iRealismMode":
         if(REALISTIC_ABILITIES == 1 && iRealismMode>=sti(GetAttributeValue(arCur)))     { return false; } // PB: To allow REALISTIC_ABILITIES to override the Realism Mode
       break;
      
       case "REALISTIC_ABILITIES":
         if(REALISTIC_ABILITIES == 1 && iRealismMode == 0)                 { return true;  } // PB: To ensure Arcade Game Mode does override the Build Default
         if(REALISTIC_ABILITIES >= sti(GetAttributeValue(arCur)))             { return false; }
       break;*/
      
       case "StorylineVar":
         if(sti(GetStorylineVar(FindCurrentStoryline(), GetAttributeValue(arCur))) < 1)   { return false; }
       break;
     }

And it still shows up. So that is disabling all realism mode code.

Also perkGunFighter does not HAVE an iRealismMode or REALISTIC_ABILITIES attribute, so those return statements should never be executed for this perk!

Pretty sure it only showed up recently too and I changed that code months back.

 

[Levis]

Removed something for performance sake but seems my logic was flawed. I overlooked something.
Placed the check back now. This should make sure gunman wont show up again.

 

[Pieter Boelen]

Looks like this is back to normal. Jack Rackham will be pleased!