Baal Namib sells Novice's Armor too late

[szapp]

Describe the bug
Baal Namib doesn't sell the Novice's Armor until chapter 3, but the player can already become a Templar in chapter 2.

Expected behavior
Baal Namib now sells the Novice's Armor in chapter 2 already, if the Minecrawler Queen quest is running or completed.

[catalinstoian]

gothic-1-community-patch/scriptbase/_work/Data/Scripts/Content/Story/Missions/DIA_GUR_1204_BaalNamib.d

Lines 153 to 172 in e66b303

	FUNC void GUR_1204_BaalNamib_ARMOR_Info()
	{
	AI_Output (hero,self,"GUR_1204_BaalNamib_ARMOR_Info_15_01");//I'd like to have better armor.
	if (Kapitel < 3)
	{
	AI_Output (self,other,"GUR_1204_BaalNamib_ARMOR_Info_02_02");//The time has not yet come for you to wear the heavy armor of a novice.
	}
	else if (Npc_HasItems (hero, ItMinugget) < VALUE_NOV_ARMOR_H )
	{
	AI_Output (self,other,"GUR_1204_BaalNamib_ARMOR_Info_02_03");//Come back as soon as you have enough ore.
	}
	else
	{
	AI_Output (self,other,"GUR_1204_BaalNamib_ARMOR_Info_02_04");//This armor protects your body, like the Sleeper protects your spirit!
	CreateInvItem (self,NOV_ARMOR_H);
	B_GiveInvItems (self, hero, NOV_ARMOR_H, 1);
	B_GiveInvItems (hero, self, ItMinugget,VALUE_NOV_ARMOR_H);
	};
	};

changed to

FUNC void  GUR_1204_BaalNamib_ARMOR_Info()
{
    AI_Output (hero,self,"GUR_1204_BaalNamib_ARMOR_Info_15_01");//I'd like to have better armor.

    if ((Kapitel >= 2) && (CorKalom_BringMCQBalls == LOG_RUNNING)) 
    {
        if (Npc_HasItems (hero,ItMiNugget) < VALUE_NOV_ARMOR_H)
        {
            AI_Output(self,other,"GUR_1204_BaalNamib_ARMOR_Info_02_03");//Come back as soon as you have enough ore.
        }
        else
        {
            AI_Output (self,other,"GUR_1204_BaalNamib_ARMOR_Info_02_04");//This armor protects your body, like the Sleeper protects your spirit!
            CreateInvItem (self,NOV_ARMOR_H);
            B_GiveInvItems (self, hero, NOV_ARMOR_H, 1);
            B_GiveInvItems (hero, self, ItMinugget,VALUE_NOV_ARMOR_H);
        }
    }
    else
    {
        AI_Output(self,other,"GUR_1204_BaalNamib_ARMOR_Info_02_02");//The time has not yet come for you to wear the heavy armor of a novice.
    };
}; 

[AmProsius]

I would change

if ((Kapitel >= 2) && (CorKalom_BringMCQBalls == LOG_RUNNING)

to

if (Kapitel >= 2 && (CorKalom_BringMCQBalls == LOG_RUNNING || CorKalom_BringMCQBalls == LOG_SUCCESS)

so the player can still buy the Novice's Armor after chapter 2 if he didn't become a Templar till then.

[AmProsius]

We can also think about just changing

gothic-1-community-patch/scriptbase/_work/Data/Scripts/Content/Story/Missions/DIA_GUR_1204_BaalNamib.d

Line 157 in e66b303

if (Kapitel < 3)

to

if (Kapitel < 2)

I don't know why the minecrawler quest was added as a condition anyway. The number might just have been a typo and adding the quest to the condition seems too opinionated for my taste.

[szapp]

We can also think about just changing

gothic-1-community-patch/scriptbase/_work/Data/Scripts/Content/Story/Missions/DIA_GUR_1204_BaalNamib.d

Line 157 in e66b303

if (Kapitel < 3)

to

if (Kapitel < 2)

I don't know why the minecrawler quest was added as a condition anyway. The number might just have been a typo and adding the quest to the condition seems too opinionated for my taste.

I think that should be correct. The heavy armor of the corresponding other guild have no limiting factor (not even the chapter). But since there are three novice's armor types (light, medium, heavy), the chapter 2 restriction makes sense. Let's go for that.

[szapp]

This is an automatic test for a change. The only restrictions for obtain the armor is now:

• Does not have the armor (unchanged)
• Guild is novice (unchanged)
• Enough ore (unchanged)
• Chapter >= 2 (new)