diff --git a/Image/wall_industrial.png b/Image/wall_industrial.png index 54466ab..b452402 100644 Binary files a/Image/wall_industrial.png and b/Image/wall_industrial.png differ diff --git a/history.txt b/history.txt index 4caffa4..ad6bb23 100644 --- a/history.txt +++ b/history.txt @@ -1,3 +1,4 @@ +1.200 February 27 2016 - Refactored "ifNPC[trait]" macros, fixing some plot emails (aslmacro.txt) - Mauna, Tokto no longer hidden in SDL mode (TS_MAP_World.txt) - Imported shuttle service from GH2 (services.pp) diff --git a/readme.md b/readme.md index 3a7e7e8..d281932 100644 --- a/readme.md +++ b/readme.md @@ -31,13 +31,23 @@ For the ASCII version, just type: fpc gharena -If everything you need has already been installed, that should be it. +Ignore the notes and warnings. If everything you need has already been +installed, that should be it. -Windows Notes: You need to download the binaries for SDL 1.2, SDL_TTF for +Windows Notes: +- You need to download the 32 bit binaries for SDL 1.2, SDL_TTF for SDL 1.2, and SDL_IMAGE for SDL 1.2. Put the .dll files in the same folder -as gharena.exe. - -Linux Notes: You need the packages libsdl1.2, libsdl1.2-dev, libsdl-image1.2, +as gharena.exe. You should download the 32 bit versions since it seems that +FPC compiles to a 32 bit target on Windows by default, and these will run on a +64 bit system just fine. There's probably some way to get a 64 bit executable; +if you figure it out, let me know. +- To open a terminal in a Windows folder, press shift and right click in the +folder window. The option to open a terminal should be there. Alternatively, +install Git for Windows and open a Git Bash shell by right clicking without +shift. + +Linux Notes: +- You need the packages libsdl1.2, libsdl1.2-dev, libsdl-image1.2, libsdl-image1.2dev, libsdl-ttf2.0-0, and libsdl-ttf2.0-0dev. **************************** diff --git a/replace.py b/replace.py deleted file mode 100644 index 85f0e20..0000000 --- a/replace.py +++ /dev/null @@ -1,46 +0,0 @@ -#! /usr/bin/env python -# -*- coding: latin-1 -*- - -import os -import re - -EXTENSIONS = [".txt", ".pp", ".pas"] - -def make_replacement(old, new): - regex = re.compile(r"\b%s\b" % re.escape(old)) - for dir_path, _, filenames in os.walk("."): - for filename in filenames: - if os.path.splitext(filename)[1].lower() not in EXTENSIONS: - continue - full_path = os.path.join(dir_path, filename) - full_path = os.path.normpath(full_path) - text = open(full_path).read() - new_text, replace_no = regex.subn(new, text) - if replace_no: - print "%dx %r => %r in %s." % (replace_no, old, new, full_path) - open(full_path, "w").write(new_text) - if old in new_text: - print "Warning: %r occurs in %s within another word." % (old, full_path) - -if __name__ == "__main__": - import sys - if len(sys.argv) != 3: - print """Usage: replace.py - -Recursively walk through all files and directories in the current directory, -replacing by . The appropriate replacements are made when - occurs in capitalized and upper-case form, i.e. "replace.py -medicene medicine" also replaces "Medicene" by "Medicine" and "MEDICENE" by -"MEDICINE". - -Only whole words are replaced, i.e. "replace.py foo bar" does not replace -"fool" by "barl", since this would often have unintended consequences. -However, if is found as part of another word in some file, a -warning message is emitted so that the user can check the file and make a -manual replacement if appropriate.""" - raise SystemExit(2) - - old, new = sys.argv[1:3] - make_replacement(old, new) - make_replacement(old.capitalize(), new.capitalize()) - make_replacement(old.upper(), new.upper())