Merge branch 'release/0_9_9_8'

Author: epyon

.gitignore

@@ -5,4 +5,20 @@ CMakeLists.txt
 cmake-build-debug/
 mod.info
 revision.info
-*.a
+*.a
+*.mp3
+*.wav
+bin/core.wad
+bin/doom.prc
+bin/doomrl.wad
+src/doomrl.lps
+src/makewad.lps
+src/backup/
+bin/log.txt
+temp/
+bin/backup/
+src/fpcmade.x86_64-linux
+src/Makefile
+*.wad
+bin/makewad
+bin/doomrl

Makefile.fpc

@@ -1,42 +1,45 @@
 # doomrl
 
-DRL a.k.a. doomrl, a.k.a, D**m, the Roguelike
+DRL a.k.a. doomrl, a.k.a, D**m, the Roguelike, version 0.9.9.8
 http://drl.chaosforge.org/
 
-This release is dedicated to *eniMax, and the Jupiter Hell Kickstarter:
+This release is dedicated to Jupiter Hell Classic, the newly announced commercial remake/expansion to DRL:
 
-https://www.kickstarter.com/projects/2020043306/jupiter-hell-a-modern-turn-based-sci-fi-roguelike
+https://store.steampowered.com/app/3126530/Jupiter_Hell_Classic/
 
-If you enjoy this Open Source release, please consider pledging!
+If you enjoy this Open Source release, please consider wishlisting and later buying Jupiter Hell Classic! Also, you might be interested in DRL's modern 3D spiritual successor, Jupiter Hell (yes, it's still turn-based :P):
 
-Parts of this codebase date back to 2002, please do not judge! :P
+https://store.steampowered.com/app/811320/Jupiter_Hell/
 
-## Additional Information
-1. This FreePascal source code release is provided as is. 
-2. You can try compiling it using the latest version of Lazarus ( http://www.lazarus-ide.org/ ). 
-3. You need to download the 32 bit version (64-bit is possible, but much more tricky). 
-4. You will also need the FPC Valkyrie library ( https://github.com/ChaosForge/fpcvalkyrie/ ). 
-5. You will also probably need the binary files of the full game downloadable from http://drl.chaosforge.org/ (in particular the sound, soundhq, music and mp3 folder contents, and the premade doomrl.wad and core.wad if you don't want to create it yourself).
+Parts of this codebase date back to 2002, please do not judge! :P
 
-## Build
-Detailed compilation instructions will appear at some later point after the Jupiter Hell Kickstarter finishes.
+This FreePascal source code release is provided as is. You can try compiling it using the latest version of Lazarus ( http://www.lazarus-ide.org/ ). You will also need the FPC Valkyrie library ( https://github.com/ChaosForge/fpcvalkyrie/ ), version 0.9.0. You will also probably need the binary files of the full game downloadable from http://drl.chaosforge.org/ (in particular the sound, soundhq, music and mp3 folder contents, and the premade drl.wad and core.wad if you don't want to create it yourself).
 
-Short version:
+Compilation instructions, short version:
 
-1. Download 32-bit DoomRL from http://drl.chaosforge.org/
-2. Copy bin/mp3, bin/music, bin/sound, bin/soundhq from the DoomRL folders to the source tree bin folder
-3. Download 32-bit Lazarus
+1. Download DRL from http://drl.chaosforge.org/
+2. Copy bin/mp3, bin/music, bin/sound, bin/soundhq from the DRL folders to the source tree bin folder
+3. Download 64-bit Lazarus
 4. Open src/makewad.lpi build, do not run
-5. Run makewad.exe from the command line in the bin folder to generate doomrl.wad and core.wad (precompiled lua files)
-6. Open src/doomrl.lpi, build and run
+5. Run makewad.exe from the command line in the bin folder to generate drl.wad and core.wad (precompiled lua files)
+6. Open src/drl.lpi, build and run
 7. Profit (?)
 
-## Legal Information
-All code is (C) 2003-2016 Kornel Kisielewicz
+Lua makefile path (tested on Windows, might work on Linux):
+
+1. Have lua (5.1 is tested, but any should work?) in your path
+2. Have fpc bin directory in your path
+3. From the root folder run lua5.1 makefile.lua
+4. You can build packages by running "lua5.1 makefile.lua all" or lq or hq
+
+All code is (C) 2003-2024 Kornel Kisielewicz
+
 Code is distributed under the GPL 2.0 license (see LICENSE file in this folder)
 
-All art is (C) 2003-2016 Derek Yu
+All art is (C) 2003-2024 Derek Yu
+
 Art is distributed under the CC-BY-SA 4.0 license (see LICENSE file in the bin/graphics/ folder)
 
 sincerely,
-Kornel Kisielewicz of ChaosForge
+
+Kornel Kisielewicz of ChaosForge

README.md

@@ -1,4 +1,4 @@
--- Custom coloring based on entity ID's. Search the DoomRL wiki
+-- Custom coloring based on entity ID's. Search the DRL wiki
 -- for id's for entities.
 --
 -- In case of cells, there are two overrides - [id]_light and [id]_dark
@@ -21,7 +21,7 @@ LIGHTMAGENTA= 13
 YELLOW      = 14
 WHITE       = 15
 
--- An example of how to change DoomRL's color scheme.
+-- An example of how to change DRL's color scheme.
 Colors = {
 --	floor_dark  = GREEN,
 --	floor_light = BLUE,

bin/colors.lua

@@ -1,5 +1,5 @@
 -- ----------------------------------------------------------------------
---  This is the DoomRL initialization file. Modify at your own risk :). 
+--  This is the DRL initialization file. Modify at your own risk :). 
 --  If you mess up something overwrite with a new config.lua.
 -- ----------------------------------------------------------------------
 
@@ -9,8 +9,6 @@ dofile "colors.lua"
 dofile "music.lua" 
 dofile "sound.lua"
 
-dofile "keybindings.lua"
-
 -- Graphics mode. Can be CONSOLE for raw console, or TILES for graphical 
 -- tiles. Overriden by -graphics and -console command line parameters.
 Graphics = "TILES"
@@ -21,122 +19,44 @@ Graphics = "TILES"
 -- Possible values are FMOD, SDL, NONE, DEFAULT
 SoundEngine = "DEFAULT"
 
--- SDL sound only options. See SDL_mixer manual on what to put here if
--- defaults don't get you working audio. Format needs to be decoded because
--- Lua doesn't support hex notation.
-SDLMixerFreq      = 44100
-SDLMixerFormat    = 32784
-SDLMixerChunkSize = 1024
-
--- Windows and GFX mode only:
--- Set to false to turn off the Fullscreen query at run time. If false you
--- can use StartFullscreen to control fullscreen at startup.
-FullscreenQuery  = true
-
--- whether to start in fullscreen mode, use ALT-Enter to toggle, only
--- used when FullscreenQuery is set to false
-StartFullscreen  = false
-
--- Windowed sizes
-WindowedWidth       = 800
-WindowedHeight      = 600
--- Multiplication values of font and tile display - use at most 2
-WindowedFontMult    = 1
-WindowedTileMult    = 1
--- minimap size multiplication, set to 0 to remove minimap, -1 is auto
--- choice based on resolution
-WindowedMiniMapSize = -1
-
--- Fullscreen resolution sizes
--- -1 means auto-detection of screen size, and fontmult and tilemult and 
--- minimap based on it
-FullscreenWidth       = -1
-FullscreenHeight      = -1
-FullscreenFontMult    = -1
-FullscreenTileMult    = -1
-FullscreenMiniMapSize = -1
-
 -- Whether to allow high-ASCII signs. Set to false if you see weird signs 
 -- on the screen. Not setting it at all will use the default which
 -- is true on Windows and false on OS X and Linux
 -- AllowHighAscii   = true
 
--- Setting to true will skip name entry procedure and choose a random name
--- instead
-AlwaysRandomName = false
-
 -- Specifies wether items in inventory and equipment should be colored
 ColoredInventory = true
 
--- Menu styles can be LETTER for letter choince only menus, CHOICE for only arrow 
--- selection or HYBRID for both. Note that additional commands (like BACKSPACE for 
--- in-menu drop and TAB for swap) wont work in the LETTER mode.
-InvMenuStyle     = "HYBRID"
-EqMenuStyle      = "HYBRID"
-HelpMenuStyle    = "HYBRID"
-
 -- Setting this to anything except "" will always use that as the name.
 -- Warning - no error checking, so don't use too long names, or especially
 -- the "@" sign (it's a control char). This setting overrides the one above!
-AlwaysName       = ""
-
--- Setting to true will skip the intro
-SkipIntro        = false
-
--- Setting to true will remove the bloodslide effect
-NoBloodSlides    = false
-
--- Setting to true will remove the flashing effect
-NoFlashing       = false
-
--- Setting to true will make the run command not stop on items
-RunOverItems     = false
+--AlwaysName       = ""
 
 -- Setting to false will turn off music during gameplay
 GameMusic        = true
 
 -- Setting to false will turn off sounds during gameplay
 GameSound        = true
 
--- Setting to false will turn off Menu change/select sound
-MenuSound        = true
-
 -- Setting to true will turn on enhancements for blind people playing
--- DoomRL using a screen reader. Yes, some do.
+-- DRL using a screen reader. Yes, some do.
 BlindMode        = false
 
--- Setting to true will turn on enhancements for colorblind people.
-ColorBlindMode   = false
-
 -- Setting to true will make old messages disappear from the screen 
 -- (useful in BlindMode)
 ClearMessages    = false
 
--- Setting to false will prevent DoomRL from waiting for confirmation
+-- Setting to false will prevent DRL from waiting for confirmation
 -- when too many messages are printed in a turn. Usefull for Speedrunning.
 MorePrompt       = true
 
--- Setting to true will make the game wait for an enter/space key if
--- trying to fire an empty weapon.
-EmptyConfirm     = false
-
 -- If set to true, pickup sound will be used for quickkeys and weapon
 -- swapping.
 SoundEquipPickup = false
 
--- Controls whether gameplay hints appear on the intro level. Once you learn
--- to use the game, you can safely turn it off!
-Hints            = true
-
--- Sets the delay value when running. Value is in milliseconds. Set to 0 for no delay.
+-- (ASCII Only) Sets the delay value when running. Value is in milliseconds. Set to 0 for no delay.
 RunDelay         = 20
 
--- Music volume in the range of 0..25
-MusicVolume      = 12
-
--- Sound volume in the range of 0..25
-SoundVolume      = 20
-
 -- Handles what should be done in case of trying to unwield an item when inventory
 -- is full : if set to false will ask the player if he wants to drop it. If set
 -- to true will drop it without questions.
@@ -160,7 +80,7 @@ PlayerBackups    = 7
 -- is held for a given day.
 ScoreBackups     = 7
 
--- If set to false DoomRL will quit on death and quitting. Normally it will go back
+-- If set to false DRL will quit on death and quitting. Normally it will go back
 -- to the main menu.
 MenuReturn       = true
 
@@ -175,7 +95,7 @@ MaxWait          = 20
 -- true by default.
 LockBreak        = true
 
--- Windows only - Disables closing of DoomRL by console close button. 
+-- Windows only - Disables closing of DRL by console close button. 
 -- true by default.
 LockClose        = true
 
@@ -194,38 +114,6 @@ TimeStamp        = "yyyy/mm/dd hh:nn:ss"
 -- to turn this off
 SaveOnCrash      = true
 
--- This is the global internet connection switch, allowing DoomRL
--- to use internet connection features. Think twice before disabling
--- it, or you'll loose the features listed below and MOTD and ModServer
--- support!
-NetworkConnection = true
-
--- Should DoomRL check if there's a new version at runtime. If 
--- NetworkConnection is set to true this check is made regardless,
--- but there will be no alert if set to false.
-VersionCheck = true
-
--- Should DoomRL check if there's a new BETA version at runtime. If 
--- NetworkConnection is set to true this check is made regardless,
--- but there will be no alert if set to false. BETA versions are only
--- available to Supporters, but why not hop in and join the fun?
--- By default it's set to VERSION_BETA which is true for beta releases
--- and false for stable releases. Set to true, to get notified of the
--- next BETA batch!
-BetaCheck = VERSION_BETA
-
--- Should DoomRL check for other alerts. Sometimes we will want to
--- point you out to a major ChaosForge release or news flash. This feature
--- will not be abused, and each alert will be displayed only once, so 
--- please consider leaving this set to true! :)
-AlertCheck = true
-
--- DoomRL by default uses it's own mod server, where we host only screened
--- mods from the DoomRL community. A day may come when there will be an
--- unofficial server, for example for mods in testing. You can specify it 
--- here. Note that this overrides the default server.
-CustomModServer = ''
-
 -- Message coloring system. Works only if MessageColoring
 -- variable is set to true. Use basic color names available in 
 -- colors.lua.
@@ -241,3 +129,24 @@ Messages = {
 	["Your * damaged!"]               = BROWN,
 	["You feel relatively safe now."] = BLUE
 }
+
+-- == Path configuration ==
+-- You can use command line switch -config=/something/something/config.lua 
+-- to load a different config!
+
+-- Uncomment the following paths if needed:
+
+-- This is the directory path to the read only data folder (current dir by
+-- default, needs slash at end if changed). -datapath= to override on 
+-- command line.
+--DataPath = ""
+
+-- This is the directory path for writing (save, log) (current dir by
+-- default, needs slash at end if changed). -writepath= to override on 
+-- command line.
+--WritePath = ""
+
+-- This is the directory path for score table (by default it will be the
+-- same as WritePath, change for multi-user systems. -scorepath= to override
+-- on command line.
+--ScorePath = ""