Update installer, mods order, readme and batch scripts

Author: phobos2077

docs/ddraw_ini_settings.txt

@@ -1,6 +1,6 @@
 [Misc]
 
-VersionString=FALLOUT II 1.02d  RPU v26 + map_update_v2 + EcCo v0.9.1
+VersionString=FALLOUT II 1.02d  RPU v29 + map_update + EcCo v0.9.4
 
 DamageFormula=0
 

docs/ecco_changelog.txt

@@ -1,5 +1,8 @@
 -=== CHANGELOG ===-
 
+v0.9.4
+- Compatibility with RPU v29
+
 v0.9.3
 > Stealing & looting:
 - Steal rolls calculation changed to make stealing harder but encourage investing into the skill

docs/ecco_changelog_ru.txt

@@ -1,5 +1,8 @@
 -=== СПИСОК ИЗМЕНЕНИЙ ===-
 
+v0.9.4
+- Совместимость с RPU v29
+
 v0.9.3
 > Воровство и лут:
 - изменён расчёт исхода воровства для его усложнения и мотивации инвестировать в навык

docs/ecco_readme.txt

@@ -1,6 +1,6 @@
 -====================-
 -===   EcCo mod   ===-
--=== v0.9.3 BETA  ===-
+-=== v0.9.4 BETA  ===-
 -====================-
 						by phobos2077
 

docs/todo.txt

@@ -1,22 +1,30 @@
-for 0.9.3:
-- release
+for 0.9.*:
+- make sure weapon skill investments are relevant (reduce AP ammo AC penalty, increase high-tier NPC's AC)
+- playtest
 
 
 for "future":
 - add early game Flamerthrower (Incinerator)
 - Stimpak & Healing powder heal amt to depend upon First Aid skill
 - Crafting: use items from party members inventory
 - Crafting: read config from INI file and texts from game/craft.msg
-- port "grenades anywhere" script from FO2Tweaks?
-- port auto-cursor from FO2Tweaks (with modifications)
+- Crafting: add small XP rewards for crafting
 - add tie-ins to barter "demand" feature, have some trader explain it in dialog (and maybe also boost your barter skill)
 - sneak attack msg from combat.msg
 - replace "handmade grenade" sprite
 - replace Throwing Axe sprite
 - add info about bonus move points to stat description
 
 
+Considering:
+- make stimpak irradiation optional using set_proto_data
+- port "grenades anywhere" script from FO2Tweaks?
+- port auto-cursor from FO2Tweaks (with modifications)
+
+
 IDEAS:
+- Hunting Rifle -> Scoped for Slags rewards
+- Marcus Scoped Rifle  to something better as reward
 - remove early link to EPA (it has too OP enemies and loot)?
 - Reduce ammo/drug loot in containers similar to critter loot and FNV Famine mod (less reduction for closed containers, etc.)
 - one more "unarmed" weapon above Spiked Knuckles (knuckles with knife?)

extra/bin/compile_folder.cmd

@@ -0,0 +1,21 @@
+@echo off
+rem Compile script using gcc preprocessor
+
+rem echo 1=%1 2=%2 3=%3 4=%4 5=%5 6=%6 7=%7 8=%8 9=%9
+
+set sce=
+echo %~n3 | findstr /i /r "^hs_ ^gl_ ^test[0-9]" >nul && (
+   echo Compiling with short-circuit evaluation!
+   set sce=-s
+)
+set out=
+if not "%3"=="" set out=-o %3
+
+gcc -E -x c -P -Werror -Wfatal-errors -o "%~nx1.tmp" "%1"
+rem if errorlevel 1 exit /b %errorlevel%
+echo compile.exe -q -l -O2 %sce% "%~nx1.tmp" %out%
+compile.exe -q -l -O2 %sce% "%~nx1.tmp" %out%
+SET compileErr=%ERRORLEVEL%
+del "%~nx1.tmp"
+if exist "%~n1.err" del "%~n1.err"
+exit /B %compileErr%

extra/bin/compile_gcc.cmd

@@ -11,11 +11,12 @@ echo %~n3 | findstr /i /r "^hs_ ^gl_ ^test[0-9]" >nul && (
 set out=
 if not "%3"=="" set out=-o %3
 
-wcc386.exe %1 -plw=0 -fo="%~nx1.i" -w4 -wcd123 -wcd138
+rem wcc386.exe %1 -plw=0 -fo="%~nx1.i" -w4 -wcd123 -wcd138
+wpp386.exe %1 -plw=0 -fo="%~nx1.i" -w4 -wcd735 -wcd894
 rem if errorlevel 1 exit /b %errorlevel%
 echo compile.exe -q -l -O2 %sce% "%~nx1.i" %out%
 compile.exe -q -l -O2 %sce% "%~nx1.i" %out%
 SET compileErr=%ERRORLEVEL%
 del "%~nx1.i"
-if exist "%~nx1.err" del "%~nx1.err"
+if exist "%~n1.err" del "%~n1.err"
 exit /B %compileErr%

extra/bin/compile_wcc.cmd

@@ -0,0 +1,2 @@
+@echo off
+gcc -E -x c -P -Werror -Wfatal-errors -o "%~nx1.tmp" "%1"

extra/bin/gcc_preproc.cmd

@@ -0,0 +1,12 @@
+@ECHO OFF
+
+rem Used to batch recompile scripts previously decompiled with decompile_folder
+
+set compile=%~dp0compile.exe
+set output=..\
+
+for %%i in (*.ssl) do (
+    "%compile%" -l -O0 -q -n "%%~nxi" -o "%output%/%%~ni.int"
+)
+
+:end

extra/bin/recompile_folder.cmd

@@ -1 +1,3 @@
-wcc386.exe %1 -plw=0 -fo="%~nx1.i" -w4 -wcd123 -wcd138
+@echo off
+rem wcc386.exe %1 -plw=0 -fo="%~nx1.i" -w4 -wcd123 -wcd138
+wpp386.exe %1 -plw=0 -fo="%~nx1.i" -w4 -wcd735

extra/bin/wcc_preproc.cmd

@@ -35,7 +35,7 @@ exit /b
 :RunCompile
 cd /d "%~dp1"
 rem "%compile%" -l -O2 -p -s -q -n "%%~nxi" -o "%output%/%%~ni.int"
-call compile_wcc "%~nx1" -o "%output%/%~n1.int"
+call compile_gcc "%~nx1" -o "%output%/%~n1.int"
 set compileErr=%errorlevel%
 if %compileErr% geq 1 (
     set /a ne+=1 >nul

extra/compile_all.cmd

@@ -4,7 +4,7 @@
 
 [Setup]
 #define MyAppName "Fallout 2: EcCo Gameplay Overhaul"
-#define MyAppVersion "0.9.3"
+#define MyAppVersion "0.9.4"
 #define MyAppPublisher "phobos2077"
 
 #define DocsDir "..\docs\"
@@ -17,7 +17,7 @@
 AppName={#MyAppName}
 AppID=pbs_fallout2_economy_and_combat
 AppVerName={#MyAppPublisher} {#MyAppName}
-OutputBaseFilename=pbs_fo2rpu_ecco_mod_v0-9-3
+OutputBaseFilename=pbs_fo2rpu_ecco_mod_v0-9-4
 DefaultDirName={sd}\Games\Fallout2\
 AppendDefaultDirName=no
 ;UsePreviousAppDir=no
@@ -38,7 +38,7 @@ VersionInfoVersion={#MyAppVersion}
 ;Compression=lzma
 OutputDir=.
 
-AppCopyright=Copyright © 2023, (phobos2077)
+AppCopyright=Copyright © 2024, (phobos2077)
 InfoBeforeFile={#DocsDir}ecco_readme.txt
 SetupIconFile=fallout.ico
 WizardSmallImageFile=phobos.bmp
@@ -86,11 +86,13 @@ ru.WRPMapUpdateNotFound=RPU: Maps Updated 
 
 [Types]
 Name: "full"; Description: "{cm:InstallFull}"
-;Name: "custom"; Description: "{cm:InstallCustom}"; Flags: iscustom
+Name: "custom"; Description: "{cm:InstallCustom}"; Flags: iscustom
 ;Name: "null"; Description: "{cm:InstallNull}"
 
 [Components]
-Name: "main"; Description: "EcCo mod"; Types: full; Flags: fixed
+Name: "main"; Description: "EcCo mod"; Types: full custom; Flags: fixed
+Name: "combat_free_move"; Description: "Bonus move points for high AG characters"; Types: full
+Name: "carry_unspent_ap"; Description: "Carry up to 2 unspent AP to next round"; Types: full
 
 [InstallDelete]
 Type: files; Name: "{app}\data\worldmap.dat"
@@ -103,7 +105,7 @@ Type: filesandordirs; Name: "{app}\mods\ecco"
 ; 
 #define FLAGS "Flags: recursesubdirs createallsubdirs overwritereadonly"
 ; 
-Source: "{#RootDir}ddraw.dll"; DestDir: "{app}\";
+;Source: "{#RootDir}ddraw.dll"; DestDir: "{app}\";
 Source: "{#RootDir}mods\*"; DestDir: "{app}\mods\"; {#FLAGS}
 Source: "{#RootDir}sfall\*"; DestDir: "{app}\sfall\"; {#FLAGS}
 Source: "{#DocsDir}ecco_readme.txt"; DestDir: "{app}\"
@@ -132,16 +134,15 @@ Filename: "{app}\ddraw.ini"; Section: "Misc"; Key: "MovieTimer_artimer4"; String
 
 ;Filename: "{app}\ddraw.ini"; Section: "Misc"; Key: "CheckWeaponAmmoCost"; String: "1"; Components: combat
 
-                                                                              
-;[Run]
-;FileName: "{app}\@pbs_rebalance_finalize.cmd"; WorkingDir: "{app}"; Flags: shellexec waituntilterminated
+Filename: "{app}\mods\ecco\combat.ini"; Section: "COMBAT_FREE_MOVE"; Key: "mult_dude"; String: "0"; Components: not combat_free_move
+Filename: "{app}\mods\ecco\combat.ini"; Section: "COMBAT_FREE_MOVE"; Key: "mult_npc"; String: "0"; Components: not combat_free_move
+Filename: "{app}\mods\ecco\combat.ini"; Section: "APCOST"; Key: "carry_unspent_ap"; String: "0"; Components: not carry_unspent_ap
 
-; Optional:
-;FileName: "{app}\weapon_chart.xls"; Description: "Îòêðûòü òàáëèöó õàðàêòåðèñòèê îðóæèÿ"; WorkingDir: "{app}"; Flags: postinstall shellexec unchecked
-;FileName: "{app}\@pbs_rebalance_readme.rtf"; Description: "Îòêðûòü ReadMe"; WorkingDir: "{app}"; Flags: postinstall shellexec
+                                                                              
+[Run]
+FileName: "{app}\ecco_readme.txt"; Description: "Open ReadMe"; WorkingDir: "{app}"; Flags: postinstall shellexec
+FileName: "http://phobos2077.github.io/fo2_ecco/ttx/damage_calc.html"; Description: "Open Damage Calculator"; Flags: postinstall shellexec unchecked runasoriginaluser
   
 
 ; Code for additional effects
 #include "installer_code.iss"
-
-

extra/installer.iss

@@ -1,35 +1,43 @@
-; HRP
-f2_res.dat
-sfall-mods
-
-; RPU/UPU
+; RPU main & localizations
 rpu.dat
+npc_armor.dat
+rpu_czech.dat
+rpu_french.dat
+rpu_german.dat
+rpu_hungarian.dat
+rpu_italian.dat
+rpu_polish.dat
+rpu_portuguese.dat
+rpu_russian.dat
+upu_russian_sound.dat
+rpu_spanish.dat
+
+; RPU optional
 rpu_enhanced_worldmap.dat
 rpu_extended_flamer.dat
-rpu_improved_mysterious_stranger.dat
 rpu_rifle_animations.dat
 rpu_wakizashi_animations.dat
-rpu_russian.dat
-upu_russian_sound.dat
+cassidy_head.dat
+cassidy_voice_joey_bracken_hq.dat
+rpu_improved_mysterious_stranger.dat
+walk_speed_fix_low_fps.dat
+goris_fast_derobing_low_fps.dat
+
+; Pixote Updated maps
 rpu_map_update.dat
 
 ; Visual and audio
-cassidy_head.dat
-cassidy_voice_joey_bracken_hq.dat
-npc_armor.dat
 talking_heads.dat
 talking_heads_audio.dat
-x_rpu_companion_expansion.dat
 
 ; Patches for Maps Updated
-talking_heads_map_update_patch.dat
-talking_heads_map_update_patch_THAT.dat
+talking_heads_that_rpu_map_update_patch.dat
 
 ; Gameplay overhauls
 rpu_y_ecco.dat
 
 ; Patches for EcCo
-x_rpu_companion_expansion_ecco_patch.dat
+
 
 ; QoL/tweaks
 fo2tweaks.dat