Skip to content

Commit

Permalink
MM7Patch v2.5.1:
Browse files Browse the repository at this point in the history
[-] My bug: Energy damage wasn't displayed in identify monster dialog
  • Loading branch information
GrayFace committed Dec 23, 2021
1 parent cef6193 commit 6c21147
Show file tree
Hide file tree
Showing 18 changed files with 5,432 additions and 5,384 deletions.
10,749 changes: 5,377 additions & 5,372 deletions MMPatches/Install/MM7patch.map

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion MMPatches/Install/MM7patch/Files/MM7Patch ReadMe.TXT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GrayFace MM7 Patch v2.5
GrayFace MM7 Patch v2.5.1
By Sergey Rozhenko <mailto:[email protected]>
https://grayface.github.io/

Expand All @@ -11,6 +11,10 @@ At the end of ReadMe you'll find info on how to report errors.

([+] - feature, [-] - fixed bug, [*] - other)

New in version 2.5.1:
<< MM7, MM8 >>
[-] My bug: Energy damage wasn't displayed in identify monster dialog

New in version 2.5:
<< MM6 - MM8 >>
[+] Set ShooterMode=1 to enable FPS-like mode. Press attack button to toggle the fight mode, then press left mouse button to attack and right button to use quick spell. Regular quick spell button also works. No auto-targeting is done. A sword icon indicates this mode, which also shows health of target (or last hit) monster.
Expand Down
Binary file modified MMPatches/Install/MM7patch/Files/MM7patch.dll
Binary file not shown.
Binary file modified MMPatches/Install/MM7patch/OptData/01 dragon.games.lod
Binary file not shown.
6 changes: 5 additions & 1 deletion MMPatches/Install/MM7patchBuka/Files/MM7Patch ReadMe_rus.TXT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GrayFace MM7 Patch v2.5
GrayFace MM7 Patch v2.5.1
�����: ������ ������� <mailto:[email protected]>
https://grayface.github.io/ru/

Expand All @@ -10,6 +10,10 @@ https://grayface.github.io/ru/

([+] - ����, [-] - ������������ ���, [*] - ������)

��������� ������ 2.5.1:
<< MM7, MM8 >>
[-] ��� ���: ��� ����� ������� �� ����������� � ��������� ������� � ������� �������������.

��������� ������ 2.5:
<< MM6 - MM8 >>
[+] ���������� ShooterMode=1, ����� �������� ����� ������ �� ������� ����. ������ ����� ��������/��������� ����� �����, � ������� ����� ������ ���� �������� �����, � ������ - ������������� �������� ����������. ������� ������ �������� ���������� ���� ��������. ��� ���� ������ ����� � ������, � �� � ���������� �����. ������ ���� ����������, ��� ������� ���� �����, � ����� �������� ���������� (��� ���������� ������������) �������.
Expand Down
Binary file modified MMPatches/Install/MM7patchBuka/Files/MM7patch.dll
Binary file not shown.
3 changes: 2 additions & 1 deletion MMPatches/Install/MM7patchBuka/Files/mm7lang.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ PlayerNotActive=
DoubleSpeed=Удвоенная скорость
NormalSpeed=Обычная скорость
ArmorHalved=Половина брони
ArmorHalvedMessage=^Pi[%s] отполовинил броню ^Pr[%s]
ArmorHalvedMessage=^Pi[%s] отполовинил^R[;а;] броню ^Pr[%s]
Duration=Длительность:
DurationYr=" %d:г"
DurationMo=" %d:мес"
Expand All @@ -18,4 +18,5 @@ ChooseAttackSpell=
SetAttackSpell=Назначить %s заклинанием атаки
SwitchAttackSpell=Назначить заклинанием атаки (вместо %s)
RemoveAttackSpell=Убрать заклинание атаки (%s)
Energy=Энергия
N/A=нет
Binary file modified MMPatches/Install/MM7patchBuka/OptData/01 dragon.games.lod
Binary file not shown.
Binary file modified MMPatches/Install/MM7patchLoc/Files/MM7patch.dll
Binary file not shown.
Binary file modified MMPatches/Install/MM7patchLoc/OptData/01 dragon.games.lod
Binary file not shown.
6 changes: 5 additions & 1 deletion MMPatches/Install/MM7patchLoc/eng/MM7Patch ReadMe.TXT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GrayFace MM7 Patch v2.5
GrayFace MM7 Patch v2.5.1
By Sergey Rozhenko <mailto:[email protected]>
https://grayface.github.io/

Expand All @@ -11,6 +11,10 @@ At the end of ReadMe you'll find info on how to report errors.

([+] - feature, [-] - fixed bug, [*] - other)

New in version 2.5.1:
<< MM7, MM8 >>
[-] My bug: Energy damage wasn't displayed in identify monster dialog

New in version 2.5:
<< MM6 - MM8 >>
[+] Set ShooterMode=1 to enable FPS-like mode. Press attack button to toggle the fight mode, then press left mouse button to attack and right button to use quick spell. Regular quick spell button also works. No auto-targeting is done. A sword icon indicates this mode, which also shows health of target (or last hit) monster.
Expand Down
6 changes: 5 additions & 1 deletion MMPatches/Install/MM7patchLoc/rus/MM7Patch ReadMe_rus.TXT
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
GrayFace MM7 Patch v2.5
GrayFace MM7 Patch v2.5.1
�����: ������ ������� <mailto:[email protected]>
https://grayface.github.io/ru/

Expand All @@ -10,6 +10,10 @@ https://grayface.github.io/ru/

([+] - ����, [-] - ������������ ���, [*] - ������)

��������� ������ 2.5.1:
<< MM7, MM8 >>
[-] ��� ���: ��� ����� ������� �� ����������� � ��������� ������� � ������� �������������.

��������� ������ 2.5:
<< MM6 - MM8 >>
[+] ���������� ShooterMode=1, ����� �������� ����� ������ �� ������� ����. ������ ����� ��������/��������� ����� �����, � ������� ����� ������ ���� �������� �����, � ������ - ������������� �������� ����������. ������� ������ �������� ���������� ���� ��������. ��� ���� ������ ����� � ������, � �� � ���������� �����. ������ ���� ����������, ��� ������� ���� �����, � ����� �������� ���������� (��� ���������� ������������) �������.
Expand Down
7 changes: 7 additions & 0 deletions MMPatches/Install/MM7patchLoc/rus/mm7lang.ini
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,10 @@ DurationMo=" %d:
DurationDy=" %d:д"
DurationHr=" %d:ч"
DurationMn=" %d:мин"
StoleItem=^%s украл %s!
ChooseAttackSpell=Выберите заклинание и затем нажмите здесь, чтоба назначить его заклинанием атаки
SetAttackSpell=Назначить %s заклинанием атаки
SwitchAttackSpell=Назначить заклинанием атаки (вместо %s)
RemoveAttackSpell=Убрать заклинание атаки (%s)
Energy=Энергия
N/A=нет
8 changes: 4 additions & 4 deletions MMPatches/MM7Patch/MM7patch.bdsproj
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,8 @@
<VersionInfo Name="IncludeVerInfo">True</VersionInfo>
<VersionInfo Name="AutoIncBuild">False</VersionInfo>
<VersionInfo Name="MajorVer">2</VersionInfo>
<VersionInfo Name="MinorVer">4</VersionInfo>
<VersionInfo Name="Release">0</VersionInfo>
<VersionInfo Name="MinorVer">5</VersionInfo>
<VersionInfo Name="Release">1</VersionInfo>
<VersionInfo Name="Build">0</VersionInfo>
<VersionInfo Name="Debug">False</VersionInfo>
<VersionInfo Name="PreRelease">False</VersionInfo>
Expand All @@ -162,13 +162,13 @@
<VersionInfoKeys>
<VersionInfoKeys Name="CompanyName"></VersionInfoKeys>
<VersionInfoKeys Name="FileDescription">GrayFace MM7 Patch</VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">2.4.0.0</VersionInfoKeys>
<VersionInfoKeys Name="FileVersion">2.5.1.0</VersionInfoKeys>
<VersionInfoKeys Name="InternalName"></VersionInfoKeys>
<VersionInfoKeys Name="LegalCopyright">Sergey Rozhenko (http://grayface.github.io)</VersionInfoKeys>
<VersionInfoKeys Name="LegalTrademarks"></VersionInfoKeys>
<VersionInfoKeys Name="OriginalFilename"></VersionInfoKeys>
<VersionInfoKeys Name="ProductName">GrayFace MM7 Patch</VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">2.4.0.0</VersionInfoKeys>
<VersionInfoKeys Name="ProductVersion">2.5.1.0</VersionInfoKeys>
</VersionInfoKeys>
</Delphi.Personality>
</BorlandProject>
5 changes: 5 additions & 0 deletions MMPatches/MM7Patch/MM7patch.dpr
Original file line number Diff line number Diff line change
Expand Up @@ -399,6 +399,10 @@ Version 2.5:
[-] Wetsuits had recovery penalty
[-] FixUnimplementedSpells
Version 2.5.1:
(MM7, MM8)
[-] My bug: Energy damage wasn't displayed in identify monster dialog
[!!] https://discord.com/channels/296507109997019137/296508593744773120/900738954477834260
[!!] Configure controls like in MM6, keyboard layout-independant in-game Controls
Expand All @@ -411,6 +415,7 @@ Version 2.5:
[!!] "Minotuars" in MM8 Promotion Quest NPC
[!!] FPS don't do std action?
[!!] Setup controls
[!!] MouseLookBorder in UILayout mode
(Figo:) Is there still the limit of how many we can acquire with one party (~13)?
I've read that in the Merge there is none, so how about a vanilla game?
Expand Down
Binary file modified MMPatches/MM7Patch/MM7patch.res
Binary file not shown.
3 changes: 2 additions & 1 deletion MMPatches/MMCommon/MMCommon.pas
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,7 @@ interface
QuickSaveName, QuickSaveDigitSpace, SArmorHalved, SArmorHalvedMessage,
SDuration, SDurationYr, SDurationMo, SDurationDy, SDurationHr,
SDurationMn, SRemoveASpell, SChooseASpell, SSetASpell, SSetASpell2,
SStoleItem, SNotAvailable: string;
SStoleItem, SNotAvailable, SEnergy: string;

CapsLockToggleRun, NoDeathMovie, FreeTabInInventory, ReputationNumber,
AlwaysStrafe, StandardStrafe, MouseLookChanged, MLookRaw, FixInfiniteScrolls,
Expand Down Expand Up @@ -1285,6 +1285,7 @@ procedure LoadIni;
SDurationDy:= ReadLocString('DurationDy', ' %d:dy');
SDurationHr:= ReadLocString('DurationHr', ' %d:hr');
SDurationMn:= ReadLocString('DurationMn', ' %d:mn');
SEnergy:= ReadLocString('Energy', 'Energy');
{$ENDIF}
SNotAvailable:= ReadLocString('N/A', 'N/A');

Expand Down
17 changes: 15 additions & 2 deletions MMPatches/MMCommon/MMHooks.pas
Original file line number Diff line number Diff line change
Expand Up @@ -3678,10 +3678,21 @@ procedure FixUnimplementedSpells;
ret 8 + 4*m8
end;

//----- Show Energy damage type in monster info

procedure FixIdMonEnergyDamage;
asm
cmp eax, 10
jna @std
mov edx, SEnergy
mov [esp + 4], edx
@std:
end;

//----- HooksList

var
HooksCommon: array[1..74] of TRSHookInfo = (
HooksCommon: array[1..75] of TRSHookInfo = (
(p: m6*$453ACE + m7*$463341 + m8*$461316; newp: @UpdateHintHook;
t: RShtCallStore; Querry: hqFixStayingHints), // Fix element hints staying active in some dialogs
(p: m6*$4226F8 + m7*$427E71 + m8*$4260A8; newp: @FixItemSpells;
Expand Down Expand Up @@ -3815,7 +3826,9 @@ procedure FixUnimplementedSpells;
size: 12 + 2*m7; Querry: hqKeepEmptyWands), // Keep wands without charges
(p: m7*$4270B9 + m8*$4254BA; newp: @FixUnimplementedSpells;
t: RShtBefore; size: 6; Querry: hqFixUnimplementedSpells), // Monsters can't cast some spells, but waste turn
(p: m7*$49DB05 + m8*$49AFCD; size: 2), // Windows 10 incompatibility
(p: m7*$49DB05 + m8*$49AFCD; size: 2), // Windows 10 incompatibility
(p: m7*$41EF8F + m8*$41E500; newp: @FixIdMonEnergyDamage;
t: RShtAfter; size: 7), // Show Energy damage type in monster info
()
);
{$IFDEF MM6}
Expand Down

0 comments on commit 6c21147

Please sign in to comment.