diff --git a/%APPDATA%/quake3e/baseq3/q3config.cfg b/%APPDATA%/quake3e/baseq3/q3config.cfg new file mode 100644 index 0000000..6123735 --- /dev/null +++ b/%APPDATA%/quake3e/baseq3/q3config.cfg @@ -0,0 +1,209 @@ +// generated by quake, do not modify +unbindall +bind TAB "+scores" +bind ENTER "+button2" +bind ESCAPE "togglemenu" +bind SPACE "+moveup" +bind + "sizeup" +bind - "sizedown" +bind / "weapnext" +bind 0 "weapon 10" +bind 1 "weapon 1" +bind 2 "weapon 2" +bind 3 "weapon 3" +bind 4 "weapon 4" +bind 5 "weapon 5" +bind 6 "weapon 6" +bind 7 "weapon 7" +bind 8 "weapon 8" +bind 9 "weapon 9" +bind = "sizeup" +bind [ "weapprev" +bind \ "+mlook" +bind ] "weapnext" +bind _ "sizedown" +bind ` "toggleconsole" +bind a "+moveleft" +bind c "+movedown" +bind d "+moveright" +bind s "+back" +bind t "messagemode" +bind w "+forward" +bind 0x7e "toggleconsole" +bind PAUSE "pause" +bind UPARROW "+forward" +bind DOWNARROW "+back" +bind LEFTARROW "+left" +bind RIGHTARROW "+right" +bind ALT "+strafe" +bind CTRL "+attack" +bind SHIFT "+speed" +bind DEL "+lookdown" +bind PGDN "+lookup" +bind END "centerview" +bind F1 "vote yes" +bind F2 "vote no" +bind F3 "ui_teamorders" +bind F11 "screenshot" +bind MOUSE1 "+attack" +bind MOUSE2 "+strafe" +bind MOUSE3 "+zoom" +bind MWHEELDOWN "weapnext" +bind MWHEELUP "weapprev" +seta capturelimit "0" +seta cg_autoswitch "1" +seta cg_bobpitch "0.002" +seta cg_bobroll "0.002" +seta cg_brassTime "2500" +seta cg_cameraOrbitDelay "50" +seta cg_crosshairHealth "1" +seta cg_crosshairSize "24" +seta cg_crosshairX "0" +seta cg_crosshairY "0" +seta cg_deferPlayers "1" +seta cg_draw2D "1" +seta cg_draw3dIcons "1" +seta cg_drawAmmoWarning "1" +seta cg_drawAttacker "1" +seta cg_drawCrosshair "4" +seta cg_drawCrosshairNames "1" +seta cg_drawFPS "0" +seta cg_drawFriend "1" +seta cg_drawGun "1" +seta cg_drawIcons "1" +seta cg_drawRewards "1" +seta cg_drawSnapshot "0" +seta cg_drawStatus "1" +seta cg_drawTeamOverlay "0" +seta cg_drawTimer "0" +seta cg_forceModel "0" +seta cg_fov "90" +seta cg_gibs "1" +seta cg_lagometer "1" +seta cg_marks "1" +seta cg_noProjectileTrail "0" +seta cg_noTaunt "0" +seta cg_noVoiceChats "0" +seta cg_noVoiceText "0" +seta cg_oldPlasma "1" +seta cg_oldRail "1" +seta cg_oldRocket "1" +seta cg_predictItems "1" +seta cg_railTrailTime "400" +seta cg_runpitch "0.002" +seta cg_runroll "0.005" +seta cg_scorePlums "1" +seta cg_shadows "1" +seta cg_simpleItems "0" +seta cg_smoothClients "0" +seta cg_stereoSeparation "0" +seta cg_teamChatHeight "0" +seta cg_teamChatTime "3000" +seta cg_teamChatsOnly "0" +seta cg_trueLightning "0.0" +seta cg_zoomfov "22.5" +seta cl_autoRecordDemo "0" +seta cl_aviFrameRate "25" +seta cl_aviMotionJpeg "1" +seta cl_aviPipeFormat "-preset medium -crf 23 -c:v libx264 -flags +cgop -pix_fmt yuvj420p -bf 2 -c:a aac -strict -2 -b:a 160k -movflags faststart" +seta cl_consoleKeys "~ ` 0x7e 0x60" +seta cl_drawRecording "1" +seta cl_maxpackets "125" +seta cl_renderer "opengl" +seta color1 "4" +seta color2 "5" +seta com_blood "1" +seta com_hunkMegs "128" +seta com_introplayed "1" +seta com_skipIdLogo "0" +seta com_soundMegs "8" +seta com_zoneMegs "12" +seta dmflags "0" +seta fraglimit "20" +seta g_allowVote "1" +seta g_banIPs "" +seta g_filterBan "1" +seta g_friendlyfire "0" +seta g_log "games.log" +seta g_logSync "0" +seta g_maxGameClients "0" +seta g_spAwards "" +seta g_spScores1 "" +seta g_spScores2 "" +seta g_spScores3 "" +seta g_spScores4 "" +seta g_spScores5 "" +seta g_spSkill "2" +seta g_spVideos "" +seta g_teamAutoJoin "0" +seta g_teamForceBalance "0" +seta g_warmup "20" +seta in_keyboardDebug "0" +seta in_mouse "1" +seta r_customHeight "1024" +seta r_customWidth "1600" +seta r_dlightMode "1" +seta r_dynamiclight "1" +seta r_fullscreen "1" +seta r_mode "-2" +seta r_modeFullscreen "-2" +seta r_neatsky "0" +seta r_nomip "0" +seta r_picmip "0" +seta r_stereoEnabled "0" +seta r_teleporterFlash "1" +seta r_textureMode "GL_LINEAR_MIPMAP_NEAREST" +seta r_vertexLight "0" +seta rate "25000" +seta s_musicVolume "0.25" +seta s_muteWhenMinimized "1" +seta s_muteWhenUnfocused "1" +seta s_volume "0.8" +seta sensitivity "5" +seta server1 "" +seta server10 "" +seta server11 "" +seta server12 "" +seta server13 "" +seta server14 "" +seta server15 "" +seta server16 "" +seta server2 "" +seta server3 "" +seta server4 "" +seta server5 "" +seta server6 "" +seta server7 "" +seta server8 "" +seta server9 "" +seta snaps "40" +seta sv_dlRate "100" +seta sv_dlURL "" +seta sv_filter "filter.txt" +seta sv_floodProtect "1" +seta sv_hostname "noname" +seta sv_maxclients "8" +seta sv_maxclientsPerIP "3" +seta timelimit "0" +seta ui_bigFont "0.4" +seta ui_browserGameType "0" +seta ui_browserMaster "0" +seta ui_browserShowEmpty "1" +seta ui_browserShowFull "1" +seta ui_browserSortKey "4" +seta ui_ctf_capturelimit "8" +seta ui_ctf_friendly "0" +seta ui_ctf_timelimit "30" +seta ui_ffa_fraglimit "20" +seta ui_ffa_timelimit "0" +seta ui_smallFont "0.25" +seta ui_team_fraglimit "0" +seta ui_team_friendly "1" +seta ui_team_timelimit "20" +seta ui_tourney_fraglimit "0" +seta ui_tourney_timelimit "15" +seta vid_xpos "3" +seta vid_ypos "22" +seta vm_cgame "2" +seta vm_game "2" +seta vm_ui "2" diff --git a/%APPDATA%/quake3e/baseq3/q3history b/%APPDATA%/quake3e/baseq3/q3history new file mode 100644 index 0000000..3fc689c --- /dev/null +++ b/%APPDATA%/quake3e/baseq3/q3history @@ -0,0 +1 @@ +5 0 5 \quit \ No newline at end of file diff --git a/RA3MP3Playback.pyw b/RA3MP3Playback.pyw index e29c4eb..155d3a2 100644 --- a/RA3MP3Playback.pyw +++ b/RA3MP3Playback.pyw @@ -34,11 +34,11 @@ DEFAULT_ARENA0_BL = r"./arena/music/arena0_bl.txt" DEFAULT_GAME_EXE = "" # Debug override paths -DEBUG_WIN_GAME_EXE = r"D:/GOG Games/Quake III/qgame.dll" -DEBUG_LIN_GAME_EXE = r"D:/GOG Games/Quake III/qgame.so" -DEBUG_PLAYLIST = r"D:/GOG Games/Quake III/arena/music/playlist.txt" -DEBUG_RA3_MAPS = r"D:/GOG Games/Quake III/arena/music/ra3_maps.txt" -DEBUG_ARENA0_BL = r"D:/GOG Games/Quake III/arena/music/arena0_bl.txt" +DEBUG_WIN_GAME_EXE = r"//gameframe-omv/games/quake3arena/qgame.dll" +DEBUG_LIN_GAME_EXE = r"//gameframe-omv/games/quake3arena/qgame.so" +DEBUG_PLAYLIST = r"//gameframe-omv/games/quake3arena/arena/music/playlist.txt" +DEBUG_RA3_MAPS = r"//gameframe-omv/games/quake3arena/arena/music/ra3_maps.txt" +DEBUG_ARENA0_BL = r"//gameframe-omv/games/quake3arena/arena/music/arena0_bl.txt" DEBUG_GAME_EXE = "" if (os.name == "nt"): @@ -713,8 +713,10 @@ def main(): chosen_mod = None run_mod = [] + game_path = Path(game_exe) + if "fs_game" not in sys.argv[1:]: - game_path = Path(game_exe) + items = find_pk3_subfolders(game_path.parent) # Create a queue to get the result from the menu thread @@ -757,7 +759,13 @@ def main(): #sys.exit(0) - game_args = run_mod + sys.argv[1:] + # + + if (Path(game_exe).parent / "shared_instance.txt").exists(): + game_args = run_mod + ["+set","fs_homepath", os.environ['APPDATA']+"\\quake3e\\"] + sys.argv[1:] + else: + game_args = run_mod + sys.argv[1:] + # Start game launcher thread #game_launch_thread = threading.Thread(target=game_launch,args=(game_args,))