Merge pull request #11 from JeodC/descent2

Update Descent 2 port
PortsMaster · Jan 28, 2024 · e51909f · e51909f
2 parents ed1b3c4 + d950075
commit e51909f
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 39 deletions.
diff --git a/ports/descent2/Descent 2.sh b/ports/descent2/Descent 2.sh
@@ -23,9 +23,9 @@ $ESUDO rm -rf ~/.$GAME
 ln -sfv $GAMEDIR/conf/.$GAME ~/
 
 export LIBGL_FB=4
-export LD_LIBRARY_PATH=$GAMEDIR/lib:/usr/lib
+export LD_LIBRARY_PATH=$GAMEDIR/libs:/usr/lib
 export SDL_FORCE_SOUNDFONTS=1
-export SDL_SOUNDFONTS="$GAMEDIR/lib/soundfont.sf2"
+export SDL_SOUNDFONTS="$GAMEDIR/libs/soundfont.sf2"
 
 # Add some cheats
 if [ ! -f "./cheats.txt" ]; then
@@ -47,7 +47,7 @@ $GPTOKEYB "$GAME" -c "conf/joy.gptk" &
 SDL_GAMECONTROLLERCONFIG="$sdl_controllerconfig"
 
 # Run the game
-./$GAME -hogdir data 2>&1 | tee -a ./log.txt
+./$GAME -hogdir data
 $ESUDO kill -9 $(pidof gptokeyb)
 $ESUDO systemctl restart oga_events & 
 printf "\033c" >> /dev/tty1
diff --git a/ports/descent2/README.md b/ports/descent2/README.md
@@ -34,8 +34,7 @@ Descent I & II: Definitive Edition came with some extra content not available on
 This extra content can be placed in the data/missions folder for both Descent and Descent 2. If done correctly you'll see a new submenu when selecting New Game.
 
 ## Configuration
-Ini files `d1x.ini` and `d2x.ini` are configurable. The port features KBM emulation and native SDL joystick controls. To switch between them, tick the option `-nojoystick` in the ini file. Joystick controls only affect the analog sticks and is meant for those who
-prefer a more "authentic" experience.  
+Ini files `d1x.ini` and `d2x.ini` are configurable. The port features keyboard emulation and native SDL joystick controls.
 
 You may rename `Player.plr` and `Player.plx` in the conf folder for a different multiplayer display name. If you do so, please modify the `d1x.ini` or `d2x.ini` file to reflect this change.
 
@@ -83,6 +82,16 @@ Add-Ons (.dxa files) such as different soundtracks from various soundcards and g
 |SELECT + Y|9|
 |D-PAD Left|Backspace|
 
+## Secret Levels
+|Origin Level|Leads To|
+|--|--|
+|Level 3 & 4|Secret Level 1|
+|Level 5 & 8|Secret Level 2|
+|Level 12|Secret Level 3| 
+|Level 14|Secret Level 4|
+|Level 17 & 20|Secret Level 5|
+|Level 21 & 24|Secret Level 6|
+
 ## Thanks
 Cebion  
 romadu  

diff --git a/ports/descent2/descent2/data/d2xr-sc55-music.dxa b/ports/descent2/descent2/data/d2xr-sc55-music.dxa
diff --git a/ports/descent2/descent2/descent2.gptk b/ports/descent2/descent2/descent2.gptk
diff --git a/ports/descent2/descent2/lib/libGL.so.1 b/ports/descent2/descent2/lib/libGL.so.1
diff --git a/ports/descent2/descent2/lib/libGLU.so.1 b/ports/descent2/descent2/lib/libGLU.so.1
diff --git a/ports/descent2/descent2/lib/libX11.so.6 b/ports/descent2/descent2/lib/libX11.so.6
diff --git a/ports/descent2/descent2/lib/libphysfs.so.1 b/ports/descent2/descent2/lib/libphysfs.so.1
diff --git a/ports/descent2/descent2/libs/libmodplug.so.1 b/ports/descent2/descent2/libs/libmodplug.so.1
diff --git a/ports/descent2/descent2/lib/soundfont.sf2 → ports/descent2/descent2/libs/soundfont.sf2 b/ports/descent2/descent2/lib/soundfont.sf2 → ports/descent2/descent2/libs/soundfont.sf2