From 6a78637b3b37b6cc7ad32ed69e13a5cc61497d44 Mon Sep 17 00:00:00 2001 From: Marek Wydmuch Date: Wed, 27 Sep 2023 18:17:11 +0200 Subject: [PATCH 1/5] Fix the bug in load_config/loadConfig --- .gitignore | 9 +- src/_vizdoom/vizdoom.ini | 568 ++++++++++++++++++++++++++++++++ src/lib/ViZDoomConfigLoader.cpp | 9 +- src/lib/ViZDoomPathHelpers.cpp | 11 + src/lib/ViZDoomPathHelpers.h | 2 + src/lib_python/__init__.py.in | 4 + src/vizdoom/src/d_iwad.cpp | 2 +- tests/test_configs.py | 18 + 8 files changed, 614 insertions(+), 9 deletions(-) create mode 100644 src/_vizdoom/vizdoom.ini create mode 100644 tests/test_configs.py diff --git a/.gitignore b/.gitignore index e570ce593..19aa90253 100644 --- a/.gitignore +++ b/.gitignore @@ -111,8 +111,11 @@ src/vizdoom/zlib/CTestTestfile.cmake **/freedm.wad **_vizdoom.ini -# CLion & PyCharm -**/.idea - # MacOS .DS_Store + +# Visual Studio Code +.vscode + +# CLion & PyCharm +**/.idea diff --git a/src/_vizdoom/vizdoom.ini b/src/_vizdoom/vizdoom.ini new file mode 100644 index 000000000..45405b5e0 --- /dev/null +++ b/src/_vizdoom/vizdoom.ini @@ -0,0 +1,568 @@ +# This file was generated by ViZDoom 1.2.1 (ZDOOM 2.8.1+) on Tue Sep 26 19:16:31 2023 + +# These are the directories to automatically search for IWADs. +# Each directory should be on a separate line, preceded by Path= +[IWADSearch.Directories] +Path=. +Path=$DOOMWADDIR +Path=./_vizdoom +Path=/usr/local/share/doom +Path=/usr/local/share/games/doom +Path=/usr/share/doom +Path=/usr/share/games/doom + +# These are the directories to search for wads added with the -file +# command line parameter, if they cannot be found with the path +# as-is. Layout is the same as for IWADSearch.Directories +[FileSearch.Directories] +Path=./_vizdoom +Path=/usr/local/share/ +Path=$DOOMWADDIR + +# Files to automatically execute when running the corresponding game. +# Each file should be on its own line, preceded by Path= + +[Doom.AutoExec] +Path=./_vizdoom/autoexec.cfg + +[Heretic.AutoExec] +Path=./_vizdoom/autoexec.cfg + +[Hexen.AutoExec] +Path=./_vizdoom/autoexec.cfg + +[Strife.AutoExec] +Path=./_vizdoom/autoexec.cfg + +[Chex.AutoExec] +Path=./_vizdoom/autoexec.cfg + +# WAD files to always load. These are loaded after the IWAD but before +# any files added with -file. Place each file on its own line, preceded +# by Path= +[Global.Autoload] + +# Wad files to automatically load depending on the game and IWAD you are +# playing. You may have have files that are loaded for all similar IWADs +# (the game) and files that are only loaded for particular IWADs. For example, +# any files listed under 'doom.Autoload' will be loaded for any version of Doom, +# but files listed under 'doom.doom2.Autoload' will only load when you are +# playing a Doom 2 based game (doom2.wad, tnt.wad or plutonia.wad), and files listed under +# 'doom.doom2.commercial.Autoload' only when playing doom2.wad. + +[doom.Autoload] + +[doom.doom2.Autoload] + +[doom.doom2.commercial.Autoload] + +[doom.doom2.bfg.Autoload] + +[doom.doom2.plutonia.Autoload] + +[doom.doom2.tnt.Autoload] + +[doom.doom1.Autoload] + +[doom.doom1.registered.Autoload] + +[doom.doom1.ultimate.Autoload] + +[doom.doom1.bfg.Autoload] + +[doom.freedoom.Autoload] + +[doom.freedoom.demo.Autoload] + +[doom.freedoom.phase1.Autoload] + +[doom.freedoom.phase2.Autoload] + +[doom.freedoom.freedm.Autoload] + +[heretic.Autoload] + +[heretic.heretic.Autoload] + +[heretic.shadow.Autoload] + +[blasphemer.Autoload] + +[hexen.Autoload] + +[hexen.deathkings.Autoload] + +[hexen.hexen.Autoload] + +[strife.Autoload] + +[chex.Autoload] + +[chex.chex1.Autoload] + +[chex.chex3.Autoload] + +[urbanbrawl.Autoload] + +[hacx.Autoload] + +[hacx.hacx1.Autoload] + +[hacx.hacx2.Autoload] + +[harmony.Autoload] + +[square.Autoload] + +[square.squareware.Autoload] + +[square.square.Autoload] + +[LastRun] +Version=211 + +[GlobalSettings] +gus_memsize=0 +midi_dmxgus=true +gus_patchdir= +midi_voices=32 +midi_config=timidity.cfg +snd_efx=true +snd_aldevice=Default +wildmidi_enhanced_resampling=true +wildmidi_reverb=false +wildmidi_frequency=0 +wildmidi_config= +fluid_chorus_type=0 +fluid_chorus_depth=8 +fluid_chorus_speed=0.3 +fluid_chorus_level=1 +fluid_chorus_voices=3 +fluid_reverb_level=0.57 +fluid_reverb_width=0.76 +fluid_reverb_damping=0.23 +fluid_reverb_roomsize=0.61 +fluid_threads=1 +fluid_samplerate=0 +fluid_interp=1 +fluid_voices=128 +fluid_chorus=true +fluid_reverb=true +fluid_gain=0.5 +fluid_patchset= +opl_core=0 +opl_numchips=2 +timidity_frequency=44100 +timidity_pipe=90 +timidity_mastervolume=1 +timidity_byteswap=false +timidity_8bit=false +timidity_stereo=true +timidity_reverb=0 +timidity_chorus=0 +timidity_extargs= +timidity_exe=timidity +snd_mididevice=-1 +spc_amp=1.875 +mod_dumb_mastervolume=1 +mod_autochip_scan_threshold=12 +mod_autochip_size_scan=500 +mod_autochip_size_force=100 +mod_autochip=false +mod_interp=2 +mod_volramp=2 +mod_samplerate=0 +mod_dumb=true +snd_sfxvolume=1 +snd_backend=openal +snd_output=default +snd_buffersize=0 +snd_samplerate=0 +snd_musicvolume=0.5 +snd_waterlp=250 +snd_midipatchset= +snd_output_format=PCM-16 +snd_speakermode=Auto +snd_resampler=Linear +snd_waterreverb=true +snd_hrtf=false +snd_buffercount=0 +snd_driver=0 +opl_fullpan=true +vid_tft=true +m_showinputgrid=false +m_show_backbutton=0 +m_use_mouse=1 +show_messages=true +mouse_sensitivity=1 +map_point_coordinates=true +vid_aspect=0 +vid_nowidescreen=false +vid_refreshrate=0 +vid_vsync=false +vid_defbits=8 +vid_defheight=480 +vid_defwidth=640 +Gamma=1 +statfile=zdoomstat.txt +savestatistics=0 +snd_flipstereo=false +snd_channels=32 +r_columnmethod=1 +r_quakeintensity=1 +cl_predict_lerpthreshold=2 +cl_predict_lerpscale=0.05 +cl_predict_specials=true +cl_noprediction=false +telezoom=true +r_fakecontrast=1 +chase_dist=90 +chase_height=-8 +gl_cachetime=0.6 +gl_cachenodes=true +nomonsterinterpolation=false +png_gamma=0 +png_level=5 +screenshot_dir= +screenshot_type=png +screenshot_quiet=false +use_joystick=false +autosavecount=4 +disableautosave=0 +autosavenum=0 +smooth_mouse=false +m_side=2 +m_forward=1 +m_yaw=1 +m_pitch=1 +lookstrafe=false +freelook=false +invertmouse=false +cl_run=false +demo_compress=true +cl_waitforsave=true +save_dir= +longsavemessages=true +storesavepic=true +nofilecompression=false +cl_capfps=false +defaultiwad= +queryiwad=true +con_ctrl_d= +con_buffersize=-1 +showendoom=0 +bgamma=1 +ggamma=1 +rgamma=1 +vid_forcesurface=false +vid_displaybits=32 +vid_adapter=0 +mouse_capturemode=1 +m_filter=false +m_noprescale=false +use_mouse=true +vid_winscale=1 +fullscreen=false +vid_maxfps=200 + +[GlobalSettings.Unknown] + +[Doom.Player] +wi_noautostartmap=false +playerclass=Fighter +stillbob=0 +movebob=0.25 +neverswitchonpickup=false +gender=male +team=255 +skin=base +colorset=0 +color=40 cf 00 +name=Player +autoaim=35 + +[Doom.ConsoleVariables] +r_drawfuzz=1 +vid_nopalsubstitutions=false +snd_pitched=false +menu_screenratios=-1 +snd_menuvolume=0.6 +show_obituaries=true +am_showmaplabel=2 +crosshairgrow=false +crosshairscale=false +crosshairhealth=true +crosshaircolor=ff 00 00 +crosshairforce=false +crosshair=0 +st_scale=true +paletteflash=0 +hudcolor_stats=3 +hudcolor_statnames=6 +hudcolor_xyco=3 +hudcolor_ttim=5 +hudcolor_ltim=8 +hudcolor_time=6 +hudcolor_titl=10 +hud_berserk_health=true +hud_armor_green=100 +hud_armor_yellow=50 +hud_armor_red=25 +hud_health_green=100 +hud_health_yellow=50 +hud_health_red=25 +hud_ammo_yellow=50 +hud_ammo_red=25 +hud_showlag=0 +hud_timecolor=5 +hud_showtime=0 +hud_showammo=2 +hud_showweapons=true +hud_showscore=false +hud_showstats=false +hud_showitems=false +hud_showmonsters=true +hud_showsecrets=true +hud_althud=false +hud_althudscale=2 +st_oldouch=false +cl_maxdecals=1024 +cl_spreaddecals=true +transsouls=0.75 +wi_showtotaltime=true +wi_percents=true +dimcolor=ff d7 00 +dimamount=-1 +hud_scale=false +allcheats=false +r_stretchsky=true +r_shadercolormaps=true +screenblocks=10 +r_deathcamera=false +cl_showsecretmessage=true +cl_bloodtype=0 +cl_pufftype=0 +addrocketexplosion=false +cl_missiledecals=true +cl_doautoaim=false +cl_bloodsplats=true +cl_showmultikills=true +cl_showsprees=true +r_maxparticles=4000 +r_rail_trailsparsity=1 +r_rail_spiralsparsity=1 +r_rail_smartspiral=false +cl_rockettrails=1 +dlg_musicvolume=1 +sb_teamdeathmatch_headingcolor=6 +sb_teamdeathmatch_enable=true +sb_deathmatch_otherplayercolor=2 +sb_deathmatch_yourplayercolor=3 +sb_deathmatch_headingcolor=6 +sb_deathmatch_enable=true +sb_cooperative_otherplayercolor=2 +sb_cooperative_yourplayercolor=3 +sb_cooperative_headingcolor=6 +sb_cooperative_enable=true +nametagcolor=5 +displaynametags=0 +language=auto +compatmode=0 +vid_cursor=None +wipetype=1 +dehload=0 +chat_substitution=false +chatmacro0=No +chatmacro9=Yes +chatmacro8=I'll take care of it. +chatmacro7=Come here! +chatmacro6=Next time, scumbag... +chatmacro5=You suck! +chatmacro4=Help! +chatmacro3=I'm not looking too good! +chatmacro2=I'm OK. +chatmacro1=I'm ready to kick butt! +lookspring=true +con_midtime=3 +msgmidcolor2=4 +msgmidcolor=5 +msg4color=3 +msg3color=3 +msg2color=2 +msg1color=5 +msg0color=6 +msg=0 +con_alpha=0.75 +con_scaletext=0 +con_centernotify=false +con_notifytime=3 +con_notablist=false +cl_bbannounce=false +am_followplayer=true +am_textured=false +am_ovthingcolor_citem=e8 88 00 +am_ovthingcolor_item=e8 88 00 +am_ovthingcolor_ncmonster=e8 88 00 +am_ovthingcolor_monster=e8 88 00 +am_ovthingcolor_friend=e8 88 00 +am_ovthingcolor=e8 88 00 +am_ovsecretsectorcolor=00 ff ff +am_ovinterlevelcolor=ff ff 00 +am_ovtelecolor=ff ff 00 +am_ovunseencolor=00 22 6e +am_ovcdwallcolor=00 88 44 +am_ovfdwallcolor=00 88 44 +am_ovefwallcolor=00 88 44 +am_ovlockedcolor=00 88 44 +am_ovotherwallscolor=00 88 44 +am_ovspecialwallcolor=ff ff ff +am_ovsecretwallcolor=00 88 44 +am_ovwallcolor=00 ff 00 +am_ovyourcolor=fc e8 d8 +am_thingcolor_citem=fc fc fc +am_thingcolor_item=fc fc fc +am_thingcolor_ncmonster=fc fc fc +am_thingcolor_monster=fc fc fc +am_thingcolor_friend=fc fc fc +am_secretsectorcolor=ff 00 ff +am_interlevelcolor=ff 00 00 +am_intralevelcolor=00 00 ff +am_lockedcolor=00 78 00 +am_notseencolor=6c 6c 6c +am_xhaircolor=80 80 80 +am_gridcolor=8b 5a 2b +am_thingcolor=fc fc fc +am_efwallcolor=66 55 55 +am_cdwallcolor=4c 38 20 +am_fdwallcolor=88 70 58 +am_tswallcolor=88 88 88 +am_specialwallcolor=ff ff ff +am_secretwallcolor=00 00 00 +am_wallcolor=2c 18 08 +am_yourcolor=fc e8 d8 +am_backcolor=6c 54 40 +am_showthingsprites=0 +am_showtriggerlines=false +am_showkeys=true +am_drawmapback=1 +am_map_secrets=1 +am_customcolors=true +am_colorset=0 +am_showtotaltime=false +am_showtime=true +am_showitems=false +am_showmonsters=true +am_showsecrets=true +am_overlay=0 +am_rotate=0 + +[Doom.LocalServerInfo] +sv_corpsequeuesize=64 +forcewater=false +sv_smartaim=0 +sv_disableautohealth=false +sv_dropstyle=0 +compatflags2=0 +compatflags=0 + +[Doom.UnknownConsoleVariables] + +[Doom.ConsoleAliases] + +[Doom.Bindings] +1=slot 1 +2=slot 2 +3=slot 3 +4=slot 4 +5=slot 5 +6=slot 6 +7=slot 7 +8=slot 8 +9=slot 9 +0=slot 0 +-=sizedown +Equals=sizeup +tab=togglemap +t=messagemode +LeftBracket=invprev +RightBracket=invnext +enter=invuse +ctrl=+attack +`=toggleconsole +shift=+speed +\=+showscores +,=+moveleft +.=+moveright +alt=+strafe +space=+use +capslock=toggle cl_run +f1=menu_help +f2=menu_save +f3=menu_load +f4=menu_options +f5=menu_display +f6=quicksave +f7=menu_endgame +f8=togglemessages +f9=quickload +f10=menu_quit +f11=bumpgamma +f12=spynext +sysrq=screenshot +pause=pause +home=land +uparrow=+forward +pgup=+moveup +leftarrow=+left +rightarrow=+right +end=centerview +downarrow=+back +pgdn=+lookup +ins=+movedown +del=+lookdown +mouse1=+attack +mouse2=+strafe +mouse3=+forward +mouse4=+speed +joy1=+attack +joy2=+strafe +joy3=+speed +joy4=+use +mwheelup=weapprev +mwheeldown=weapnext +mwheelright=invnext +mwheelleft=invprev +dpadup=togglemap +dpaddown=invuse +dpadleft=invprev +dpadright=invnext +pad_start=pause +pad_back=menu_main +lthumb=crouch +lshoulder=weapprev +rshoulder=weapnext +ltrigger=+altattack +rtrigger=+attack +pad_a=+use +pad_y=+jump + +[Doom.DoubleBindings] + +[Doom.AutomapBindings] +0=am_gobig +-=+am_zoomout +Equals=+am_zoomin +p=am_toggletexture +f=am_togglefollow +g=am_togglegrid +c=am_clearmarks +m=am_setmark +kp-=+am_zoomout +kp+=+am_zoomin +uparrow=+am_panup +leftarrow=+am_panleft +rightarrow=+am_panright +downarrow=+am_pandown +mwheelup=am_zoom 1.2 +mwheeldown=am_zoom -1.2 + diff --git a/src/lib/ViZDoomConfigLoader.cpp b/src/lib/ViZDoomConfigLoader.cpp index e5af15f3a..d8c755d25 100644 --- a/src/lib/ViZDoomConfigLoader.cpp +++ b/src/lib/ViZDoomConfigLoader.cpp @@ -395,14 +395,13 @@ namespace vizdoom { std::string sharedConfigPath = getThisSharedObjectPath() + "/scenarios/" + scenarioName; // Check if scenario exists in library's scenerios directory - if (fileExists(filePath)) this->filePath = filePath; - else if (fileExists(workingConfigPath)) this->filePath = workingConfigPath; - else if (fileExists(sharedConfigPath)) this->filePath = sharedConfigPath; + if (fileExistsAndCanBeRead(filePath)) this->filePath = filePath; + else if (fileExistsAndCanBeRead(workingConfigPath)) this->filePath = workingConfigPath; + else if (fileExistsAndCanBeRead(sharedConfigPath)) this->filePath = sharedConfigPath; else throw FileDoesNotExistException(filePath + " | " + workingConfigPath + " | " + sharedConfigPath); bool success = true; - std::ifstream file(filePath); - + std::ifstream file(this->filePath); std::string line; int lineNumber = 0; diff --git a/src/lib/ViZDoomPathHelpers.cpp b/src/lib/ViZDoomPathHelpers.cpp index fe15ea042..144ac274b 100644 --- a/src/lib/ViZDoomPathHelpers.cpp +++ b/src/lib/ViZDoomPathHelpers.cpp @@ -62,6 +62,17 @@ namespace vizdoom { //return exist; } + bool ifstreamGood(std::string filePath) { + std::ifstream file(filePath); + bool isGood = file.good(); + file.close(); + return isGood; + } + + bool fileExistsAndCanBeRead(std::string filePath){ + return fileExists(filePath) && ifstreamGood(filePath); + } + std::string relativePath(std::string relativePath, std::string basePath) { bfs::path outPath(basePath); outPath.remove_filename(); diff --git a/src/lib/ViZDoomPathHelpers.h b/src/lib/ViZDoomPathHelpers.h index 54c411834..3c83865b1 100644 --- a/src/lib/ViZDoomPathHelpers.h +++ b/src/lib/ViZDoomPathHelpers.h @@ -43,6 +43,8 @@ namespace vizdoom { bool fileExists(std::string filePath); + bool fileExistsAndCanBeRead(std::string filePath); + std::string relativePath(std::string relativePath, std::string basePath = ""); std::string checkFile(std::string filePath, std::string expectedExt = ""); diff --git a/src/lib_python/__init__.py.in b/src/lib_python/__init__.py.in index f443199c8..77b4a5896 100644 --- a/src/lib_python/__init__.py.in +++ b/src/lib_python/__init__.py.in @@ -14,6 +14,10 @@ from .vizdoom import * import os as _os +root_path = __path__[0] +exe_path_windows = _os.path.join(__path__[0], "vizdoom.exe") +exe_path_unix = _os.path.join(__path__[0], "vizdoom") +exe_path = exe_path_windows if _os.path.exists(exe_path_windows) else exe_path_unix scenarios_path = _os.path.join(__path__[0], "scenarios") wads = [wad for wad in sorted(_os.listdir(scenarios_path)) if wad.endswith(".wad")] configs = [cfg for cfg in sorted(_os.listdir(scenarios_path)) if cfg.endswith(".cfg")] diff --git a/src/vizdoom/src/d_iwad.cpp b/src/vizdoom/src/d_iwad.cpp index 59466d846..d723cd8a5 100644 --- a/src/vizdoom/src/d_iwad.cpp +++ b/src/vizdoom/src/d_iwad.cpp @@ -556,7 +556,7 @@ int FIWadManager::IdentifyVersion (TArray &wadfiles, const char *iwad, if (pickwad < 0) exit (0); - // zdoom.pk3 must always be the first file loaded and the IWAD second. + // vizdoom.pk3 must always be the first file loaded and the IWAD second. wadfiles.Clear(); D_AddFile (wadfiles, zdoom_wad); diff --git a/tests/test_configs.py b/tests/test_configs.py new file mode 100644 index 000000000..624237c10 --- /dev/null +++ b/tests/test_configs.py @@ -0,0 +1,18 @@ +#!/usr/bin/env python3 + +# Tests for ViZDoom enums and related methods. +# This test can be run as Python script or via PyTest + +import os +import vizdoom as vzd + + +def test_load_config(): + for file in os.listdir(vzd.scenarios_path): + if file.endswith(".cfg"): + vzd.DoomGame().load_config(os.path.join(vzd.scenarios_path, file)) + vzd.DoomGame().load_config(file) + + +if __name__ == "__main__": + test_load_config() From 1c5d50b1e35f4d2f6a346870dc99772070c9e7e4 Mon Sep 17 00:00:00 2001 From: Marek Wydmuch Date: Wed, 27 Sep 2023 18:20:02 +0200 Subject: [PATCH 2/5] Update the docs regarding load_config/loadConfig --- docs/api/cpp/doomGame.md | 2 ++ src/lib_python/ViZDoomMethodsDocstrings.h | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/docs/api/cpp/doomGame.md b/docs/api/cpp/doomGame.md index 96cc0192c..abef630a0 100644 --- a/docs/api/cpp/doomGame.md +++ b/docs/api/cpp/doomGame.md @@ -620,6 +620,8 @@ Overwriting does not involve resetting to default values. Thus only overlapping The method returns true if the whole configuration file was correctly read and applied, false if the file contained errors. +If the file relative path is given, it will be searched for in the following order: current directory, current directory + `/scenarios/`, ViZDoom's installation directory + `/scenarios/`. + See also: - [ConfigFile](./configurationFiles.md) diff --git a/src/lib_python/ViZDoomMethodsDocstrings.h b/src/lib_python/ViZDoomMethodsDocstrings.h index 0155a0ab6..47e2d645a 100644 --- a/src/lib_python/ViZDoomMethodsDocstrings.h +++ b/src/lib_python/ViZDoomMethodsDocstrings.h @@ -145,7 +145,9 @@ Default value: 0)DOCSTRING"; In case of multiple invocations, older configurations will be overwritten by the recent ones. Overwriting does not involve resetting to default values. Thus only overlapping parameters will be changed. The method returns True if the whole configuration file was correctly read and applied, -False if the file contained errors.)DOCSTRING"; +False if the file contained errors. + +If the file relative path is given, it will be searched for in the following order: current directory, current directory + `/scenarios/`, ViZDoom's installation directory + `/scenarios/`.)DOCSTRING"; const char *getMode = R"DOCSTRING(Returns current mode (`PLAYER`, `SPECTATOR`, `ASYNC_PLAYER`, `ASYNC_SPECTATOR`).)DOCSTRING"; From 3cb0fd165a13b67e4a1b525dd2bd4b233460540e Mon Sep 17 00:00:00 2001 From: Marek Wydmuch Date: Wed, 27 Sep 2023 18:22:26 +0200 Subject: [PATCH 3/5] Fix pre-commit failed checks --- tests/test_configs.py | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/test_configs.py b/tests/test_configs.py index 624237c10..df03ba669 100644 --- a/tests/test_configs.py +++ b/tests/test_configs.py @@ -4,6 +4,7 @@ # This test can be run as Python script or via PyTest import os + import vizdoom as vzd From 86757ce61b40422627c5011a52640d02e184cc1f Mon Sep 17 00:00:00 2001 From: Marek Wydmuch Date: Wed, 27 Sep 2023 18:25:51 +0200 Subject: [PATCH 4/5] Fix pre-commit failed checks once again --- tests/test_configs.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 tests/test_configs.py diff --git a/tests/test_configs.py b/tests/test_configs.py old mode 100644 new mode 100755 From a70a45b6f33ab28d48bc7e13fc9b734c53c66d3a Mon Sep 17 00:00:00 2001 From: Marek Wydmuch Date: Wed, 27 Sep 2023 18:37:47 +0200 Subject: [PATCH 5/5] Delete src/_vizdoom/vizdoom.ini --- src/_vizdoom/vizdoom.ini | 568 --------------------------------------- 1 file changed, 568 deletions(-) delete mode 100644 src/_vizdoom/vizdoom.ini diff --git a/src/_vizdoom/vizdoom.ini b/src/_vizdoom/vizdoom.ini deleted file mode 100644 index 45405b5e0..000000000 --- a/src/_vizdoom/vizdoom.ini +++ /dev/null @@ -1,568 +0,0 @@ -# This file was generated by ViZDoom 1.2.1 (ZDOOM 2.8.1+) on Tue Sep 26 19:16:31 2023 - -# These are the directories to automatically search for IWADs. -# Each directory should be on a separate line, preceded by Path= -[IWADSearch.Directories] -Path=. -Path=$DOOMWADDIR -Path=./_vizdoom -Path=/usr/local/share/doom -Path=/usr/local/share/games/doom -Path=/usr/share/doom -Path=/usr/share/games/doom - -# These are the directories to search for wads added with the -file -# command line parameter, if they cannot be found with the path -# as-is. Layout is the same as for IWADSearch.Directories -[FileSearch.Directories] -Path=./_vizdoom -Path=/usr/local/share/ -Path=$DOOMWADDIR - -# Files to automatically execute when running the corresponding game. -# Each file should be on its own line, preceded by Path= - -[Doom.AutoExec] -Path=./_vizdoom/autoexec.cfg - -[Heretic.AutoExec] -Path=./_vizdoom/autoexec.cfg - -[Hexen.AutoExec] -Path=./_vizdoom/autoexec.cfg - -[Strife.AutoExec] -Path=./_vizdoom/autoexec.cfg - -[Chex.AutoExec] -Path=./_vizdoom/autoexec.cfg - -# WAD files to always load. These are loaded after the IWAD but before -# any files added with -file. Place each file on its own line, preceded -# by Path= -[Global.Autoload] - -# Wad files to automatically load depending on the game and IWAD you are -# playing. You may have have files that are loaded for all similar IWADs -# (the game) and files that are only loaded for particular IWADs. For example, -# any files listed under 'doom.Autoload' will be loaded for any version of Doom, -# but files listed under 'doom.doom2.Autoload' will only load when you are -# playing a Doom 2 based game (doom2.wad, tnt.wad or plutonia.wad), and files listed under -# 'doom.doom2.commercial.Autoload' only when playing doom2.wad. - -[doom.Autoload] - -[doom.doom2.Autoload] - -[doom.doom2.commercial.Autoload] - -[doom.doom2.bfg.Autoload] - -[doom.doom2.plutonia.Autoload] - -[doom.doom2.tnt.Autoload] - -[doom.doom1.Autoload] - -[doom.doom1.registered.Autoload] - -[doom.doom1.ultimate.Autoload] - -[doom.doom1.bfg.Autoload] - -[doom.freedoom.Autoload] - -[doom.freedoom.demo.Autoload] - -[doom.freedoom.phase1.Autoload] - -[doom.freedoom.phase2.Autoload] - -[doom.freedoom.freedm.Autoload] - -[heretic.Autoload] - -[heretic.heretic.Autoload] - -[heretic.shadow.Autoload] - -[blasphemer.Autoload] - -[hexen.Autoload] - -[hexen.deathkings.Autoload] - -[hexen.hexen.Autoload] - -[strife.Autoload] - -[chex.Autoload] - -[chex.chex1.Autoload] - -[chex.chex3.Autoload] - -[urbanbrawl.Autoload] - -[hacx.Autoload] - -[hacx.hacx1.Autoload] - -[hacx.hacx2.Autoload] - -[harmony.Autoload] - -[square.Autoload] - -[square.squareware.Autoload] - -[square.square.Autoload] - -[LastRun] -Version=211 - -[GlobalSettings] -gus_memsize=0 -midi_dmxgus=true -gus_patchdir= -midi_voices=32 -midi_config=timidity.cfg -snd_efx=true -snd_aldevice=Default -wildmidi_enhanced_resampling=true -wildmidi_reverb=false -wildmidi_frequency=0 -wildmidi_config= -fluid_chorus_type=0 -fluid_chorus_depth=8 -fluid_chorus_speed=0.3 -fluid_chorus_level=1 -fluid_chorus_voices=3 -fluid_reverb_level=0.57 -fluid_reverb_width=0.76 -fluid_reverb_damping=0.23 -fluid_reverb_roomsize=0.61 -fluid_threads=1 -fluid_samplerate=0 -fluid_interp=1 -fluid_voices=128 -fluid_chorus=true -fluid_reverb=true -fluid_gain=0.5 -fluid_patchset= -opl_core=0 -opl_numchips=2 -timidity_frequency=44100 -timidity_pipe=90 -timidity_mastervolume=1 -timidity_byteswap=false -timidity_8bit=false -timidity_stereo=true -timidity_reverb=0 -timidity_chorus=0 -timidity_extargs= -timidity_exe=timidity -snd_mididevice=-1 -spc_amp=1.875 -mod_dumb_mastervolume=1 -mod_autochip_scan_threshold=12 -mod_autochip_size_scan=500 -mod_autochip_size_force=100 -mod_autochip=false -mod_interp=2 -mod_volramp=2 -mod_samplerate=0 -mod_dumb=true -snd_sfxvolume=1 -snd_backend=openal -snd_output=default -snd_buffersize=0 -snd_samplerate=0 -snd_musicvolume=0.5 -snd_waterlp=250 -snd_midipatchset= -snd_output_format=PCM-16 -snd_speakermode=Auto -snd_resampler=Linear -snd_waterreverb=true -snd_hrtf=false -snd_buffercount=0 -snd_driver=0 -opl_fullpan=true -vid_tft=true -m_showinputgrid=false -m_show_backbutton=0 -m_use_mouse=1 -show_messages=true -mouse_sensitivity=1 -map_point_coordinates=true -vid_aspect=0 -vid_nowidescreen=false -vid_refreshrate=0 -vid_vsync=false -vid_defbits=8 -vid_defheight=480 -vid_defwidth=640 -Gamma=1 -statfile=zdoomstat.txt -savestatistics=0 -snd_flipstereo=false -snd_channels=32 -r_columnmethod=1 -r_quakeintensity=1 -cl_predict_lerpthreshold=2 -cl_predict_lerpscale=0.05 -cl_predict_specials=true -cl_noprediction=false -telezoom=true -r_fakecontrast=1 -chase_dist=90 -chase_height=-8 -gl_cachetime=0.6 -gl_cachenodes=true -nomonsterinterpolation=false -png_gamma=0 -png_level=5 -screenshot_dir= -screenshot_type=png -screenshot_quiet=false -use_joystick=false -autosavecount=4 -disableautosave=0 -autosavenum=0 -smooth_mouse=false -m_side=2 -m_forward=1 -m_yaw=1 -m_pitch=1 -lookstrafe=false -freelook=false -invertmouse=false -cl_run=false -demo_compress=true -cl_waitforsave=true -save_dir= -longsavemessages=true -storesavepic=true -nofilecompression=false -cl_capfps=false -defaultiwad= -queryiwad=true -con_ctrl_d= -con_buffersize=-1 -showendoom=0 -bgamma=1 -ggamma=1 -rgamma=1 -vid_forcesurface=false -vid_displaybits=32 -vid_adapter=0 -mouse_capturemode=1 -m_filter=false -m_noprescale=false -use_mouse=true -vid_winscale=1 -fullscreen=false -vid_maxfps=200 - -[GlobalSettings.Unknown] - -[Doom.Player] -wi_noautostartmap=false -playerclass=Fighter -stillbob=0 -movebob=0.25 -neverswitchonpickup=false -gender=male -team=255 -skin=base -colorset=0 -color=40 cf 00 -name=Player -autoaim=35 - -[Doom.ConsoleVariables] -r_drawfuzz=1 -vid_nopalsubstitutions=false -snd_pitched=false -menu_screenratios=-1 -snd_menuvolume=0.6 -show_obituaries=true -am_showmaplabel=2 -crosshairgrow=false -crosshairscale=false -crosshairhealth=true -crosshaircolor=ff 00 00 -crosshairforce=false -crosshair=0 -st_scale=true -paletteflash=0 -hudcolor_stats=3 -hudcolor_statnames=6 -hudcolor_xyco=3 -hudcolor_ttim=5 -hudcolor_ltim=8 -hudcolor_time=6 -hudcolor_titl=10 -hud_berserk_health=true -hud_armor_green=100 -hud_armor_yellow=50 -hud_armor_red=25 -hud_health_green=100 -hud_health_yellow=50 -hud_health_red=25 -hud_ammo_yellow=50 -hud_ammo_red=25 -hud_showlag=0 -hud_timecolor=5 -hud_showtime=0 -hud_showammo=2 -hud_showweapons=true -hud_showscore=false -hud_showstats=false -hud_showitems=false -hud_showmonsters=true -hud_showsecrets=true -hud_althud=false -hud_althudscale=2 -st_oldouch=false -cl_maxdecals=1024 -cl_spreaddecals=true -transsouls=0.75 -wi_showtotaltime=true -wi_percents=true -dimcolor=ff d7 00 -dimamount=-1 -hud_scale=false -allcheats=false -r_stretchsky=true -r_shadercolormaps=true -screenblocks=10 -r_deathcamera=false -cl_showsecretmessage=true -cl_bloodtype=0 -cl_pufftype=0 -addrocketexplosion=false -cl_missiledecals=true -cl_doautoaim=false -cl_bloodsplats=true -cl_showmultikills=true -cl_showsprees=true -r_maxparticles=4000 -r_rail_trailsparsity=1 -r_rail_spiralsparsity=1 -r_rail_smartspiral=false -cl_rockettrails=1 -dlg_musicvolume=1 -sb_teamdeathmatch_headingcolor=6 -sb_teamdeathmatch_enable=true -sb_deathmatch_otherplayercolor=2 -sb_deathmatch_yourplayercolor=3 -sb_deathmatch_headingcolor=6 -sb_deathmatch_enable=true -sb_cooperative_otherplayercolor=2 -sb_cooperative_yourplayercolor=3 -sb_cooperative_headingcolor=6 -sb_cooperative_enable=true -nametagcolor=5 -displaynametags=0 -language=auto -compatmode=0 -vid_cursor=None -wipetype=1 -dehload=0 -chat_substitution=false -chatmacro0=No -chatmacro9=Yes -chatmacro8=I'll take care of it. -chatmacro7=Come here! -chatmacro6=Next time, scumbag... -chatmacro5=You suck! -chatmacro4=Help! -chatmacro3=I'm not looking too good! -chatmacro2=I'm OK. -chatmacro1=I'm ready to kick butt! -lookspring=true -con_midtime=3 -msgmidcolor2=4 -msgmidcolor=5 -msg4color=3 -msg3color=3 -msg2color=2 -msg1color=5 -msg0color=6 -msg=0 -con_alpha=0.75 -con_scaletext=0 -con_centernotify=false -con_notifytime=3 -con_notablist=false -cl_bbannounce=false -am_followplayer=true -am_textured=false -am_ovthingcolor_citem=e8 88 00 -am_ovthingcolor_item=e8 88 00 -am_ovthingcolor_ncmonster=e8 88 00 -am_ovthingcolor_monster=e8 88 00 -am_ovthingcolor_friend=e8 88 00 -am_ovthingcolor=e8 88 00 -am_ovsecretsectorcolor=00 ff ff -am_ovinterlevelcolor=ff ff 00 -am_ovtelecolor=ff ff 00 -am_ovunseencolor=00 22 6e -am_ovcdwallcolor=00 88 44 -am_ovfdwallcolor=00 88 44 -am_ovefwallcolor=00 88 44 -am_ovlockedcolor=00 88 44 -am_ovotherwallscolor=00 88 44 -am_ovspecialwallcolor=ff ff ff -am_ovsecretwallcolor=00 88 44 -am_ovwallcolor=00 ff 00 -am_ovyourcolor=fc e8 d8 -am_thingcolor_citem=fc fc fc -am_thingcolor_item=fc fc fc -am_thingcolor_ncmonster=fc fc fc -am_thingcolor_monster=fc fc fc -am_thingcolor_friend=fc fc fc -am_secretsectorcolor=ff 00 ff -am_interlevelcolor=ff 00 00 -am_intralevelcolor=00 00 ff -am_lockedcolor=00 78 00 -am_notseencolor=6c 6c 6c -am_xhaircolor=80 80 80 -am_gridcolor=8b 5a 2b -am_thingcolor=fc fc fc -am_efwallcolor=66 55 55 -am_cdwallcolor=4c 38 20 -am_fdwallcolor=88 70 58 -am_tswallcolor=88 88 88 -am_specialwallcolor=ff ff ff -am_secretwallcolor=00 00 00 -am_wallcolor=2c 18 08 -am_yourcolor=fc e8 d8 -am_backcolor=6c 54 40 -am_showthingsprites=0 -am_showtriggerlines=false -am_showkeys=true -am_drawmapback=1 -am_map_secrets=1 -am_customcolors=true -am_colorset=0 -am_showtotaltime=false -am_showtime=true -am_showitems=false -am_showmonsters=true -am_showsecrets=true -am_overlay=0 -am_rotate=0 - -[Doom.LocalServerInfo] -sv_corpsequeuesize=64 -forcewater=false -sv_smartaim=0 -sv_disableautohealth=false -sv_dropstyle=0 -compatflags2=0 -compatflags=0 - -[Doom.UnknownConsoleVariables] - -[Doom.ConsoleAliases] - -[Doom.Bindings] -1=slot 1 -2=slot 2 -3=slot 3 -4=slot 4 -5=slot 5 -6=slot 6 -7=slot 7 -8=slot 8 -9=slot 9 -0=slot 0 --=sizedown -Equals=sizeup -tab=togglemap -t=messagemode -LeftBracket=invprev -RightBracket=invnext -enter=invuse -ctrl=+attack -`=toggleconsole -shift=+speed -\=+showscores -,=+moveleft -.=+moveright -alt=+strafe -space=+use -capslock=toggle cl_run -f1=menu_help -f2=menu_save -f3=menu_load -f4=menu_options -f5=menu_display -f6=quicksave -f7=menu_endgame -f8=togglemessages -f9=quickload -f10=menu_quit -f11=bumpgamma -f12=spynext -sysrq=screenshot -pause=pause -home=land -uparrow=+forward -pgup=+moveup -leftarrow=+left -rightarrow=+right -end=centerview -downarrow=+back -pgdn=+lookup -ins=+movedown -del=+lookdown -mouse1=+attack -mouse2=+strafe -mouse3=+forward -mouse4=+speed -joy1=+attack -joy2=+strafe -joy3=+speed -joy4=+use -mwheelup=weapprev -mwheeldown=weapnext -mwheelright=invnext -mwheelleft=invprev -dpadup=togglemap -dpaddown=invuse -dpadleft=invprev -dpadright=invnext -pad_start=pause -pad_back=menu_main -lthumb=crouch -lshoulder=weapprev -rshoulder=weapnext -ltrigger=+altattack -rtrigger=+attack -pad_a=+use -pad_y=+jump - -[Doom.DoubleBindings] - -[Doom.AutomapBindings] -0=am_gobig --=+am_zoomout -Equals=+am_zoomin -p=am_toggletexture -f=am_togglefollow -g=am_togglegrid -c=am_clearmarks -m=am_setmark -kp-=+am_zoomout -kp+=+am_zoomin -uparrow=+am_panup -leftarrow=+am_panleft -rightarrow=+am_panright -downarrow=+am_pandown -mwheelup=am_zoom 1.2 -mwheeldown=am_zoom -1.2 -