Merge pull request #30 from Carlmundo/1.7

1.7
Carlmundo · Mar 10, 2025 · dc8e01d · dc8e01d
2 parents b3c94c6 + c78e468
commit dc8e01d
Show file tree

Hide file tree

Showing 37 changed files with 21 additions and 14 deletions.
diff --git a/FrontendGen/cs.res b/FrontendGen/cs.res
diff --git a/FrontendGen/de.res b/FrontendGen/de.res
diff --git a/FrontendGen/en.res b/FrontendGen/en.res
diff --git a/FrontendGen/es-419.res b/FrontendGen/es-419.res
diff --git a/FrontendGen/es.res b/FrontendGen/es.res
diff --git a/FrontendGen/fr.res b/FrontendGen/fr.res
diff --git a/FrontendGen/it.res b/FrontendGen/it.res
diff --git a/FrontendGen/nl.res b/FrontendGen/nl.res
diff --git a/FrontendGen/pl.res b/FrontendGen/pl.res
diff --git a/FrontendGen/pt-br.res b/FrontendGen/pt-br.res
diff --git a/FrontendGen/ru.res b/FrontendGen/ru.res
diff --git a/FrontendGen/sv.res b/FrontendGen/sv.res
diff --git a/Inno/Install.iss b/Inno/Install.iss
@@ -1,5 +1,5 @@
 #define AppName "Worms 2 Plus"
-#define AppVersion "1.6.3"
+#define AppVersion "1.7"
 #define AppProcess1 "frontend.exe"
 #define AppProcess2 "worms2.exe"
 #define Game "Worms 2"
@@ -38,7 +38,7 @@ MinVersion=0,5.1sp3
 
 [Files]
 ;Redistributables
-;C++ 2015-2022 used by modules (Windows 7+)
+;C++ 2015-2022 used by modules (Windows 7+) - 14.42.34438
 Source: "..\Redist\vc_redist.x86.exe"; DestDir: "{tmp}\"; Flags: ignoreversion overwritereadonly deleteafterinstall; MinVersion: 6.1;
 ;C++ 2015-2022 last(?) supported version for Vista - 14.31.30818
 Source: "..\Redist\vc_redist.x86_vista.exe"; DestDir: "{tmp}\"; DestName: "vc_redist.x86.exe"; Flags: ignoreversion overwritereadonly deleteafterinstall; OnlyBelowVersion: 6.1; MinVersion: 6.0;
@@ -193,6 +193,8 @@ Type: files; Name: "{app}\Data\Wav\Speech\US Sports\oof1.wav";
 Type: files; Name: "{app}\Data\Wav\Speech\US Sports\oof2.wav";
 Type: files; Name: "{app}\Data\Wav\Speech\US Sports\oof3.wav";
 Type: files; Name: "{app}\Data\Wav\Speech\US Sports\uhoh.wav";
+;Remove old IPX Address Book
+Type: files; Name: "{app}\ipxaddress.exe";
 
 [Languages]
 Name: "cs"; MessagesFile: "compiler:Languages\Czech.isl"
@@ -226,8 +228,8 @@ Root: HKCU; Subkey: "{#RegPathCU1}"; ValueType: string; ValueName: "CD"; ValueDa
 Root: HKCU; Subkey: "{#RegPathCU1}"; ValueType: string; ValueName: "W2PATH"; ValueData: "."
 ;Set graphics to maximum settings
 Root: HKCU; Subkey: "{#RegPathCU2}"; ValueType: dword; ValueName: "VideoSetting"; ValueData: 5
-;Set default connection to IPX
-Root: HKCU; Subkey: "{#RegPathCU2}"; ValueType: dword; ValueName: "Connection"; ValueData: 0
+;Set default connection to TCP
+Root: HKCU; Subkey: "{#RegPathCU2}"; ValueType: dword; ValueName: "Connection"; ValueData: 1
 ;Functionality
 Root: HKLM32; Subkey: "{#RegPathLM2}"; ValueType: none; ValueName: "CommandLine"
 Root: HKLM32; Subkey: "{#RegPathLM2}"; ValueType: string; ValueName: "CurrentDirectory"; ValueData: "{app}"

diff --git a/Patch/Base/Worm2NAT.ini b/Patch/Base/Worm2NAT.ini
@@ -0,0 +1,3 @@
+[Settings]
+Enabled=1
+EnableConsole=0
diff --git a/Patch/Base/devoptions.exe b/Patch/Base/devoptions.exe
diff --git a/Patch/Base/dpwsockx.dll b/Patch/Base/dpwsockx.dll
diff --git a/Patch/Base/dpwsockx_ipx.dll b/Patch/Base/dpwsockx_ipx.dll
diff --git a/Patch/Base/fkNetcode.dll b/Patch/Base/fkNetcode.dll
diff --git a/Patch/Base/fkUpdate.dll b/Patch/Base/fkUpdate.dll
diff --git a/Patch/Base/fkWorm2NAT.dll b/Patch/Base/fkWorm2NAT.dll
diff --git a/Patch/Base/ipxaddress.exe b/Patch/Base/ipxaddress.exe
diff --git a/Patch/Base/ipxwrapper.ini b/Patch/Base/ipxwrapper.ini
@@ -1,3 +1 @@
-logging = none
-dosbox server port = 10000
-dosbox server address = master.frag-net.com
+logging = none
diff --git a/Patch/ExtraContent/Data/LEVEL/-'NAM/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-'NAM/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/-CANDY/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-CANDY/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/-GEIGER/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-GEIGER/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/-GRAVEYARD/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-GRAVEYARD/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/-JUNK/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-JUNK/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/-MARS/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-MARS/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/-MONEY/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-MONEY/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/-SNOW/FRICTION.TXT b/Patch/ExtraContent/Data/LEVEL/-SNOW/FRICTION.TXT
@@ -0,0 +1 @@
+98
diff --git a/Patch/ExtraContent/Data/LEVEL/-SNOW/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-SNOW/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/-WARZONE/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/-WARZONE/LEVEL.DIR
diff --git a/Patch/ExtraContent/Data/LEVEL/TOOLS/LEVEL.DIR b/Patch/ExtraContent/Data/LEVEL/TOOLS/LEVEL.DIR
diff --git a/Patch/Languages/English/frontend.exe b/Patch/Languages/English/frontend.exe
diff --git a/Patch/fkMissions/fkMissions.dll b/Patch/fkMissions/fkMissions.dll
diff --git a/Patch/fkSettings/fkSettings.dll b/Patch/fkSettings/fkSettings.dll
diff --git a/README.md b/README.md
@@ -10,11 +10,9 @@ There is no need to set any Windows compatibility settings.
 - Launch the game by running either:
 	- start.exe or frontend.exe (to skip intro videos) from the game's installed folder
 	- Desktop shortcuts if checked on install
-- Online Play:
-	- IPX - works without port forwarding. By default, this uses servers but you can also use your own LAN or VPN.
-	- TCP - all players need to set up [Port Forwarding](https://portforward.com/router.htm) on their router with the following ports:
-		- 47624 (TCP)
-		- 2300-2400 (TCP and UDP)
+- Network Play:
+	- TCP - Play online without port forwarding
+	- IPX - Play over LAN or VPN
 
 ## Features
 - Compatible with modern versions of Windows and Wine ([WineHQ](https://gitlab.winehq.org/wine/wine/-/wikis/Download#wine-binary-packages) binary packages are recommended)
@@ -39,6 +37,11 @@ There is no need to set any Windows compatibility settings.
 	- Worms Armageddon: Brummie, Cad, Cyberworms, Czech (Czech Republic CD), Drill Sergeant, Finnish, Formula One, Geezer, Irish, Jock, Kidz, Polish, Rasta, Redneck, Rushki, Russian, Stooges, Team 17 Test, The Raj, Thespian, US Sports, Whoopsie
 	- Worms World Party: Danish-2, Dutch-2, French-2, Italian-2, Spanish-2, Swedish-2, Korean-2 (South Korea CD)
 	- Worms World Party Aqua - 6 Korean Soundbanks
+- Added terrains from other classic Worms releases:
+	- Worms (& Reinforcements/United) (originally ported to W:A by CarmineLynx)
+	- Worms Armageddon
+	- Worms Armageddon & Worms World Party (PlayStation & Dreamcast)
+- New Water colour: Oil Black
 - Ported over enhancements from [Des/S*natch patch](https://worms2d.info/Des_patch)
 	- Frontend
 		- Minimize or exit from anywhere
@@ -74,12 +77,12 @@ Join the [Worms 2 Discord](https://discord.gg/Tvs83972UD) to find players.
 
 ## Project Contributors
 Carlmundo is the project lead but development was also actively worked on with the following people:
- - Dawid8 - Author of modules: fkMissions, fkSettings, fkWaterFix, wkBackflip, wkDLang, wkDNet. Implemented mod loader improvements, old weapon cheat code and real-time volume changing. Author of tools: DW2SMT, W2TerrainConvert.
+ - Dawid8 - Author of modules: fkMissions, fkSettings, fkWaterFix, fkWorm2NAT, wkBackflip, wkDLang, wkDNet. Implemented mod loader improvements, old weapon cheat code and real-time volume changing. Author of tools: DW2SMT, W2TerrainConvert, Worm2NAT Relay Server.
  - FunkyFr3sh - Updates and implementation for cnc-ddraw that improved game rendering and online stability
  - 333networks / Darkelarious, Dark1, Dr.Flay - Server hosting
  - Frag-Net / eukara - Server hosting
  - Rúben Fernandes (rubinho146) - Portuguese translation, Portuguese soundbank director
  - Ana Martins (GoRobotnikGo) - Portuguese soundbank voice actor
  - JPEXS - Czech translation
 
-Open source software used is credited under "Features".
+Open source software used is credited under "Features".