Release 4.3.1

FakelsHub · FakelsHub · commit 8ec794d59f99 · 2021-10-14T20:53:45.000+03:00
diff --git a/artifacts/config_files/Translations.ini b/artifacts/config_files/Translations.ini
@@ -39,4 +39,3 @@ StyleText=Style
 ;HipKick=Hip kick:
 ;HookKick=Hook kick:
 ;PiercingKick=Piercing kick:
-
diff --git a/artifacts/translations/brazilian_portuguese.ini b/artifacts/translations/brazilian_portuguese.ini
@@ -4,7 +4,7 @@ KarmaGain=Voc
 KarmaLoss=Voc� perdeu %d de karma.
 HighlightFail1=Voc� n�o est� carregando um sensor de movimento.
 HighlightFail2=Seu sensor de movimento est� sem cargas.
-SuperStimExploitMsg=Voc� n�o pode usar um super stim em algu�m que n�o est� ferido!
+SuperStimExploitMsg=Voc� n�o pode usar este item em algu�m que n�o esteja ferido!
 BlockedCombat=Voc� n�o pode entrar em combate desta vez.
 SaveSfallDataFail=ERRO ao salvar a informa��o extendida do jogo salvo! Verifique se outros programas interferem com os arquivos/pastas do jogo salvo e tente de novo.
 PartyLvlMsg=Nvl:
diff --git a/artifacts/translations/chs.ini b/artifacts/translations/chs.ini
@@ -4,7 +4,7 @@ KarmaGain=
 KarmaLoss=��ʧȥ��%d����¡�
 HighlightFail1=��û��Я����̬��Ӧ����
 HighlightFail2=��Ķ�̬��Ӧ��û���ˡ�
-SuperStimExploitMsg=�㲻�ܶ�û���˵���ʹ�ó��������룡
+SuperStimExploitMsg=�㲻�ܶ�û���˵Ľ�ɫʹ�������Ʒ��
 BlockedCombat=�����ڲ��ܽ���ս����
 SaveSfallDataFail=����浵��չ��Ϣʱ�������󣡼���Ƿ�����������ռ�ô浵�ļ����ļ��A֮������һ�Ρ�
 PartyLvlMsg=�ȼ�:
@@ -20,3 +20,20 @@ PartyOrderAttackRobot=::
 RaceText=����
 StyleText=���
 DoneBtn=���
+
+;��ҿ��ֹ�����ʽ���Զ����ƣ��Ϊ16����Ԫ��8�������֣�
+[Unarmed]
+;Punch=ȭ��:
+;Kick=�߻�:
+;StrongPunch=��ȭ:
+;HammerPunch=��ͷȭ:
+;Haymaker=ǿȭ:
+;Jab=��ȭ:
+;PalmStrike=�ƻ�:
+;PiercingStrike=�̻�:
+;StrongKick=����:
+;SnapKick=����:
+;PowerKick=ǿ��:
+;HipKick=����:
+;HookKick=����:
+;PiercingKick=����:
diff --git a/artifacts/translations/cht.ini b/artifacts/translations/cht.ini
@@ -4,7 +4,7 @@ KarmaGain=
 KarmaLoss=�A���h�F%d�I�D�w�C
 HighlightFail1=�A�S����a�ʺA�P�����C
 HighlightFail2=�A���ʺA�P�����S�q�F�C
-SuperStimExploitMsg=�A�����S���˪�����ϥζW�Ūv���w�I
+SuperStimExploitMsg=�A�����S���˪�����ϥγo�Ӫ��~�I
 BlockedCombat=�A�{�b����i�J�԰��C
 SaveSfallDataFail=�x�s�s�ɩ�����T�ɵo�Ϳ��~�I�ˬd�O�_����L�{���e�Φs���ɮס���Ƨ�����A�դ@���C
 PartyLvlMsg=����:
@@ -20,3 +20,20 @@ PartyOrderAttackRobot=::
 RaceText=�ر�
 StyleText=����
 DoneBtn=����
+
+;���a�Ť�����ۦ����۩w�W�١]�̪���16�Ӧr���A8�Ӥ���r�^
+[Unarmed]
+;Punch=����:
+;Kick=����:
+;StrongPunch=����:
+;HammerPunch=�}�Y��:
+;Haymaker=�j��:
+;Jab=�뮱:
+;PalmStrike=�x��:
+;PiercingStrike=����:
+;StrongKick=����:
+;SnapKick=�ֽ�:
+;PowerKick=�j��:
+;HipKick=�I��:
+;HookKick=�Ľ�:
+;PiercingKick=���:
diff --git a/artifacts/translations/french.ini b/artifacts/translations/french.ini
@@ -4,7 +4,7 @@ KarmaGain=Tu gagnes %d points de Karma.
 KarmaLoss=Tu perds %d points de Karma.
 HighlightFail1=Tu ne porte pas de Capteur de mouvement.
 HighlightFail2=Ton Capteur de mouvement est vide.
-SuperStimExploitMsg=Tu ne peux pas utiliser un Super Stimpak sur une personne qui n'est pas bless�e!
+SuperStimExploitMsg=Tu ne peux pas utiliser cet objet sur une personne qui n'est pas bless�e!
 BlockedCombat=Tu ne peux pas entrer en combat actuellement.
 SaveSfallDataFail=ERROR � la sauvegarde! V�rifiez que d'autres programmes n'interferent pas avec les fichiers ou les dossiers de sauvegarde et essayez � nouveau.
 PartyLvlMsg=Niveau:
diff --git a/artifacts/translations/german.ini b/artifacts/translations/german.ini
@@ -4,7 +4,7 @@ KarmaGain=Du erh
 KarmaLoss=Du verlierst %d Karma.
 HighlightFail1=Du tr�gst keinen Bewegungssensor.
 HighlightFail2=Dein Bewegungssensor ist entladen.
-SuperStimExploitMsg=Du kannst einem Unverletzten kein Super-Stimpak verabreichen!
+SuperStimExploitMsg=Du kannst diesen Gegenstand nicht auf Unverletzte anwenden!
 BlockedCombat=Kampfmodus momentan nicht verf�gbar.
 SaveSfallDataFail=FEHLER beim Speichern des Spielstandes! Pr�fe, ob andere Programme darauf zugreifen und probiere es erneut.
 PartyLvlMsg=Lvl:
diff --git a/artifacts/translations/polish.ini b/artifacts/translations/polish.ini
@@ -0,0 +1,22 @@
+[sfall]
+SaveInCombat=Nie mo�esz zapisa� gry w tym momencie.
+KarmaGain=Zdoby�e� %d karmy.
+KarmaLoss=Straci�e� %d karmy.
+HighlightFail1=Nie masz przy sobie detektora ruchu.
+HighlightFail2=Tw�j detektor ruchu jest roz�adowany.
+SuperStimExploitMsg=Nie mo�esz u�y� tego przedmiotu na w pe�ni zdrowej osobie!
+BlockedCombat=Nie mo�esz obecnie wej�� w tryb walki.
+SaveSfallDataFail=B��D Zapisujesz rozszerzone informacje w zapisie gry! Sprawd�, czy inne programy nie koliduj� z plikami/folderami zapisu gry i spr�buj ponownie.
+PartyLvlMsg=Lvl:
+PartyACMsg=AC:
+PartyAddictMsg=Uzale�niony
+NPCPickupFail=%s nie mo�e podnie�� przedmiotu.
+
+PartyOrderAttackHuman=Zajm� si� tym.|Okej, zrozumia�em.|No to mamy plan.
+PartyOrderAttackCreature=::Warkni�cie::
+PartyOrderAttackRobot=::Bip::
+
+[AppearanceMod]
+RaceText=Rasa
+StyleText=Styl
+DoneBtn=Gotowe
diff --git a/artifacts/translations/russian.ini b/artifacts/translations/russian.ini
@@ -22,3 +22,20 @@ PartyOrderAttackRobot=::
 RaceText=����
 StyleText=�����
 DoneBtn=�������
+
+;����� ��� ������������� ���� ������ (����. 16 ��������)
+[Hits]
+;Punch=���� �����:
+;Kick=���� �����:
+;StrongPunch=
+;HammerPunch=
+;Haymaker=
+;Jab=
+;PalmStrike=
+;PiercingStrike=
+;StrongKick=
+;SnapKick=
+;PowerKick=
+;HipKick=
+;HookKick=
+;PiercingKick=
diff --git a/artifacts/translations/russian_oem.ini b/artifacts/translations/russian_oem.ini
@@ -22,3 +22,20 @@ PartyOrderAttackRobot=::
 RaceText=���
 StyleText=�⨫�
 DoneBtn=�������
+
+;����� ��� ������㦥���� �⠪ ��ப� (����. 16 ᨬ�����)
+[Hits]
+;Punch=���� �㪮�:
+;Kick=���� �����:
+;StrongPunch=
+;HammerPunch=
+;Haymaker=
+;Jab=
+;PalmStrike=
+;PiercingStrike=
+;StrongKick=
+;SnapKick=
+;PowerKick=
+;HipKick=
+;HookKick=
+;PiercingKick=
diff --git a/sfall/FalloutEngine/Functions.cpp b/sfall/FalloutEngine/Functions.cpp
@@ -298,6 +298,7 @@ void __cdecl buf_to_buf(BYTE* src, long width, long height, long src_width, BYTE
 		mov  esi, src;
 		mov  edi, dst;
 		mov  eax, height;
+
 	startLoop:
 		mov  ecx, blockCount;
 		test ecx, ecx;
@@ -325,6 +326,7 @@ void __cdecl buf_to_buf(BYTE* src, long width, long height, long src_width, BYTE
 		dec  eax;      // height
 		jnz  startLoop;
 		jmp  end;
+
 	copySmall: // copies the small size data
 		mov  ecx, sizeD;
 		rep  movsd;
diff --git a/sfall/Game/GUI/render.cpp b/sfall/Game/GUI/render.cpp
@@ -43,6 +43,9 @@ static void Draw(fo::Window* win, BYTE* surface, long width, long height, long w
 }
 
 void __fastcall Render::GNW_win_refresh(fo::Window* win, RECT* updateRect, BYTE* toBuffer) {
+	///fo::func::GNW_win_refresh(win, (fo::BoundRect*)updateRect, (long*)toBuffer);
+	///return;
+
 	if (win->flags & fo::WinFlags::Hidden) return;
 	fo::RectList* rects;
 
@@ -138,7 +141,7 @@ void __fastcall Render::GNW_win_refresh(fo::Window* win, RECT* updateRect, BYTE*
 			}
 			surface = &win->surface[currRect->wRect.left - win->rect.x] + ((currRect->wRect.top - win->rect.y) * win->width);
 		} else {
-			surface = new BYTE[height * width](); // black background
+			surface = new BYTE[height * width](); // black background (for main menu)
 			widthFrom = width; // replace with rectangle
 		}
 
@@ -188,6 +191,11 @@ void Render::init() {
 	sf::MakeJump(0x4D6FD9, GNW_win_refresh_hack, 1);
 	// replace _screendump_buf to _screen_buffer for create screenshot
 	sf::SafeWriteBatch<DWORD>(FO_VAR_screen_buffer, { 0x4C8FD1, 0x4C900D });
+
+	// dev test
+	//sf::BlockCall(0x4CA506);
+	//sf::SafeWrite8(0x4CA50B, 0x90);
+	//sf::BlockCall(0x4D764C);
 }
 
 }
diff --git a/sfall/Game/ImprovedAI/AI.Behavior.cpp b/sfall/Game/ImprovedAI/AI.Behavior.cpp
@@ -555,6 +555,7 @@ static fo::AttackType AISearchBestWeaponOnBeginAttack(fo::GameObject* source, fo
 	return hitMode;
 }
 
+#ifndef NDEBUG
 static void PrintShootResult(long result) {
 	const char* type;
 	switch (result) {
@@ -570,6 +571,9 @@ static void PrintShootResult(long result) {
 	}
 	fo::func::debug_printf("\n[AI] Try Attack: Check bad shot result: %s", type);
 }
+#else
+static void PrintShootResult(long result) {}
+#endif
 
 static bool weaponIsSwitched = false; // true - смена оружия уже была произведена
 
@@ -606,9 +610,8 @@ static CombatShootResult __fastcall AICheckAttack(fo::GameObject* &weapon, fo::G
 
 	CombatShootResult result = AICombat::combat_check_bad_shot(source, target, hitMode, 0);
 
-	#ifndef NDEBUG
+	// for debug
 	PrintShootResult((long)result); // "Try Attack: Check bad shot result:"
-	#endif
 
 	switch (result)
 	{
@@ -1002,7 +1005,7 @@ static fo::GameObject* ClearMovePathSub(fo::GameObject* source, fo::GameObject*
 			if (obj) {
 				if (lastCritter) {
 					// проверить путь до текущего криттера
-					if (game::Tilemap::make_path_func(obj, obj->tile, target->tile, 0, 0, 0, (void*)fo::funcoffs::obj_blocking_at_) == 0) {
+					if (game::Tilemap::make_path_func(source, source->tile, obj->tile, 0, 0, 0, (void*)fo::funcoffs::obj_blocking_at_) == 0) {
 						// путь блокирован, передвинуть предыдущего криттера
 						if (MoveCritter(source, lastCritter, pathTiles[lastStep - 1])) return lastCritter;
 					}
@@ -1109,6 +1112,7 @@ long __fastcall AIBehavior::AIMoveStepsCloser(long flags, fo::GameObject* target
 
 	if (!fo::func::make_path_func(source, source->tile, target->tile, 0, 0, (void*)fo::funcoffs::obj_blocking_at_)) {
 		// [ADD-EXT] Реализация функции освобождения пути криттера блокирующего путь к цели
+		if (fo::func::critter_body_type(source) != fo::BodyType::Biped) goto block;
 		long gotoTile = -1;
 		fo::GameObject* object = ClearMovePath(source, target, gotoTile);
 		if (object) {
@@ -1118,8 +1122,8 @@ long __fastcall AIBehavior::AIMoveStepsCloser(long flags, fo::GameObject* target
 		else if (gotoTile != -1) {
 			destinationTile = gotoTile;
 		} else {
-			// не удалось построить путь, найти ближайщего криттера
-			fo::var::moveBlockObj = 0;
+	block:	// не удалось построить путь, найти ближайщего криттера	
+			fo::var::moveBlockObj = nullptr;
 			if (!fo::func::make_path_func(source, source->tile, target->tile, 0, 0, (void*)fo::funcoffs::obj_ai_blocking_at_)
 				&& fo::var::moveBlockObj && fo::var::moveBlockObj->IsCritter())
 			{
diff --git a/sfall/Game/ImprovedAI/AI.Combat.cpp b/sfall/Game/ImprovedAI/AI.Combat.cpp
@@ -1015,25 +1015,6 @@ static void __declspec(naked) combat_attack_hook() {
 */
 /////////////////////////////////////////////////////////////////////////////////////////
 
-//#ifndef NDEBUG
-//static void __declspec(naked) ai_move_steps_closer_debug() {
-//	static const char* move_steps_closer_fail = "\nERROR: ai_move_steps_closer.";
-//	__asm {
-//		test eax, eax;
-//		jns  skip;
-//		push move_steps_closer_fail;
-//		call fo::funcoffs::debug_printf_;
-//		add  esp, 4;
-//skip:
-//		add  esp, 0x10;
-//		pop  ebp;
-//		pop  edi;
-//		pop  esi;
-//		retn;
-//	}
-//}
-//#endif
-
 void AICombat::init(bool smartBehavior) {
 
 	// Enables the use of the RunAwayMode value from the AI-packet for the NPC
@@ -1056,7 +1037,6 @@ void AICombat::init(bool smartBehavior) {
 
 		#ifndef NDEBUG
 		combatDebug = (sf::IniReader::GetConfigInt("CombatAI", "Debug", 0) != 0);
-		//sf::MakeJump(0x42A1B6, ai_move_steps_closer_debug);
 		#endif
 	}
 }
diff --git a/sfall/Modules/Tiles.cpp b/sfall/Modules/Tiles.cpp
@@ -175,6 +175,15 @@ static int ProcessTile(fo::Art* tiles, int tile, int listPos) {
 	}
 	overrides[tile] = new OverrideEntry(xSize, ySize, listPos);
 
+	// Test
+	///sprintf(&buf[10], "z_%s", &tiles->names[13 * tile]);
+	///fo::func::db_fseek(artFile, 0, SEEK_SET);
+	///fo::func::db_freadByteCount(artFile, (BYTE*)&frame, 74);
+	///fo::DbFile* file = fo::func::db_fopen(buf, "wb");
+	///fo::func::db_fwriteByteCount(file, (BYTE*)&frame, 74);
+	///fo::func::db_fwriteByteCount(file, pixelData, bytes);
+	///fo::func::db_fclose(file);
+
 	fo::func::db_fclose(artFile);
 	delete[] pixelData;
 
diff --git a/sfall/ddraw.sln b/sfall/ddraw.sln
diff --git a/sfall/ddraw.vcxproj b/sfall/ddraw.vcxproj

-Original file line number
+Diff line change
 KarmaLoss=Você perdeu %d de karma.
 HighlightFail1=Você não está carregando um sensor de movimento.
 HighlightFail2=Seu sensor de movimento está sem cargas.
 -SuperStimExploitMsg=Você não pode usar um super stim em alguém que não está ferido!
 +SuperStimExploitMsg=Você não pode usar este item em alguém que não esteja ferido!
 BlockedCombat=Você não pode entrar em combate desta vez.
 SaveSfallDataFail=ERRO ao salvar a informação extendida do jogo salvo! Verifique se outros programas interferem com os arquivos/pastas do jogo salvo e tente de novo.
 PartyLvlMsg=Nvl:
-Original file line number
+Diff line change
 KarmaLoss=你失去了%d点道德。
 HighlightFail1=你没有携带动态感应器。
 HighlightFail2=你的动态感应器没电了。
 -SuperStimExploitMsg=你不能对没受伤的人使用超级治疗针！
 +SuperStimExploitMsg=你不能对没受伤的角色使用这个物品！
 BlockedCombat=你现在不能进入战斗。
 SaveSfallDataFail=储存存档延展信息时发生错误！检查是否有其他程序占用存档文件／文件夾之后再试一次。
 PartyLvlMsg=等级:
 RaceText=种族
 StyleText=风格
 DoneBtn=完成
++
 +;玩家空手攻击招式的自定名称（最长为16个字元，8个中文字）
 +[Unarmed]
 +;Punch=拳击:
 +;Kick=踢击:
 +;StrongPunch=重拳:
 +;HammerPunch=榔头拳:
 +;Haymaker=强拳:
 +;Jab=刺拳:
 +;PalmStrike=掌击:
 +;PiercingStrike=刺击:
 +;StrongKick=重踢:
 +;SnapKick=快踢:
 +;PowerKick=强踢:
 +;HipKick=背踢:
 +;HookKick=勾踢:
 +;PiercingKick=刺踢:
-Original file line number
+Diff line change
 KarmaLoss=你失去了%d點道德。
 HighlightFail1=你沒有攜帶動態感應器。
 HighlightFail2=你的動態感應器沒電了。
 -SuperStimExploitMsg=你不能對沒受傷的角色使用超級治療針！
 +SuperStimExploitMsg=你不能對沒受傷的角色使用這個物品！
 BlockedCombat=你現在不能進入戰鬥。
 SaveSfallDataFail=儲存存檔延伸資訊時發生錯誤！檢查是否有其他程式占用存檔檔案／資料夾之後再試一次。
 PartyLvlMsg=等級:
 RaceText=種族
 StyleText=風格
 DoneBtn=完成
++
 +;玩家空手攻擊招式的自定名稱（最長為16個字元，8個中文字）
 +[Unarmed]
 +;Punch=拳擊:
 +;Kick=踢擊:
 +;StrongPunch=重拳:
 +;HammerPunch=榔頭拳:
 +;Haymaker=強拳:
 +;Jab=刺拳:
 +;PalmStrike=掌擊:
 +;PiercingStrike=刺擊:
 +;StrongKick=重踢:
 +;SnapKick=快踢:
 +;PowerKick=強踢:
 +;HipKick=背踢:
 +;HookKick=勾踢:
 +;PiercingKick=刺踢:
-Original file line number
+Diff line change
@@ @@ -0,0 +1,22 @@ @@
 +[sfall]
 +SaveInCombat=Nie możesz zapisać gry w tym momencie.
 +KarmaGain=Zdobyłeś %d karmy.
 +KarmaLoss=Straciłeś %d karmy.
 +HighlightFail1=Nie masz przy sobie detektora ruchu.
 +HighlightFail2=Twój detektor ruchu jest rozładowany.
 +SuperStimExploitMsg=Nie możesz użyć tego przedmiotu na w pełni zdrowej osobie!
 +BlockedCombat=Nie możesz obecnie wejść w tryb walki.
 +SaveSfallDataFail=BŁĄD Zapisujesz rozszerzone informacje w zapisie gry! Sprawdź, czy inne programy nie kolidują z plikami/folderami zapisu gry i spróbuj ponownie.
 +PartyLvlMsg=Lvl:
 +PartyACMsg=AC:
 +PartyAddictMsg=Uzależniony
 +NPCPickupFail=%s nie może podnieść przedmiotu.
++
 +PartyOrderAttackHuman=Zajmę się tym.|Okej, zrozumiałem.|No to mamy plan.
 +PartyOrderAttackCreature=::Warknięcie::
 +PartyOrderAttackRobot=::Bip::
++
 +[AppearanceMod]
 +RaceText=Rasa
 +StyleText=Styl
 +DoneBtn=Gotowe