# HG changeset patch # User Beliar # Date 1329753010 -3600 # Node ID 0897c89da4fe60138baf897bb1195fc4e807f9de # Parent 8da675d9f525f7288cf916b9f528a86c0d88477e Using fife settings module again instead of our own. diff -r 8da675d9f525 -r 0897c89da4fe .hgsubstate --- a/.hgsubstate Thu Jan 12 19:57:38 2012 +0100 +++ b/.hgsubstate Mon Feb 20 16:50:10 2012 +0100 @@ -1,2 +1,2 @@ 23 data -a6bbb732b27b902baed40c395c0e494135327869 parpg +b3b82c2aebee375df6f119b474a22efdf1561483 parpg diff -r 8da675d9f525 -r 0897c89da4fe parpg.cfg.default --- a/parpg.cfg.default Thu Jan 12 19:57:38 2012 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,137 +0,0 @@ -[fife] -# Options marked with ? are untested/unknown - -# Game window's title (string) DO NOT EDIT! -WindowTitle = PARPG Techdemo 2 - -# Icon to use for the game window's border (filename) DO NOT EDIT! -WindowIcon = window_icon.png - -# Video driver to use. (?) -VideoDriver = "" - -# Backend to use for graphics (OpenGL|SDL) -RenderBackend = OpenGL - -# Run the game in fullscreen mode or not. (True|False) -FullScreen = False - -# Screen Resolution's width. Not used if FullScreen is set to False (800|1024|etc) -ScreenWidth = 800 - -# Screen Resolution's height. Not used if FullScreen is set to False (600|768|etc) -ScreenHeight = 600 - -# Screen DPI? (?) -BitsPerPixel = 0 - -# ? (?) -SDLRemoveFakeAlpha = 1 - -GLUseFramebuffer = True - -GLUseNPOT = True - -# The Sensitivity of the mouse. (-0.99 to 10.0) -MouseSensitivity = 0.0 - -# Sets whether the mouse should be accelerated. (True|False) -MouseAcceleration = False - -# Subdirectory to load icons from (path) -IconsPath = icons - -# ? ([R, G, B]) -ColorKey = [250, 0, 250] - -# ? (True|False) -ColorKeyEnabled = False - -# Turn on sound effects and music (True|False) -EnableSound = True - -# Initial volume of sound effects and music (0.0-100.0?) -InitialVolume = 5.0 - -# Characters to use to render fonts. DO NOT EDIT! -FontGlyphs = " abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]"" - -# Subdirectory to load fronts from (path) -FontsPath = fonts - -# Font to load when game starts -#TODO: make it so that the font name is supplied instead of the filename -Font = oldtypewriter.ttf - -# Size of in-game fonts -DefaultFontSize = 12 - -# ? (?) -LogModules = [controller] - -# ? (?) -PychanDebug = False - -# use Psyco Acceperation (True|False) -UsePsyco = False - -# ? (?) -ProfilingOn = False - -# Lighting Model to use (0-2) -Lighting = 0 - -[parpg] -# System directory where all data files are located (path) -DataPath = "./data" - -# System subdirectory to load maps from (path) -MapsPath = maps - -# YAML file that contains the available maps (filename) -MapsFile = maps.yaml - -# Map to load when game starts (filename) -Map = Mall - -# ? (filename) -AllAgentsFile = all_agents.yaml - -# System subdirectory to load objects from (path) -ObjectsPath = objects - -# YAML file that contains the database of availabel objects (filename) -ObjectDatabaseFile = object_database.yaml - -# System subdirectory to load dialogues from (path) -DialoguesPath = dialogue - -# System subdirectory to load quests from (path) -QuestsPath = quests - -# System subdirectory where gui files are loaded from (path) -GuiPath = gui - -# System subdirectory where cursors are loaded from (path) -CursorPath = cursors - -# File to use for default cursor (filename) -CursorDefault = cursor_plain.png - -# File to use for up cursor (filename) -CursorUp = cursor_up.png - -# File to use for right cursor (filename) -CursorRight = cursor_right.png - -# File to use for down cursor (filename) -CursorDown = cursor_down.png - -# File to use for left cursor (filename) -CursorLeft = cursor_left.png - -# how many pixles to move the camera per time frame (digit) -ScrollSpeed = 1.0 - -# Player walk speed (digit) -PCSpeed = 3 diff -r 8da675d9f525 -r 0897c89da4fe parpg.py --- a/parpg.py Thu Jan 12 19:57:38 2012 +0100 +++ b/parpg.py Mon Feb 20 16:50:10 2012 +0100 @@ -1,4 +1,4 @@ -#!/usr/bin/env python2 +#!/usr/bin/env python # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or @@ -19,11 +19,7 @@ from parpg.main import main -usage = ('usage: %prog [options] settings_path [system_path user_path]\n\n' - 'The settings_path argument is mandatory and is the directory in \n' - 'which your parpg.cfg file is located. Optionally, you may \n' - 'specify where data files are located (system_path), and where \n' - 'the user settings and data files should be saved to (user_path)\n\n' +usage = ('usage: %prog [options]' 'Example: python %prog .') parser = OptionParser(description='PARPG Launcher Script', usage=usage) @@ -33,15 +29,4 @@ help='desired output level for log file') opts, args = parser.parse_args() -if not args: - if path.isfile("./parpg.cfg"): - args =(".") - elif path.isfile("./parpg.cfg.default"): - import shutil - shutil.copyfile("./parpg.cfg.default", "./parpg.cfg") - args =(".") - else: - parser.print_help() - sys.exit(1) - -main(args, opts) \ No newline at end of file +main(args, opts) diff -r 8da675d9f525 -r 0897c89da4fe settings-dist.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/settings-dist.xml Mon Feb 20 16:50:10 2012 +0100 @@ -0,0 +1,43 @@ + + + + False + True + OpenGL + 800x600 + 0 + 5.0 + 1 + True + True + PARPG + data/gui/icons/window_icon.png + data/fonts/oldtypewriter.ttf + abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789.,!?-+/():;%&`'*#=[]" + 12 + controller + True + 1 + 0 + + + data + maps + maps.yaml + Mall + all_agents.yaml + objects + object_database.yaml + dialogue + quests + gui + cursors + cursor_plain.png + cursor_up.png + cursor_right.png + cursor_down.png + cursor_left.png + 1.0 + 1.0 + +