Cord teaches One-handed Sword Level 2 too soon

[AmProsius]

Describe the bug
Cord's dialog option to teach One-handed Sword Level 2 appears before the player learned Level 1.

Expected behavior
Cord's dialog option to teach One-handed Sword Level 2 now appears only after the player learned Level 1.

Additional context

• The German translation for One-handed Sword Level 2 is Einhänder Stufe 2.
• The player can't actually learn Level 2 before Level 1, but for consistency reasons I suggest to hide the dialog option (see Fingers teaches advanced skills too soon #39). Therefore the issue is marked as opinionated.

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

Lines 441 to 449 in 746a440

	FUNC int TPL_1402_GorNaToth_TRAINAGAIN_Condition()
	{
	if (Npc_GetTalentSkill (hero,NPC_TALENT_1H) == 1)
	&& (C_NpcBelongsToPsiCamp(hero))
	{
	return TRUE;
	};
	};

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

Lines 318 to 321 in 746a440

	if (Npc_GetTalentSkill(hero, NPC_TALENT_1H) == 1)
	{
	Info_AddChoice (DIA_Scatty_TRAIN,B_BuildLearnString(NAME_Learn1h_2, LPCOST_TALENT_1H_2,150) ,DIA_Scatty_TRAIN_2h);
	};

[AmProsius]

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

Lines 115 to 123 in 746a440

	FUNC int SLD_709_Cord_TRAINAGAIN_Condition()
	{
	if (Npc_KnowsInfo (hero,SLD_709_Cord_TRAINOFFER))
	&& (Npc_GetTalentSkill (hero,NPC_TALENT_1H) < 2)
	{
	return TRUE;
	};
	};

changed to

FUNC int  SLD_709_Cord_TRAINAGAIN_Condition()
{
    if (Npc_KnowsInfo (hero,SLD_709_Cord_TRAINOFFER))
    && (Npc_GetTalentSkill (hero,NPC_TALENT_1H) == 1)
    {
        return TRUE;
    };

};

[szapp]

Note on implementation:

Place a hook around the condition function. Before calling the original function, do

if (Npc_GetTalentSkill(hero, NPC_TALENT_1H) != 1) {
    return FALSE;
};

Of course, NPC_TALENT_1H has to be locally defined, retrieved. See similar fixes.

[szapp]

I got some minor remarks. Note: I only skimmed the code and I have not run the tests!

[szapp]

Code wise it looks good I think. But I haven't tried it. Do all tests pass?

[AmProsius]

Code wise it looks good I think. But I haven't tried it. Do all tests pass?

Yes, I wrote the test first, tested it, then wrote the fix and tested again. The fist test failed (obviously) and the second test passed.