v1.5 - 14.08.2022

N1kX94 · Aug 14, 2022 · 75100da · 75100da
1 parent 1f20af4
commit 75100da
Show file tree

Hide file tree

Showing 14 changed files with 32 additions and 21 deletions.
diff --git a/PrjGothic/AI/Human/C_Human/C_NpcIsEvil.d b/PrjGothic/AI/Human/C_Human/C_NpcIsEvil.d
@@ -1,7 +1,7 @@
 
 func int c_npcisevil(var C_NPC slf)
 {
-	if((slf.guild == GIL_DMT) || (slf.guild == GIL_BDT) || (slf.guild == GIL_DRAGON) || (slf.guild == GIL_ORC) || (slf.aivar[AIV_MM_REAL_ID] == ID_WARG) || (slf.aivar[AIV_MM_REAL_ID] == ID_DRAGONSNAPPER) || (slf.guild == GIL_DRACONIAN) || (slf.guild == GIL_DEMON) || (slf.guild == GIL_SUMMONED_DEMON) || c_npcisundead(slf))
+	if((slf.guild == GIL_DMT) || (slf.guild == GIL_DRAGON) || (slf.guild == GIL_ORC) || (slf.aivar[AIV_MM_REAL_ID] == ID_WARG) || (slf.aivar[AIV_MM_REAL_ID] == ID_DRAGONSNAPPER) || (slf.guild == GIL_DRACONIAN) || (slf.guild == GIL_DEMON) || (slf.guild == GIL_SUMMONED_DEMON) || c_npcisundead(slf))
 	{
 		return TRUE;
 	};

diff --git a/PrjGothic/AI/Magic/C_CanNpcCollideWithSpell.d b/PrjGothic/AI/Magic/C_CanNpcCollideWithSpell.d
@@ -133,7 +133,7 @@ func int c_cannpccollidewithspell(var int spelltype)
 	};
 	if((spelltype == SPL_PALREPELEVIL) || (spelltype == SPL_PALDESTROYEVIL) || (spelltype == SPL_PALHOLYBOLT))
 	{
-		if(c_npcisevil(self) && (self.guild != GIL_BDT))
+		if(c_npcisevil(self))
 		{
 			if(self.guild == GIL_DRAGON)
 			{

diff --git a/PrjGothic/Items/IT_Written.d b/PrjGothic/Items/IT_Written.d
@@ -217,7 +217,7 @@ func void useeinhandbuch()
 	var int ndocid;
 	if(LERNE_EINHAND == FALSE)
 	{
-		self.hitchance[NPC_TALENT_1H] = self.hitchance[NPC_TALENT_1H] + 5;
+		b_addfightskill(self,NPC_TALENT_1H,5);
 		Print(PRINT_LEARN1H);
 		LERNE_EINHAND = TRUE;
 		Snd_Play("LEVELUP");
@@ -267,7 +267,7 @@ func void usezweihandbuch()
 	var int ndocid;
 	if(LERNE_ZWEIHAND == FALSE)
 	{
-		self.hitchance[NPC_TALENT_2H] = self.hitchance[NPC_TALENT_2H] + 5;
+		b_addfightskill(self,NPC_TALENT_2H,5);
 		Print(PRINT_LEARN2H);
 		LERNE_ZWEIHAND = TRUE;
 		Snd_Play("LEVELUP");

diff --git a/PrjGothic/Story/Dialoge/DIA_PAL_281_Fajeth.d b/PrjGothic/Story/Dialoge/DIA_PAL_281_Fajeth.d
@@ -188,9 +188,12 @@ instance DIA_FAJETH_LEADER(C_INFO)
 
 func int dia_fajeth_leader_condition()
 {
-	if(Npc_KnowsInfo(other,dia_bilgot_knowsleadsnapper) && Npc_IsDead(newmine_leadsnapper) && (MIS_FAJETH_KILL_SNAPPER == LOG_RUNNING))
+	if(Npc_KnowsInfo(other,dia_bilgot_knowsleadsnapper) && (MIS_FAJETH_KILL_SNAPPER == LOG_RUNNING))
 	{
-		return TRUE;
+		if(Npc_IsDead(newmine_leadsnapper))
+		{
+			return TRUE;
+		};
 	};
 };
 
@@ -222,9 +225,12 @@ instance DIA_FAJETH_SNAPPER_KILLED(C_INFO)
 
 func int dia_fajeth_snapper_killed_condition()
 {
-	if((MIS_FAJETH_KILL_SNAPPER == LOG_RUNNING) && (c_snapperdeath() == TRUE))
+	if(MIS_FAJETH_KILL_SNAPPER == LOG_RUNNING)
 	{
-		return TRUE;
+		if(c_snapperdeath())
+		{
+			return TRUE;
+		};
 	};
 };
 

diff --git a/PrjGothic/Story/Dialoge/DIA_djg_700_sylvio.d b/PrjGothic/Story/Dialoge/DIA_djg_700_sylvio.d
@@ -383,7 +383,7 @@ func void dia_sylviodjg_whatnext_attack()
 	Npc_SetRefuseTalk(self,60);
 	Npc_ExchangeRoutine(self,"Start");
 	b_startotherroutine(djg_bullco,"Start");
-	b_logentry(TOPIC_DRAGONHUNTER,"Ýòà ãðÿçíàÿ ñâèíüÿ Ñèëüâèî ñîáèðàëñÿ ïðèñâîèòü ñåáå ìîþ ïîáåäó íàä ëåäÿíûìè äðàêîíàìè. Ìû íåìíîãî ïîâçäîðèëè.");
+	b_logentry(TOPIC_DRAGONHUNTER,"Ýòà ãðÿçíàÿ ñâèíüÿ Ñèëüâèî ñîáèðàëñÿ ïðèñâîèòü ñåáå ìîþ ïîáåäó íàä ëåäÿíûì äðàêîíîì. Ìû íåìíîãî ïîâçäîðèëè.");
 	b_attack(self,other,AR_NONE,1);
 	b_attack(djg_bullco,other,AR_NONE,1);
 };

diff --git a/PrjGothic/Story/Dialoge/DIA_djg_701_bullco.d b/PrjGothic/Story/Dialoge/DIA_djg_701_bullco.d
@@ -41,7 +41,7 @@ func int dia_bullcodjg_hallo_condition()
 
 func void dia_bullcodjg_hallo_info()
 {
-	AI_Output(other,self,"DIA_BullcoDJG_HALLO_15_00");	//Â ÷åì äåëî???
+	AI_Output(other,self,"DIA_BullcoDJG_HALLO_15_00");	//Â ÷åì äåëî?
 	AI_Output(self,other,"DIA_BullcoDJG_HALLO_06_01");	//Çäåñü òàê õîëîäíî! Íå ïîíèìàþ, ïî÷åìó Ñèëüâèî íàñòîÿë, ÷òîáû ìû øëè èìåííî ñþäà.
 	AI_Output(self,other,"DIA_BullcoDJG_HALLO_06_02");	//Çäåñü åñòü ìíîæåñòâî äðóãèõ ìåñò, ãäå ìîæíî áûëî áû ïîèñêàòü!
 	AI_StopProcessInfos(self);
@@ -55,7 +55,7 @@ instance DIA_BULLCODJG_WARTEMAL(C_INFO)
 	condition = dia_bullcodjg_wartemal_condition;
 	information = dia_bullcodjg_wartemal_info;
 	permanent = TRUE;
-	description = "Âñå â ïîðÿäêå?";
+	description = "À âñå îñòàëüíîå â ïîðÿäêå?";
 };
 
 
@@ -114,7 +114,7 @@ instance DIA_BULLCO_WASNUN(C_INFO)
 	nr = 8;
 	condition = dia_bullco_wasnun_condition;
 	information = dia_bullco_wasnun_info;
-	description = "×òî òû ïëàíèðóåøü äåëàòü äàëüøå?";
+	description = "×òî òû áóäåøü äåëàòü òåïåðü, êîãäà Ñèëüâèî ìåðòâ?";
 };
 
 
@@ -146,7 +146,7 @@ func void dia_bullco_wasnun_woandere_zuihnen()
 	AI_Output(other,self,"DIA_Bullco_WASNUN_woandere_zuihnen_15_00");	//Îòâåäè ìåíÿ ê äðóãèì îõîòíèêàì íà äðàêîíîâ.
 	AI_Output(self,other,"DIA_Bullco_WASNUN_woandere_zuihnen_06_01");	//Ýé, ÿ íå òâîé ëàêåé.
 	Info_ClearChoices(dia_bullco_wasnun);
-	Info_AddChoice(dia_bullco_wasnun,"Êàê çíàåøü.",dia_bullco_wasnun_woandere_zuihnen_alleine);
+	Info_AddChoice(dia_bullco_wasnun,"Êàê çíàåøü. ß ñàì èõ íàéäó.",dia_bullco_wasnun_woandere_zuihnen_alleine);
 	Info_AddChoice(dia_bullco_wasnun,"Ðàäóéñÿ, åñëè ÿ îñòàâëþ òåáÿ â æèâûõ.",dia_bullco_wasnun_woandere_zuihnen_lebenlassen);
 	Info_AddChoice(dia_bullco_wasnun,"ß çàïëà÷ó òåáå 50 çîëîòûõ çà ýòî.",dia_bullco_wasnun_woandere_zuihnen_geld);
 };

diff --git a/PrjGothic/Story/Dialoge/DIA_djg_703_cipher.d b/PrjGothic/Story/Dialoge/DIA_djg_703_cipher.d
@@ -267,7 +267,7 @@ instance DIA_CIPHERDJG_WHATNEXT(C_INFO)
 	condition = dia_cipherdjg_whatnext_condition;
 	information = dia_cipherdjg_whatnext_info;
 	permanent = TRUE;
-	description = "Áîëîòíûé äðàêîí ìåðòâ!";
+	description = "Áîëîòíûé äðàêîí ìåðòâ! ×òî òû áóäåøü äåëàòü äàëüøå?";
 };
 
 

diff --git a/PrjGothic/Story/Dialoge/DIA_mil_312_wulfgar.d b/PrjGothic/Story/Dialoge/DIA_mil_312_wulfgar.d
@@ -362,7 +362,7 @@ func void dia_wulfgar_bonus_info()
 	AI_Output(self,other,"DIA_Wulfgar_Bonus_04_00");	//Ðàííÿÿ ïòàøêà? ß îáû÷íî îäèí â ýòî âðåìÿ äíÿ. Íî ðàç óæ òû çäåñü, òî ìîæíî ïîòðåíèðîâàòüñÿ.
 	AI_Output(self,other,"DIA_Wulfgar_Bonus_04_01");	//Áóäü âíèìàòåëüíûì. Òû ìîæåøü îáìàíóòü íåêîòîðûõ ïðîòèâíèêîâ, åñëè óêëîíèøüñÿ îò óäàðà, à çàòåì àòàêóåøü â ïðàâèëüíûé ìîìåíò.
 	AI_Output(self,other,"DIA_Wulfgar_Bonus_04_02");	//Ïîìíè îá ýòîì â ñâîåì ñëåäóþùåì áîþ!
-	other.hitchance[NPC_TALENT_1H] = other.hitchance[NPC_TALENT_1H] + 2;
+	b_addfightskill(other,NPC_TALENT_1H,2);
 	PrintScreen(PRINT_LEARN1H,-1,-1,FONT_SCREENSMALL,2);
 };
 

diff --git a/PrjGothic/Story/Dialoge/DIA_pal_299_sergio.d b/PrjGothic/Story/Dialoge/DIA_pal_299_sergio.d
@@ -88,7 +88,7 @@ func void dia_sergio_isgaroth_xp()
 {
 	AI_Output(other,self,"DIA_Sergio_Isgaroth_XP_15_00");	//Òû íå ìîã áû ïîäåëèòüñÿ ñâîèì áîåâûì îïûòîì?
 	AI_Output(self,other,"DIA_Sergio_Isgaroth_XP_04_01");	//Êîãäà òû ñðàæàåøüñÿ, ïîñòàðàéñÿ, ÷òîáû íèêòî íå ìîã àòàêîâàòü òåáÿ ñçàäè.
-	other.hitchance[NPC_TALENT_2H] = other.hitchance[NPC_TALENT_2H] + 2;
+	b_addfightskill(other,NPC_TALENT_2H,2);
 	PrintScreen(PRINT_LEARN2H,-1,-1,FONT_SCREENSMALL,2);
 	Info_ClearChoices(dia_sergio_isgaroth);
 };

diff --git a/PrjGothic/Story/Dialoge/DIA_vlk_404_lutero.d b/PrjGothic/Story/Dialoge/DIA_vlk_404_lutero.d
@@ -61,7 +61,7 @@ instance DIA_LUTERO_GETLOST(C_INFO)
 	nr = 5;
 	condition = dia_lutero_getlost_condition;
 	information = dia_lutero_getlost_info;
-	permanent = FALSE;
+	permanent = TRUE;
 	important = TRUE;
 };
 

diff --git a/PrjGothic/Story/Dialoge/DIA_vlk_4110_jergan.d b/PrjGothic/Story/Dialoge/DIA_vlk_4110_jergan.d
@@ -290,9 +290,12 @@ instance DIA_JERGAN_LEADER(C_INFO)
 
 func int dia_jergan_leader_condition()
 {
-	if((Npc_GetDistToWP(self,"OW_NEWMINE_04") < 1000) && Npc_IsDead(newmine_leadsnapper) && Npc_KnowsInfo(other,dia_bilgot_knowsleadsnapper))
+	if((Npc_GetDistToWP(self,"OW_NEWMINE_04") < 1000) && Npc_KnowsInfo(other,dia_bilgot_knowsleadsnapper))
 	{
-		return TRUE;
+		if(Npc_IsDead(newmine_leadsnapper))
+		{
+			return TRUE;
+		};
 	};
 };
 

diff --git a/PrjGothic/Story/NPC/bau_935_bronko.d b/PrjGothic/Story/NPC/bau_935_bronko.d
@@ -32,6 +32,6 @@ func void rtn_prestart_935()
 func void rtn_start_935()
 {
 	ta_pick_fp(8,0,22,0,"NW_FARM4_FIELD_01");
-	ta_pick_fp(22,0,8,0,"NW_FARM4_FIELD_01");
+	ta_sit_campfire(22,0,8,0,"NW_FARM4_REST_02");
 };
 
diff --git a/PrjGothic/_Intern/Constants.d b/PrjGothic/_Intern/Constants.d
@@ -764,6 +764,6 @@ const int INVCAM_Z_RING_STANDARD = 45;
 
 const int UnionActivated = 0;
 
-const string FIX_VERSION_DATE = "06/08/2022";
+const string FIX_VERSION_DATE = "14/08/2022";
 const int FIX_VERSION_START = 15;
 var int FIX_VERSION_SAVE;
diff --git a/src/txt/g2_classic_readme.txt b/src/txt/g2_classic_readme.txt
@@ -15,6 +15,8 @@
 - тексты получения награды от Сифера и Рауля не накладываются друг на друга;
 - добавлено меню подтверждения начала новой игры;
 - исправлено соотношение сторон рисунка Бабо;
+- исправлены ошибки при повышении навыков с помощью бонусов Вульфгара, Сержио и книг;
+- исправлена ошибка в диалогах Лютеро, позволявшая торговать с ним нейтралу и послушнику;
 
 1.4
 - квесты 'Стать наемником' и 'Член городской стражи' закроются при вступлении в послушники, а не маги;