(svn r24613) -Release: 1.2.3-RC1

- Change: [NewGRF] Set the reference brightness of 32bpp mask recolouring to 128 (r24610)

Makefile.bundle.in

@@ -10,13 +10,9 @@
 #
 
 # The revision is needed for the bundle name and creating an OSX application bundle.
-ifdef REVISION
-REV := $(REVISION)
-else
 # Detect the revision
 VERSIONS := $(shell AWK="$(AWK)" "$(ROOT_DIR)/findversion.sh")
 REV      := $(shell echo "$(VERSIONS)" | cut -f 1 -d'	')
-endif
 
 # Make sure we have something in REV
 ifeq ($(REV),)
@@ -73,7 +69,6 @@ endif
 	$(Q)cp "$(ROOT_DIR)/COPYING"              "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/known-bugs.txt"       "$(BUNDLE_DIR)/"
 	$(Q)cp "$(ROOT_DIR)/docs/multiplayer.txt" "$(BUNDLE_DIR)/docs/"
-	$(Q)cp "$(ROOT_DIR)/docs/32bpp.txt"       "$(BUNDLE_DIR)/docs/"
 	$(Q)cp "$(ROOT_DIR)/changelog.txt"        "$(BUNDLE_DIR)/"
 ifdef MAN_DIR
 	$(Q)mkdir -p "$(BUNDLE_DIR)/man/"
@@ -85,7 +80,7 @@ endif
 	$(Q)cp "$(BIN_DIR)/scripts/"*             "$(BUNDLE_DIR)/scripts/"
 ifdef MENU_DIR
 	$(Q)cp "$(ROOT_DIR)/media/openttd.desktop" "$(BUNDLE_DIR)/media/"
-	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) >> "$(BUNDLE_DIR)/media/openttd.desktop"
+	$(Q)$(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.translation.awk" "$(SRC_DIR)/lang/"*.txt | $(SORT) |  $(AWK) -f "$(ROOT_DIR)/media/openttd.desktop.filter.awk" >> "$(BUNDLE_DIR)/media/openttd.desktop"
 	$(Q)sed s/=openttd/=$(BINARY_NAME)/g "$(BUNDLE_DIR)/media/openttd.desktop" > "$(ROOT_DIR)/media/openttd.desktop.install"
 endif
 ifeq ($(TTD), openttd.exe)

Makefile.grf.in

@@ -66,7 +66,7 @@ $(OBJS_DIR)/openttd.grf: $(PNG_FILES) $(NFO_FILES) $(OBJS_DIR)/sprites
 	$(Q) gcc -I$(GRF_DIR) -C -E - < "$(GRF_DIR)/openttd.nfo" | sed -e '/^#/d' -e '/^$$/d' > $(OBJS_DIR)/sprites/openttd.nfo
 	$(Q) $(NFORENUM) -s $(OBJS_DIR)/sprites/openttd.nfo
 	$(E) '$(STAGE) Compiling openttd.grf'
-	$(Q) $(GRFCODEC) -s -e -p1 $(OBJS_DIR)/openttd.grf
+	$(Q) $(GRFCODEC) -n -s -e -p1 $(OBJS_DIR)/openttd.grf
 
 # Clean up temporary files.
 clean:

Makefile.in

@@ -41,7 +41,6 @@ TTDS        = $(SRC_DIRS:%=%/$(TTD))
 OS          = !!OS!!
 OSXAPP      = !!OSXAPP!!
 LIPO        = !!LIPO!!
-REVISION    = !!REVISION!!
 AWK         = !!AWK!!
 SORT        = !!SORT!!
 DISTCC      = !!DISTCC!!

Makefile.lang.in

@@ -14,6 +14,7 @@ LANGS_SRC     = $(shell ls $(LANG_DIR)/*.txt)
 LANGS         = $(LANGS_SRC:$(LANG_DIR)/%.txt=%.lng)
 CXX_BUILD     = !!CXX_BUILD!!
 CFLAGS_BUILD  = !!CFLAGS_BUILD!!
+CXXFLAGS_BUILD= !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD = !!LDFLAGS_BUILD!!
 STRGEN_FLAGS  = !!STRGEN_FLAGS!!
 STAGE         = !!STAGE!!
@@ -44,23 +45,23 @@ all: table/strings.h $(LANGS)
 
 strgen_base.o: $(SRC_DIR)/strgen/strgen_base.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
 strgen.o: $(SRC_DIR)/strgen/strgen.cpp $(SRC_DIR)/strgen/strgen.h endian_host.h $(SRC_DIR)/table/control_codes.h $(SRC_DIR)/table/strgen_tables.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
 string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
 alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
 getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSTRGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSTRGEN -c -o $@ $<
 
 lang/english.txt: $(LANG_DIR)/english.txt
 	$(Q)mkdir -p lang
@@ -68,7 +69,7 @@ lang/english.txt: $(LANG_DIR)/english.txt
 
 $(STRGEN): alloc_func.o string.o strgen_base.o strgen.o getoptdata.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
 
 table/strings.h: lang/english.txt $(STRGEN)
 	$(E) '$(STAGE) Generating $@'
@@ -87,7 +88,7 @@ endian_host.h: $(ENDIAN_CHECK)
 
 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
 
 depend:
 

Makefile.setting.in

@@ -10,6 +10,7 @@ ENDIAN_CHECK     = !!ENDIAN_CHECK!!
 SRC_DIR          = !!SRC_DIR!!
 CXX_BUILD        = !!CXX_BUILD!!
 CFLAGS_BUILD     = !!CFLAGS_BUILD!!
+CXXFLAGS_BUILD   = !!CXXFLAGS_BUILD!!
 LDFLAGS_BUILD    = !!LDFLAGS_BUILD!!
 STAGE            = !!STAGE!!
 SETTING_OBJS_DIR = !!SETTING_OBJS_DIR!!
@@ -29,27 +30,27 @@ all: table/settings.h
 
 settingsgen.o: $(SRC_DIR)/settingsgen/settingsgen.cpp $(SRC_DIR)/string_func.h $(SRC_DIR)/strings_type.h $(SRC_DIR)/misc/getoptdata.h $(SRC_DIR)/ini_type.h $(SRC_DIR)/core/smallvec_type.hpp
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
 alloc_func.o: $(SRC_DIR)/core/alloc_func.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
 getoptdata.o: $(SRC_DIR)/misc/getoptdata.cpp $(SRC_DIR)/misc/getoptdata.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/misc/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
 string.o: $(SRC_DIR)/string.cpp endian_host.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
 ini_load.o: $(SRC_DIR)/ini_load.cpp $(SRC_DIR)/core/alloc_func.hpp $(SRC_DIR)/core/mem_func.hpp $(SRC_DIR)/ini_type.h $(SRC_DIR)/string_func.h
 	$(E) '$(STAGE) Compiling $(<:$(SRC_DIR)/%.cpp=%.cpp)'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) -DSETTINGSGEN -c -o $@ $<
 
 $(SETTINGSGEN): alloc_func.o string.o ini_load.o settingsgen.o getoptdata.o
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(LDFLAGS_BUILD) $^ -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $^ -o $@
 
 table/settings.h: $(SETTINGSGEN) $(SRC_DIR)/table/settings.h.preamble $(SRC_DIR)/table/settings.h.postamble $(SRC_DIR)/table/*.ini
 	$(E) '$(STAGE) Generating $@'
@@ -64,7 +65,7 @@ endian_host.h: $(ENDIAN_CHECK)
 
 $(ENDIAN_CHECK): $(SRC_DIR)/endian_check.cpp
 	$(E) '$(STAGE) Compiling and Linking $@'
-	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $< -o $@
+	$(Q)$(CXX_BUILD) $(CFLAGS_BUILD) $(CXXFLAGS_BUILD) $(LDFLAGS_BUILD) $< -o $@
 
 depend:
 

bin/ai/compat_0.7.nut

@@ -350,3 +350,20 @@ AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID

bin/ai/compat_1.0.nut

@@ -102,3 +102,20 @@ AIEvent.AI_ET_ENGINE_AVAILABLE <- AIEvent.ET_ENGINE_AVAILABLE;
 AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID

bin/ai/compat_1.1.nut

@@ -39,3 +39,20 @@ AIEvent.AI_ET_STATION_FIRST_VEHICLE <- AIEvent.ET_STATION_FIRST_VEHICLE;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CRASHED <- AIEvent.ET_DISASTER_ZEPPELINER_CRASHED;
 AIEvent.AI_ET_DISASTER_ZEPPELINER_CLEARED <- AIEvent.ET_DISASTER_ZEPPELINER_CLEARED;
 AIEvent.AI_ET_TOWN_FOUNDED <- AIEvent.ET_TOWN_FOUNDED;
+AIOrder.AIOF_NONE <- AIOrder.OF_NONE
+AIOrder.AIOF_NON_STOP_INTERMEDIATE <- AIOrder.OF_NON_STOP_INTERMEDIATE
+AIOrder.AIOF_NON_STOP_DESTINATION <- AIOrder.OF_NON_STOP_DESTINATION
+AIOrder.AIOF_UNLOAD <- AIOrder.OF_UNLOAD
+AIOrder.AIOF_TRANSFER <- AIOrder.OF_TRANSFER
+AIOrder.AIOF_NO_UNLOAD <- AIOrder.OF_NO_UNLOAD
+AIOrder.AIOF_FULL_LOAD <- AIOrder.OF_FULL_LOAD
+AIOrder.AIOF_FULL_LOAD_ANY <- AIOrder.OF_FULL_LOAD_ANY
+AIOrder.AIOF_NO_LOAD <- AIOrder.OF_NO_LOAD
+AIOrder.AIOF_SERVICE_IF_NEEDED <- AIOrder.OF_SERVICE_IF_NEEDED
+AIOrder.AIOF_STOP_IN_DEPOT <- AIOrder.OF_STOP_IN_DEPOT
+AIOrder.AIOF_GOTO_NEAREST_DEPOT <- AIOrder.OF_GOTO_NEAREST_DEPOT
+AIOrder.AIOF_NON_STOP_FLAGS <- AIOrder.OF_NON_STOP_FLAGS
+AIOrder.AIOF_UNLOAD_FLAGS <- AIOrder.OF_UNLOAD_FLAGS
+AIOrder.AIOF_LOAD_FLAGS <- AIOrder.OF_LOAD_FLAGS
+AIOrder.AIOF_DEPOT_FLAGS <- AIOrder.OF_DEPOT_FLAGS
+AIOrder.AIOF_INVALID <- AIOrder.OF_INVALID

bin/ai/regression/regression.nut

@@ -923,12 +923,12 @@ function Regression::Order()
 	print("--Order--");
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 1));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_UNLOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.AIOF_TRANSFER | AIOrder.AIOF_FULL_LOAD));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_SERVICE_IF_NEEDED));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.AIOF_STOP_IN_DEPOT));
-	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.AIOF_SERVICE_IF_NEEDED | AIOrder.AIOF_GOTO_NEAREST_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER | AIOrder.OF_UNLOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33416, AIOrder.OF_TRANSFER | AIOrder.OF_FULL_LOAD));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.OF_SERVICE_IF_NEEDED));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(33417, AIOrder.OF_STOP_IN_DEPOT));
+	print("  AreOrderFlagsValid():  " + AIOrder.AreOrderFlagsValid(0, AIOrder.OF_SERVICE_IF_NEEDED | AIOrder.OF_GOTO_NEAREST_DEPOT));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_LOAD_PERCENTAGE, AIOrder.CF_EQUALS));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_RELIABILITY, AIOrder.CF_IS_TRUE));
 	print("  IsValidConditionalOrder(): " + AIOrder.IsValidConditionalOrder(AIOrder.OC_REQUIRES_SERVICE, AIOrder.CF_IS_FALSE));
@@ -940,8 +940,8 @@ function Regression::Order()
 	print("  IsConditionalOrder():  " + AIOrder.IsConditionalOrder(12, 1));
 	print("  IsCurrentOrderPartOfOrderList(): " + AIOrder.IsCurrentOrderPartOfOrderList(12));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.AIOF_TRANSFER));
-	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.AIOF_TRANSFER));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33416, AIOrder.OF_TRANSFER));
+	print("  InsertOrder():         " + AIOrder.InsertOrder(12, 0, 33416, AIOrder.OF_TRANSFER));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(12));
 	print("  IsValidVehicleOrder(): " + AIOrder.IsValidVehicleOrder(12, 1));
 	print("  IsGotoStationOrder():  " + AIOrder.IsGotoStationOrder(12, 1));
@@ -953,7 +953,7 @@ function Regression::Order()
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 1));
 	print("  GetOrderJumpTo():      " + AIOrder.GetOrderJumpTo(12, 1));
 	print("  RemoveOrder():         " + AIOrder.RemoveOrder(12, 0));
-	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.AIOF_FULL_LOAD));
+	print("  SetOrderFlags():       " + AIOrder.SetOrderFlags(12, 0, AIOrder.OF_FULL_LOAD));
 	print("  GetOrderFlags():       " + AIOrder.GetOrderFlags(12, 0));
 	print("  GetOrderDestination(): " + AIOrder.GetOrderDestination(12, 0));
 	print("  CopyOrders():          " + AIOrder.CopyOrders(12, 1));
@@ -961,12 +961,12 @@ function Regression::Order()
 	print("  ShareOrders():         " + AIOrder.ShareOrders(13, 1));
 	print("  ShareOrders():         " + AIOrder.ShareOrders(13, 12));
 	print("  UnshareOrders():       " + AIOrder.UnshareOrders(13));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.AIOF_NONE));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(12, 33421, AIOrder.OF_NONE));
 
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(13, 0));
 	print("  BuildVehicle():        " + AIVehicle.BuildVehicle(23596, 8));
 	print("  BuildRailStation():    " + AIRail.BuildRailStation(7958, AIRail.RAILTRACK_NE_SW, 1, 1, AIStation.STATION_NEW));
-	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.AIOF_NONE));
+	print("  AppendOrder():         " + AIOrder.AppendOrder(20, 7958, AIOrder.OF_NONE));
 	print("  GetOrderCount():       " + AIOrder.GetOrderCount(20));
 	print("  GetStopLocation():     " + AIOrder.GetStopLocation(20, 0));
 	print("  SetStopLocation():     " + AIOrder.SetStopLocation(20, 0, AIOrder.STOPLOCATION_MIDDLE));

bin/baseset/orig_dos.obg

@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = e30e8a398ae86c03dc534a8ac7dfb3b6
-OPENTTD.GRF  = 8bcc7d7b6c7fdfba27af872743e9efd6
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_dos_de.obg

@@ -55,7 +55,7 @@ TRGI.GRF     = da6a6c9dcc451eec88d79211437b76a8
 TRGC.GRF     = ed446637e034104c5559b32c18afe78d
 TRGH.GRF     = ee6616fb0e6ef6b24892c58c93d86fc9
 TRGT.GRF     = fcde1d7e8a74197d72a62695884b909e
-OPENTTD.GRF  = 8bcc7d7b6c7fdfba27af872743e9efd6
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

bin/baseset/orig_win.obg

@@ -55,7 +55,7 @@ TRGIR.GRF    = 0c2484ff6be49fc63a83be6ab5c38f32
 TRGCR.GRF    = 3668f410c761a050b5e7095a2b14879b
 TRGHR.GRF    = 06bf2b7a31766f048baac2ebe43457b1
 TRGTR.GRF    = de53650517fe661ceaa3138c6edb0eb8
-OPENTTD.GRF  = 8bcc7d7b6c7fdfba27af872743e9efd6
+OPENTTD.GRF  = 51f9d2b8a29a079e83486db13509336c
 
 [origin]
 default      = You can find it on your Transport Tycoon Deluxe CD-ROM.

changelog.txt

@@ -1,3 +1,207 @@
+1.2.3-RC1 (2012-10-17)
+------------------------------------------------------------------------
+- Change: [NewGRF] Set the reference brightness of 32bpp mask recolouring to 128 (r24610)
+- Fix: Configure script did not properly handle _BUILD flags during reconfigure (r24601)
+- Fix: Configure script failed to detect libfontconfig 2.10 as newer than 2.3 (r24598)
+- Fix: When fontconfig is not available, the bootstrap download crashed [FS#5336] (r24597)
+- Fix: Crash when a gamescript provided too many parameters to a GSText object [FS#5333] (r24593)
+- Fix: [Script] API documentation mistakes/omissions (r24584)
+- Fix: Do not add duplicates to the ban list [FS#5308] (r24580)
+- Fix: Draw the window resize sprite bottom-aligned [FS#5324] (r24577)
+- Fix: Vehicle list at buoys did no longer work [FS#5319] (r24576)
+- Fix: [Windows] Do not cast away const in OS specific code (r24572, r24571)
+- Fix: Naming of bundles was somewhat broken (r24569)
+- Fix: Non-train vehicle lists were not resorted when vehicles were renamed [FS#5261] (r24567)
+- Fix: Stop both price and payment inflation if either of them has reached MAX_INFLATION (r24565)
+- Fix: Limiting the inflation did not quite work [FS#5312] (r24564)
+- Fix: Do not show profit from refits as cost in the refit window [FS#5297] (r24544)
+- Fix: Do not limit to reading one UDP packet per game loop (r24532)
+- Fix: Max script chance was too big (r24531)
+- Fix: [NewGRF] RandomAction 84 should interpret register 100 as signed (r24528)
+- Fix: [OSX] Some compile problems in mac-only code [FS#5296] (r24524)
+- Fix: The gender of an industry name is defined by the industry-type part of the name, not by the town-name part, even if it comes first (r24523, r24522)
+- Fix: GStexts were compiled incompletely when containing certain string codes (r24516, r24515)
+- Fix: The mousewheel did not work in the build waypoint window [FS#5285] (r24507)
+- Fix: [NewGRF] Airport variables 60 to 65 and 69 used the wrong cargo translation table for translations (r24506)
+- Fix: Do not show the global goals as company goals for spectators (r24500)
+- Fix: Clarify description of command line option -n (r24485)
+- Fix: Do not call RebuildSubsidisedSourceAndDestinationCache() before subsidy savegame conversion is finished [FS#5232] (r24482)
+- Fix: Trains were unable to reverse in stations when using NPF (r24479)
+- Fix: The --xxx yyy format (instead of --xxx=yyy) for configure did not work (r24471)
+- Fix: --prefix was not accepted by configure (r24470)
+- Fix: Changing auto-refit for a 'goto station' order was inadvertently modifying the full load state [FS#5264] (r24457)
+
+
+1.2.2 (2012-08-16)
+------------------------------------------------------------------------
+(None)
+
+
+1.2.2-RC1 (2012-08-01)
+------------------------------------------------------------------------
+- Fix: In some cases ships could be covered with land [CVE-2012-3436] [FS#5254] (r24449, r24439)
+- Fix: Copy constructor and assignment operator cannot be implicit template specialisations [FS#5255] (r24448)
+- Fix: Make (non-refittable) vehicles with invalid default cargo unavailable [FS#5256] (r24438)
+- Fix: CFLAGS/CXXFLAGS ignored for helper binaries (r24432, r24429, r24427, r24365)
+- Fix: [Windows] Unbreak NewGRF MD5 sum calculation. Macros and side effects do not mix, especially if there is some obscure '#define min' in a windows header that nobody thinks of [FS#5231] (r24416)
+- Fix: Disallow removing roadtypes from bridges when not dragging in bridge direction [FS#5221] (r24414)
+- Fix: Draw wires under low bridges if the bridge is transparent, not if the wire is transparent (r24403)
+- Fix: Station properties 11 and 14 were combined incorrectly [FS#5243] (r24402)
+- Fix: [Windows] Changing resolution did not resize the window (r24394)
+- Fix: Use the 'all vehicles' group for the autoreplace window from the vehicle list [FS#5239] (r24392)
+- Fix: Do not consider not finding a particular base set critical; just load a different one and display an in-game error later on [FS#5233] (r24388)
+- Fix: Make IsInDepot() functions behave consistent across vehicle types and add IsChainInDepot instead, if that is what shall be checked [FS#5188] (r24384)
+- Fix: Call Vehicle::IsStoppedInDepot only for the first vehicle in a chain (i.e. primary vehicle or free wagon) (r24382)
+- Fix: Do not resize the object GUI when selecting objects. Rather clip the object name (r24379)
+- Fix: ReInit could crash for windows with NWidgetMatrix widgets [FS#5218] (r24378)
+- Fix: [NewGRF] Extended action A1 did not work correctly [FS#5227] (r24369, r24361)
+- Fix: [NewGRF] Ship-specific 80+x variables were missing for unknown reason [FS#5224] (r24360)
+- Fix: When airport construction was denied due to noise, the error message named the wrong town (r24354)
+- Fix: [NoAI] A TileIndex is not a station id, so do not use it as one [FS#5215] (r24353)
+- Fix: When highlighting the drop position for vehicles in depots, make space for all articulated parts (r24352)
+- Fix: Short vehicles were not properly positioned at the cursor when dragging for RTL languages (r24351)
+- Fix: EQUALSIZE widget containers within EQUALSIZE containers were initialised with wrong sizes (r24346)
+- Fix: The cursor in the company password window was not blinking due to wrong magic constants (r24335)
+- Fix: [NewGRF] Change the length of 8/8 roadvehicles in vehicle lists to 32 pixels; this is in fact the correct length as can be seen in corners for short articulated parts following each other [FS#2553] (r24332)
+- Fix: [NewGRF] Group vehicles in the purchase list properly by source GRF, but also consider engine GRFID overrides [FS#4254] (r24330, r24321)
+- Fix: Make the AI settings window behave more like the other settings window by closing the query window whenever selecting a different row (r24315)
+- Fix: Editing NewGRF parameters using the query window showed wrong values, if there was no direct relation between parameter index and parameter register (r24314)
+- Fix: Center object previews in 1- and 2-view selectors based on the 4-view selector layout [FS#5057] (r24299)
+- Fix: Increase the left and right margins of the text in the yes/no query window (r24293)
+- Fix: [NewGRF] GetReverseCargoTranslation() was unnecessary complicated and also returned the wrong thing for cargos not present in the translation table (r24273)
+- Fix: [NewGRF] Load cargo- and railtype-translation during both reservation and activation stage. That way they can be selected using Action7 depending on present cargo- or railtypes (r24272)
+- Fix: Use the same colour scheme for the script selection window as in other comparable windows (r24268)
+- Fix: Make the oilrig-vehicle list accessible to spectators and colour its caption neutrally grey [FS#5126] (r24260)
+
+
+1.2.1 (2012-06-01)
+------------------------------------------------------------------------
+- Fix: [Script] ScriptTown::GetGrowthRate() returned wrong values after usage of SetGrowthRate() (r24302)
+
+
+1.2.1-RC1 (2012-05-16)
+------------------------------------------------------------------------
+- Fix: Change the unit of the sprite-cache size setting from megabytes to megapixels, so it depends on the blitter being used. Also increase it from 64 to 128, and change the name in the cfg file, so everyone gets the new default [FS#5162] (r24252)
+- Fix: Do not immediately display error messages from parsing the cfg file, but schedule them for displaying after the GUI is prepared for it [FS#5154] (r24250, r24249, r24248, r24247)
+- Fix: Dereferencing uninitialised pointer causing a crash [FS#5159] (r24224)
+- Fix: Lag counters were not properly reset when switching states making it possible to get disconnected for lagging when you were not lagging [FS#5166] (r24221)
+- Fix: Adopt ICU version detection to also deal with the new versioning scheme since ICU 49 [FS#5182] (r24220)
+- Fix: Immediately do the cargo payment on vehicle crashes instead of when they are cleared [FS#5152] (r24219)
+- Fix: The confirmation window to abort world generation was hidden during world generation, so actually you could not abort it [FS#5159] (r24214)
+- Fix: If a company is taken over or bankrupts, transfer exclusive transport rights to the new owner respectively cancel them (r24204)
+- Fix: Make the engine name not overdraw the engine count in the autoreplace GUI (r24203)
+- Fix: Make the size of the details in the autoreplace GUI match more the size of the details in the purchase list (r24202)
+- Fix: Mark group list dirty when setting/clearing autoreplace for an engine type [FS#5170] (r24201)
+- Fix: Invalidate build vehicle windows every month, in case they need resorting due to changed reliabilities [FS#5149] (r24200)
+- Fix: If you consider a settings to potentially cause desyncs via NewGRFs and thus disallow changing it in network games, you should probably also sync it to clients (r24193, r24191)
+- Fix: Use default value when reading an invalid setting value [FS#5153] (r24192, r24146)
+- Fix: [Windows] When going to fullscreen and back, restore to the resolution you were, not to the fullscreen resolution (r24189)
+- Fix: [Windows] When changing the basics of a window (fullscreen, 8bpp/32bpp), and a window already exists, it was forced out of maximize mode, and its resolution/position was reset, often causing unwanted side-effects [FS#5151] (r24188)
+- Fix: Town radii were not updated immediatelly after construction/destruction of houses, resulting in desyncs [FS#5169] (r24183)
+- Fix: The population of a town was computed incorrectly for overridden houses when loading a game (r24182, r24181, r24179)
+- Fix: The object name from property A was not displayed in the object GUI [FS#5110] (r24178)
+- Fix: The arctic 'shops and offices' used the 'church' sprite in one of its four views [FS#5148] (r24177)
+- Fix: The object GUI did not draw objects when all objects of a class are disabled (r24176)
+- Fix: If you spent hard work on finding an available object ID, you should probably also use it instead of always 0 (r24159)
+- Fix: Town producing no cargo at all could spawn passenger subsidies (r24158)
+- Fix: The music volume was set too early during startup causing it to be not set correctly (r24155)
+- Fix: [Squirrel] Crash when trying to create an array with negative size [FS#5160] (r24153)
+- Fix: [NoAI] Do not return the last 'cached' speed of vehicles when they are stopped/crashed [FS#5157] (r24152)
+- Fix: [Script] Typo in script documentation (r24151)
+- Fix: Glass-sprite of bubble-generator was not drawn anymore for completely constructed tiles [FS#5143] (r24107)
+- Fix: Conflicting strategies for resizing the main toolbar and statusbar after resizing the main window [FS#5136] (r24089)
+- Fix: Significantly reduce the area that is redrawn for text effects [FS#5103] (r24068)
+- Fix: Do not redraw up to 25% of the map when making a new vehicle visible for the first time (r24067)
+- Fix: Do not redraw the text effect when nothing changed (r24066)
+
+
+1.2.0 (2012-04-15)
+------------------------------------------------------------------------
+- Fix: When starting GS or AI, always use the settings of the game, not the new-game settings [FS#5142] (r24108)
+- Fix: Provide translated comments in the desktop file without language name postfix (r24100)
+- Fix: Cloning orders of aircraft with limited range failed [FS#5131] (r24086)
+
+
+1.2.0-RC4 (2012-04-01)
+------------------------------------------------------------------------
+- Fix: Reversing trains while they were entering or leaving a depot could lead to stuck trains [FS#5093] (r24078, r24071)
+- Fix: The 'last joined' server was not properly selected anymore [FS#5098] (r24070)
+- Fix: Immediately start querying the last joined server instead of waiting for the requery loop [FS#5097] (r24069, r24062)
+- Fix: Make the full snowedness level of houses the same as roads and rails [FS#5121] (r24064)
+- Fix: With certain versions of GCC and compiler flags the compiler could reorder some code badly causing the 32bpp depot flag not working [FS#5125] (r24063)
+- Fix: Do not freeze aircraft mid-flight when skipping to an out-of-range destination [FS#5123] (r24060)
+- Fix: Wrong numbering of string parameters causing wrong capacities to be shown [FS#5124] (r24058)
+- Fix: Crash when timetabling a maximum travel speed of 0 [FS#5111] (r24053)
+- Fix: [NewGRF] Imported GRF sounds were inserted into the wrong slots [FS#5107] (r24052)
+- Fix: [NewGRF] Realsprites inside the action 11 block were not skipped correctly (r24050)
+- Fix: Improve error messages for the placement restrictions of banks, water towers and toy shops [FS#5095] (r24040)
+
+
+1.2.0-RC3 (2012-03-18)
+------------------------------------------------------------------------
+- Feature: Allow display of baseset textfiles (r24037)
+- Feature: Increase the station class limit from 32 to 256 (r24031)
+- Fix: After opening a text window with the monospaced font, all other text started glitching (r24038)
+- Fix: [NoAI] Reset 'is random' status of temporary variable during saveload as it is not always written to when loading an AI which means it wouldd be taking the 'is random' setting of another AI (r24033)
+- Fix: [NoAI] Make AIEngine::IsArticulated return true if the articulated callback flag is set, do not try to run the callback (r24029)
+- Fix: Pass cases down into the list of cargos [FS#5090] (r24024, r24023, r24022)
+
+
+1.2.0-RC2 (2012-03-04)
+------------------------------------------------------------------------
+- Fix: [Script] AI used in names in API for GSOrder [FS#5088] (r24006)
+- Fix: Improve rounding when converting display speeds to internal speeds [FS#5079] (r23995)
+- Fix: Also reset the font glyph cache when switching blitters (r23992, r23987)
+- Fix: [NewGRF] Also display the cargo subtype for vehicles which have no capacity, but a subtype [FS#5076] (r23991)
+- Fix: Zero the offsets of disabled zoomlevels, so they do not influence offset calculations (r23989)
+- Fix: Invalid reads when scaling an odd-sized sprite smaller (r23986)
+- Fix: Inconsistent quit/abandon/exit game/scenario/editor strings [FS#5074] (r23985)
+- Fix: Fix the order of lights on the helipad [FS#5082] (r23984)
+- Fix: Tarred heightmaps would not be found [FS#5083] (r23983)
+- Fix: Do not load a game during UpdateWindows as that might trigger changing the blitter which triggers re-entrant locking (r23980, r23977)
+- Fix: [SDL] Palette update was done too late making switching from 8bpp -> 32bpp look ugly (r23978)
+- Fix: Sprites of different zoom levels were not always padded correctly to a common size (r23976)
+- Fix: Also save the maximum travel speed for the current vehicle order (r23973)
+
+
+1.2.0-RC1 (2012-02-19)
+------------------------------------------------------------------------
+- Feature: [NewGRF] Customisable tunnel portals for rail types (r23952)
+- Feature: Timetabled maximum travel speeds for non-flying vehicles (r23947)
+- Feature: Readme/licence/changelog viewer for AI and game scripts [FS#5047] (r23936)
+- Feature: [NewGRF] 32bpp sprites in GRFs (r23897)
+- Feature: [NewGRF] Support for RealSprites with multiple zoom levels (r23890)
+- Feature: [NewGRF] Support for container version 2 (r23887)
+- Fix: Refittability should never depend on the current capacity of a vehicle [FS#5070] (r23965)
+- Fix: Do not look for missing sprites twice during startup [FS#5072] (r23963)
+- Fix: [Script] Infinite recursion within a script was not caught properly, so they could cause crashes of OpenTTD instead of the AI [FS#5068] (r23962)
+- Fix: [NewGRF] Make the properties for always/never refittable cargo types not behave incremental, but reset them on reassignment (r23960)
+- Fix: [Network] Do not allow chat messages from pre-active clients. As they have not got the savegame yet, they will not have the interface to send them either (r23958)
+- Fix: [Network] Allow sending chat to pre-active clients as the clients start accepting once they send 'map ok' to the server, which is the same moment we change their status to pre-active [FS#4990] (r23957)
+- Fix: When the population of a town changes the town view might even have to change size due to different cargo requirements [FS#5062] (r23953)
+- Fix: [NoGo] Never show GSGoal::Question() to spectators [FS#5063] (r23950)
+- Fix: Better rounding when converting internal speed to displayed speed (r23945)
+- Fix: Also list DEITY signs in the signlist in the scenario editor [FS#5061] (r23943)
+- Fix: Infrastructure cache of standard road stops would get messed up when buying a company with them (r23942)
+- Fix: Scale infrastructure cost of rail tracks by the total number of all tracks and not independently for each rail type (r23931)
+- Fix: [Script] Do not close the parameter window when a script starts [FS#4944] (r23930)
+- Fix: Do not accelerate, for smoke purposes, when you reached the track's maximum speed [FS#5053]
+- Fix: 32bpp animated blitter was optimised a bit too far regarding not needing to update the colour mapping when (re)initialising the palette [FS#5056] (r23927)
+- Fix: [NoGo] Some news messages would cause an assertion to be triggered due to a missing proper location for the viewport of the news message, so only allow building when valid data for the viewport is provided or no viewport is used [FS#5054] (r23924)
+- Fix: Consider only the middle tile of a lock for lock-infrastructure costs. The other two tiles may be owned by other companies. Also do not count the middle tile of a lock as canal, independent of whether it is build on ground or river slope (r23920)
+- Fix: [NewGRF] When determining the first refittable cargotype according to CTT order, do not rely on the GRF assigning the refit_mask property. Also check for GRFs setting the default_cargo or refittable-cargo-classes or -types properties (r23916)
+- Fix: [NewGRF] Do not test validity of cargobits using a mask of cargoslots (r23914)
+- Fix: [NewGRF] When testing whether a engine shall only carry the default cargo, check ctt_include_mask for being empty before applying cargo translation (r23912)
+- Fix: [SDL] Handle the SDL_VIDEOEXPOSE event to solve issues with SDL 1.3 (r23910)
+- Fix: [SDL] Fix keyboard-related segfault when compiling against SDL 1.3 (r23909)
+- Fix: [Makefile] Make sure bin/baseset/openttd.32.bmp is removed on make clean (r23908)
+- Fix: [Makefile] Let "make clean --dry-run" not delete Makefiles (r23907)
+- Fix: [Windows installer] OpenMSX got downloaded to and extracted in the wrong (non-existent) folder [FS#5045] (r23905)
+- Fix: Memory leak everytime one clicked a savegame in the load GUI (r23901)
+- Fix: [NewGRF] It was not possible to import sounds from a NewGRF later in the load order (r23883)
+- Remove: PNG sprite loader; use 32bpp sprites in a NewGRF (r23898)
+
+
 1.2.0-beta4 (2012-02-04)
 ------------------------------------------------------------------------
 - Feature: [NewGRF] Give NewGRF defined level crossings and rail depots access to the townzone (r23866)

config.lib

@@ -164,7 +164,7 @@ set_default() {
 		with_ccache
 		with_grfcodec
 		with_nforenum
-	CC CXX CFLAGS CXXFLAGS LDFLAGS"
+	CC CXX CFLAGS CXXFLAGS LDFLAGS CFLAGS_BUILD CXXFLAGS_BUILD LDFLAGS_BUILD"
 }
 
 detect_params() {
@@ -197,21 +197,21 @@ detect_params() {
 			--cpu-type)                   prev_p="cpu_type";;
 			--cpu-type=*)                 cpu_type="$optarg";;
 
-			--cc-build)                   prevp_p="cc_build";;
+			--cc-build)                   prev_p="cc_build";;
 			--cc-build=*)                 cc_build="$optarg";;
-			--cc-host)                    prevp_p="cc_host";;
+			--cc-host)                    prev_p="cc_host";;
 			--cc-host=*)                  cc_host="$optarg";;
-			--cxx-build)                  prevp_p="cxx_build";;
+			--cxx-build)                  prev_p="cxx_build";;
 			--cxx-build=*)                cxx_build="$optarg";;
-			--cxx-host)                   prevp_p="cxx_host";;
+			--cxx-host)                   prev_p="cxx_host";;
 			--cxx-host=*)                 cxx_host="$optarg";;
-			--windres)                    prevp_p="windres";;
+			--windres)                    prev_p="windres";;
 			--windres=*)                  windres="$optarg";;
-			--awk)                        prevp_p="awk";;
+			--awk)                        prev_p="awk";;
 			--awk=*)                      awk="$optarg";;
-			--strip)                      prevp_p="strip";;
+			--strip)                      prev_p="strip";;
 			--strip=*)                    strip="$optarg";;
-			--lipo)                       prevp_p="lipo";;
+			--lipo)                       prev_p="lipo";;
 			--lipo=*)                     lipo="$optarg";;
 
 			--endian)                     prev_p="endian";;
@@ -219,52 +219,53 @@ detect_params() {
 
 
 
-			--prefix-dir)                 prevp_p="prefix-dir";;
-			--prefix-dir=*)               prefix_dir="$optarg";;
+			# Alias --prefix with --prefix-dir, for compatibility with GNU autotools
+			--prefix-dir | --prefix)      prev_p="prefix_dir";;
+			--prefix-dir=* | --prefix=*)  prefix_dir="$optarg";;
 
-			--binary-dir)                 prevp_p="binary-dir";;
+			--binary-dir)                 prev_p="binary_dir";;
 			--binary-dir=*)               binary_dir="$optarg";;
 
-			--data-dir)                   prevp_p="data-dir";;
+			--data-dir)                   prev_p="data_dir";;
 			--data-dir=*)                 data_dir="$optarg";;
 
-			--doc-dir)                    prevp_p="doc-dir";;
+			--doc-dir)                    prev_p="doc_dir";;
 			--doc-dir=*)                  doc_dir="$optarg";;
 
-			--icon-dir)                   prevp_p="icon-dir";;
+			--icon-dir)                   prev_p="icon_dir";;
 			--icon-dir=*)                 icon_dir="$optarg";;
 
-			--icon-theme-dir)             prevp_p="icon-theme-dir";;
+			--icon-theme-dir)             prev_p="icon_theme_dir";;
 			--icon-theme-dir=*)           icon_theme_dir="$optarg";;
 			--without-icon-theme)         icon_theme_dir="";;
 
-			--menu-dir)                   prevp_p="menu_dir";;
+			--menu-dir)                   prev_p="menu_dir";;
 			--menu-dir=*)                 menu_dir="$optarg";;
 			--without-menu-entry)         menu_dir="";;
 
-			--menu-name)                  prevp_p="menu_name";;
+			--menu-name)                  prev_p="menu_name";;
 			--menu-name=*)                menu_name="$optarg";;
 
-			--binary-name)                prevp_p="binary_name";;
+			--binary-name)                prev_p="binary_name";;
 			--binary-name=*)              binary_name="$optarg";;
 
-			--man-dir)                    prevp_p="man_dir";;
+			--man-dir)                    prev_p="man_dir";;
 			--man-dir=*)                  man_dir="$optarg";;
 
-			--personal-dir)               prevp_p="personal-dir";;
+			--personal-dir)               prev_p="personal_dir";;
 			--personal-dir=*)             personal_dir="$optarg";;
 			--without-personal-dir)       personal_dir="";;
 
-			--shared-dir)                 prevp_p="shared-dir";;
+			--shared-dir)                 prev_p="shared_dir";;
 			--shared-dir=*)               shared_dir="$optarg";;
 			--without-shared-dir)         shared_dir="";;
 
-			--install-dir)                prevp_p="install-dir";;
+			--install-dir)                prev_p="install_dir";;
 			--install-dir=*)              install_dir="$optarg";;
 
 
 
-			--menu-group)                 prevp_p="menu_group";;
+			--menu-group)                 prev_p="menu_group";;
 			--menu-group=*)               menu_group="$optarg";;
 
 
@@ -442,6 +443,9 @@ detect_params() {
 			CFLAGS=* | --CFLAGS=*)        CFLAGS="$optarg";;
 			CXXFLAGS=* | --CXXFLAGS=*)    CXXFLAGS="$optarg";;
 			LDFLAGS=* | --LDFLAGS=*)      LDFLAGS="$optarg";;
+			CFLAGS_BUILD=* | --CFLAGS_BUILD=* | --CFLAGS-BUILD=*)     CFLAGS_BUILD="$optarg";;
+			CXXFLAGS_BUILD=* | --CXXFLAGS_BUILD=* | --CXXFLAGS-BUILD=*) CXXFLAGS_BUILD="$optarg";;
+			LDFLAGS_BUILD=* | --LDFLAGS_BUILD=* | --LDFLAGS-BUILD=*)   LDFLAGS_BUILD="$optarg";;
 
 			--ignore-extra-parameters)    ignore_extra_parameters="1";;
 
@@ -1386,11 +1390,11 @@ make_compiler_cflags() {
 
 make_cflags_and_ldflags() {
 	# General CFlags for BUILD
-	CFLAGS_BUILD=""
+	CFLAGS_BUILD="$CFLAGS_BUILD"
 	# Special CXXFlags for BUILD
-	CXXFLAGS_BUILD=""
+	CXXFLAGS_BUILD="$CXXFLAGS_BUILD"
 	# LDFLAGS for BUILD
-	LDFLAGS_BUILD=""
+	LDFLAGS_BUILD="$LDFLAGS_BUILD"
 	# FEATURES for BUILD (lto)
 	FEATURES_BUILD=""
 	# General CFlags for HOST
@@ -1771,6 +1775,7 @@ make_cflags_and_ldflags() {
 
 	if [ "$enable_assert" = "0" ]; then
 		CFLAGS="$CFLAGS -DNDEBUG"
+		CFLAGS_BUILD="$CFLAGS_BUILD -DNDEBUG"
 	fi
 
 	if [ "$enable_desync_debug" != "0" ]; then
@@ -1806,6 +1811,9 @@ make_cflags_and_ldflags() {
 		fi
 	fi
 
+	log 1 "using CFLAGS_BUILD... $CFLAGS_BUILD"
+	log 1 "using CXXFLAGS_BUILD... $CXXFLAGS_BUILD"
+	log 1 "using LDFLAGS_BUILD... $LDFLAGS_BUILD"
 	log 1 "using CFLAGS... $CFLAGS"
 	log 1 "using CXXFLAGS... $CXXFLAGS"
 	log 1 "using LDFLAGS... $LIBS $LDFLAGS"
@@ -2130,6 +2138,30 @@ check_makedepend() {
 	log 1 "checking makedepend... $makedepend"
 }
 
+check_version() {
+	# $1 - requested version (major.minor)
+	# $2 - version we got (major.minor)
+
+	if [ -z "$2" ]; then
+		return 0
+	fi
+
+	req_major=`echo $1 | cut -d. -f1`
+	got_major=`echo $2 | cut -d. -f1`
+	if [ $got_major -lt $req_major ]; then
+		return 0
+	elif [ $got_major -gt $req_major ]; then
+		return 1
+	fi
+
+	req_minor=`echo $1 | cut -d. -f2`
+	got_minor=`echo $2 | cut -d. -f2`
+	if [ $got_minor -lt $req_minor ]; then
+		return 0
+	fi
+	return 1
+}
+
 detect_awk() {
 	# Not all awks allow gsub(), so we test for that here! It is in fact all we need...
 
@@ -2815,13 +2847,14 @@ detect_fontconfig() {
 
 	version=`$fontconfig_config --modversion 2>/dev/null`
 	ret=$?
-	shortversion=`echo $version | cut -c 1,3`
+	check_version '2.3' "$version"
+	version_ok=$?
 	log 2 "executing $fontconfig_config --modversion"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -le "22" ]; then
-		if [ -n "$shortversion" ] && [ "$shortversion" -le "22" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
+		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
 			log 1 "checking libfontconfig... needs at least version 2.3.0, fontconfig NOT enabled"
 		else
 			log 1 "checking libfontconfig... not found"
@@ -2864,13 +2897,14 @@ detect_icu() {
 
 	version=`$icu_config --version 2>/dev/null`
 	ret=$?
-	shortversion=`echo $version | cut -c 1,3`
+	check_version '3.6' "$version"
+	version_ok=$?
 	log 2 "executing $icu_config --version"
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$shortversion" -lt "36" ]; then
-		if [ -n "$shortversion" ] && [ "$shortversion" -lt "36" ]; then
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version_ok" != "1" ]; then
+		if [ -n "$version" ] && [ "$version_ok" != "1" ]; then
 			log 1 "checking libicu... needs at least version 3.6.0, icu NOT enabled"
 		else
 			log 1 "checking libicu... not found"
@@ -3120,9 +3154,9 @@ detect_grfcodec() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "897" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "897" ]; then
-			log 1 "checking grfcodec... needs at least version 5.1.4 (r897), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
+			log 1 "checking grfcodec... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking grfcodec... not found"
 		fi
@@ -3162,9 +3196,9 @@ detect_nforenum() {
 	log 2 "  returned $version"
 	log 2 "  exit code $ret"
 
-	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "846" ]; then
-		if [ -n "$version" ] && [ "$version" -lt "846" ]; then
-			log 1 "checking nforenum... needs at least version 5.1.3 (r846), disabled"
+	if [ -z "$version" ] || [ "$ret" != "0" ] || [ "$version" -lt "913" ]; then
+		if [ -n "$version" ] && [ "$version" -lt "913" ]; then
+			log 1 "checking nforenum... needs at least version 5.1.4 (r913), disabled"
 		else
 			log 1 "checking nforenum... not found"
 		fi

docs/32bpp.txt

@@ -1,44 +0,0 @@
-32bpp and OpenTTD
-Last updated:    2007-06-13
-------------------------------------------------------------------------
-
-
-Table of contents
------------------
-1.0) About
-2.0) The format
-
-
-1.0) About
----- -----
-OpenTTD has 32bpp support. This means: OpenTTD still is 8bpp, but it has the
-posibility to override the graphics with 32bpp. This means that it isn't a
-replacement of grf or newgrf, but simply an addition. If you want to use 32bpp
-graphics of a newgrf, you do need the newgrf itself too (with 8bpp graphics).
-
-
-2.0) The format
----- ----------
-32bpp images are stored in PNG. They should go in:
-  data/sprites/<grfname>/<SpriteID>.png
-
-For example, a grfname would be 'openttd' (without .grf, lowercase), and the
-SpriteID 3, to override the 3rd sprite in openttd.grf with a 32bpp version.
-
-The format of this PNG can be almost anything, but we advise to use RGBA
-format. Alpha-channel is fully supported.
-
-As the core of OpenTTD is 8bpp, and because you of course want company colours
-in your images, you will need to add a mask for every sprite that needs colour
-remapping. The name is simular as above, only you have to put a 'm' behind the
-SpriteID. This image should be a 8bpp palette image, where the palette is the
-OpenTTD palette. Upon load of the PNG, the mask is loaded too, and overrides
-the RGB (not the Alpha) of the original PNG image, and replacing it with a
-8bpp color remapped and converted to 32bpp.
-
-Another thing that OpenTTD needs in your png, is 2 tEXt chunks: x_offs and
-y_offs. This to define the x- and y-offset, of course. Use the tool we supply
-to add this information. Sadly enough most graphical editors trashes those
-chunks upon save, so you have to readd it every time you save your image.
-
-Your images should be the same as the grf, in size.

known-bugs.txt

@@ -1,6 +1,6 @@
 OpenTTD's known bugs
-Last updated:    2012-02-04
-Release version: 1.2.0-beta4
+Last updated:    2012-06-01
+Release version: 1.2.1
 ------------------------------------------------------------------------
 
 

media/extra_grf/airport_preview.nfo

@@ -8,12 +8,12 @@
 //
    -1 * 0	 0C "Airport previews"
    -1 * 0	 05 16 09
-   -1 sprites/airport_preview.png 50 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 290 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 530 8 09 140 230 0 0
-   -1 sprites/airport_preview.png 2 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 242 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 482 168 09 140 230 0 0
-   -1 sprites/airport_preview.png 2 328 09 140 230 0 0
-   -1 sprites/airport_preview.png 242 328 09 140 230 0 0
-   -1 sprites/airport_preview.png 482 328 09 140 230 0 0
+   -1 sprites/airport_preview.png 8bpp  50    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 290    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 530    8 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp   2  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 242  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 482  168 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp   2  328 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 242  328 230 140   0   0 normal
+   -1 sprites/airport_preview.png 8bpp 482  328 230 140   0   0 normal

media/extra_grf/airports.nfo

@@ -8,18 +8,18 @@
 //
    -1 * 0	 0C "Extra airport graphics"
    -1 * 3	 05 10 0F
-   -1 sprites/airports.png 18 8 09 31 64 -31 0
-   -1 sprites/airports.png 98 8 09 31 64 -31 0
-   -1 sprites/airports.png 178 8 09 31 64 -31 0
-   -1 sprites/airports.png 258 8 09 31 64 -31 0
-   -1 sprites/airports.png 338 8 09 31 64 -31 0
-   -1 sprites/airports.png 418 8 09 31 64 -31 0
-   -1 sprites/airports.png 498 8 09 55 64 -2 -38
-   -1 sprites/airports.png 578 8 09 17 18 16 -1
-   -1 sprites/airports.png 610 8 09 55 64 -2 -38
-   -1 sprites/airports.png 690 8 09 17 18 -30 1
-   -1 sprites/airports.png 722 8 09 55 64 -2 -38
-   -1 sprites/airports.png 2 88 09 55 64 -2 -38
-   -1 sprites/airports.png 82 88 09 31 64 -31 0
-   -1 sprites/airports.png 162 88 09 31 64 -31 0
-   -1 sprites/airports.png 242 88 09 31 64 -31 0
+   -1 sprites/airports.png 8bpp  18    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp  98    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 178    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 258    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 338    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 418    8  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 498    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp 578    8  18  17  16  -1 normal
+   -1 sprites/airports.png 8bpp 610    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp 690    8  18  17 -30   1 normal
+   -1 sprites/airports.png 8bpp 722    8  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp   2   88  64  55  -2 -38 normal
+   -1 sprites/airports.png 8bpp  82   88  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 162   88  64  31 -31   0 normal
+   -1 sprites/airports.png 8bpp 242   88  64  31 -31   0 normal

media/extra_grf/aqueduct.nfo

@@ -10,22 +10,22 @@
 // temperate aqueduct
    -1 * 6	 07 83 01 \7! 00 09
    -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png  34  8 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 114  8 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 194  8 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 274  8 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 354  8 09 32 61 -30 -4
-   -1 sprites/aqueduct.png 434  8 09 31 62 -29 -4
-   -1 sprites/aqueduct.png 514  8 09 23 33 -31  0
-   -1 sprites/aqueduct.png 562  8 09 23 33   0  1
+   -1 sprites/aqueduct.png 8bpp  34    8  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 114    8  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 194    8  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 274    8  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 354    8  61  32 -30  -4 normal
+   -1 sprites/aqueduct.png 8bpp 434    8  62  31 -29  -4 normal
+   -1 sprites/aqueduct.png 8bpp 514    8  33  23 -31   0 normal
+   -1 sprites/aqueduct.png 8bpp 562    8  33  23   0   1 normal
 // non-temperate aqueduct
    -1 * 6	 07 83 01 \7= 00 09
    -1 * 3	 05 12 08
-   -1 sprites/aqueduct.png  34 48 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 114 48 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 194 48 09 32 61 -30 -9
-   -1 sprites/aqueduct.png 274 48 09 31 62 -29 -9
-   -1 sprites/aqueduct.png 354 48 09 32 61 -30 -4
-   -1 sprites/aqueduct.png 434 48 09 31 62 -29 -4
-   -1 sprites/aqueduct.png 514 48 09 23 33 -31  0
-   -1 sprites/aqueduct.png 562 48 09 23 33   0  1
+   -1 sprites/aqueduct.png 8bpp  34   48  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 114   48  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 194   48  61  32 -30  -9 normal
+   -1 sprites/aqueduct.png 8bpp 274   48  62  31 -29  -9 normal
+   -1 sprites/aqueduct.png 8bpp 354   48  61  32 -30  -4 normal
+   -1 sprites/aqueduct.png 8bpp 434   48  62  31 -29  -4 normal
+   -1 sprites/aqueduct.png 8bpp 514   48  33  23 -31   0 normal
+   -1 sprites/aqueduct.png 8bpp 562   48  33  23   0   1 normal

media/extra_grf/autorail.nfo

@@ -8,58 +8,58 @@
 //
    -1 * 0	 0C "Autorail graphics"
    -1 * 3	 05 13 37
-   -1 sprites/autorail.png 18 8 09 31 64 -31 7
-   -1 sprites/autorail.png 98 8 09 31 64 -31 -1
-   -1 sprites/autorail.png 178 8 09 39 64 -31 -1
-   -1 sprites/autorail.png 258 8 09 47 64 -31 -9
-   -1 sprites/autorail.png 338 8 09 31 64 -31 -5
-   -1 sprites/autorail.png 418 8 09 23 64 -31 7
-   -1 sprites/autorail.png 498 8 09 18 64 -31 4
-   -1 sprites/autorail.png 578 8 09 31 64 -31 -1
-   -1 sprites/autorail.png 658 8 09 31 64 -31 7
-   -1 sprites/autorail.png 2 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 82 72 09 23 64 -31 7
-   -1 sprites/autorail.png 162 72 09 18 64 -31 4
-   -1 sprites/autorail.png 242 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 322 72 09 39 64 -31 -1
-   -1 sprites/autorail.png 402 72 09 47 64 -31 -9
-   -1 sprites/autorail.png 482 72 09 31 64 -31 -5
-   -1 sprites/autorail.png 562 72 09 31 64 -31 7
-   -1 sprites/autorail.png 642 72 09 31 64 -31 -1
-   -1 sprites/autorail.png 722 72 09 47 64 -31 -9
-   -1 sprites/autorail.png 2 136 09 26 64 -31 4
-   -1 sprites/autorail.png 82 136 09 23 64 -31 4
-   -1 sprites/autorail.png 162 136 09 31 64 -31 -3
-   -1 sprites/autorail.png 242 136 09 26 64 -31 4
-   -1 sprites/autorail.png 322 136 09 23 64 -31 4
-   -1 sprites/autorail.png 402 136 09 31 64 -31 -3
-   -1 sprites/autorail.png 482 136 09 31 64 -31 7
-   -1 sprites/autorail.png 562 136 09 31 64 -31 -1
-   -1 sprites/autorail.png 642 136 09 15 64 -31 7
-   -1 sprites/autorail.png 722 136 09 31 64 -31 7
-   -1 sprites/autorail.png 2 184 09 39 64 -31 -1
-   -1 sprites/autorail.png 82 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 162 184 09 31 64 -31 7
-   -1 sprites/autorail.png 242 184 09 39 64 -31 -1
-   -1 sprites/autorail.png 322 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 402 184 09 31 64 -31 7
-   -1 sprites/autorail.png 482 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 562 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 642 184 09 31 64 -31 -1
-   -1 sprites/autorail.png 722 184 09 23 64 -31 7
-   -1 sprites/autorail.png 2 248 09 15 64 -31 7
-   -1 sprites/autorail.png 82 248 09 39 64 -31 -1
-   -1 sprites/autorail.png 162 248 09 47 64 -31 -9
-   -1 sprites/autorail.png 242 248 09 31 64 -31 7
-   -1 sprites/autorail.png 322 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 402 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 482 248 09 31 64 -31 -1
-   -1 sprites/autorail.png 562 248 09 23 64 -31 7
-   -1 sprites/autorail.png 642 248 09 15 64 -31 7
-   -1 sprites/autorail.png 722 248 09 39 64 -31 -1
-   -1 sprites/autorail.png 2 312 09 47 64 -31 -9
-   -1 sprites/autorail.png 82 312 09 31 64 -31 -1
-   -1 sprites/autorail.png 162 312 09 31 64 -31 -1
-   -1 sprites/autorail.png 242 312 09 23 64 -31 7
-   -1 sprites/autorail.png 322 312 09 31 64 -31 7
-   -1 sprites/autorail.png 402 312 09 31 64 -31 7
+   -1 sprites/autorail.png 8bpp  18    8  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp  98    8  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 178    8  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 258    8  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 338    8  64  31 -31  -5 normal
+   -1 sprites/autorail.png 8bpp 418    8  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 498    8  64  18 -31   4 normal
+   -1 sprites/autorail.png 8bpp 578    8  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 658    8  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp  82   72  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 162   72  64  18 -31   4 normal
+   -1 sprites/autorail.png 8bpp 242   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 322   72  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402   72  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 482   72  64  31 -31  -5 normal
+   -1 sprites/autorail.png 8bpp 562   72  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 642   72  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 722   72  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp   2  136  64  26 -31   4 normal
+   -1 sprites/autorail.png 8bpp  82  136  64  23 -31   4 normal
+   -1 sprites/autorail.png 8bpp 162  136  64  31 -31  -3 normal
+   -1 sprites/autorail.png 8bpp 242  136  64  26 -31   4 normal
+   -1 sprites/autorail.png 8bpp 322  136  64  23 -31   4 normal
+   -1 sprites/autorail.png 8bpp 402  136  64  31 -31  -3 normal
+   -1 sprites/autorail.png 8bpp 482  136  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 562  136  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 642  136  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp 722  136  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2  184  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp  82  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  184  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 242  184  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 322  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402  184  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 482  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 562  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 642  184  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 722  184  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp   2  248  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp  82  248  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  248  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp 242  248  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 322  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 402  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 482  248  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 562  248  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 642  248  64  15 -31   7 normal
+   -1 sprites/autorail.png 8bpp 722  248  64  39 -31  -1 normal
+   -1 sprites/autorail.png 8bpp   2  312  64  47 -31  -9 normal
+   -1 sprites/autorail.png 8bpp  82  312  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 162  312  64  31 -31  -1 normal
+   -1 sprites/autorail.png 8bpp 242  312  64  23 -31   7 normal
+   -1 sprites/autorail.png 8bpp 322  312  64  31 -31   7 normal
+   -1 sprites/autorail.png 8bpp 402  312  64  31 -31   7 normal

media/extra_grf/canals.nfo

@@ -9,107 +9,107 @@
    -1 * 0	 0C "Canal graphics by George / PaulC"
    -1 * 3	 05 08 41
 // Canal slopes
-   -1 sprites/canal_locks.png 66 8 09 23 64 -31 0
-   -1 sprites/canal_locks.png 146 8 09 39 64 -31 -8
-   -1 sprites/canal_locks.png 226 8 09 23 64 -31 0
-   -1 sprites/canal_locks.png 306 8 09 39 64 -31 -8
+   -1 sprites/canal_locks.png 8bpp  66    8  64  23 -31   0 normal
+   -1 sprites/canal_locks.png 8bpp 146    8  64  39 -31  -8 normal
+   -1 sprites/canal_locks.png 8bpp 226    8  64  23 -31   0 normal
+   -1 sprites/canal_locks.png 8bpp 306    8  64  39 -31  -8 normal
 // Lock sides
-   -1 sprites/canal_locks.png 386 8 09 26 40 -7 -12
-   -1 sprites/canal_locks.png 434 8 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 482 8 09 25 40 -31 -12
-   -1 sprites/canal_locks.png 530 8 09 34 42 -9 -14
-   -1 sprites/canal_locks.png 578 8 09 27 32 -1 -17
-   -1 sprites/canal_locks.png 626 8 09 35 32 -29 -17
-   -1 sprites/canal_locks.png 674 8 09 27 32 -29 -17
-   -1 sprites/canal_locks.png 722 8 09 35 32 -1 -17
-   -1 sprites/canal_locks.png 2 72 09 44 40 -7 -24
-   -1 sprites/canal_locks.png 50 72 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 98 72 09 32 40 -31 -12
-   -1 sprites/canal_locks.png 146 72 09 31 41 -8 -12
-   -1 sprites/canal_locks.png 194 72 09 32 34 -1 -13
-   -1 sprites/canal_locks.png 242 72 09 34 38 -35 -17
-   -1 sprites/canal_locks.png 290 72 09 44 34 -29 -26
-   -1 sprites/canal_locks.png 338 72 09 34 38 -1 -17
-   -1 sprites/canal_locks.png 386 72 09 24 42 -9 -4
-   -1 sprites/canal_locks.png 434 72 09 24 43 -31 -4
-   -1 sprites/canal_locks.png 482 72 09 24 53 -31 -4
-   -1 sprites/canal_locks.png 546 72 09 37 43 -10 -16
-   -1 sprites/canal_locks.png 594 72 09 26 38 -1 -9
-   -1 sprites/canal_locks.png 642 72 09 37 34 -29 -18
-   -1 sprites/canal_locks.png 690 72 09 26 38 -35 -9
-   -1 sprites/canal_locks.png 738 72 09 23 32 -1 -5
-   -1 sprites/canal_locks.png 2 136 09 26 40 -7 -12
-   -1 sprites/canal_locks.png 50 136 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 98 136 09 25 40 -31 -12
-   -1 sprites/canal_locks.png 146 136 09 34 42 -9 -14
-   -1 sprites/canal_locks.png 194 136 09 27 32 -1 -17
-   -1 sprites/canal_locks.png 242 136 09 35 32 -29 -17
-   -1 sprites/canal_locks.png 290 136 09 27 32 -29 -17
-   -1 sprites/canal_locks.png 338 136 09 35 32 -1 -17
-   -1 sprites/canal_locks.png 386 136 09 32 40 -7 -12
-   -1 sprites/canal_locks.png 434 136 09 33 42 -31 -13
-   -1 sprites/canal_locks.png 482 136 09 32 40 -31 -12
-   -1 sprites/canal_locks.png 530 136 09 31 41 -8 -12
-   -1 sprites/canal_locks.png 578 136 09 32 34 -1 -13
-   -1 sprites/canal_locks.png 626 136 09 34 38 -35 -17
-   -1 sprites/canal_locks.png 674 136 09 32 34 -29 -14
-   -1 sprites/canal_locks.png 722 136 09 34 38 -1 -17
-   -1 sprites/canal_locks.png 2 184 09 24 42 -9 -4
-   -1 sprites/canal_locks.png 50 184 09 24 43 -31 -4
-   -1 sprites/canal_locks.png 98 184 09 24 53 -31 -4
-   -1 sprites/canal_locks.png 162 184 09 25 43 -10 -4
-   -1 sprites/canal_locks.png 210 184 09 26 38 -1 -9
-   -1 sprites/canal_locks.png 258 184 09 25 34 -29 -6
-   -1 sprites/canal_locks.png 306 184 09 26 38 -35 -9
-   -1 sprites/canal_locks.png 354 184 09 23 32 -1 -5
+   -1 sprites/canal_locks.png 8bpp 386    8  40  26  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp 434    8  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp 482    8  40  25 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 530    8  42  34  -9 -14 normal
+   -1 sprites/canal_locks.png 8bpp 578    8  32  27  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 626    8  32  35 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 674    8  32  27 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 722    8  32  35  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp   2   72  40  44  -7 -24 normal
+   -1 sprites/canal_locks.png 8bpp  50   72  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp  98   72  40  32 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 146   72  41  31  -8 -12 normal
+   -1 sprites/canal_locks.png 8bpp 194   72  34  32  -1 -13 normal
+   -1 sprites/canal_locks.png 8bpp 242   72  38  34 -35 -17 normal
+   -1 sprites/canal_locks.png 8bpp 290   72  34  44 -29 -26 normal
+   -1 sprites/canal_locks.png 8bpp 338   72  38  34  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 386   72  42  24  -9  -4 normal
+   -1 sprites/canal_locks.png 8bpp 434   72  43  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 482   72  53  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 546   72  43  37 -10 -16 normal
+   -1 sprites/canal_locks.png 8bpp 594   72  38  26  -1  -9 normal
+   -1 sprites/canal_locks.png 8bpp 642   72  34  37 -29 -18 normal
+   -1 sprites/canal_locks.png 8bpp 690   72  38  26 -35  -9 normal
+   -1 sprites/canal_locks.png 8bpp 738   72  32  23  -1  -5 normal
+   -1 sprites/canal_locks.png 8bpp   2  136  40  26  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp  50  136  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp  98  136  40  25 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 146  136  42  34  -9 -14 normal
+   -1 sprites/canal_locks.png 8bpp 194  136  32  27  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 242  136  32  35 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 290  136  32  27 -29 -17 normal
+   -1 sprites/canal_locks.png 8bpp 338  136  32  35  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp 386  136  40  32  -7 -12 normal
+   -1 sprites/canal_locks.png 8bpp 434  136  42  33 -31 -13 normal
+   -1 sprites/canal_locks.png 8bpp 482  136  40  32 -31 -12 normal
+   -1 sprites/canal_locks.png 8bpp 530  136  41  31  -8 -12 normal
+   -1 sprites/canal_locks.png 8bpp 578  136  34  32  -1 -13 normal
+   -1 sprites/canal_locks.png 8bpp 626  136  38  34 -35 -17 normal
+   -1 sprites/canal_locks.png 8bpp 674  136  34  32 -29 -14 normal
+   -1 sprites/canal_locks.png 8bpp 722  136  38  34  -1 -17 normal
+   -1 sprites/canal_locks.png 8bpp   2  184  42  24  -9  -4 normal
+   -1 sprites/canal_locks.png 8bpp  50  184  43  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp  98  184  53  24 -31  -4 normal
+   -1 sprites/canal_locks.png 8bpp 162  184  43  25 -10  -4 normal
+   -1 sprites/canal_locks.png 8bpp 210  184  38  26  -1  -9 normal
+   -1 sprites/canal_locks.png 8bpp 258  184  34  25 -29  -6 normal
+   -1 sprites/canal_locks.png 8bpp 306  184  38  26 -35  -9 normal
+   -1 sprites/canal_locks.png 8bpp 354  184  32  23  -1  -5 normal
 // Canal edges (temperate)
-   -1 sprites/canals.png  30  10 09 22 45 -11 -1
-   -1 sprites/canals.png  94  10 09 21 41  -8 10
-   -1 sprites/canals.png 142  10 09 21 42 -31 10
-   -1 sprites/canals.png 190  10 09 22 43 -31 -1
-   -1 sprites/canals.png 238  10 09 22 22  11  4
-   -1 sprites/canals.png 270  10 09 16 24 -11 15
-   -1 sprites/canals.png 302  10 09 23 23 -31  4
-   -1 sprites/canals.png 334  10 09 18 24 -11 -1
-   -1 sprites/canals.png 366  10 09 11 12  21 10
-   -1 sprites/canals.png 398  10 09 10 19  -8 21
-   -1 sprites/canals.png 430  10 09 10 11 -31 10
-   -1 sprites/canals.png 446  10 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30   10  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   10  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   10  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   10  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   10  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   10  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   10  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   10  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   10  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   10  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   10  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   10  24  16 -11  -6 normal
 // Canal icon
-   -1 sprites/canal_locks.png 50 232 09 20 20 0 0
+   -1 sprites/canal_locks.png 8bpp  50  232  20  20   0   0 normal
 
 // Differentiation for the climates starts here
 
 // Canal edges (arctic snowy)
    -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30  40 09 22 45 -11 -1
-   -1 sprites/canals.png  94  40 09 21 41  -8 10
-   -1 sprites/canals.png 142  40 09 21 42 -31 10
-   -1 sprites/canals.png 190  40 09 22 43 -31 -1
-   -1 sprites/canals.png 238  40 09 22 22  11  4
-   -1 sprites/canals.png 270  40 09 16 24 -11 15
-   -1 sprites/canals.png 302  40 09 23 23 -31  4
-   -1 sprites/canals.png 334  40 09 18 24 -11 -1
-   -1 sprites/canals.png 366  40 09 11 12  21 10
-   -1 sprites/canals.png 398  40 09 10 19  -8 21
-   -1 sprites/canals.png 430  40 09 10 11 -31 10
-   -1 sprites/canals.png 446  40 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30   40  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   40  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   40  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   40  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   40  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   40  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   40  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   40  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   40  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   40  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   40  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   40  24  16 -11  -6 normal
    -1 * 7        02 05 10 01 00 00 00
 
 // Canal edges (arctic normal)
    -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30  70 09 22 45 -11 -1
-   -1 sprites/canals.png  94  70 09 21 41  -8 10
-   -1 sprites/canals.png 142  70 09 21 42 -31 10
-   -1 sprites/canals.png 190  70 09 22 43 -31 -1
-   -1 sprites/canals.png 238  70 09 22 22  11  4
-   -1 sprites/canals.png 270  70 09 16 24 -11 15
-   -1 sprites/canals.png 302  70 09 23 23 -31  4
-   -1 sprites/canals.png 334  70 09 18 24 -11 -1
-   -1 sprites/canals.png 366  70 09 11 12  21 10
-   -1 sprites/canals.png 398  70 09 10 19  -8 21
-   -1 sprites/canals.png 430  70 09 10 11 -31 10
-   -1 sprites/canals.png 446  70 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30   70  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94   70  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142   70  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190   70  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238   70  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270   70  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302   70  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334   70  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366   70  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398   70  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430   70  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446   70  24  16 -11  -6 normal
    -1 * 7        02 05 11 01 00 00 00
 // Choose the right arctic canal edges
    -1 * 14       02 05 12 81 81 00 FF 01 10 00 04 04 11 00
@@ -118,34 +118,34 @@
 
 // Canal edges (tropic desert)
    -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 100 09 22 45 -11 -1
-   -1 sprites/canals.png  94 100 09 21 41  -8 10
-   -1 sprites/canals.png 142 100 09 21 42 -31 10
-   -1 sprites/canals.png 190 100 09 22 43 -31 -1
-   -1 sprites/canals.png 238 100 09 22 22  11  4
-   -1 sprites/canals.png 270 100 09 16 24 -11 15
-   -1 sprites/canals.png 302 100 09 23 23 -31  4
-   -1 sprites/canals.png 334 100 09 18 24 -11 -1
-   -1 sprites/canals.png 366 100 09 11 12  21 10
-   -1 sprites/canals.png 398 100 09 10 19  -8 21
-   -1 sprites/canals.png 430 100 09 10 11 -31 10
-   -1 sprites/canals.png 446 100 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30  100  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  100  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  100  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  100  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  100  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  100  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  100  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  100  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  100  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  100  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  100  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  100  24  16 -11  -6 normal
    -1 * 7        02 05 13 01 00 00 00
 
 // Canal edges (tropic rainforest)
    -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 130 09 22 45 -11 -1
-   -1 sprites/canals.png  94 130 09 21 41  -8 10
-   -1 sprites/canals.png 142 130 09 21 42 -31 10
-   -1 sprites/canals.png 190 130 09 22 43 -31 -1
-   -1 sprites/canals.png 238 130 09 22 22  11  4
-   -1 sprites/canals.png 270 130 09 16 24 -11 15
-   -1 sprites/canals.png 302 130 09 23 23 -31  4
-   -1 sprites/canals.png 334 130 09 18 24 -11 -1
-   -1 sprites/canals.png 366 130 09 11 12  21 10
-   -1 sprites/canals.png 398 130 09 10 19  -8 21
-   -1 sprites/canals.png 430 130 09 10 11 -31 10
-   -1 sprites/canals.png 446 130 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30  130  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  130  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  130  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  130  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  130  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  130  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  130  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  130  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  130  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  130  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  130  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  130  24  16 -11  -6 normal
    -1 * 7        02 05 14 01 00 00 00
 // Choose the right tropic canal edges
    -1 * 14       02 05 15 81 81 00 FF 01 13 00 01 01 14 00
@@ -154,18 +154,18 @@
 
 // Canal edges (toyland)
    -1 * 4        01 05 01 \b12
-   -1 sprites/canals.png  30 160 09 22 45 -11 -1
-   -1 sprites/canals.png  94 160 09 21 41  -8 10
-   -1 sprites/canals.png 142 160 09 21 42 -31 10
-   -1 sprites/canals.png 190 160 09 22 43 -31 -1
-   -1 sprites/canals.png 238 160 09 22 22  11  4
-   -1 sprites/canals.png 270 160 09 16 24 -11 15
-   -1 sprites/canals.png 302 160 09 23 23 -31  4
-   -1 sprites/canals.png 334 160 09 18 24 -11 -1
-   -1 sprites/canals.png 366 160 09 11 12  21 10
-   -1 sprites/canals.png 398 160 09 10 19  -8 21
-   -1 sprites/canals.png 430 160 09 10 11 -31 10
-   -1 sprites/canals.png 446 160 09 16 24 -11 -6
+   -1 sprites/canals.png 8bpp  30  160  45  22 -11  -1 normal
+   -1 sprites/canals.png 8bpp  94  160  41  21  -8  10 normal
+   -1 sprites/canals.png 8bpp 142  160  42  21 -31  10 normal
+   -1 sprites/canals.png 8bpp 190  160  43  22 -31  -1 normal
+   -1 sprites/canals.png 8bpp 238  160  22  22  11   4 normal
+   -1 sprites/canals.png 8bpp 270  160  24  16 -11  15 normal
+   -1 sprites/canals.png 8bpp 302  160  23  23 -31   4 normal
+   -1 sprites/canals.png 8bpp 334  160  24  18 -11  -1 normal
+   -1 sprites/canals.png 8bpp 366  160  12  11  21  10 normal
+   -1 sprites/canals.png 8bpp 398  160  19  10  -8  21 normal
+   -1 sprites/canals.png 8bpp 430  160  11  10 -31  10 normal
+   -1 sprites/canals.png 8bpp 446  160  24  16 -11  -6 normal
    -1 * 7        02 05 16 01 00 00 00
    -1 * 6        07 83 01 \7! 03 01
    -1 * 7        03 05 01 02 00 16 00

media/extra_grf/elrails.nfo

@@ -8,51 +8,51 @@
 //
    -1 * 0	 0C "Electrified rail by Michael Blunck"
    -1 * 3	 05 05 30
-   -1 sprites/elrails.png 66 8 01 16 32 -29 -2
-   -1 sprites/elrails.png 114 8 01 16 32 -1 -2
-   -1 sprites/elrails.png 162 8 01 1 32 -1 -2
-   -1 sprites/elrails.png 210 8 01 16 1 0 -3
-   -1 sprites/elrails.png 226 8 01 24 32 -29 -2
-   -1 sprites/elrails.png 274 8 01 9 32 -1 6
-   -1 sprites/elrails.png 322 8 01 9 32 -29 6
-   -1 sprites/elrails.png 370 8 01 24 32 -1 -2
-   -1 sprites/elrails.png 418 8 01 16 32 -29 -2
-   -1 sprites/elrails.png 466 8 01 16 32 -1 -2
-   -1 sprites/elrails.png 514 8 01 1 32 -1 -2
-   -1 sprites/elrails.png 562 8 01 16 1 0 -3
-   -1 sprites/elrails.png 578 8 01 24 32 -29 -2
-   -1 sprites/elrails.png 626 8 01 9 32 -1 6
-   -1 sprites/elrails.png 674 8 01 9 32 -29 6
-   -1 sprites/elrails.png 722 8 01 24 32 -1 -2
-   -1 sprites/elrails.png 2 56 01 16 32 -29 -2
-   -1 sprites/elrails.png 50 56 01 16 32 -1 -2
-   -1 sprites/elrails.png 98 56 01 1 32 -1 -2
-   -1 sprites/elrails.png 146 56 01 16 1 0 -3
-   -1 sprites/elrails.png 162 56 01 24 32 -29 -2
-   -1 sprites/elrails.png 210 56 01 9 32 -1 6
-   -1 sprites/elrails.png 258 56 01 9 32 -29 6
-   -1 sprites/elrails.png 306 56 01 24 32 -1 -2
-   -1 sprites/elrails.png 354 56 01 8 16 -29 6
-   -1 sprites/elrails.png 386 56 01 8 16 -1 -2
-   -1 sprites/elrails.png 418 56 01 8 16 -13 -2
-   -1 sprites/elrails.png 450 56 01 8 16 15 6
-   -1 sprites/elrails.png 482 56 01 16 8 -7 -14
-   -1 sprites/elrails.png 498 56 01 18 8 0 -17
-   -1 sprites/elrails.png 514 56 01 16 8 0 -14
-   -1 sprites/elrails.png 530 56 01 18 8 -7 -17
-   -1 sprites/elrails.png 546 56 01 16 2 0 -15
-   -1 sprites/elrails.png 562 56 01 18 2 0 -16
-   -1 sprites/elrails.png 578 56 01 16 8 0 -15
-   -1 sprites/elrails.png 594 56 01 16 8 -7 -15
-   -1 sprites/elrails.png 610 56 09 16 13 4 2
-   -1 sprites/elrails.png 642 56 09 16 20 0 2
-   -1 sprites/elrails.png 674 56 09 16 20 0 2
-   -1 sprites/elrails.png 706 56 09 16 20 0 2
-   -1 sprites/elrails.png 738 56 03 30 38 -3 -14
-   -1 sprites/elrails.png 2 104 03 44 72 -16 -8
-   -1 sprites/elrails.png 82 104 03 35 44 -21 -2
-   -1 sprites/elrails.png 146 104 03 44 72 -16 -35
-   -1 sprites/elrails.png 226 104 09 19 20 0 1
-   -1 sprites/elrails.png 258 104 03 32 32 0 0
-   -1 sprites/elrails.png 306 104 01 22 12 -9 -18
-   -1 sprites/elrails.png 338 104 01 22 12 -1 -18
+   -1 sprites/elrails.png 8bpp  66    8  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 114    8  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 162    8  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 210    8   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 226    8  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 274    8  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 322    8  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 370    8  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 418    8  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 466    8  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 514    8  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 562    8   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 578    8  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 626    8  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 674    8  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 722    8  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp   2   56  32  16 -29  -2 normal
+   -1 sprites/elrails.png 8bpp  50   56  32  16  -1  -2 normal
+   -1 sprites/elrails.png 8bpp  98   56  32   1  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 146   56   1  16   0  -3 normal
+   -1 sprites/elrails.png 8bpp 162   56  32  24 -29  -2 normal
+   -1 sprites/elrails.png 8bpp 210   56  32   9  -1   6 normal
+   -1 sprites/elrails.png 8bpp 258   56  32   9 -29   6 normal
+   -1 sprites/elrails.png 8bpp 306   56  32  24  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 354   56  16   8 -29   6 normal
+   -1 sprites/elrails.png 8bpp 386   56  16   8  -1  -2 normal
+   -1 sprites/elrails.png 8bpp 418   56  16   8 -13  -2 normal
+   -1 sprites/elrails.png 8bpp 450   56  16   8  15   6 normal
+   -1 sprites/elrails.png 8bpp 482   56   8  16  -7 -14 normal
+   -1 sprites/elrails.png 8bpp 498   56   8  18   0 -17 normal
+   -1 sprites/elrails.png 8bpp 514   56   8  16   0 -14 normal
+   -1 sprites/elrails.png 8bpp 530   56   8  18  -7 -17 normal
+   -1 sprites/elrails.png 8bpp 546   56   2  16   0 -15 normal
+   -1 sprites/elrails.png 8bpp 562   56   2  18   0 -16 normal
+   -1 sprites/elrails.png 8bpp 578   56   8  16   0 -15 normal
+   -1 sprites/elrails.png 8bpp 594   56   8  16  -7 -15 normal
+   -1 sprites/elrails.png 8bpp 610   56  13  16   4   2 normal
+   -1 sprites/elrails.png 8bpp 642   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 674   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 706   56  20  16   0   2 normal
+   -1 sprites/elrails.png 8bpp 738   56  38  30  -3 -14 normal
+   -1 sprites/elrails.png 8bpp   2  104  72  44 -16  -8 normal
+   -1 sprites/elrails.png 8bpp  82  104  44  35 -21  -2 normal
+   -1 sprites/elrails.png 8bpp 146  104  72  44 -16 -35 normal
+   -1 sprites/elrails.png 8bpp 226  104  20  19   0   1 normal
+   -1 sprites/elrails.png 8bpp 258  104  32  32   0   0 normal
+   -1 sprites/elrails.png 8bpp 306  104  12  22  -9 -18 normal
+   -1 sprites/elrails.png 8bpp 338  104  12  22  -1 -18 normal

media/extra_grf/fix_graphics.nfo

@@ -12,194 +12,194 @@
    -1 * 6	 07 83 01 \7= 03 3D
 // Fix missing wheels on the wood trucks
    -1 * 14	 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E
-   -1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 114 8 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 146 8 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 178 8 09 16 22 -14 -7
+   -1 sprites/fix_graphics.png 8bpp  82    8  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 114    8  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146    8  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 178    8  22  16 -14  -7 normal
 // Show correct graphics for various 3rd generation trucks
    -1 * 5	 0A 01 28 C4 0D
-   -1 sprites/fix_graphics.png 226 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 242 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 274 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 322 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 354 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 370 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 402 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 450 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 482 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 498 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 530 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 578 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 610 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 626 8 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 658 8 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 706 8 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 738 8 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 754 8 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 2 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 50 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 82 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 98 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 130 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 178 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 210 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 226 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 258 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 306 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 338 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 354 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 386 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 434 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 466 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 482 40 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 514 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 562 40 09 16 20 -6 -7
-   -1 sprites/fix_graphics.png 594 40 01 18 8 -3 -10
-   -1 sprites/fix_graphics.png 610 40 09 16 20 -14 -7
-   -1 sprites/fix_graphics.png 642 40 01 12 28 -14 -6
-   -1 sprites/fix_graphics.png 690 40 09 16 20 -6 -7
+   -1 sprites/fix_graphics.png 8bpp 226    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 242    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 274    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 322    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 354    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 370    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 402    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 450    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 482    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 498    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 530    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 578    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 610    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 626    8  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 658    8  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 706    8  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 738    8   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 754    8  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp   2   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp  50   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  82   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp  98   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 130   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 178   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 210   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 226   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 258   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 306   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 338   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 354   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 386   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 434   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 466   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 482   40  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 514   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 562   40  20  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 594   40   8  18  -3 -10 normal
+   -1 sprites/fix_graphics.png 8bpp 610   40  20  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 642   40  28  12 -14  -6 normal
+   -1 sprites/fix_graphics.png 8bpp 690   40  20  16  -6  -7 normal
 // Fix clipping on the 2nd generation paper truck
    -1 * 14	 0A 04 01 9D 0C 01 9F 0C 01 A1 0C 01 A3 0C
-   -1 sprites/fix_graphics.png 738 40 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 770 40 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 2 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 34 72 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 8bpp 738   40  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 770   40  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp   2   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  34   72  22  16  -6  -7 normal
 // Fix clipping on the 1st generation paper truck
    -1 * 14	 0A 04 01 5D 0D 01 5F 0D 01 61 0D 01 63 0D
-   -1 sprites/fix_graphics.png 82 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 114 72 09 17 22 -5 -7
-   -1 sprites/fix_graphics.png 146 72 09 17 22 -14 -8
-   -1 sprites/fix_graphics.png 178 72 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 8bpp  82   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 114   72  22  17  -5  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146   72  22  17 -14  -8 normal
+   -1 sprites/fix_graphics.png 8bpp 178   72  22  16  -6  -7 normal
 // Fix clipping on the 3rd generation paper truck
    -1 * 14	 0A 04 01 1D 0E 01 1F 0E 01 21 0E 01 23 0E
-   -1 sprites/fix_graphics.png 226 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 258 72 09 16 22 -6 -7
-   -1 sprites/fix_graphics.png 290 72 09 16 22 -14 -7
-   -1 sprites/fix_graphics.png 322 72 09 16 22 -6 -7
+   -1 sprites/fix_graphics.png 8bpp 226   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 258   72  22  16  -6  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 290   72  22  16 -14  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 322   72  22  16  -6  -7 normal
 
 // Fix clipping on the toyland toy van in the German DOS graphics
    -1 * 6 07 83 01 \7! 03 02
    -1 * 5 0A 01 01 5D 0C
-   -1 sprites/fix_graphics.png 18 296 09 16 20 -14 -7
+   -1 sprites/fix_graphics.png 8bpp  18  296  20  16 -14  -7 normal
 
 // Non-toyland specific
    -1 * 6	 07 83 01 \7= 03 08
 // Fix offsets for the monorail bridge heads
    -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 370 72 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 434 72 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 498 72 09 21 49 -24 3
+   -1 sprites/fix_graphics.png 8bpp 370   72  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 434   72  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 498   72  49  21 -24   3 normal
 // Fix offsets for the maglev bridge heads
    -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 322 486 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 386 486 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 450 486 09 21 49 -24 3
+   -1 sprites/fix_graphics.png 8bpp 322  486  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 386  486  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 450  486  49  21 -24   3 normal
 
 // Toyland specific
    -1 * 6	 07 83 01 \7! 03 0F
 // Fix offsets for the toyland monorail bridge heads
    -1 * 8	 0A 02 01 EA 10 02 EC 10
-   -1 sprites/fix_graphics.png 610 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 674 630 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 738 630 09 21 49 -24 3
+   -1 sprites/fix_graphics.png 8bpp 610  630  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 674  630  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 738  630  49  21 -24   3 normal
 // Fix offsets for the toyland maglev bridge heads
    -1 * 8	 0A 02 01 12 11 02 14 11
-   -1 sprites/fix_graphics.png 18 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 82 678 09 35 48 -23 -7
-   -1 sprites/fix_graphics.png 146 678 09 21 49 -24 3
+   -1 sprites/fix_graphics.png 8bpp  18  678  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp  82  678  48  35 -23  -7 normal
+   -1 sprites/fix_graphics.png 8bpp 146  678  49  21 -24   3 normal
 // Fix colours for toyland maglev junction overlays
    -1 * 5	 0A 01 06 91 04
-   -1 sprites/fix_graphics.png 338 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 386 630 09 16 30 -14 8
-   -1 sprites/fix_graphics.png 434 630 01 7 40 -19 4
-   -1 sprites/fix_graphics.png 482 630 01 7 40 -19 20
-   -1 sprites/fix_graphics.png 530 630 01 19 12 11 6
-   -1 sprites/fix_graphics.png 562 630 01 19 12 -21 6
+   -1 sprites/fix_graphics.png 8bpp 338  630  30  16 -14   8 normal
+   -1 sprites/fix_graphics.png 8bpp 386  630  30  16 -14   8 normal
+   -1 sprites/fix_graphics.png 8bpp 434  630  40   7 -19   4 normal
+   -1 sprites/fix_graphics.png 8bpp 482  630  40   7 -19  20 normal
+   -1 sprites/fix_graphics.png 8bpp 530  630  12  19  11   6 normal
+   -1 sprites/fix_graphics.png 8bpp 562  630  12  19 -21   6 normal
 
 // Fix transparency of cinema
    -1 * 5	 0A 01 02 34 11
-   -1 sprites/fix_graphics.png 578 72 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 658 72 09 47 50 -28 -20
+   -1 sprites/fix_graphics.png 8bpp 578   72  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 658   72  50  47 -28 -20 normal
 
 // Fix misaligned undergrounds for temperate monorail
    -1 * 6	 07 83 01 \7! 00 06
    -1 * 5	 0A 01 05 4C 04
-   -1 sprites/fix_graphics.png 2 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 136 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp   2  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  136  64  31 -31   0 normal
 
 // Fix misaligned undergrounds for arctic monorail
    -1 * 6	 07 83 01 \7! 01 06
    -1 * 5	 0A 01 05 4C 04
-   -1 sprites/fix_graphics.png 434 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 136 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 184 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 434  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  136  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  184  64  31 -31   0 normal
 
 // Fix misaligned undergrounds for tropical/desert monorail/maglev
    -1 * 6	 07 83 01 \7! 02 10
    -1 * 11	 0A 03 05 4C 04 05 66 04 05 B8 04
-   -1 sprites/fix_graphics.png 114 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 194 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 184 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 232 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 114  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 194  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  184  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  232  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  232  64  31 -31   0 normal
 
 // Fix misaligned X crossing for snow-covered monorail
    -1 * 6	 07 83 01 \7! 01 02
    -1 * 5	 0A 01 01 65 04
-   -1 sprites/fix_graphics.png 594 232 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 594  232  64  31 -31   0 normal
 
 // Fix offsets for the tropical house
    -1 * 5	 0A 01 01 FF 11
-   -1 sprites/fix_graphics.png 706 232 09 47 64 -31 -16
+   -1 sprites/fix_graphics.png 8bpp 706  232  64  47 -31 -16 normal
 
 // Graphics metadata pixel higher than actual graphics
    -1 * 6	 12 01 00 01 AC E2
-   -1 sprites/fix_graphics.png 66 296 01 10 9 0 0
+   -1 sprites/fix_graphics.png 8bpp  66  296   9  10   0   0 normal
 
 // Non-toyland specific
    -1 * 6	 07 83 01 \7= 03 0A
 // Fix offsets for the tubular bridge pillars
    -1 * 5	 0A 01 04 05 0A
-   -1 sprites/fix_graphics.png 98 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 114 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 130 296 09 9 4 -4 0
-   -1 sprites/fix_graphics.png 146 296 09 9 4 -4 0
+   -1 sprites/fix_graphics.png 8bpp  98  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 114  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 130  296   4   9  -4   0 normal
+   -1 sprites/fix_graphics.png 8bpp 146  296   4   9  -4   0 normal
 // Fix offsets for the cantilever bridge pillars
    -1 * 5	 0A 01 04 DD 09
-   -1 sprites/fix_graphics.png 178 296 09 11 10 2 -3
-   -1 sprites/fix_graphics.png 194 296 09 12 10 2 -2
-   -1 sprites/fix_graphics.png 210 296 09 11 10 -10 -1
-   -1 sprites/fix_graphics.png 226 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 8bpp 178  296  10  11   2  -3 normal
+   -1 sprites/fix_graphics.png 8bpp 194  296  10  12   2  -2 normal
+   -1 sprites/fix_graphics.png 8bpp 210  296  10  11 -10  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 226  296  10  11 -10  -1 normal
 
 // Toyland specific
    -1 * 6	 07 83 01 \7! 03 0A
 // Fix offsets for the toyland tubular bridge pillars
    -1 * 5	 0A 01 04 05 0A
-   -1 sprites/fix_graphics.png 248 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 264 296 09 9 4 2 -1
-   -1 sprites/fix_graphics.png 280 296 09 9 4 -4 0
-   -1 sprites/fix_graphics.png 296 296 09 9 4 -4 0
+   -1 sprites/fix_graphics.png 8bpp 248  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 264  296   4   9   2  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 280  296   4   9  -4   0 normal
+   -1 sprites/fix_graphics.png 8bpp 296  296   4   9  -4   0 normal
 // Fix offsets for the toyland cantilever bridge pillars
    -1 * 5	 0A 01 04 DD 09
-   -1 sprites/fix_graphics.png 328 296 09 11 10 2 -3
-   -1 sprites/fix_graphics.png 344 296 09 12 10 2 -2
-   -1 sprites/fix_graphics.png 360 296 09 11 10 -10 -1
-   -1 sprites/fix_graphics.png 376 296 09 11 10 -10 -1
+   -1 sprites/fix_graphics.png 8bpp 328  296  10  11   2  -3 normal
+   -1 sprites/fix_graphics.png 8bpp 344  296  10  12   2  -2 normal
+   -1 sprites/fix_graphics.png 8bpp 360  296  10  11 -10  -1 normal
+   -1 sprites/fix_graphics.png 8bpp 376  296  10  11 -10  -1 normal
 
 // Wrong, non-translated colours in tubular bridge in 'normal' climates
 // Toyland has separate sprites which are not colour translated, thus
@@ -208,169 +208,169 @@
    -1 * 6	 07 83 01 \7= 03 \b22
 // Main tubular bridge sprites
    -1 * 5	 0A 01 \b6 \w2559
-   -1 sprites/fix_graphics.png 2 330 09 40 32 -30 -26
-   -1 sprites/fix_graphics.png 52 330 09 50 44 -42 -26
-   -1 sprites/fix_graphics.png 116 330 09 45 46 -42 -21
-   -1 sprites/fix_graphics.png 180 330 09 45 46 -2 -20
-   -1 sprites/fix_graphics.png 244 330 09 50 44 0 -25
-   -1 sprites/fix_graphics.png 308 330 09 41 32 0 -25
+   -1 sprites/fix_graphics.png 8bpp   2  330  32  40 -30 -26 normal
+   -1 sprites/fix_graphics.png 8bpp  52  330  44  50 -42 -26 normal
+   -1 sprites/fix_graphics.png 8bpp 116  330  46  45 -42 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 180  330  46  45  -2 -20 normal
+   -1 sprites/fix_graphics.png 8bpp 244  330  44  50   0 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 308  330  32  41   0 -25 normal
 // start rail bridge
    -1 * 5	 0A 01 01 \w2569
-   -1 sprites/fix_graphics.png 350 330 09 29 52 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 350  330  52  29 -25  -4 normal
 // start rail + road bridge
    -1 * 5	 0A 01 02 \w2574
-   -1 sprites/fix_graphics.png 420 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 489 330 09 29 52 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 420  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 489  330  52  29 -25  -4 normal
 // start road + monorail bridge
    -1 * 5	 0A 01 02 \w2580
-   -1 sprites/fix_graphics.png 559 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 629 330 09 29 52 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 559  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 629  330  52  29 -25  -4 normal
 // start monrail + maglev bridge
    -1 * 5	 0A 01 02 \w2586
-   -1 sprites/fix_graphics.png 699 330 09 29 50 -25 -4
-   -1 sprites/fix_graphics.png 489 283 09 29 52 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 699  330  50  29 -25  -4 normal
+   -1 sprites/fix_graphics.png 8bpp 489  283  52  29 -25  -4 normal
 // start maglev bridge
    -1 * 5	 0A 01 01 \w2592
-   -1 sprites/fix_graphics.png 559 283 09 29 50 -25 -4
+   -1 sprites/fix_graphics.png 8bpp 559  283  50  29 -25  -4 normal
 // GUI sprite
    -1 * 5	 0A 01 01 \w2600
-   -1 sprites/fix_graphics.png 433 298 09 15 40 0 5
+   -1 sprites/fix_graphics.png 8bpp 433  298  40  15   0   5 normal
 
 // Remove road markings from tropical rail crossings
    -1 * 6	 07 83 01 \7! 02 19
    -1 * 14	 0A 04 04 5A 05 08 62 05 08 6E 05 04 7A 05
-   -1 sprites/fix_graphics.png 2 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 390 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 438 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 162 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 486 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp   2  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  390  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  438  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 162  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  486  64  31 -31   0 normal
 
 // Fix transparency of steel mill
    -1 * 5	 0A 01 06 46 08
-   -1 sprites/fix_graphics.png 162 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 870 09 51 64 -31 -21
-   -1 sprites/fix_graphics.png 322 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 870 09 58 49 -29 -29
-   -1 sprites/fix_graphics.png 466 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 546 870 09 42 45 -18 -12
+   -1 sprites/fix_graphics.png 8bpp 162  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  870  64  51 -31 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 322  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  870  49  58 -29 -29 normal
+   -1 sprites/fix_graphics.png 8bpp 466  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 546  870  45  42 -18 -12 normal
    -1 * 5	 0A 01 0A 4D 08
-   -1 sprites/fix_graphics.png 610 486 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 690 486 09 61 59 -31 -33
-   -1 sprites/fix_graphics.png 2 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 566 09 50 51 -25 -21
-   -1 sprites/fix_graphics.png 606 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 686 870 09 46 64 -31 -16
-   -1 sprites/fix_graphics.png 2 945 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 945 09 51 50 -29 -21
-   -1 sprites/fix_graphics.png 146 945 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 226 945 09 42 47 -18 -12
+   -1 sprites/fix_graphics.png 8bpp 610  486  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 690  486  59  61 -31 -33 normal
+   -1 sprites/fix_graphics.png 8bpp   2  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  566  51  50 -25 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 606  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 686  870  64  46 -31 -16 normal
+   -1 sprites/fix_graphics.png 8bpp   2  945  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  945  50  51 -29 -21 normal
+   -1 sprites/fix_graphics.png 8bpp 146  945  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 226  945  47  42 -18 -12 normal
    -1 * 5	 0A 01 04 58 08
-   -1 sprites/fix_graphics.png 162 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 242 566 09 52 59 -31 -24
-   -1 sprites/fix_graphics.png 306 566 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 386 566 09 44 51 -25 -15
+   -1 sprites/fix_graphics.png 8bpp 162  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 242  566  59  52 -31 -24 normal
+   -1 sprites/fix_graphics.png 8bpp 306  566  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 386  566  51  44 -25 -15 normal
 
 // Fix transparency of oil well
    -1 * 5	 0A 01 07 7D 08
-   -1 sprites/fix_graphics.png 2 630 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 566 09 50 31 -11 -28
-   -1 sprites/fix_graphics.png 530 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 578 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 626 566 09 47 31 -11 -25
-   -1 sprites/fix_graphics.png 674 566 09 49 31 -11 -27
-   -1 sprites/fix_graphics.png 722 566 09 52 31 -11 -30
+   -1 sprites/fix_graphics.png 8bpp   2  630  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  566  31  50 -11 -28 normal
+   -1 sprites/fix_graphics.png 8bpp 530  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 578  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 626  566  31  47 -11 -25 normal
+   -1 sprites/fix_graphics.png 8bpp 674  566  31  49 -11 -27 normal
+   -1 sprites/fix_graphics.png 8bpp 722  566  31  52 -11 -30 normal
    -1 * 6	 07 83 01 \7! 01 02
    -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 114 630 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 114  630  64  31 -31   0 normal
    -1 * 6	 07 83 01 \7! 02 02
    -1 * 5	 0A 01 01 7D 08
-   -1 sprites/fix_graphics.png 226 630 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 226  630  64  31 -31   0 normal
 
 // Fix city airport's grass for temperate
    -1 * 6	 07 83 01 \7! 00 0A
    -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 242 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 322 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 402 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 482 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 562 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 642 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 722 678 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 726 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 242  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 322  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 402  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 482  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 562  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 642  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 722  678  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  726  64  31 -31   0 normal
 
 // Fix city airport's grass for arctic
    -1 * 6	 07 83 01 \7! 01 0A
    -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 726 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 774 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 194  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  726  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  774  64  31 -31   0 normal
 
 // Fix city airport's grass for tropical
    -1 * 6	 07 83 01 \7! 02 0A
    -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 774 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 822 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 194  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  774  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  822  64  31 -31   0 normal
 
 // Fix city airport's grass for toyland
    -1 * 6	 07 83 01 \7! 03 0A
    -1 * 5	 0A 01 09 4C 0A
-   -1 sprites/fix_graphics.png 194 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 274 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 354 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 434 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 514 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 594 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 674 822 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 2 870 09 31 64 -31 0
-   -1 sprites/fix_graphics.png 82 870 09 31 64 -31 0
+   -1 sprites/fix_graphics.png 8bpp 194  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 274  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 354  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 434  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 514  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 594  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp 674  822  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp   2  870  64  31 -31   0 normal
+   -1 sprites/fix_graphics.png 8bpp  82  870  64  31 -31   0 normal
 
 // Wrong, non-translated colours in arctic buildings
    -1 * 8	 0A 02 01 1F 06 01 DB 11
-   -1 sprites/fix_graphics.png 305 945 09 29 59 -29 -12
-   -1 sprites/fix_graphics.png 369 945 09 29 59 -29 -12
+   -1 sprites/fix_graphics.png 8bpp 305  945  59  29 -29 -12 normal
+   -1 sprites/fix_graphics.png 8bpp 369  945  59  29 -29 -12 normal
    -1 * 8	 0A 02 01 76 11 01 E6 11
-   -1 sprites/fix_graphics.png 449 945 09 69 64 -31 -38
-   -1 sprites/fix_graphics.png 529 945 09 69 64 -31 -38
+   -1 sprites/fix_graphics.png 8bpp 449  945  64  69 -31 -38 normal
+   -1 sprites/fix_graphics.png 8bpp 529  945  64  69 -31 -38 normal
    -1 * 8	 0A 02 02 7E 11 01 E1 11
-   -1 sprites/fix_graphics.png 625 945 03 75 54 -25 -47
-   -1 sprites/fix_graphics.png 2 1037 09 75 54 -25 -47
-   -1 sprites/fix_graphics.png 66 1037 09 75 54 -25 -47
+   -1 sprites/fix_graphics.png 8bpp 625  945  54  75 -25 -47 normal
+   -1 sprites/fix_graphics.png 8bpp   2 1037  54  75 -25 -47 normal
+   -1 sprites/fix_graphics.png 8bpp  66 1037  54  75 -25 -47 normal
 
 // Fix buoy in-game; don't show black outline
    -1 * 4        01 05 01 \b1
-   -1 sprites/fix_graphics.png 575 490 09 11 7 7 4
+   -1 sprites/fix_graphics.png 8bpp 575  490   7  11   7   4 normal
    -1 * 7        02 05 17 01 00 00 00
    -1 * 7        03 05 01 08 00 17 00

media/extra_grf/flags.nfo

@@ -8,39 +8,39 @@
 //
    -1 * 0	 0C "Flag graphics"
    -1 * 3	 05 14 24
-   -1 sprites/flags.png 34 8 09 8 11 0 0
-   -1 sprites/flags.png 50 8 09 8 11 0 0
-   -1 sprites/flags.png 66 8 09 8 11 0 0
-   -1 sprites/flags.png 82 8 09 8 11 0 0
-   -1 sprites/flags.png 98 8 09 8 11 0 0
-   -1 sprites/flags.png 114 8 09 8 11 0 0
-   -1 sprites/flags.png 130 8 09 8 11 0 0
-   -1 sprites/flags.png 146 8 09 8 11 0 0
-   -1 sprites/flags.png 162 8 09 8 11 0 0
-   -1 sprites/flags.png 178 8 09 8 11 0 0
-   -1 sprites/flags.png 194 8 09 8 11 0 0
-   -1 sprites/flags.png 210 8 09 8 11 0 0
-   -1 sprites/flags.png 226 8 09 8 11 0 0
-   -1 sprites/flags.png 242 8 09 8 11 0 0
-   -1 sprites/flags.png 258 8 09 8 11 0 0
-   -1 sprites/flags.png 274 8 09 8 11 0 0
-   -1 sprites/flags.png 290 8 09 8 11 0 0
-   -1 sprites/flags.png 306 8 09 8 11 0 0
-   -1 sprites/flags.png 322 8 09 8 11 0 0
-   -1 sprites/flags.png 338 8 09 8 11 0 0
-   -1 sprites/flags.png 354 8 09 8 11 0 0
-   -1 sprites/flags.png 370 8 09 8 11 0 0
-   -1 sprites/flags.png 386 8 09 8 11 0 0
-   -1 sprites/flags.png 402 8 09 8 11 0 0
-   -1 sprites/flags.png 418 8 09 8 11 0 0
-   -1 sprites/flags.png 434 8 09 8 11 0 0
-   -1 sprites/flags.png 450 8 09 8 11 0 0
-   -1 sprites/flags.png 466 8 09 8 11 0 0
-   -1 sprites/flags.png 482 8 09 8 11 0 0
-   -1 sprites/flags.png 498 8 09 8 11 0 0
-   -1 sprites/flags.png 514 8 09 8 11 0 0
-   -1 sprites/flags.png 530 8 09 8 11 0 0
-   -1 sprites/flags.png 546 8 09 8 11 0 0
-   -1 sprites/flags.png 562 8 09 8 11 0 0
-   -1 sprites/flags.png 578 8 09 8 11 0 0
-   -1 sprites/flags.png 594 8 09 8 11 0 0
+   -1 sprites/flags.png 8bpp  34    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  50    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  66    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  82    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp  98    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 114    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 130    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 146    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 162    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 178    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 194    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 210    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 226    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 242    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 258    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 274    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 290    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 306    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 322    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 338    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 354    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 370    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 386    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 402    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 418    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 434    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 450    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 466    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 482    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 498    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 514    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 530    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 546    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 562    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 578    8  11   8   0   0 normal
+   -1 sprites/flags.png 8bpp 594    8  11   8   0   0 normal

media/extra_grf/foundations.nfo

@@ -9,369 +9,369 @@
    -1 * 0	 0C "Foundations. Non-halftile ones by Marcin Grzegorczyk"
    -1 * 6	 07 83 01 \7! 00 5B
    -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 82 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 8 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 8 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 8 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 72 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 72 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 136 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 136 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 200 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 200 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 264 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 264 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 328 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 328 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 392 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 392 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 456 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 456 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 456 09 40 64 -15 -17
-   -1 sprites/foundations.png 482 456 09 33 64 -31 -25
-   -1 sprites/foundations.png 562 456 09 40 64 -47 -17
-   -1 sprites/foundations.png 642 456 09 33 64 -31 -9
-   -1 sprites/foundations.png 722 456 09 40 64 -15 -17
-   -1 sprites/foundations.png 2 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 82 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 162 520 09 33 64 -31 -9
-   -1 sprites/foundations.png 242 520 09 40 64 -15 -17
-   -1 sprites/foundations.png 322 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 402 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 482 520 09 33 64 -31 -9
-   -1 sprites/foundations.png 562 520 09 40 64 -15 -17
-   -1 sprites/foundations.png 642 520 09 33 64 -31 -25
-   -1 sprites/foundations.png 722 520 09 40 64 -47 -17
-   -1 sprites/foundations.png 2 584 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp  82    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242    8  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322    8  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722    8  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562   72  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722   72  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  136  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  136  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  200  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  200  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  264  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  264  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  328  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  328  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  392  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  392  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  456  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  456  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  456  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 482  456  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 562  456  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 642  456  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  456  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp   2  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp  82  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 162  520  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  520  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 322  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 402  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 482  520  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  520  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 642  520  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 722  520  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp   2  584  64  33 -31  -9 normal
    -1 * 6	 07 83 01 \7! 01 5B
    -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 114 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 194 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 274 584 09 32 64 -31 -9
-   -1 sprites/foundations.png 354 584 09 32 64 -31 -9
-   -1 sprites/foundations.png 434 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 514 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 594 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 584 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 648 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 648 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 712 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 712 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 776 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 776 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 840 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 840 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 904 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 904 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 968 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 968 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1032 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1032 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1032 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1032 09 40 64 -15 -17
-   -1 sprites/foundations.png 562 1032 09 33 64 -31 -25
-   -1 sprites/foundations.png 642 1032 09 40 64 -47 -17
-   -1 sprites/foundations.png 722 1032 09 33 64 -31 -9
-   -1 sprites/foundations.png 2 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 82 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 162 1096 09 40 64 -47 -17
-   -1 sprites/foundations.png 242 1096 09 33 64 -31 -9
-   -1 sprites/foundations.png 322 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 402 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 482 1096 09 40 64 -47 -17
-   -1 sprites/foundations.png 562 1096 09 33 64 -31 -9
-   -1 sprites/foundations.png 642 1096 09 40 64 -15 -17
-   -1 sprites/foundations.png 722 1096 09 33 64 -31 -25
-   -1 sprites/foundations.png 2 1160 09 40 64 -47 -17
-   -1 sprites/foundations.png 82 1160 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 114  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 194  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 274  584  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354  584  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674  584  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  648  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  648  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  712  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  712  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  776  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  776  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  840  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  840  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  904  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  904  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562  968  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722  968  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1032  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1032  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1032  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1032  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 562 1032  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 642 1032  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 722 1032  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp  82 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 162 1096  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 242 1096  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 402 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 482 1096  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 562 1096  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1096  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 722 1096  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp   2 1160  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp  82 1160  64  33 -31  -9 normal
    -1 * 6	 07 83 01 \7! 02 5B
    -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 194 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 274 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 354 1160 09 32 64 -31 -9
-   -1 sprites/foundations.png 434 1160 09 32 64 -31 -9
-   -1 sprites/foundations.png 514 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 594 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 1160 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1224 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1224 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1288 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1288 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1352 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1352 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1416 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1416 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1480 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1480 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1544 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1544 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1608 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1608 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1608 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1608 09 40 64 -15 -17
-   -1 sprites/foundations.png 642 1608 09 33 64 -31 -25
-   -1 sprites/foundations.png 722 1608 09 40 64 -47 -17
-   -1 sprites/foundations.png 2 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 82 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 162 1672 09 33 64 -31 -25
-   -1 sprites/foundations.png 242 1672 09 40 64 -47 -17
-   -1 sprites/foundations.png 322 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 402 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 482 1672 09 33 64 -31 -25
-   -1 sprites/foundations.png 562 1672 09 40 64 -47 -17
-   -1 sprites/foundations.png 642 1672 09 33 64 -31 -9
-   -1 sprites/foundations.png 722 1672 09 40 64 -15 -17
-   -1 sprites/foundations.png 2 1736 09 33 64 -31 -25
-   -1 sprites/foundations.png 82 1736 09 40 64 -47 -17
-   -1 sprites/foundations.png 162 1736 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 194 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 274 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354 1160  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434 1160  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674 1160  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1224  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1224  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1288  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1288  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1352  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1352  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1416  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1416  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1480  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1480  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1544  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1544  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1608  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1608  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1608  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1608  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 642 1608  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 722 1608  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp   2 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 162 1672  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 242 1672  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 322 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 482 1672  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 562 1672  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 642 1672  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1672  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp   2 1736  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp  82 1736  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 162 1736  64  33 -31  -9 normal
    -1 * 6	 07 83 01 \7! 03 5B
    -1 * 3	 05 06 5A
-   -1 sprites/foundations.png 274 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 354 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 434 1736 09 32 64 -31 -9
-   -1 sprites/foundations.png 514 1736 09 32 64 -31 -9
-   -1 sprites/foundations.png 594 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 674 1736 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1800 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1800 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1864 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 1864 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 1928 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1928 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 402 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 1992 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 1992 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 82 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 242 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 642 2056 09 32 64 -31 -9
-   -1 sprites/foundations.png 722 2056 09 40 64 -31 -9
-   -1 sprites/foundations.png 2 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 162 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 322 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 482 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 562 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 2120 09 40 64 -31 -9
-   -1 sprites/foundations.png 722 2120 09 32 64 -31 -9
-   -1 sprites/foundations.png 2 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 82 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 162 2184 09 32 64 -31 -9
-   -1 sprites/foundations.png 242 2184 09 32 64 -31 -9
-   -1 sprites/foundations.png 322 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 402 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 482 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 562 2184 09 40 64 -31 -9
-   -1 sprites/foundations.png 642 2184 09 40 64 -15 -17
-   -1 sprites/foundations.png 722 2184 09 33 64 -31 -25
-   -1 sprites/foundations.png 2 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 82 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 162 2248 09 40 64 -15 -17
-   -1 sprites/foundations.png 242 2248 09 33 64 -31 -25
-   -1 sprites/foundations.png 322 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 402 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 482 2248 09 40 64 -15 -17
-   -1 sprites/foundations.png 562 2248 09 33 64 -31 -25
-   -1 sprites/foundations.png 642 2248 09 40 64 -47 -17
-   -1 sprites/foundations.png 722 2248 09 33 64 -31 -9
-   -1 sprites/foundations.png 2 2312 09 40 64 -15 -17
-   -1 sprites/foundations.png 82 2312 09 33 64 -31 -25
-   -1 sprites/foundations.png 162 2312 09 40 64 -47 -17
-   -1 sprites/foundations.png 242 2312 09 33 64 -31 -9
+   -1 sprites/foundations.png 8bpp 274 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 354 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 434 1736  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 514 1736  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 594 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 674 1736  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1800  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1800  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1864  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1864  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1928  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1928  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 1992  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 1992  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2056  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 2056  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2120  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 722 2120  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp  82 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2184  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 242 2184  64  32 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 322 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 402 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 562 2184  64  40 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 642 2184  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 722 2184  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp   2 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp  82 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 162 2248  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 242 2248  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 322 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 402 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp 482 2248  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp 562 2248  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 642 2248  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 722 2248  64  33 -31  -9 normal
+   -1 sprites/foundations.png 8bpp   2 2312  64  40 -15 -17 normal
+   -1 sprites/foundations.png 8bpp  82 2312  64  33 -31 -25 normal
+   -1 sprites/foundations.png 8bpp 162 2312  64  40 -47 -17 normal
+   -1 sprites/foundations.png 8bpp 242 2312  64  33 -31  -9 normal

media/extra_grf/mono.nfo

@@ -8,233 +8,233 @@
 //
    -1 * 0	 0C "Monospaced characters (Liberation Mono)"
    -1 * 0 12 01 03 60 20 00
-   -1 sprites/mono.png  10  30 01 13 7 0 0
-   -1 sprites/mono.png  25  30 01 13 7 0 0
-   -1 sprites/mono.png  40  30 01 13 7 0 0
-   -1 sprites/mono.png  55  30 01 13 7 0 0
-   -1 sprites/mono.png  70  30 01 13 7 0 0
-   -1 sprites/mono.png  85  30 01 13 7 0 0
-   -1 sprites/mono.png 100  30 01 13 7 0 0
-   -1 sprites/mono.png 115  30 01 13 7 0 0
-   -1 sprites/mono.png 130  30 01 13 7 0 0
-   -1 sprites/mono.png 145  30 01 13 7 0 0
-   -1 sprites/mono.png 160  30 01 13 7 0 0
-   -1 sprites/mono.png 175  30 01 13 7 0 0
-   -1 sprites/mono.png 190  30 01 13 7 0 0
-   -1 sprites/mono.png 205  30 01 13 7 0 0
-   -1 sprites/mono.png 220  30 01 13 7 0 0
-   -1 sprites/mono.png 235  30 01 13 7 0 0
-   -1 sprites/mono.png 250  30 01 13 7 0 0
-   -1 sprites/mono.png 265  30 01 13 7 0 0
-   -1 sprites/mono.png 280  30 01 13 7 0 0
-   -1 sprites/mono.png 295  30 01 13 7 0 0
-   -1 sprites/mono.png 310  30 01 13 7 0 0
-   -1 sprites/mono.png 325  30 01 13 7 0 0
-   -1 sprites/mono.png 340  30 01 13 7 0 0
-   -1 sprites/mono.png 355  30 01 13 7 0 0
-   -1 sprites/mono.png 370  30 01 13 7 0 0
-   -1 sprites/mono.png 385  30 01 13 7 0 0
-   -1 sprites/mono.png 400  30 01 13 7 0 0
-   -1 sprites/mono.png 415  30 01 13 7 0 0
-   -1 sprites/mono.png 430  30 01 13 7 0 0
-   -1 sprites/mono.png 445  30 01 13 7 0 0
-   -1 sprites/mono.png 460  30 01 13 7 0 0
-   -1 sprites/mono.png 475  30 01 13 7 0 0
-   -1 sprites/mono.png  10  50 01 13 7 0 0
-   -1 sprites/mono.png  25  50 01 13 7 0 0
-   -1 sprites/mono.png  40  50 01 13 7 0 0
-   -1 sprites/mono.png  55  50 01 13 7 0 0
-   -1 sprites/mono.png  70  50 01 13 7 0 0
-   -1 sprites/mono.png  85  50 01 13 7 0 0
-   -1 sprites/mono.png 100  50 01 13 7 0 0
-   -1 sprites/mono.png 115  50 01 13 7 0 0
-   -1 sprites/mono.png 130  50 01 13 7 0 0
-   -1 sprites/mono.png 145  50 01 13 7 0 0
-   -1 sprites/mono.png 160  50 01 13 7 0 0
-   -1 sprites/mono.png 175  50 01 13 7 0 0
-   -1 sprites/mono.png 190  50 01 13 7 0 0
-   -1 sprites/mono.png 205  50 01 13 7 0 0
-   -1 sprites/mono.png 220  50 01 13 7 0 0
-   -1 sprites/mono.png 235  50 01 13 7 0 0
-   -1 sprites/mono.png 250  50 01 13 7 0 0
-   -1 sprites/mono.png 265  50 01 13 7 0 0
-   -1 sprites/mono.png 280  50 01 13 7 0 0
-   -1 sprites/mono.png 295  50 01 13 7 0 0
-   -1 sprites/mono.png 310  50 01 13 7 0 0
-   -1 sprites/mono.png 325  50 01 13 7 0 0
-   -1 sprites/mono.png 340  50 01 13 7 0 0
-   -1 sprites/mono.png 355  50 01 13 7 0 0
-   -1 sprites/mono.png 370  50 01 13 7 0 0
-   -1 sprites/mono.png 385  50 01 13 7 0 0
-   -1 sprites/mono.png 400  50 01 13 7 0 0
-   -1 sprites/mono.png 415  50 01 13 7 0 0
-   -1 sprites/mono.png 430  50 01 13 7 0 0
-   -1 sprites/mono.png 445  50 01 13 7 0 0
-   -1 sprites/mono.png 460  50 01 13 7 0 0
-   -1 sprites/mono.png 475  50 01 13 7 0 0
-   -1 sprites/mono.png  10  70 01 13 7 0 0
-   -1 sprites/mono.png  25  70 01 13 7 0 0
-   -1 sprites/mono.png  40  70 01 13 7 0 0
-   -1 sprites/mono.png  55  70 01 13 7 0 0
-   -1 sprites/mono.png  70  70 01 13 7 0 0
-   -1 sprites/mono.png  85  70 01 13 7 0 0
-   -1 sprites/mono.png 100  70 01 13 7 0 0
-   -1 sprites/mono.png 115  70 01 13 7 0 0
-   -1 sprites/mono.png 130  70 01 13 7 0 0
-   -1 sprites/mono.png 145  70 01 13 7 0 0
-   -1 sprites/mono.png 160  70 01 13 7 0 0
-   -1 sprites/mono.png 175  70 01 13 7 0 0
-   -1 sprites/mono.png 190  70 01 13 7 0 0
-   -1 sprites/mono.png 205  70 01 13 7 0 0
-   -1 sprites/mono.png 220  70 01 13 7 0 0
-   -1 sprites/mono.png 235  70 01 13 7 0 0
-   -1 sprites/mono.png 250  70 01 13 7 0 0
-   -1 sprites/mono.png 265  70 01 13 7 0 0
-   -1 sprites/mono.png 280  70 01 13 7 0 0
-   -1 sprites/mono.png 295  70 01 13 7 0 0
-   -1 sprites/mono.png 310  70 01 13 7 0 0
-   -1 sprites/mono.png 325  70 01 13 7 0 0
-   -1 sprites/mono.png 340  70 01 13 7 0 0
-   -1 sprites/mono.png 355  70 01 13 7 0 0
-   -1 sprites/mono.png 370  70 01 13 7 0 0
-   -1 sprites/mono.png 385  70 01 13 7 0 0
-   -1 sprites/mono.png 400  70 01 13 7 0 0
-   -1 sprites/mono.png 415  70 01 13 7 0 0
-   -1 sprites/mono.png 430  70 01 13 7 0 0
-   -1 sprites/mono.png 445  70 01 13 7 0 0
-   -1 sprites/mono.png 460  70 01 13 7 0 0
-   -1 sprites/mono.png 475  70 01 13 7 0 0
+   -1 sprites/mono.png 8bpp  10   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   30   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   50   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   70   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   70   7  13   0   0 normal
 
    -1 * 0 12 01 03 80 80 00
-   -1 sprites/mono.png  10  90 01 13 7 0 0
-   -1 sprites/mono.png  25  90 01 13 7 0 0
-   -1 sprites/mono.png  40  90 01 13 7 0 0
-   -1 sprites/mono.png  55  90 01 13 7 0 0
-   -1 sprites/mono.png  70  90 01 13 7 0 0
-   -1 sprites/mono.png  85  90 01 13 7 0 0
-   -1 sprites/mono.png 100  90 01 13 7 0 0
-   -1 sprites/mono.png 115  90 01 13 7 0 0
-   -1 sprites/mono.png 130  90 01 13 7 0 0
-   -1 sprites/mono.png 145  90 01 13 7 0 0
-   -1 sprites/mono.png 160  90 01 13 7 0 0
-   -1 sprites/mono.png 175  90 01 13 7 0 0
-   -1 sprites/mono.png 190  90 01 13 7 0 0
-   -1 sprites/mono.png 205  90 01 13 7 0 0
-   -1 sprites/mono.png 220  90 01 13 7 0 0
-   -1 sprites/mono.png 235  90 01 13 7 0 0
-   -1 sprites/mono.png 250  90 01 13 7 0 0
-   -1 sprites/mono.png 265  90 01 13 7 0 0
-   -1 sprites/mono.png 280  90 01 13 7 0 0
-   -1 sprites/mono.png 295  90 01 13 7 0 0
-   -1 sprites/mono.png 310  90 01 13 7 0 0
-   -1 sprites/mono.png 325  90 01 13 7 0 0
-   -1 sprites/mono.png 340  90 01 13 7 0 0
-   -1 sprites/mono.png 355  90 01 13 7 0 0
-   -1 sprites/mono.png 370  90 01 13 7 0 0
-   -1 sprites/mono.png 385  90 01 13 7 0 0
-   -1 sprites/mono.png 400  90 01 13 7 0 0
-   -1 sprites/mono.png 415  90 01 13 7 0 0
-   -1 sprites/mono.png 430  90 01 13 7 0 0
-   -1 sprites/mono.png 445  90 01 13 7 0 0
-   -1 sprites/mono.png 460  90 01 13 7 0 0
-   -1 sprites/mono.png 475  90 01 13 7 0 0
-   -1 sprites/mono.png  10 110 01 13 7 0 0
-   -1 sprites/mono.png  25 110 01 13 7 0 0
-   -1 sprites/mono.png  40 110 01 13 7 0 0
-   -1 sprites/mono.png  55 110 01 13 7 0 0
-   -1 sprites/mono.png  70 110 01 13 7 0 0
-   -1 sprites/mono.png  85 110 01 13 7 0 0
-   -1 sprites/mono.png 100 110 01 13 7 0 0
-   -1 sprites/mono.png 115 110 01 13 7 0 0
-   -1 sprites/mono.png 130 110 01 13 7 0 0
-   -1 sprites/mono.png 145 110 01 13 7 0 0
-   -1 sprites/mono.png 160 110 01 13 7 0 0
-   -1 sprites/mono.png 175 110 01 13 7 0 0
-   -1 sprites/mono.png 190 110 01 13 7 0 0
-   -1 sprites/mono.png 205 110 01 13 7 0 0
-   -1 sprites/mono.png 220 110 01 13 7 0 0
-   -1 sprites/mono.png 235 110 01 13 7 0 0
-   -1 sprites/mono.png 250 110 01 13 7 0 0
-   -1 sprites/mono.png 265 110 01 13 7 0 0
-   -1 sprites/mono.png 280 110 01 13 7 0 0
-   -1 sprites/mono.png 295 110 01 13 7 0 0
-   -1 sprites/mono.png 310 110 01 13 7 0 0
-   -1 sprites/mono.png 325 110 01 13 7 0 0
-   -1 sprites/mono.png 340 110 01 13 7 0 0
-   -1 sprites/mono.png 355 110 01 13 7 0 0
-   -1 sprites/mono.png 370 110 01 13 7 0 0
-   -1 sprites/mono.png 385 110 01 13 7 0 0
-   -1 sprites/mono.png 400 110 01 13 7 0 0
-   -1 sprites/mono.png 415 110 01 13 7 0 0
-   -1 sprites/mono.png 430 110 01 13 7 0 0
-   -1 sprites/mono.png 445 110 01 13 7 0 0
-   -1 sprites/mono.png 460 110 01 13 7 0 0
-   -1 sprites/mono.png 475 110 01 13 7 0 0
-   -1 sprites/mono.png  10 130 01 13 7 0 0
-   -1 sprites/mono.png  25 130 01 13 7 0 0
-   -1 sprites/mono.png  40 130 01 13 7 0 0
-   -1 sprites/mono.png  55 130 01 13 7 0 0
-   -1 sprites/mono.png  70 130 01 13 7 0 0
-   -1 sprites/mono.png  85 130 01 13 7 0 0
-   -1 sprites/mono.png 100 130 01 13 7 0 0
-   -1 sprites/mono.png 115 130 01 13 7 0 0
-   -1 sprites/mono.png 130 130 01 13 7 0 0
-   -1 sprites/mono.png 145 130 01 13 7 0 0
-   -1 sprites/mono.png 160 130 01 13 7 0 0
-   -1 sprites/mono.png 175 130 01 13 7 0 0
-   -1 sprites/mono.png 190 130 01 13 7 0 0
-   -1 sprites/mono.png 205 130 01 13 7 0 0
-   -1 sprites/mono.png 220 130 01 13 7 0 0
-   -1 sprites/mono.png 235 130 01 13 7 0 0
-   -1 sprites/mono.png 250 130 01 13 7 0 0
-   -1 sprites/mono.png 265 130 01 13 7 0 0
-   -1 sprites/mono.png 280 130 01 13 7 0 0
-   -1 sprites/mono.png 295 130 01 13 7 0 0
-   -1 sprites/mono.png 310 130 01 13 7 0 0
-   -1 sprites/mono.png 325 130 01 13 7 0 0
-   -1 sprites/mono.png 340 130 01 13 7 0 0
-   -1 sprites/mono.png 355 130 01 13 7 0 0
-   -1 sprites/mono.png 370 130 01 13 7 0 0
-   -1 sprites/mono.png 385 130 01 13 7 0 0
-   -1 sprites/mono.png 400 130 01 13 7 0 0
-   -1 sprites/mono.png 415 130 01 13 7 0 0
-   -1 sprites/mono.png 430 130 01 13 7 0 0
-   -1 sprites/mono.png 445 130 01 13 7 0 0
-   -1 sprites/mono.png 460 130 01 13 7 0 0
-   -1 sprites/mono.png 475 130 01 13 7 0 0
-   -1 sprites/mono.png  10 150 01 13 7 0 0
-   -1 sprites/mono.png  25 150 01 13 7 0 0
-   -1 sprites/mono.png  40 150 01 13 7 0 0
-   -1 sprites/mono.png  55 150 01 13 7 0 0
-   -1 sprites/mono.png  70 150 01 13 7 0 0
-   -1 sprites/mono.png  85 150 01 13 7 0 0
-   -1 sprites/mono.png 100 150 01 13 7 0 0
-   -1 sprites/mono.png 115 150 01 13 7 0 0
-   -1 sprites/mono.png 130 150 01 13 7 0 0
-   -1 sprites/mono.png 145 150 01 13 7 0 0
-   -1 sprites/mono.png 160 150 01 13 7 0 0
-   -1 sprites/mono.png 175 150 01 13 7 0 0
-   -1 sprites/mono.png 190 150 01 13 7 0 0
-   -1 sprites/mono.png 205 150 01 13 7 0 0
-   -1 sprites/mono.png 220 150 01 13 7 0 0
-   -1 sprites/mono.png 235 150 01 13 7 0 0
-   -1 sprites/mono.png 250 150 01 13 7 0 0
-   -1 sprites/mono.png 265 150 01 13 7 0 0
-   -1 sprites/mono.png 280 150 01 13 7 0 0
-   -1 sprites/mono.png 295 150 01 13 7 0 0
-   -1 sprites/mono.png 310 150 01 13 7 0 0
-   -1 sprites/mono.png 325 150 01 13 7 0 0
-   -1 sprites/mono.png 340 150 01 13 7 0 0
-   -1 sprites/mono.png 355 150 01 13 7 0 0
-   -1 sprites/mono.png 370 150 01 13 7 0 0
-   -1 sprites/mono.png 385 150 01 13 7 0 0
-   -1 sprites/mono.png 400 150 01 13 7 0 0
-   -1 sprites/mono.png 415 150 01 13 7 0 0
-   -1 sprites/mono.png 430 150 01 13 7 0 0
-   -1 sprites/mono.png 445 150 01 13 7 0 0
-   -1 sprites/mono.png 460 150 01 13 7 0 0
-   -1 sprites/mono.png 475 150 01 13 7 0 0
+   -1 sprites/mono.png 8bpp  10   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475   90   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  110   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  130   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  10  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  25  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  40  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  55  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  70  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp  85  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 100  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 115  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 130  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 145  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 160  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 175  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 190  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 205  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 220  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 235  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 250  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 265  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 280  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 295  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 310  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 325  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 340  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 355  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 370  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 385  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 400  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 415  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 430  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 445  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 460  150   7  13   0   0 normal
+   -1 sprites/mono.png 8bpp 475  150   7  13   0   0 normal
 
 //U+0178 Latin Capital Letter Y With Diaeresis (only needed for mono as it is in the base set, but relocated by some code)
    -1 * 0 12 01 03 01 78 01
-   -1 sprites/mono.png 370 230 01 13 7 0 0
+   -1 sprites/mono.png 8bpp 370  230   7  13   0   0 normal

media/extra_grf/oneway.nfo

@@ -8,9 +8,9 @@
 //
    -1 * 0	 0C "One way road graphics"
    -1 * 3	 05 09 06
-   -1 sprites/oneway.png 34 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 66 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 98 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 130 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 162 8 01 16 24 -12 -8
-   -1 sprites/oneway.png 194 8 01 16 24 -12 -8
+   -1 sprites/oneway.png 8bpp  34    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp  66    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp  98    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 130    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 162    8  24  16 -12  -8 normal
+   -1 sprites/oneway.png 8bpp 194    8  24  16 -12  -8 normal

media/extra_grf/openttd.nfo

@@ -1,6 +1,6 @@
 // Automatically generated by GRFCODEC. Do not modify!
-// (Info version 7)
-// Format: spritenum.pngfile xpos ypos compression ysize xsize xrel yrel
+// (Info version 32)
+// Format: spritenum imagefile depth xpos ypos xsize ysize xrel yrel zoom flags
 //
 // $Id$
 //
@@ -14,13 +14,6 @@
 // allowing it to be used.
 //
 
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use a reserved GRF ID
-// @@WARNING DISABLE 101
-// -- End of NFO Renum 'settings' --
-//
-
 //
 // Number of sprites, it is wrong, but GRFcodec automagically gets it right.
 //

media/extra_grf/openttdgui.nfo

@@ -5,179 +5,168 @@
 // OpenTTD 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, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use more sprites.
-// We are the 'authority' on how many sprites may be used.
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
 //
    -1 * 0	 0C "OpenTTD GUI graphics"
    -1 * 3	 05 15 A2
-   -1 sprites/openttdgui.png 66 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 146 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 226 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 306 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 386 8 09 31 64 -31 -1
-   -1 sprites/openttdgui.png 466 8 09 39 64 -31 -1
-   -1 sprites/openttdgui.png 546 8 09 31 64 -31 -1
-   -1 sprites/openttdgui.png 626 8 09 23 64 -31 7
-   -1 sprites/openttdgui.png 706 8 09 31 64 -31 7
-   -1 sprites/openttdgui.png 2 72 09 23 64 -31 7
-   -1 sprites/openttdgui.png 82 72 09 31 64 -31 7
-   -1 sprites/openttdgui.png 162 72 09 39 64 -31 -1
-   -1 sprites/openttdgui.png 242 72 01 26 23 0 0
-   -1 sprites/openttdgui.png 274 72 09 26 24 0 0
-   -1 sprites/openttdgui.png 306 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 322 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 338 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 386 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 402 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 418 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 466 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 482 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 498 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 546 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 562 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 578 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 626 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 642 72 01 9 4 0 1
-   -1 sprites/openttdgui.png 658 72 09 23 32 0 1
-   -1 sprites/openttdgui.png 706 72 01 8 4 -31 15
-   -1 sprites/openttdgui.png 722 72 01 9 4 -3 0
-   -1 sprites/openttdgui.png 738 72 09 23 32 -31 0
-   -1 sprites/openttdgui.png 786 72 01 8 4 28 16
-   -1 sprites/openttdgui.png 2 136 01 9 4 0 1
-   -1 sprites/openttdgui.png 18 136 09 23 32 0 1
-   -1 sprites/openttdgui.png 66 136 01 8 4 -31 15
-   -1 sprites/openttdgui.png 82 136 01 9 4 -3 0
-   -1 sprites/openttdgui.png 98 136 09 23 32 -31 0
-   -1 sprites/openttdgui.png 146 136 09 10 10 0 0
-   -1 sprites/openttdgui.png 162 136 01 8 8 0 0
-   -1 sprites/openttdgui.png 178 136 09 9 7 0 0
-   -1 sprites/openttdgui.png 194 136 01 7 9 0 0
-   -1 sprites/openttdgui.png 210 136 01 7 9 0 0
-   -1 sprites/openttdgui.png 226 136 01 10 10 0 0
-   -1 sprites/openttdgui.png 242 136 09 7 7 0 0
-   -1 sprites/openttdgui.png 258 136 09 4 7 1 2
-   -1 sprites/openttdgui.png 274 136 09 4 7 1 2
-   -1 sprites/openttdgui.png 290 136 09 7 4 1 1
-   -1 sprites/openttdgui.png 306 136 09 7 4 2 1
-   -1 sprites/openttdgui.png 322 136 01 8 8 1 1
-   -1 sprites/openttdgui.png 338 136 01 9 9 0 0
-   -1 sprites/openttdgui.png 354 136 01 8 7 0 0
-   -1 sprites/openttdgui.png 370 136 01 8 8 0 0
-   -1 sprites/openttdgui.png 386 136 09 13 20 0 4
-   -1 sprites/openttdgui.png 418 136 03 36 56 0 0
-   -1 sprites/openttdgui.png 482 136 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 136 01 32 32 0 0
-   -1 sprites/openttdgui.png 562 136 09 16 20 0 3
-   -1 sprites/openttdgui.png 594 136 03 43 56 0 0
-   -1 sprites/openttdgui.png 658 136 01 19 20 0 1
-   -1 sprites/openttdgui.png 690 136 01 32 32 0 0
-   -1 sprites/openttdgui.png 738 136 01 20 20 0 0
-   -1 sprites/openttdgui.png 2 200 01 31 31 1 1
-   -1 sprites/openttdgui.png 50 200 09 15 20 0 3
-   -1 sprites/openttdgui.png 82 200 03 36 56 0 0
-   -1 sprites/openttdgui.png 146 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 178 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 226 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 258 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 306 200 09 11 19 0 6
-   -1 sprites/openttdgui.png 338 200 03 36 56 0 0
-   -1 sprites/openttdgui.png 402 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 434 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 482 200 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 200 01 32 32 0 0
-   -1 sprites/openttdgui.png 562 200 09 20 20 0 0
-   -1 sprites/openttdgui.png 594 200 09 20 20 0 0
-   -1 sprites/openttdgui.png 626 200 03 32 52 0 0
-   -1 sprites/openttdgui.png 690 200 09 33 29 -27 -16
-   -1 sprites/openttdgui.png 738 200 09 39 35 -29 -29
-   -1 sprites/openttdgui.png 2 264 09 34 29 1 -17
-   -1 sprites/openttdgui.png 50 264 09 39 34 -3 -28
-   -1 sprites/openttdgui.png 98 264 09 13 20 0 4
-   -1 sprites/openttdgui.png 130 264 03 36 56 0 0
-   -1 sprites/openttdgui.png 194 264 09 13 20 0 4
-   -1 sprites/openttdgui.png 226 264 03 36 56 0 0
-   -1 sprites/openttdgui.png 290 264 01 18 39 -9 -9
-   -1 sprites/openttdgui.png 338 264 01 44 72 -16 -35
-   -1 sprites/openttdgui.png 418 264 01 20 20 0 0
-   -1 sprites/openttdgui.png 450 264 01 44 72 -16 -35
-   -1 sprites/openttdgui.png 530 264 09 18 18 1 1
-   -1 sprites/openttdgui.png 562 264 01 20 20 0 0
-   -1 sprites/openttdgui.png 594 264 01 32 32 0 0
-   -1 sprites/openttdgui.png 642 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 674 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 706 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 738 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 770 264 01 18 18 0 0
-   -1 sprites/openttdgui.png 2 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 34 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 66 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 98 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 130 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 162 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 194 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 226 328 01 18 18 0 0
-   -1 sprites/openttdgui.png 258 328 09 16 16 0 0
-   -1 sprites/openttdgui.png 290 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 322 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 354 328 01 16 16 0 0
-   -1 sprites/openttdgui.png 386 328 09 31 35 0 0
-   -1 sprites/openttdgui.png 434 328 01 30 33 0 0
-   -1 sprites/openttdgui.png 482 328 01 33 36 0 0
-   -1 sprites/openttdgui.png 530 328 01 33 37 0 0
-   -1 sprites/openttdgui.png 578 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 610 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 642 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 674 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 706 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 738 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 770 328 09 18 18 0 0
-   -1 sprites/openttdgui.png 2 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 34 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 66 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 98 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 130 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 162 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 194 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 226 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 258 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 290 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 322 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 354 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 386 376 09 18 18 0 0
-   -1 sprites/openttdgui.png 418 376 01 20 20 0 0
-   -1 sprites/openttdgui.png 450 376 01 22 19 0 0
-   -1 sprites/openttdgui.png 482 376 01 20 20 0 0
-   -1 sprites/openttdgui.png 514 376 01 44 54 -16 -35
-   -1 sprites/openttdgui.png 578 376 01 7 7 3 4
-   -1 sprites/openttdgui.png 594 376 01 7 7 3 4
-   -1 sprites/openttdgui.png 610 376 01 9 10 2 3
-   -1 sprites/openttdgui.png 626 376 01 9 10 2 3
-   -1 sprites/openttdgui.png 642 376 01 7 11 2 1
-   -1 sprites/openttdgui.png 658 376 01 9 9 3 3
-   -1 sprites/openttdgui.png 674 376 09 20 20 0 0
-   -1 sprites/openttdgui.png 706 376 09 20 20 0 0
-   -1 sprites/openttdgui.png 738 376 09 32 32 0 0
-   -1 sprites/openttdgui.png 786 376 09 10 10 0 0
-   -1 sprites/openttdgui.png 2 440 09 10 10 0 0
-   -1 sprites/openttdgui.png 18 440 09 7 7 0 0
-   -1 sprites/openttdgui.png 34 440 09 13 14 4 4
-   -1 sprites/openttdgui.png 66 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 82 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 98 440 09 8 7 0 0
-   -1 sprites/openttdgui.png 114 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 130 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 146 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 162 440 01 8 8 0 0
-   -1 sprites/openttdgui.png 178 440 01 10 8 0 0
-   -1 sprites/openttdgui.png 194 440 09 10 13 0 -2
-   -1 sprites/openttdgui.png 215 440 09 10 9 0 0
-   -1 sprites/openttdgui.png 232 440 09 10 8 0 0
-
-// -- NFO Renum 'settings' --
-// Undo disabling the warning
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
+   -1 sprites/openttdgui.png 8bpp  66    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 146    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 226    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 306    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 386    8  64  31 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 466    8  64  39 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 546    8  64  31 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 626    8  64  23 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 706    8  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp   2   72  64  23 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp  82   72  64  31 -31   7 normal
+   -1 sprites/openttdgui.png 8bpp 162   72  64  39 -31  -1 normal
+   -1 sprites/openttdgui.png 8bpp 242   72  23  26   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 274   72  24  26   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 306   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 322   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 338   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 386   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 402   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 418   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 466   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 482   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 498   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 546   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 562   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 578   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 626   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp 642   72   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 658   72  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 706   72   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp 722   72   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp 738   72  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 786   72   4   8  28  16 normal
+   -1 sprites/openttdgui.png 8bpp   2  136   4   9   0   1 normal
+   -1 sprites/openttdgui.png 8bpp  18  136  32  23   0   1 normal
+   -1 sprites/openttdgui.png 8bpp  66  136   4   8 -31  15 normal
+   -1 sprites/openttdgui.png 8bpp  82  136   4   9  -3   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  136  32  23 -31   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  136  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  136   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  136   7   9   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  136   9   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 210  136   9   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  136  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 242  136   7   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  136   7   4   1   2 normal
+   -1 sprites/openttdgui.png 8bpp 274  136   7   4   1   2 normal
+   -1 sprites/openttdgui.png 8bpp 290  136   4   7   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 306  136   4   7   2   1 normal
+   -1 sprites/openttdgui.png 8bpp 322  136   8   8   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 338  136   9   9   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  136   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 370  136   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  136  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 418  136  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  136  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  136  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 562  136  20  16   0   3 normal
+   -1 sprites/openttdgui.png 8bpp 594  136  56  43   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 658  136  20  19   0   1 normal
+   -1 sprites/openttdgui.png 8bpp 690  136  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  136  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  200  31  31   1   1 normal
+   -1 sprites/openttdgui.png 8bpp  50  200  20  15   0   3 normal
+   -1 sprites/openttdgui.png 8bpp  82  200  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 306  200  19  11   0   6 normal
+   -1 sprites/openttdgui.png 8bpp 338  200  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 402  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 434  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  200  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 562  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 594  200  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 626  200  52  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 690  200  29  33 -27 -16 normal
+   -1 sprites/openttdgui.png 8bpp 738  200  35  39 -29 -29 normal
+   -1 sprites/openttdgui.png 8bpp   2  264  29  34   1 -17 normal
+   -1 sprites/openttdgui.png 8bpp  50  264  34  39  -3 -28 normal
+   -1 sprites/openttdgui.png 8bpp  98  264  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 130  264  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  264  20  13   0   4 normal
+   -1 sprites/openttdgui.png 8bpp 226  264  56  36   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  264  39  18  -9  -9 normal
+   -1 sprites/openttdgui.png 8bpp 338  264  72  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 418  264  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 450  264  72  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 530  264  18  18   1   1 normal
+   -1 sprites/openttdgui.png 8bpp 562  264  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 594  264  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 642  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 674  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 770  264  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  66  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 322  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  328  16  16   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  328  35  31   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 434  328  33  30   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  328  36  33   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 530  328  37  33   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 578  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 610  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 642  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 674  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 770  328  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  66  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 226  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 258  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 290  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 322  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 354  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 386  376  18  18   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 418  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 450  376  19  22   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 482  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 514  376  54  44 -16 -35 normal
+   -1 sprites/openttdgui.png 8bpp 578  376   7   7   3   4 normal
+   -1 sprites/openttdgui.png 8bpp 594  376   7   7   3   4 normal
+   -1 sprites/openttdgui.png 8bpp 610  376  10   9   2   3 normal
+   -1 sprites/openttdgui.png 8bpp 626  376  10   9   2   3 normal
+   -1 sprites/openttdgui.png 8bpp 642  376  11   7   2   1 normal
+   -1 sprites/openttdgui.png 8bpp 658  376   9   9   3   3 normal
+   -1 sprites/openttdgui.png 8bpp 674  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 706  376  20  20   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 738  376  32  32   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 786  376  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp   2  440  10  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  18  440   7   7   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  34  440  14  13   4   4 normal
+   -1 sprites/openttdgui.png 8bpp  66  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  82  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp  98  440   7   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 114  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 130  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 146  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 162  440   8   8   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 178  440   8  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 194  440  13  10   0  -2 normal
+   -1 sprites/openttdgui.png 8bpp 215  440   9  10   0   0 normal
+   -1 sprites/openttdgui.png 8bpp 232  440   8  10   0   0 normal

media/extra_grf/rivers/arctic.nfo

@@ -8,271 +8,271 @@
 //
    -1 * 0	 0C "Arctic river graphics by andythenorth (Andrew Parkhouse)"
    -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png  10  10 09 19 38  -5  0
-   -1 sprites/arctic_snowy.png  58  10 09 18 38  -5 13
-   -1 sprites/arctic_snowy.png 106  10 09 18 38 -31 13
-   -1 sprites/arctic_snowy.png 154  10 09 19 38 -31  0
-   -1 sprites/arctic_snowy.png 202  10 09  9 19  14 11
-   -1 sprites/arctic_snowy.png 234  10 09  9 16  -7 22
-   -1 sprites/arctic_snowy.png 266  10 09  9 19 -31 11
-   -1 sprites/arctic_snowy.png 298  10 09  9 16  -7  0
-   -1 sprites/arctic_snowy.png 330  10 09  6  8  25 13
-   -1 sprites/arctic_snowy.png 346  10 09  4 12  -5 27
-   -1 sprites/arctic_snowy.png 364  10 09  6  8 -31 13
-   -1 sprites/arctic_snowy.png 380  10 09  5 12  -5  0
+   -1 sprites/arctic_snowy.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   10  12   5  -5   0 normal
 
-   -1 sprites/arctic_snowy.png  10  40 09 11 40  -7  0
-   -1 sprites/arctic_snowy.png  58  40 09 18 39  -6  5
-   -1 sprites/arctic_snowy.png 106  40 09 11 38 -31 12
-   -1 sprites/arctic_snowy.png 154  40 09 18 39 -31  0
-   -1 sprites/arctic_snowy.png 202  40 09  6 20  13  5
-   -1 sprites/arctic_snowy.png 234  40 09  7 13  -6 16
-   -1 sprites/arctic_snowy.png 266  40 09  6 20 -31 12
-   -1 sprites/arctic_snowy.png 298  40 09  7 13  -5  0
-   -1 sprites/arctic_snowy.png 330  40 09  5  8  25  6
-   -1 sprites/arctic_snowy.png 346  40 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364  40 09  4  8 -31 13
-   -1 sprites/arctic_snowy.png 380  40 09  4 15  -7  0
+   -1 sprites/arctic_snowy.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   40  15   4  -7   0 normal
 
-   -1 sprites/arctic_snowy.png  10  70 09 20 38  -5 -8
-   -1 sprites/arctic_snowy.png  58  70 09 26 38  -5  5
-   -1 sprites/arctic_snowy.png 106  70 09 20 37 -31 11
-   -1 sprites/arctic_snowy.png 154  70 09 27 38 -31 -8
-   -1 sprites/arctic_snowy.png 202  70 09  9 16  17  3
-   -1 sprites/arctic_snowy.png 234  70 09  9 15  -7 22
-   -1 sprites/arctic_snowy.png 266  70 09  9 16 -31 11
-   -1 sprites/arctic_snowy.png 298  70 09  9 15  -6 -8
-   -1 sprites/arctic_snowy.png 330  70 09  7  8  25  5
-   -1 sprites/arctic_snowy.png 346  70 09  5 10  -4 27
-   -1 sprites/arctic_snowy.png 364  70 09  7  8 -31 11
-   -1 sprites/arctic_snowy.png 380  70 09  6 12  -5 -8
+   -1 sprites/arctic_snowy.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 380   70  12   6  -5  -8 normal
 
-   -1 sprites/arctic_snowy.png  10 100 09 18 39  -6  0
-   -1 sprites/arctic_snowy.png  58 100 09 11 38  -5 12
-   -1 sprites/arctic_snowy.png 106 100 09 18 39 -31  5
-   -1 sprites/arctic_snowy.png 154 100 09 11 40 -32  0
-   -1 sprites/arctic_snowy.png 202 100 09  6 20  13 12
-   -1 sprites/arctic_snowy.png 234 100 09  7 13  -5 16
-   -1 sprites/arctic_snowy.png 266 100 09  6 20 -31  5
-   -1 sprites/arctic_snowy.png 298 100 09  7 13  -6  0
-   -1 sprites/arctic_snowy.png 330 100 09  4  8  26 13
-   -1 sprites/arctic_snowy.png 346 100 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 100 09  5  8 -31  6
-   -1 sprites/arctic_snowy.png 380 100 09  4 15  -6  0
+   -1 sprites/arctic_snowy.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  100  15   4  -6   0 normal
 
-   -1 sprites/arctic_snowy.png  10 130 09 27 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 130 09 20 37  -4 11
-   -1 sprites/arctic_snowy.png 106 130 09 26 37 -31  5
-   -1 sprites/arctic_snowy.png 154 130 09 20 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 130 09  9 16  17 11
-   -1 sprites/arctic_snowy.png 234 130 09  9 15  -6 22
-   -1 sprites/arctic_snowy.png 266 130 09  9 16 -31  3
-   -1 sprites/arctic_snowy.png 298 130 09  9 15  -7 -8
-   -1 sprites/arctic_snowy.png 330 130 09  7  8  25 11
-   -1 sprites/arctic_snowy.png 346 130 09  5 10  -4 26
-   -1 sprites/arctic_snowy.png 364 130 09  7  8 -31  5
-   -1 sprites/arctic_snowy.png 380 130 09  6 12  -5 -8
+   -1 sprites/arctic_snowy.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  130  12   6  -5  -8 normal
    -1 * 7	 02 05 30 01 00 00 00
 
    -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png  10  10 09 19 38  -5  0
-   -1 sprites/arctic_brown.png  58  10 09 18 38  -5 13
-   -1 sprites/arctic_brown.png 106  10 09 18 38 -31 13
-   -1 sprites/arctic_brown.png 154  10 09 19 38 -31  0
-   -1 sprites/arctic_brown.png 202  10 09  9 19  14 11
-   -1 sprites/arctic_brown.png 234  10 09  9 16  -7 22
-   -1 sprites/arctic_brown.png 266  10 09  9 19 -31 11
-   -1 sprites/arctic_brown.png 298  10 09  9 16  -7  0
-   -1 sprites/arctic_brown.png 330  10 09  6  8  25 13
-   -1 sprites/arctic_brown.png 346  10 09  4 12  -5 27
-   -1 sprites/arctic_brown.png 364  10 09  6  8 -31 13
-   -1 sprites/arctic_brown.png 380  10 09  5 12  -5  0
+   -1 sprites/arctic_brown.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/arctic_brown.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380   10  12   5  -5   0 normal
 
-   -1 sprites/arctic_brown.png  10  40 09 11 40  -7  0
-   -1 sprites/arctic_brown.png  58  40 09 18 39  -6  5
-   -1 sprites/arctic_brown.png 106  40 09 11 38 -31 12
-   -1 sprites/arctic_brown.png 154  40 09 18 39 -31  0
-   -1 sprites/arctic_brown.png 202  40 09  6 20  13  5
-   -1 sprites/arctic_brown.png 234  40 09  7 13  -6 16
-   -1 sprites/arctic_brown.png 266  40 09  6 20 -31 12
-   -1 sprites/arctic_brown.png 298  40 09  7 13  -5  0
-   -1 sprites/arctic_brown.png 330  40 09  5  8  25  6
-   -1 sprites/arctic_brown.png 346  40 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364  40 09  4  8 -31 13
-   -1 sprites/arctic_brown.png 380  40 09  4 15  -7  0
+   -1 sprites/arctic_brown.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/arctic_brown.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/arctic_brown.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380   40  15   4  -7   0 normal
 
-   -1 sprites/arctic_brown.png  10  70 09 20 38  -5 -8
-   -1 sprites/arctic_brown.png  58  70 09 26 38  -5  5
-   -1 sprites/arctic_brown.png 106  70 09 20 37 -31 11
-   -1 sprites/arctic_brown.png 154  70 09 27 38 -31 -8
-   -1 sprites/arctic_brown.png 202  70 09  9 16  17  3
-   -1 sprites/arctic_brown.png 234  70 09  9 15  -7 22
-   -1 sprites/arctic_brown.png 266  70 09  9 16 -31 11
-   -1 sprites/arctic_brown.png 298  70 09  9 15  -6 -8
-   -1 sprites/arctic_brown.png 330  70 09  7  8  25  5
-   -1 sprites/arctic_brown.png 346  70 09  5 10  -4 27
-   -1 sprites/arctic_brown.png 364  70 09  7  8 -31 11
-   -1 sprites/arctic_brown.png 380  70 09  6 12  -5 -8
+   -1 sprites/arctic_brown.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/arctic_brown.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/arctic_brown.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 380   70  12   6  -5  -8 normal
 
-   -1 sprites/arctic_brown.png  10 100 09 18 39  -6  0
-   -1 sprites/arctic_brown.png  58 100 09 11 38  -5 12
-   -1 sprites/arctic_brown.png 106 100 09 18 39 -31  5
-   -1 sprites/arctic_brown.png 154 100 09 11 40 -32  0
-   -1 sprites/arctic_brown.png 202 100 09  6 20  13 12
-   -1 sprites/arctic_brown.png 234 100 09  7 13  -5 16
-   -1 sprites/arctic_brown.png 266 100 09  6 20 -31  5
-   -1 sprites/arctic_brown.png 298 100 09  7 13  -6  0
-   -1 sprites/arctic_brown.png 330 100 09  4  8  26 13
-   -1 sprites/arctic_brown.png 346 100 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 100 09  5  8 -31  6
-   -1 sprites/arctic_brown.png 380 100 09  4 15  -6  0
+   -1 sprites/arctic_brown.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/arctic_brown.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/arctic_brown.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/arctic_brown.png 8bpp 380  100  15   4  -6   0 normal
 
-   -1 sprites/arctic_brown.png  10 130 09 27 38  -5 -8
-   -1 sprites/arctic_brown.png  58 130 09 20 37  -4 11
-   -1 sprites/arctic_brown.png 106 130 09 26 37 -31  5
-   -1 sprites/arctic_brown.png 154 130 09 20 38 -31 -8
-   -1 sprites/arctic_brown.png 202 130 09  9 16  17 11
-   -1 sprites/arctic_brown.png 234 130 09  9 15  -6 22
-   -1 sprites/arctic_brown.png 266 130 09  9 16 -31  3
-   -1 sprites/arctic_brown.png 298 130 09  9 15  -7 -8
-   -1 sprites/arctic_brown.png 330 130 09  7  8  25 11
-   -1 sprites/arctic_brown.png 346 130 09  5 10  -4 26
-   -1 sprites/arctic_brown.png 364 130 09  7  8 -31  5
-   -1 sprites/arctic_brown.png 380 130 09  6 12  -5 -8
+   -1 sprites/arctic_brown.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/arctic_brown.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/arctic_brown.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/arctic_brown.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/arctic_brown.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 380  130  12   6  -5  -8 normal
    -1 * 7	 02 05 31 01 00 00 00
 
    -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_snowy.png  10 210 09 19 38  -5  0
-   -1 sprites/arctic_snowy.png  58 210 09 18 38  -5 13
-   -1 sprites/arctic_snowy.png 106 210 09 18 38 -31 13
-   -1 sprites/arctic_snowy.png 154 210 09 19 38 -31  0
-   -1 sprites/arctic_snowy.png 202 210 09  9 19  14 11
-   -1 sprites/arctic_snowy.png 234 210 09  9 16  -7 22
-   -1 sprites/arctic_snowy.png 266 210 09  9 19 -31 11
-   -1 sprites/arctic_snowy.png 298 210 09  9 16  -7  0
-   -1 sprites/arctic_snowy.png 330 210 09  6  8  25 13
-   -1 sprites/arctic_snowy.png 346 210 09  4 12  -5 27
-   -1 sprites/arctic_snowy.png 364 210 09  6  8 -31 13
-   -1 sprites/arctic_snowy.png 380 210 09  5 12  -5  0
+   -1 sprites/arctic_snowy.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  210  12   5  -5   0 normal
 
-   -1 sprites/arctic_snowy.png  10 240 09 11 40  -7  0
-   -1 sprites/arctic_snowy.png  58 240 09 18 39  -6  5
-   -1 sprites/arctic_snowy.png 106 240 09 11 38 -31 12
-   -1 sprites/arctic_snowy.png 154 240 09 18 39 -31  0
-   -1 sprites/arctic_snowy.png 202 240 09  6 20  13  5
-   -1 sprites/arctic_snowy.png 234 240 09  7 13  -6 16
-   -1 sprites/arctic_snowy.png 266 240 09  6 20 -31 12
-   -1 sprites/arctic_snowy.png 298 240 09  7 13  -5  0
-   -1 sprites/arctic_snowy.png 330 240 09  5  8  25  6
-   -1 sprites/arctic_snowy.png 346 240 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 240 09  4  8 -31 13
-   -1 sprites/arctic_snowy.png 380 240 09  4 15  -7  0
+   -1 sprites/arctic_snowy.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  240  15   4  -7   0 normal
 
-   -1 sprites/arctic_snowy.png  10 270 09 20 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 270 09 26 38  -5  5
-   -1 sprites/arctic_snowy.png 106 270 09 20 37 -31 11
-   -1 sprites/arctic_snowy.png 154 270 09 27 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 270 09  9 16  17  3
-   -1 sprites/arctic_snowy.png 234 270 09  9 15  -7 22
-   -1 sprites/arctic_snowy.png 266 270 09  9 16 -31 11
-   -1 sprites/arctic_snowy.png 298 270 09  9 15  -6 -8
-   -1 sprites/arctic_snowy.png 330 270 09  7  8  25  5
-   -1 sprites/arctic_snowy.png 346 270 09  5 10  -4 27
-   -1 sprites/arctic_snowy.png 364 270 09  7  8 -31 11
-   -1 sprites/arctic_snowy.png 380 270 09  6 12  -5 -8
+   -1 sprites/arctic_snowy.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  270  12   6  -5  -8 normal
 
-   -1 sprites/arctic_snowy.png  10 300 09 18 39  -6  0
-   -1 sprites/arctic_snowy.png  58 300 09 11 38  -5 12
-   -1 sprites/arctic_snowy.png 106 300 09 18 39 -31  5
-   -1 sprites/arctic_snowy.png 154 300 09 11 40 -32  0
-   -1 sprites/arctic_snowy.png 202 300 09  6 20  13 12
-   -1 sprites/arctic_snowy.png 234 300 09  7 13  -5 16
-   -1 sprites/arctic_snowy.png 266 300 09  6 20 -31  5
-   -1 sprites/arctic_snowy.png 298 300 09  7 13  -6  0
-   -1 sprites/arctic_snowy.png 330 300 09  4  8  26 13
-   -1 sprites/arctic_snowy.png 346 300 09  3 12  -5 20
-   -1 sprites/arctic_snowy.png 364 300 09  5  8 -31  6
-   -1 sprites/arctic_snowy.png 380 300 09  4 15  -6  0
+   -1 sprites/arctic_snowy.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  300  15   4  -6   0 normal
 
-   -1 sprites/arctic_snowy.png  10 330 09 27 38  -5 -8
-   -1 sprites/arctic_snowy.png  58 330 09 20 37  -4 11
-   -1 sprites/arctic_snowy.png 106 330 09 26 37 -31  5
-   -1 sprites/arctic_snowy.png 154 330 09 20 38 -31 -8
-   -1 sprites/arctic_snowy.png 202 330 09  9 16  17 11
-   -1 sprites/arctic_snowy.png 234 330 09  9 15  -6 22
-   -1 sprites/arctic_snowy.png 266 330 09  9 16 -31  3
-   -1 sprites/arctic_snowy.png 298 330 09  9 15  -7 -8
-   -1 sprites/arctic_snowy.png 330 330 09  7  8  25 11
-   -1 sprites/arctic_snowy.png 346 330 09  5 10  -4 26
-   -1 sprites/arctic_snowy.png 364 330 09  7  8 -31  5
-   -1 sprites/arctic_snowy.png 380 330 09  6 12  -5 -8
+   -1 sprites/arctic_snowy.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/arctic_snowy.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/arctic_snowy.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/arctic_snowy.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/arctic_snowy.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/arctic_snowy.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/arctic_snowy.png 8bpp 380  330  12   6  -5  -8 normal
    -1 * 7	 02 05 32 01 00 00 00
 
    -1 * 4	 01 05 01 3C
-   -1 sprites/arctic_brown.png  10 210 09 19 38  -5  0
-   -1 sprites/arctic_brown.png  58 210 09 18 38  -5 13
-   -1 sprites/arctic_brown.png 106 210 09 18 38 -31 13
-   -1 sprites/arctic_brown.png 154 210 09 19 38 -31  0
-   -1 sprites/arctic_brown.png 202 210 09  9 19  14 11
-   -1 sprites/arctic_brown.png 234 210 09  9 16  -7 22
-   -1 sprites/arctic_brown.png 266 210 09  9 19 -31 11
-   -1 sprites/arctic_brown.png 298 210 09  9 16  -7  0
-   -1 sprites/arctic_brown.png 330 210 09  6  8  25 13
-   -1 sprites/arctic_brown.png 346 210 09  4 12  -5 27
-   -1 sprites/arctic_brown.png 364 210 09  6  8 -31 13
-   -1 sprites/arctic_brown.png 380 210 09  5 12  -5  0
+   -1 sprites/arctic_brown.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/arctic_brown.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380  210  12   5  -5   0 normal
 
-   -1 sprites/arctic_brown.png  10 240 09 11 40  -7  0
-   -1 sprites/arctic_brown.png  58 240 09 18 39  -6  5
-   -1 sprites/arctic_brown.png 106 240 09 11 38 -31 12
-   -1 sprites/arctic_brown.png 154 240 09 18 39 -31  0
-   -1 sprites/arctic_brown.png 202 240 09  6 20  13  5
-   -1 sprites/arctic_brown.png 234 240 09  7 13  -6 16
-   -1 sprites/arctic_brown.png 266 240 09  6 20 -31 12
-   -1 sprites/arctic_brown.png 298 240 09  7 13  -5  0
-   -1 sprites/arctic_brown.png 330 240 09  5  8  25  6
-   -1 sprites/arctic_brown.png 346 240 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 240 09  4  8 -31 13
-   -1 sprites/arctic_brown.png 380 240 09  4 15  -7  0
+   -1 sprites/arctic_brown.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/arctic_brown.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/arctic_brown.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/arctic_brown.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/arctic_brown.png 8bpp 380  240  15   4  -7   0 normal
 
-   -1 sprites/arctic_brown.png  10 270 09 20 38  -5 -8
-   -1 sprites/arctic_brown.png  58 270 09 26 38  -5  5
-   -1 sprites/arctic_brown.png 106 270 09 20 37 -31 11
-   -1 sprites/arctic_brown.png 154 270 09 27 38 -31 -8
-   -1 sprites/arctic_brown.png 202 270 09  9 16  17  3
-   -1 sprites/arctic_brown.png 234 270 09  9 15  -7 22
-   -1 sprites/arctic_brown.png 266 270 09  9 16 -31 11
-   -1 sprites/arctic_brown.png 298 270 09  9 15  -6 -8
-   -1 sprites/arctic_brown.png 330 270 09  7  8  25  5
-   -1 sprites/arctic_brown.png 346 270 09  5 10  -4 27
-   -1 sprites/arctic_brown.png 364 270 09  7  8 -31 11
-   -1 sprites/arctic_brown.png 380 270 09  6 12  -5 -8
+   -1 sprites/arctic_brown.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/arctic_brown.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/arctic_brown.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/arctic_brown.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/arctic_brown.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/arctic_brown.png 8bpp 380  270  12   6  -5  -8 normal
 
-   -1 sprites/arctic_brown.png  10 300 09 18 39  -6  0
-   -1 sprites/arctic_brown.png  58 300 09 11 38  -5 12
-   -1 sprites/arctic_brown.png 106 300 09 18 39 -31  5
-   -1 sprites/arctic_brown.png 154 300 09 11 40 -32  0
-   -1 sprites/arctic_brown.png 202 300 09  6 20  13 12
-   -1 sprites/arctic_brown.png 234 300 09  7 13  -5 16
-   -1 sprites/arctic_brown.png 266 300 09  6 20 -31  5
-   -1 sprites/arctic_brown.png 298 300 09  7 13  -6  0
-   -1 sprites/arctic_brown.png 330 300 09  4  8  26 13
-   -1 sprites/arctic_brown.png 346 300 09  3 12  -5 20
-   -1 sprites/arctic_brown.png 364 300 09  5  8 -31  6
-   -1 sprites/arctic_brown.png 380 300 09  4 15  -6  0
+   -1 sprites/arctic_brown.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/arctic_brown.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/arctic_brown.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/arctic_brown.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/arctic_brown.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/arctic_brown.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/arctic_brown.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/arctic_brown.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/arctic_brown.png 8bpp 380  300  15   4  -6   0 normal
 
-   -1 sprites/arctic_brown.png  10 330 09 27 38  -5 -8
-   -1 sprites/arctic_brown.png  58 330 09 20 37  -4 11
-   -1 sprites/arctic_brown.png 106 330 09 26 37 -31  5
-   -1 sprites/arctic_brown.png 154 330 09 20 38 -31 -8
-   -1 sprites/arctic_brown.png 202 330 09  9 16  17 11
-   -1 sprites/arctic_brown.png 234 330 09  9 15  -6 22
-   -1 sprites/arctic_brown.png 266 330 09  9 16 -31  3
-   -1 sprites/arctic_brown.png 298 330 09  9 15  -7 -8
-   -1 sprites/arctic_brown.png 330 330 09  7  8  25 11
-   -1 sprites/arctic_brown.png 346 330 09  5 10  -4 26
-   -1 sprites/arctic_brown.png 364 330 09  7  8 -31  5
-   -1 sprites/arctic_brown.png 380 330 09  6 12  -5 -8
+   -1 sprites/arctic_brown.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/arctic_brown.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/arctic_brown.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/arctic_brown.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/arctic_brown.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/arctic_brown.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/arctic_brown.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/arctic_brown.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/arctic_brown.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/arctic_brown.png 8bpp 380  330  12   6  -5  -8 normal
    -1 * 7	 02 05 33 01 00 00 00
 
    -1 * 14	 02 05 34 81 81 00 FF 01 30 00 04 04 31 00

media/extra_grf/rivers/rapids.nfo

@@ -8,115 +8,115 @@
 //
    -1 * 0	 0C "Rapid graphics"
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10  10 09 23 64 -31  0
-   -1 sprites/rapids.png  90  10 09 39 64 -31 -8
-   -1 sprites/rapids.png 170  10 09 23 64 -31  0
-   -1 sprites/rapids.png 250  10 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10   10  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90   10  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170   10  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250   10  64  39 -31  -8 normal
    -1 * 7	 02 05 00 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10  60 09 23 64 -31  0
-   -1 sprites/rapids.png  90  60 09 39 64 -31 -8
-   -1 sprites/rapids.png 170  60 09 23 64 -31  0
-   -1 sprites/rapids.png 250  60 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10   60  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90   60  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170   60  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250   60  64  39 -31  -8 normal
    -1 * 7	 02 05 01 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 110 09 23 64 -31  0
-   -1 sprites/rapids.png  90 110 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 110 09 23 64 -31  0
-   -1 sprites/rapids.png 250 110 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  110  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  110  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  110  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  110  64  39 -31  -8 normal
    -1 * 7	 02 05 02 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 160 09 23 64 -31  0
-   -1 sprites/rapids.png  90 160 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 160 09 23 64 -31  0
-   -1 sprites/rapids.png 250 160 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  160  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  160  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  160  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  160  64  39 -31  -8 normal
    -1 * 7	 02 05 03 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 210 09 23 64 -31  0
-   -1 sprites/rapids.png  90 210 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 210 09 23 64 -31  0
-   -1 sprites/rapids.png 250 210 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  210  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  210  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  210  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  210  64  39 -31  -8 normal
    -1 * 7	 02 05 04 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 260 09 23 64 -31  0
-   -1 sprites/rapids.png  90 260 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 260 09 23 64 -31  0
-   -1 sprites/rapids.png 250 260 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  260  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  260  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  260  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  260  64  39 -31  -8 normal
    -1 * 7	 02 05 05 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 310 09 23 64 -31  0
-   -1 sprites/rapids.png  90 310 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 310 09 23 64 -31  0
-   -1 sprites/rapids.png 250 310 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  310  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  310  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  310  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  310  64  39 -31  -8 normal
    -1 * 7	 02 05 06 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 360 09 23 64 -31  0
-   -1 sprites/rapids.png  90 360 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 360 09 23 64 -31  0
-   -1 sprites/rapids.png 250 360 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  360  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  360  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  360  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  360  64  39 -31  -8 normal
    -1 * 7	 02 05 07 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 410 09 23 64 -31  0
-   -1 sprites/rapids.png  90 410 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 410 09 23 64 -31  0
-   -1 sprites/rapids.png 250 410 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  410  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  410  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  410  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  410  64  39 -31  -8 normal
    -1 * 7	 02 05 08 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 460 09 23 64 -31  0
-   -1 sprites/rapids.png  90 460 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 460 09 23 64 -31  0
-   -1 sprites/rapids.png 250 460 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  460  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  460  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  460  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  460  64  39 -31  -8 normal
    -1 * 7	 02 05 09 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 510 09 23 64 -31  0
-   -1 sprites/rapids.png  90 510 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 510 09 23 64 -31  0
-   -1 sprites/rapids.png 250 510 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  510  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  510  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  510  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  510  64  39 -31  -8 normal
    -1 * 7	 02 05 0A 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 560 09 23 64 -31  0
-   -1 sprites/rapids.png  90 560 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 560 09 23 64 -31  0
-   -1 sprites/rapids.png 250 560 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  560  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  560  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  560  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  560  64  39 -31  -8 normal
    -1 * 7	 02 05 0B 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 610 09 23 64 -31  0
-   -1 sprites/rapids.png  90 610 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 610 09 23 64 -31  0
-   -1 sprites/rapids.png 250 610 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  610  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  610  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  610  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  610  64  39 -31  -8 normal
    -1 * 7	 02 05 0C 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 660 09 23 64 -31  0
-   -1 sprites/rapids.png  90 660 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 660 09 23 64 -31  0
-   -1 sprites/rapids.png 250 660 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  660  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  660  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  660  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  660  64  39 -31  -8 normal
    -1 * 7	 02 05 0D 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 710 09 23 64 -31  0
-   -1 sprites/rapids.png  90 710 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 710 09 23 64 -31  0
-   -1 sprites/rapids.png 250 710 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  710  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  710  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  710  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  710  64  39 -31  -8 normal
    -1 * 7	 02 05 0E 01 00 00 00
 
    -1 * 4	 01 05 01 04
-   -1 sprites/rapids.png  10 760 09 23 64 -31  0
-   -1 sprites/rapids.png  90 760 09 39 64 -31 -8
-   -1 sprites/rapids.png 170 760 09 23 64 -31  0
-   -1 sprites/rapids.png 250 760 09 39 64 -31 -8
+   -1 sprites/rapids.png 8bpp  10  760  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp  90  760  64  39 -31  -8 normal
+   -1 sprites/rapids.png 8bpp 170  760  64  23 -31   0 normal
+   -1 sprites/rapids.png 8bpp 250  760  64  39 -31  -8 normal
    -1 * 7	 02 05 0F 01 00 00 00
 
    -1 * 39	 02 05 10 80 00 01 10

media/extra_grf/rivers/temperate.nfo

@@ -8,137 +8,137 @@
 //
    -1 * 0	 0C "Temperate river graphics by andythenorth (Andrew Parkhouse)"
    -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png  10  10 09 19 38  -5  0
-   -1 sprites/temperate.png  58  10 09 18 38  -5 13
-   -1 sprites/temperate.png 106  10 09 18 38 -31 13
-   -1 sprites/temperate.png 154  10 09 19 38 -31  0
-   -1 sprites/temperate.png 202  10 09  9 19  14 11
-   -1 sprites/temperate.png 234  10 09  9 16  -7 22
-   -1 sprites/temperate.png 266  10 09  9 19 -31 11
-   -1 sprites/temperate.png 298  10 09  9 16  -7  0
-   -1 sprites/temperate.png 330  10 09  6  8  25 13
-   -1 sprites/temperate.png 346  10 09  4 12  -5 27
-   -1 sprites/temperate.png 364  10 09  6  8 -31 13
-   -1 sprites/temperate.png 380  10 09  5 12  -5  0
+   -1 sprites/temperate.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/temperate.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/temperate.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/temperate.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/temperate.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/temperate.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/temperate.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/temperate.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380   10  12   5  -5   0 normal
 
-   -1 sprites/temperate.png  10  40 09 11 40  -7  0
-   -1 sprites/temperate.png  58  40 09 18 39  -6  5
-   -1 sprites/temperate.png 106  40 09 11 38 -31 12
-   -1 sprites/temperate.png 154  40 09 18 39 -31  0
-   -1 sprites/temperate.png 202  40 09  6 20  13  5
-   -1 sprites/temperate.png 234  40 09  7 13  -6 16
-   -1 sprites/temperate.png 266  40 09  6 20 -31 12
-   -1 sprites/temperate.png 298  40 09  7 13  -5  0
-   -1 sprites/temperate.png 330  40 09  5  8  25  6
-   -1 sprites/temperate.png 346  40 09  3 12  -5 20
-   -1 sprites/temperate.png 364  40 09  4  8 -31 13
-   -1 sprites/temperate.png 380  40 09  4 15  -7  0
+   -1 sprites/temperate.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/temperate.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/temperate.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/temperate.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/temperate.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/temperate.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/temperate.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/temperate.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/temperate.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380   40  15   4  -7   0 normal
 
-   -1 sprites/temperate.png  10  70 09 20 38  -5 -8
-   -1 sprites/temperate.png  58  70 09 26 38  -5  5
-   -1 sprites/temperate.png 106  70 09 20 37 -31 11
-   -1 sprites/temperate.png 154  70 09 27 38 -31 -8
-   -1 sprites/temperate.png 202  70 09  9 16  17  3
-   -1 sprites/temperate.png 234  70 09  9 15  -7 22
-   -1 sprites/temperate.png 266  70 09  9 16 -31 11
-   -1 sprites/temperate.png 298  70 09  9 15  -6 -8
-   -1 sprites/temperate.png 330  70 09  7  8  25  5
-   -1 sprites/temperate.png 346  70 09  5 10  -4 27
-   -1 sprites/temperate.png 364  70 09  7  8 -31 11
-   -1 sprites/temperate.png 380  70 09  6 12  -5 -8
+   -1 sprites/temperate.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/temperate.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/temperate.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/temperate.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/temperate.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/temperate.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/temperate.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/temperate.png 8bpp 380   70  12   6  -5  -8 normal
 
-   -1 sprites/temperate.png  10 100 09 18 39  -6  0
-   -1 sprites/temperate.png  58 100 09 11 38  -5 12
-   -1 sprites/temperate.png 106 100 09 18 39 -31  5
-   -1 sprites/temperate.png 154 100 09 11 40 -32  0
-   -1 sprites/temperate.png 202 100 09  6 20  13 12
-   -1 sprites/temperate.png 234 100 09  7 13  -5 16
-   -1 sprites/temperate.png 266 100 09  6 20 -31  5
-   -1 sprites/temperate.png 298 100 09  7 13  -6  0
-   -1 sprites/temperate.png 330 100 09  4  8  26 13
-   -1 sprites/temperate.png 346 100 09  3 12  -5 20
-   -1 sprites/temperate.png 364 100 09  5  8 -31  6
-   -1 sprites/temperate.png 380 100 09  4 15  -6  0
+   -1 sprites/temperate.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/temperate.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/temperate.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/temperate.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/temperate.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/temperate.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/temperate.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/temperate.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/temperate.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/temperate.png 8bpp 380  100  15   4  -6   0 normal
 
-   -1 sprites/temperate.png  10 130 09 27 38  -5 -8
-   -1 sprites/temperate.png  58 130 09 20 37  -4 11
-   -1 sprites/temperate.png 106 130 09 26 37 -31  5
-   -1 sprites/temperate.png 154 130 09 20 38 -31 -8
-   -1 sprites/temperate.png 202 130 09  9 16  17 11
-   -1 sprites/temperate.png 234 130 09  9 15  -6 22
-   -1 sprites/temperate.png 266 130 09  9 16 -31  3
-   -1 sprites/temperate.png 298 130 09  9 15  -7 -8
-   -1 sprites/temperate.png 330 130 09  7  8  25 11
-   -1 sprites/temperate.png 346 130 09  5 10  -4 26
-   -1 sprites/temperate.png 364 130 09  7  8 -31  5
-   -1 sprites/temperate.png 380 130 09  6 12  -5 -8
+   -1 sprites/temperate.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/temperate.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/temperate.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/temperate.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/temperate.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/temperate.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/temperate.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/temperate.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/temperate.png 8bpp 380  130  12   6  -5  -8 normal
    -1 * 7	 02 05 20 01 00 00 00
 
    -1 * 4	 01 05 01 3C
-   -1 sprites/temperate.png  10 210 09 19 38  -5  0
-   -1 sprites/temperate.png  58 210 09 18 38  -5 13
-   -1 sprites/temperate.png 106 210 09 18 38 -31 13
-   -1 sprites/temperate.png 154 210 09 19 38 -31  0
-   -1 sprites/temperate.png 202 210 09  9 19  14 11
-   -1 sprites/temperate.png 234 210 09  9 16  -7 22
-   -1 sprites/temperate.png 266 210 09  9 19 -31 11
-   -1 sprites/temperate.png 298 210 09  9 16  -7  0
-   -1 sprites/temperate.png 330 210 09  6  8  25 13
-   -1 sprites/temperate.png 346 210 09  4 12  -5 27
-   -1 sprites/temperate.png 364 210 09  6  8 -31 13
-   -1 sprites/temperate.png 380 210 09  5 12  -5  0
+   -1 sprites/temperate.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/temperate.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/temperate.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/temperate.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/temperate.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/temperate.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/temperate.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/temperate.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380  210  12   5  -5   0 normal
 
-   -1 sprites/temperate.png  10 240 09 11 40  -7  0
-   -1 sprites/temperate.png  58 240 09 18 39  -6  5
-   -1 sprites/temperate.png 106 240 09 11 38 -31 12
-   -1 sprites/temperate.png 154 240 09 18 39 -31  0
-   -1 sprites/temperate.png 202 240 09  6 20  13  5
-   -1 sprites/temperate.png 234 240 09  7 13  -6 16
-   -1 sprites/temperate.png 266 240 09  6 20 -31 12
-   -1 sprites/temperate.png 298 240 09  7 13  -5  0
-   -1 sprites/temperate.png 330 240 09  5  8  25  6
-   -1 sprites/temperate.png 346 240 09  3 12  -5 20
-   -1 sprites/temperate.png 364 240 09  4  8 -31 13
-   -1 sprites/temperate.png 380 240 09  4 15  -7  0
+   -1 sprites/temperate.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/temperate.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/temperate.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/temperate.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/temperate.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/temperate.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/temperate.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/temperate.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/temperate.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/temperate.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/temperate.png 8bpp 380  240  15   4  -7   0 normal
 
-   -1 sprites/temperate.png  10 270 09 20 38  -5 -8
-   -1 sprites/temperate.png  58 270 09 26 38  -5  5
-   -1 sprites/temperate.png 106 270 09 20 37 -31 11
-   -1 sprites/temperate.png 154 270 09 27 38 -31 -8
-   -1 sprites/temperate.png 202 270 09  9 16  17  3
-   -1 sprites/temperate.png 234 270 09  9 15  -7 22
-   -1 sprites/temperate.png 266 270 09  9 16 -31 11
-   -1 sprites/temperate.png 298 270 09  9 15  -6 -8
-   -1 sprites/temperate.png 330 270 09  7  8  25  5
-   -1 sprites/temperate.png 346 270 09  5 10  -4 27
-   -1 sprites/temperate.png 364 270 09  7  8 -31 11
-   -1 sprites/temperate.png 380 270 09  6 12  -5 -8
+   -1 sprites/temperate.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/temperate.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/temperate.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/temperate.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/temperate.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/temperate.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/temperate.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/temperate.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/temperate.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/temperate.png 8bpp 380  270  12   6  -5  -8 normal
 
-   -1 sprites/temperate.png  10 300 09 18 39  -6  0
-   -1 sprites/temperate.png  58 300 09 11 38  -5 12
-   -1 sprites/temperate.png 106 300 09 18 39 -31  5
-   -1 sprites/temperate.png 154 300 09 11 40 -32  0
-   -1 sprites/temperate.png 202 300 09  6 20  13 12
-   -1 sprites/temperate.png 234 300 09  7 13  -5 16
-   -1 sprites/temperate.png 266 300 09  6 20 -31  5
-   -1 sprites/temperate.png 298 300 09  7 13  -6  0
-   -1 sprites/temperate.png 330 300 09  4  8  26 13
-   -1 sprites/temperate.png 346 300 09  3 12  -5 20
-   -1 sprites/temperate.png 364 300 09  5  8 -31  6
-   -1 sprites/temperate.png 380 300 09  4 15  -6  0
+   -1 sprites/temperate.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/temperate.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/temperate.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/temperate.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/temperate.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/temperate.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/temperate.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/temperate.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/temperate.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/temperate.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/temperate.png 8bpp 380  300  15   4  -6   0 normal
 
-   -1 sprites/temperate.png  10 330 09 27 38  -5 -8
-   -1 sprites/temperate.png  58 330 09 20 37  -4 11
-   -1 sprites/temperate.png 106 330 09 26 37 -31  5
-   -1 sprites/temperate.png 154 330 09 20 38 -31 -8
-   -1 sprites/temperate.png 202 330 09  9 16  17 11
-   -1 sprites/temperate.png 234 330 09  9 15  -6 22
-   -1 sprites/temperate.png 266 330 09  9 16 -31  3
-   -1 sprites/temperate.png 298 330 09  9 15  -7 -8
-   -1 sprites/temperate.png 330 330 09  7  8  25 11
-   -1 sprites/temperate.png 346 330 09  5 10  -4 26
-   -1 sprites/temperate.png 364 330 09  7  8 -31  5
-   -1 sprites/temperate.png 380 330 09  6 12  -5 -8
+   -1 sprites/temperate.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/temperate.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/temperate.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/temperate.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/temperate.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/temperate.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/temperate.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/temperate.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/temperate.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/temperate.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/temperate.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/temperate.png 8bpp 380  330  12   6  -5  -8 normal
    -1 * 7	 02 05 21 01 00 00 00
 
    -1 * 14	 02 05 22 81 80 00 FF 01 20 00 00 00 21 00

media/extra_grf/rivers/toyland.nfo

@@ -8,137 +8,137 @@
 //
    -1 * 0	 0C "Toyland river graphics by andythenorth (Andrew Parkhouse)"
    -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png  10  10 09 19 38  -5  0
-   -1 sprites/toyland.png  58  10 09 18 38  -5 13
-   -1 sprites/toyland.png 106  10 09 18 38 -31 13
-   -1 sprites/toyland.png 154  10 09 19 38 -31  0
-   -1 sprites/toyland.png 202  10 09  9 19  14 11
-   -1 sprites/toyland.png 234  10 09  9 16  -7 22
-   -1 sprites/toyland.png 266  10 09  9 19 -31 11
-   -1 sprites/toyland.png 298  10 09  9 16  -7  0
-   -1 sprites/toyland.png 330  10 09  6  8  25 13
-   -1 sprites/toyland.png 346  10 09  4 12  -5 27
-   -1 sprites/toyland.png 364  10 09  6  8 -31 13
-   -1 sprites/toyland.png 380  10 09  5 12  -5  0
+   -1 sprites/toyland.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/toyland.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/toyland.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/toyland.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/toyland.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/toyland.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/toyland.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/toyland.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380   10  12   5  -5   0 normal
 
-   -1 sprites/toyland.png  10  40 09 11 40  -7  0
-   -1 sprites/toyland.png  58  40 09 18 39  -6  5
-   -1 sprites/toyland.png 106  40 09 11 38 -31 12
-   -1 sprites/toyland.png 154  40 09 18 39 -31  0
-   -1 sprites/toyland.png 202  40 09  6 20  13  5
-   -1 sprites/toyland.png 234  40 09  7 13  -6 16
-   -1 sprites/toyland.png 266  40 09  6 20 -31 12
-   -1 sprites/toyland.png 298  40 09  7 13  -5  0
-   -1 sprites/toyland.png 330  40 09  5  8  25  6
-   -1 sprites/toyland.png 346  40 09  3 12  -5 20
-   -1 sprites/toyland.png 364  40 09  4  8 -31 13
-   -1 sprites/toyland.png 380  40 09  4 15  -7  0
+   -1 sprites/toyland.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/toyland.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/toyland.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/toyland.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/toyland.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/toyland.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/toyland.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/toyland.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/toyland.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380   40  15   4  -7   0 normal
 
-   -1 sprites/toyland.png  10  70 09 20 38  -5 -8
-   -1 sprites/toyland.png  58  70 09 26 38  -5  5
-   -1 sprites/toyland.png 106  70 09 20 37 -31 11
-   -1 sprites/toyland.png 154  70 09 27 38 -31 -8
-   -1 sprites/toyland.png 202  70 09  9 16  17  3
-   -1 sprites/toyland.png 234  70 09  9 15  -7 22
-   -1 sprites/toyland.png 266  70 09  9 16 -31 11
-   -1 sprites/toyland.png 298  70 09  9 15  -6 -8
-   -1 sprites/toyland.png 330  70 09  7  8  25  5
-   -1 sprites/toyland.png 346  70 09  5 10  -4 27
-   -1 sprites/toyland.png 364  70 09  7  8 -31 11
-   -1 sprites/toyland.png 380  70 09  6 12  -5 -8
+   -1 sprites/toyland.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/toyland.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/toyland.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/toyland.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/toyland.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/toyland.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/toyland.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/toyland.png 8bpp 380   70  12   6  -5  -8 normal
 
-   -1 sprites/toyland.png  10 100 09 18 39  -6  0
-   -1 sprites/toyland.png  58 100 09 11 38  -5 12
-   -1 sprites/toyland.png 106 100 09 18 39 -31  5
-   -1 sprites/toyland.png 154 100 09 11 40 -32  0
-   -1 sprites/toyland.png 202 100 09  6 20  13 12
-   -1 sprites/toyland.png 234 100 09  7 13  -5 16
-   -1 sprites/toyland.png 266 100 09  6 20 -31  5
-   -1 sprites/toyland.png 298 100 09  7 13  -6  0
-   -1 sprites/toyland.png 330 100 09  4  8  26 13
-   -1 sprites/toyland.png 346 100 09  3 12  -5 20
-   -1 sprites/toyland.png 364 100 09  5  8 -31  6
-   -1 sprites/toyland.png 380 100 09  4 15  -6  0
+   -1 sprites/toyland.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/toyland.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/toyland.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/toyland.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/toyland.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/toyland.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/toyland.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/toyland.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/toyland.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/toyland.png 8bpp 380  100  15   4  -6   0 normal
 
-   -1 sprites/toyland.png  10 130 09 27 38  -5 -8
-   -1 sprites/toyland.png  58 130 09 20 37  -4 11
-   -1 sprites/toyland.png 106 130 09 26 37 -31  5
-   -1 sprites/toyland.png 154 130 09 20 38 -31 -8
-   -1 sprites/toyland.png 202 130 09  9 16  17 11
-   -1 sprites/toyland.png 234 130 09  9 15  -6 22
-   -1 sprites/toyland.png 266 130 09  9 16 -31  3
-   -1 sprites/toyland.png 298 130 09  9 15  -7 -8
-   -1 sprites/toyland.png 330 130 09  7  8  25 11
-   -1 sprites/toyland.png 346 130 09  5 10  -4 26
-   -1 sprites/toyland.png 364 130 09  7  8 -31  5
-   -1 sprites/toyland.png 380 130 09  6 12  -5 -8
+   -1 sprites/toyland.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/toyland.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/toyland.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/toyland.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/toyland.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/toyland.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/toyland.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/toyland.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/toyland.png 8bpp 380  130  12   6  -5  -8 normal
    -1 * 7	 02 05 50 01 00 00 00
 
    -1 * 4	 01 05 01 3C
-   -1 sprites/toyland.png  10 210 09 19 38  -5  0
-   -1 sprites/toyland.png  58 210 09 18 38  -5 13
-   -1 sprites/toyland.png 106 210 09 18 38 -31 13
-   -1 sprites/toyland.png 154 210 09 19 38 -31  0
-   -1 sprites/toyland.png 202 210 09  9 19  14 11
-   -1 sprites/toyland.png 234 210 09  9 16  -7 22
-   -1 sprites/toyland.png 266 210 09  9 19 -31 11
-   -1 sprites/toyland.png 298 210 09  9 16  -7  0
-   -1 sprites/toyland.png 330 210 09  6  8  25 13
-   -1 sprites/toyland.png 346 210 09  4 12  -5 27
-   -1 sprites/toyland.png 364 210 09  6  8 -31 13
-   -1 sprites/toyland.png 380 210 09  5 12  -5  0
+   -1 sprites/toyland.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/toyland.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/toyland.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/toyland.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/toyland.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/toyland.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/toyland.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/toyland.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380  210  12   5  -5   0 normal
 
-   -1 sprites/toyland.png  10 240 09 11 40  -7  0
-   -1 sprites/toyland.png  58 240 09 18 39  -6  5
-   -1 sprites/toyland.png 106 240 09 11 38 -31 12
-   -1 sprites/toyland.png 154 240 09 18 39 -31  0
-   -1 sprites/toyland.png 202 240 09  6 20  13  5
-   -1 sprites/toyland.png 234 240 09  7 13  -6 16
-   -1 sprites/toyland.png 266 240 09  6 20 -31 12
-   -1 sprites/toyland.png 298 240 09  7 13  -5  0
-   -1 sprites/toyland.png 330 240 09  5  8  25  6
-   -1 sprites/toyland.png 346 240 09  3 12  -5 20
-   -1 sprites/toyland.png 364 240 09  4  8 -31 13
-   -1 sprites/toyland.png 380 240 09  4 15  -7  0
+   -1 sprites/toyland.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/toyland.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/toyland.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/toyland.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/toyland.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/toyland.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/toyland.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/toyland.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/toyland.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/toyland.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/toyland.png 8bpp 380  240  15   4  -7   0 normal
 
-   -1 sprites/toyland.png  10 270 09 20 38  -5 -8
-   -1 sprites/toyland.png  58 270 09 26 38  -5  5
-   -1 sprites/toyland.png 106 270 09 20 37 -31 11
-   -1 sprites/toyland.png 154 270 09 27 38 -31 -8
-   -1 sprites/toyland.png 202 270 09  9 16  17  3
-   -1 sprites/toyland.png 234 270 09  9 15  -7 22
-   -1 sprites/toyland.png 266 270 09  9 16 -31 11
-   -1 sprites/toyland.png 298 270 09  9 15  -6 -8
-   -1 sprites/toyland.png 330 270 09  7  8  25  5
-   -1 sprites/toyland.png 346 270 09  5 10  -4 27
-   -1 sprites/toyland.png 364 270 09  7  8 -31 11
-   -1 sprites/toyland.png 380 270 09  6 12  -5 -8
+   -1 sprites/toyland.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/toyland.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/toyland.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/toyland.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/toyland.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/toyland.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/toyland.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/toyland.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/toyland.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/toyland.png 8bpp 380  270  12   6  -5  -8 normal
 
-   -1 sprites/toyland.png  10 300 09 18 39  -6  0
-   -1 sprites/toyland.png  58 300 09 11 38  -5 12
-   -1 sprites/toyland.png 106 300 09 18 39 -31  5
-   -1 sprites/toyland.png 154 300 09 11 40 -32  0
-   -1 sprites/toyland.png 202 300 09  6 20  13 12
-   -1 sprites/toyland.png 234 300 09  7 13  -5 16
-   -1 sprites/toyland.png 266 300 09  6 20 -31  5
-   -1 sprites/toyland.png 298 300 09  7 13  -6  0
-   -1 sprites/toyland.png 330 300 09  4  8  26 13
-   -1 sprites/toyland.png 346 300 09  3 12  -5 20
-   -1 sprites/toyland.png 364 300 09  5  8 -31  6
-   -1 sprites/toyland.png 380 300 09  4 15  -6  0
+   -1 sprites/toyland.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/toyland.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/toyland.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/toyland.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/toyland.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/toyland.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/toyland.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/toyland.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/toyland.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/toyland.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/toyland.png 8bpp 380  300  15   4  -6   0 normal
 
-   -1 sprites/toyland.png  10 330 09 27 38  -5 -8
-   -1 sprites/toyland.png  58 330 09 20 37  -4 11
-   -1 sprites/toyland.png 106 330 09 26 37 -31  5
-   -1 sprites/toyland.png 154 330 09 20 38 -31 -8
-   -1 sprites/toyland.png 202 330 09  9 16  17 11
-   -1 sprites/toyland.png 234 330 09  9 15  -6 22
-   -1 sprites/toyland.png 266 330 09  9 16 -31  3
-   -1 sprites/toyland.png 298 330 09  9 15  -7 -8
-   -1 sprites/toyland.png 330 330 09  7  8  25 11
-   -1 sprites/toyland.png 346 330 09  5 10  -4 26
-   -1 sprites/toyland.png 364 330 09  7  8 -31  5
-   -1 sprites/toyland.png 380 330 09  6 12  -5 -8
+   -1 sprites/toyland.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/toyland.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/toyland.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/toyland.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/toyland.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/toyland.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/toyland.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/toyland.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/toyland.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/toyland.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/toyland.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/toyland.png 8bpp 380  330  12   6  -5  -8 normal
    -1 * 7	 02 05 51 01 00 00 00
 
    -1 * 14	 02 05 52 81 80 00 FF 01 50 00 00 00 51 00

media/extra_grf/rivers/tropic.nfo

@@ -8,271 +8,271 @@
 //
    -1 * 0	 0C "Tropic river graphics by andythenorth (Andrew Parkhouse)"
    -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_desert.png  10  10 09 19 38  -5  0
-   -1 sprites/tropic_desert.png  58  10 09 18 38  -5 13
-   -1 sprites/tropic_desert.png 106  10 09 18 38 -31 13
-   -1 sprites/tropic_desert.png 154  10 09 19 38 -31  0
-   -1 sprites/tropic_desert.png 202  10 09  9 19  14 11
-   -1 sprites/tropic_desert.png 234  10 09  9 16  -7 22
-   -1 sprites/tropic_desert.png 266  10 09  9 19 -31 11
-   -1 sprites/tropic_desert.png 298  10 09  9 16  -7  0
-   -1 sprites/tropic_desert.png 330  10 09  6  8  25 13
-   -1 sprites/tropic_desert.png 346  10 09  4 12  -5 27
-   -1 sprites/tropic_desert.png 364  10 09  6  8 -31 13
-   -1 sprites/tropic_desert.png 380  10 09  5 12  -5  0
+   -1 sprites/tropic_desert.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/tropic_desert.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380   10  12   5  -5   0 normal
 
-   -1 sprites/tropic_desert.png  10  40 09 11 40  -7  0
-   -1 sprites/tropic_desert.png  58  40 09 18 39  -6  5
-   -1 sprites/tropic_desert.png 106  40 09 11 38 -31 12
-   -1 sprites/tropic_desert.png 154  40 09 18 39 -31  0
-   -1 sprites/tropic_desert.png 202  40 09  6 20  13  5
-   -1 sprites/tropic_desert.png 234  40 09  7 13  -6 16
-   -1 sprites/tropic_desert.png 266  40 09  6 20 -31 12
-   -1 sprites/tropic_desert.png 298  40 09  7 13  -5  0
-   -1 sprites/tropic_desert.png 330  40 09  5  8  25  6
-   -1 sprites/tropic_desert.png 346  40 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364  40 09  4  8 -31 13
-   -1 sprites/tropic_desert.png 380  40 09  4 15  -7  0
+   -1 sprites/tropic_desert.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/tropic_desert.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/tropic_desert.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380   40  15   4  -7   0 normal
 
-   -1 sprites/tropic_desert.png  10  70 09 20 38  -5 -8
-   -1 sprites/tropic_desert.png  58  70 09 26 38  -5  5
-   -1 sprites/tropic_desert.png 106  70 09 20 37 -31 11
-   -1 sprites/tropic_desert.png 154  70 09 27 38 -31 -8
-   -1 sprites/tropic_desert.png 202  70 09  9 16  17  3
-   -1 sprites/tropic_desert.png 234  70 09  9 15  -7 22
-   -1 sprites/tropic_desert.png 266  70 09  9 16 -31 11
-   -1 sprites/tropic_desert.png 298  70 09  9 15  -6 -8
-   -1 sprites/tropic_desert.png 330  70 09  7  8  25  5
-   -1 sprites/tropic_desert.png 346  70 09  5 10  -4 27
-   -1 sprites/tropic_desert.png 364  70 09  7  8 -31 11
-   -1 sprites/tropic_desert.png 380  70 09  6 12  -5 -8
+   -1 sprites/tropic_desert.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/tropic_desert.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/tropic_desert.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 380   70  12   6  -5  -8 normal
 
-   -1 sprites/tropic_desert.png  10 100 09 18 39  -6  0
-   -1 sprites/tropic_desert.png  58 100 09 11 38  -5 12
-   -1 sprites/tropic_desert.png 106 100 09 18 39 -31  5
-   -1 sprites/tropic_desert.png 154 100 09 11 40 -32  0
-   -1 sprites/tropic_desert.png 202 100 09  6 20  13 12
-   -1 sprites/tropic_desert.png 234 100 09  7 13  -5 16
-   -1 sprites/tropic_desert.png 266 100 09  6 20 -31  5
-   -1 sprites/tropic_desert.png 298 100 09  7 13  -6  0
-   -1 sprites/tropic_desert.png 330 100 09  4  8  26 13
-   -1 sprites/tropic_desert.png 346 100 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 100 09  5  8 -31  6
-   -1 sprites/tropic_desert.png 380 100 09  4 15  -6  0
+   -1 sprites/tropic_desert.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/tropic_desert.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/tropic_desert.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/tropic_desert.png 8bpp 380  100  15   4  -6   0 normal
 
-   -1 sprites/tropic_desert.png  10 130 09 27 38  -5 -8
-   -1 sprites/tropic_desert.png  58 130 09 20 37  -4 11
-   -1 sprites/tropic_desert.png 106 130 09 26 37 -31  5
-   -1 sprites/tropic_desert.png 154 130 09 20 38 -31 -8
-   -1 sprites/tropic_desert.png 202 130 09  9 16  17 11
-   -1 sprites/tropic_desert.png 234 130 09  9 15  -6 22
-   -1 sprites/tropic_desert.png 266 130 09  9 16 -31  3
-   -1 sprites/tropic_desert.png 298 130 09  9 15  -7 -8
-   -1 sprites/tropic_desert.png 330 130 09  7  8  25 11
-   -1 sprites/tropic_desert.png 346 130 09  5 10  -4 26
-   -1 sprites/tropic_desert.png 364 130 09  7  8 -31  5
-   -1 sprites/tropic_desert.png 380 130 09  6 12  -5 -8
+   -1 sprites/tropic_desert.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/tropic_desert.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/tropic_desert.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/tropic_desert.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/tropic_desert.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 380  130  12   6  -5  -8 normal
    -1 * 7	 02 05 40 01 00 00 00
 
    -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_forest.png  10  10 09 19 38  -5  0
-   -1 sprites/tropic_forest.png  58  10 09 18 38  -5 13
-   -1 sprites/tropic_forest.png 106  10 09 18 38 -31 13
-   -1 sprites/tropic_forest.png 154  10 09 19 38 -31  0
-   -1 sprites/tropic_forest.png 202  10 09  9 19  14 11
-   -1 sprites/tropic_forest.png 234  10 09  9 16  -7 22
-   -1 sprites/tropic_forest.png 266  10 09  9 19 -31 11
-   -1 sprites/tropic_forest.png 298  10 09  9 16  -7  0
-   -1 sprites/tropic_forest.png 330  10 09  6  8  25 13
-   -1 sprites/tropic_forest.png 346  10 09  4 12  -5 27
-   -1 sprites/tropic_forest.png 364  10 09  6  8 -31 13
-   -1 sprites/tropic_forest.png 380  10 09  5 12  -5  0
+   -1 sprites/tropic_forest.png 8bpp  10   10  38  19  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58   10  38  18  -5  13 normal
+   -1 sprites/tropic_forest.png 8bpp 106   10  38  18 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 154   10  38  19 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202   10  19   9  14  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234   10  16   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266   10  19   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298   10  16   9  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330   10   8   6  25  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346   10  12   4  -5  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364   10   8   6 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380   10  12   5  -5   0 normal
 
-   -1 sprites/tropic_forest.png  10  40 09 11 40  -7  0
-   -1 sprites/tropic_forest.png  58  40 09 18 39  -6  5
-   -1 sprites/tropic_forest.png 106  40 09 11 38 -31 12
-   -1 sprites/tropic_forest.png 154  40 09 18 39 -31  0
-   -1 sprites/tropic_forest.png 202  40 09  6 20  13  5
-   -1 sprites/tropic_forest.png 234  40 09  7 13  -6 16
-   -1 sprites/tropic_forest.png 266  40 09  6 20 -31 12
-   -1 sprites/tropic_forest.png 298  40 09  7 13  -5  0
-   -1 sprites/tropic_forest.png 330  40 09  5  8  25  6
-   -1 sprites/tropic_forest.png 346  40 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364  40 09  4  8 -31 13
-   -1 sprites/tropic_forest.png 380  40 09  4 15  -7  0
+   -1 sprites/tropic_forest.png 8bpp  10   40  40  11  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58   40  39  18  -6   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106   40  38  11 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 154   40  39  18 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202   40  20   6  13   5 normal
+   -1 sprites/tropic_forest.png 8bpp 234   40  13   7  -6  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266   40  20   6 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 298   40  13   7  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330   40   8   5  25   6 normal
+   -1 sprites/tropic_forest.png 8bpp 346   40  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364   40   8   4 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380   40  15   4  -7   0 normal
 
-   -1 sprites/tropic_forest.png  10  70 09 20 38  -5 -8
-   -1 sprites/tropic_forest.png  58  70 09 26 38  -5  5
-   -1 sprites/tropic_forest.png 106  70 09 20 37 -31 11
-   -1 sprites/tropic_forest.png 154  70 09 27 38 -31 -8
-   -1 sprites/tropic_forest.png 202  70 09  9 16  17  3
-   -1 sprites/tropic_forest.png 234  70 09  9 15  -7 22
-   -1 sprites/tropic_forest.png 266  70 09  9 16 -31 11
-   -1 sprites/tropic_forest.png 298  70 09  9 15  -6 -8
-   -1 sprites/tropic_forest.png 330  70 09  7  8  25  5
-   -1 sprites/tropic_forest.png 346  70 09  5 10  -4 27
-   -1 sprites/tropic_forest.png 364  70 09  7  8 -31 11
-   -1 sprites/tropic_forest.png 380  70 09  6 12  -5 -8
+   -1 sprites/tropic_forest.png 8bpp  10   70  38  20  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58   70  38  26  -5   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106   70  37  20 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 154   70  38  27 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202   70  16   9  17   3 normal
+   -1 sprites/tropic_forest.png 8bpp 234   70  15   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266   70  16   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298   70  15   9  -6  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330   70   8   7  25   5 normal
+   -1 sprites/tropic_forest.png 8bpp 346   70  10   5  -4  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364   70   8   7 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 380   70  12   6  -5  -8 normal
 
-   -1 sprites/tropic_forest.png  10 100 09 18 39  -6  0
-   -1 sprites/tropic_forest.png  58 100 09 11 38  -5 12
-   -1 sprites/tropic_forest.png 106 100 09 18 39 -31  5
-   -1 sprites/tropic_forest.png 154 100 09 11 40 -32  0
-   -1 sprites/tropic_forest.png 202 100 09  6 20  13 12
-   -1 sprites/tropic_forest.png 234 100 09  7 13  -5 16
-   -1 sprites/tropic_forest.png 266 100 09  6 20 -31  5
-   -1 sprites/tropic_forest.png 298 100 09  7 13  -6  0
-   -1 sprites/tropic_forest.png 330 100 09  4  8  26 13
-   -1 sprites/tropic_forest.png 346 100 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 100 09  5  8 -31  6
-   -1 sprites/tropic_forest.png 380 100 09  4 15  -6  0
+   -1 sprites/tropic_forest.png 8bpp  10  100  39  18  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  100  38  11  -5  12 normal
+   -1 sprites/tropic_forest.png 8bpp 106  100  39  18 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  100  40  11 -32   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  100  20   6  13  12 normal
+   -1 sprites/tropic_forest.png 8bpp 234  100  13   7  -5  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  100  20   6 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 298  100  13   7  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  100   8   4  26  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  100  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  100   8   5 -31   6 normal
+   -1 sprites/tropic_forest.png 8bpp 380  100  15   4  -6   0 normal
 
-   -1 sprites/tropic_forest.png  10 130 09 27 38  -5 -8
-   -1 sprites/tropic_forest.png  58 130 09 20 37  -4 11
-   -1 sprites/tropic_forest.png 106 130 09 26 37 -31  5
-   -1 sprites/tropic_forest.png 154 130 09 20 38 -31 -8
-   -1 sprites/tropic_forest.png 202 130 09  9 16  17 11
-   -1 sprites/tropic_forest.png 234 130 09  9 15  -6 22
-   -1 sprites/tropic_forest.png 266 130 09  9 16 -31  3
-   -1 sprites/tropic_forest.png 298 130 09  9 15  -7 -8
-   -1 sprites/tropic_forest.png 330 130 09  7  8  25 11
-   -1 sprites/tropic_forest.png 346 130 09  5 10  -4 26
-   -1 sprites/tropic_forest.png 364 130 09  7  8 -31  5
-   -1 sprites/tropic_forest.png 380 130 09  6 12  -5 -8
+   -1 sprites/tropic_forest.png 8bpp  10  130  38  27  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  130  37  20  -4  11 normal
+   -1 sprites/tropic_forest.png 8bpp 106  130  37  26 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  130  38  20 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  130  16   9  17  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  130  15   9  -6  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  130  16   9 -31   3 normal
+   -1 sprites/tropic_forest.png 8bpp 298  130  15   9  -7  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  130   8   7  25  11 normal
+   -1 sprites/tropic_forest.png 8bpp 346  130  10   5  -4  26 normal
+   -1 sprites/tropic_forest.png 8bpp 364  130   8   7 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 380  130  12   6  -5  -8 normal
    -1 * 7	 02 05 41 01 00 00 00
 
    -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_desert.png  10 210 09 19 38  -5  0
-   -1 sprites/tropic_desert.png  58 210 09 18 38  -5 13
-   -1 sprites/tropic_desert.png 106 210 09 18 38 -31 13
-   -1 sprites/tropic_desert.png 154 210 09 19 38 -31  0
-   -1 sprites/tropic_desert.png 202 210 09  9 19  14 11
-   -1 sprites/tropic_desert.png 234 210 09  9 16  -7 22
-   -1 sprites/tropic_desert.png 266 210 09  9 19 -31 11
-   -1 sprites/tropic_desert.png 298 210 09  9 16  -7  0
-   -1 sprites/tropic_desert.png 330 210 09  6  8  25 13
-   -1 sprites/tropic_desert.png 346 210 09  4 12  -5 27
-   -1 sprites/tropic_desert.png 364 210 09  6  8 -31 13
-   -1 sprites/tropic_desert.png 380 210 09  5 12  -5  0
+   -1 sprites/tropic_desert.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/tropic_desert.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380  210  12   5  -5   0 normal
 
-   -1 sprites/tropic_desert.png  10 240 09 11 40  -7  0
-   -1 sprites/tropic_desert.png  58 240 09 18 39  -6  5
-   -1 sprites/tropic_desert.png 106 240 09 11 38 -31 12
-   -1 sprites/tropic_desert.png 154 240 09 18 39 -31  0
-   -1 sprites/tropic_desert.png 202 240 09  6 20  13  5
-   -1 sprites/tropic_desert.png 234 240 09  7 13  -6 16
-   -1 sprites/tropic_desert.png 266 240 09  6 20 -31 12
-   -1 sprites/tropic_desert.png 298 240 09  7 13  -5  0
-   -1 sprites/tropic_desert.png 330 240 09  5  8  25  6
-   -1 sprites/tropic_desert.png 346 240 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 240 09  4  8 -31 13
-   -1 sprites/tropic_desert.png 380 240 09  4 15  -7  0
+   -1 sprites/tropic_desert.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/tropic_desert.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/tropic_desert.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/tropic_desert.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/tropic_desert.png 8bpp 380  240  15   4  -7   0 normal
 
-   -1 sprites/tropic_desert.png  10 270 09 20 38  -5 -8
-   -1 sprites/tropic_desert.png  58 270 09 26 38  -5  5
-   -1 sprites/tropic_desert.png 106 270 09 20 37 -31 11
-   -1 sprites/tropic_desert.png 154 270 09 27 38 -31 -8
-   -1 sprites/tropic_desert.png 202 270 09  9 16  17  3
-   -1 sprites/tropic_desert.png 234 270 09  9 15  -7 22
-   -1 sprites/tropic_desert.png 266 270 09  9 16 -31 11
-   -1 sprites/tropic_desert.png 298 270 09  9 15  -6 -8
-   -1 sprites/tropic_desert.png 330 270 09  7  8  25  5
-   -1 sprites/tropic_desert.png 346 270 09  5 10  -4 27
-   -1 sprites/tropic_desert.png 364 270 09  7  8 -31 11
-   -1 sprites/tropic_desert.png 380 270 09  6 12  -5 -8
+   -1 sprites/tropic_desert.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/tropic_desert.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/tropic_desert.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/tropic_desert.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/tropic_desert.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/tropic_desert.png 8bpp 380  270  12   6  -5  -8 normal
 
-   -1 sprites/tropic_desert.png  10 300 09 18 39  -6  0
-   -1 sprites/tropic_desert.png  58 300 09 11 38  -5 12
-   -1 sprites/tropic_desert.png 106 300 09 18 39 -31  5
-   -1 sprites/tropic_desert.png 154 300 09 11 40 -32  0
-   -1 sprites/tropic_desert.png 202 300 09  6 20  13 12
-   -1 sprites/tropic_desert.png 234 300 09  7 13  -5 16
-   -1 sprites/tropic_desert.png 266 300 09  6 20 -31  5
-   -1 sprites/tropic_desert.png 298 300 09  7 13  -6  0
-   -1 sprites/tropic_desert.png 330 300 09  4  8  26 13
-   -1 sprites/tropic_desert.png 346 300 09  3 12  -5 20
-   -1 sprites/tropic_desert.png 364 300 09  5  8 -31  6
-   -1 sprites/tropic_desert.png 380 300 09  4 15  -6  0
+   -1 sprites/tropic_desert.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/tropic_desert.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/tropic_desert.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/tropic_desert.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/tropic_desert.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/tropic_desert.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/tropic_desert.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/tropic_desert.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/tropic_desert.png 8bpp 380  300  15   4  -6   0 normal
 
-   -1 sprites/tropic_desert.png  10 330 09 27 38  -5 -8
-   -1 sprites/tropic_desert.png  58 330 09 20 37  -4 11
-   -1 sprites/tropic_desert.png 106 330 09 26 37 -31  5
-   -1 sprites/tropic_desert.png 154 330 09 20 38 -31 -8
-   -1 sprites/tropic_desert.png 202 330 09  9 16  17 11
-   -1 sprites/tropic_desert.png 234 330 09  9 15  -6 22
-   -1 sprites/tropic_desert.png 266 330 09  9 16 -31  3
-   -1 sprites/tropic_desert.png 298 330 09  9 15  -7 -8
-   -1 sprites/tropic_desert.png 330 330 09  7  8  25 11
-   -1 sprites/tropic_desert.png 346 330 09  5 10  -4 26
-   -1 sprites/tropic_desert.png 364 330 09  7  8 -31  5
-   -1 sprites/tropic_desert.png 380 330 09  6 12  -5 -8
+   -1 sprites/tropic_desert.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/tropic_desert.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/tropic_desert.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/tropic_desert.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/tropic_desert.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/tropic_desert.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/tropic_desert.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/tropic_desert.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/tropic_desert.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/tropic_desert.png 8bpp 380  330  12   6  -5  -8 normal
    -1 * 7	 02 05 42 01 00 00 00
 
    -1 * 4	 01 05 01 3C
-   -1 sprites/tropic_forest.png  10 210 09 19 38  -5  0
-   -1 sprites/tropic_forest.png  58 210 09 18 38  -5 13
-   -1 sprites/tropic_forest.png 106 210 09 18 38 -31 13
-   -1 sprites/tropic_forest.png 154 210 09 19 38 -31  0
-   -1 sprites/tropic_forest.png 202 210 09  9 19  14 11
-   -1 sprites/tropic_forest.png 234 210 09  9 16  -7 22
-   -1 sprites/tropic_forest.png 266 210 09  9 19 -31 11
-   -1 sprites/tropic_forest.png 298 210 09  9 16  -7  0
-   -1 sprites/tropic_forest.png 330 210 09  6  8  25 13
-   -1 sprites/tropic_forest.png 346 210 09  4 12  -5 27
-   -1 sprites/tropic_forest.png 364 210 09  6  8 -31 13
-   -1 sprites/tropic_forest.png 380 210 09  5 12  -5  0
+   -1 sprites/tropic_forest.png 8bpp  10  210  38  19  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  210  38  18  -5  13 normal
+   -1 sprites/tropic_forest.png 8bpp 106  210  38  18 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 154  210  38  19 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  210  19   9  14  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  210  16   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  210  19   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298  210  16   9  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  210   8   6  25  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  210  12   4  -5  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364  210   8   6 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380  210  12   5  -5   0 normal
 
-   -1 sprites/tropic_forest.png  10 240 09 11 40  -7  0
-   -1 sprites/tropic_forest.png  58 240 09 18 39  -6  5
-   -1 sprites/tropic_forest.png 106 240 09 11 38 -31 12
-   -1 sprites/tropic_forest.png 154 240 09 18 39 -31  0
-   -1 sprites/tropic_forest.png 202 240 09  6 20  13  5
-   -1 sprites/tropic_forest.png 234 240 09  7 13  -6 16
-   -1 sprites/tropic_forest.png 266 240 09  6 20 -31 12
-   -1 sprites/tropic_forest.png 298 240 09  7 13  -5  0
-   -1 sprites/tropic_forest.png 330 240 09  5  8  25  6
-   -1 sprites/tropic_forest.png 346 240 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 240 09  4  8 -31 13
-   -1 sprites/tropic_forest.png 380 240 09  4 15  -7  0
+   -1 sprites/tropic_forest.png 8bpp  10  240  40  11  -7   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  240  39  18  -6   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106  240  38  11 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 154  240  39  18 -31   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  240  20   6  13   5 normal
+   -1 sprites/tropic_forest.png 8bpp 234  240  13   7  -6  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  240  20   6 -31  12 normal
+   -1 sprites/tropic_forest.png 8bpp 298  240  13   7  -5   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  240   8   5  25   6 normal
+   -1 sprites/tropic_forest.png 8bpp 346  240  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  240   8   4 -31  13 normal
+   -1 sprites/tropic_forest.png 8bpp 380  240  15   4  -7   0 normal
 
-   -1 sprites/tropic_forest.png  10 270 09 20 38  -5 -8
-   -1 sprites/tropic_forest.png  58 270 09 26 38  -5  5
-   -1 sprites/tropic_forest.png 106 270 09 20 37 -31 11
-   -1 sprites/tropic_forest.png 154 270 09 27 38 -31 -8
-   -1 sprites/tropic_forest.png 202 270 09  9 16  17  3
-   -1 sprites/tropic_forest.png 234 270 09  9 15  -7 22
-   -1 sprites/tropic_forest.png 266 270 09  9 16 -31 11
-   -1 sprites/tropic_forest.png 298 270 09  9 15  -6 -8
-   -1 sprites/tropic_forest.png 330 270 09  7  8  25  5
-   -1 sprites/tropic_forest.png 346 270 09  5 10  -4 27
-   -1 sprites/tropic_forest.png 364 270 09  7  8 -31 11
-   -1 sprites/tropic_forest.png 380 270 09  6 12  -5 -8
+   -1 sprites/tropic_forest.png 8bpp  10  270  38  20  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  270  38  26  -5   5 normal
+   -1 sprites/tropic_forest.png 8bpp 106  270  37  20 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 154  270  38  27 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  270  16   9  17   3 normal
+   -1 sprites/tropic_forest.png 8bpp 234  270  15   9  -7  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  270  16   9 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 298  270  15   9  -6  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  270   8   7  25   5 normal
+   -1 sprites/tropic_forest.png 8bpp 346  270  10   5  -4  27 normal
+   -1 sprites/tropic_forest.png 8bpp 364  270   8   7 -31  11 normal
+   -1 sprites/tropic_forest.png 8bpp 380  270  12   6  -5  -8 normal
 
-   -1 sprites/tropic_forest.png  10 300 09 18 39  -6  0
-   -1 sprites/tropic_forest.png  58 300 09 11 38  -5 12
-   -1 sprites/tropic_forest.png 106 300 09 18 39 -31  5
-   -1 sprites/tropic_forest.png 154 300 09 11 40 -32  0
-   -1 sprites/tropic_forest.png 202 300 09  6 20  13 12
-   -1 sprites/tropic_forest.png 234 300 09  7 13  -5 16
-   -1 sprites/tropic_forest.png 266 300 09  6 20 -31  5
-   -1 sprites/tropic_forest.png 298 300 09  7 13  -6  0
-   -1 sprites/tropic_forest.png 330 300 09  4  8  26 13
-   -1 sprites/tropic_forest.png 346 300 09  3 12  -5 20
-   -1 sprites/tropic_forest.png 364 300 09  5  8 -31  6
-   -1 sprites/tropic_forest.png 380 300 09  4 15  -6  0
+   -1 sprites/tropic_forest.png 8bpp  10  300  39  18  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp  58  300  38  11  -5  12 normal
+   -1 sprites/tropic_forest.png 8bpp 106  300  39  18 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  300  40  11 -32   0 normal
+   -1 sprites/tropic_forest.png 8bpp 202  300  20   6  13  12 normal
+   -1 sprites/tropic_forest.png 8bpp 234  300  13   7  -5  16 normal
+   -1 sprites/tropic_forest.png 8bpp 266  300  20   6 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 298  300  13   7  -6   0 normal
+   -1 sprites/tropic_forest.png 8bpp 330  300   8   4  26  13 normal
+   -1 sprites/tropic_forest.png 8bpp 346  300  12   3  -5  20 normal
+   -1 sprites/tropic_forest.png 8bpp 364  300   8   5 -31   6 normal
+   -1 sprites/tropic_forest.png 8bpp 380  300  15   4  -6   0 normal
 
-   -1 sprites/tropic_forest.png  10 330 09 27 38  -5 -8
-   -1 sprites/tropic_forest.png  58 330 09 20 37  -4 11
-   -1 sprites/tropic_forest.png 106 330 09 26 37 -31  5
-   -1 sprites/tropic_forest.png 154 330 09 20 38 -31 -8
-   -1 sprites/tropic_forest.png 202 330 09  9 16  17 11
-   -1 sprites/tropic_forest.png 234 330 09  9 15  -6 22
-   -1 sprites/tropic_forest.png 266 330 09  9 16 -31  3
-   -1 sprites/tropic_forest.png 298 330 09  9 15  -7 -8
-   -1 sprites/tropic_forest.png 330 330 09  7  8  25 11
-   -1 sprites/tropic_forest.png 346 330 09  5 10  -4 26
-   -1 sprites/tropic_forest.png 364 330 09  7  8 -31  5
-   -1 sprites/tropic_forest.png 380 330 09  6 12  -5 -8
+   -1 sprites/tropic_forest.png 8bpp  10  330  38  27  -5  -8 normal
+   -1 sprites/tropic_forest.png 8bpp  58  330  37  20  -4  11 normal
+   -1 sprites/tropic_forest.png 8bpp 106  330  37  26 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 154  330  38  20 -31  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 202  330  16   9  17  11 normal
+   -1 sprites/tropic_forest.png 8bpp 234  330  15   9  -6  22 normal
+   -1 sprites/tropic_forest.png 8bpp 266  330  16   9 -31   3 normal
+   -1 sprites/tropic_forest.png 8bpp 298  330  15   9  -7  -8 normal
+   -1 sprites/tropic_forest.png 8bpp 330  330   8   7  25  11 normal
+   -1 sprites/tropic_forest.png 8bpp 346  330  10   5  -4  26 normal
+   -1 sprites/tropic_forest.png 8bpp 364  330   8   7 -31   5 normal
+   -1 sprites/tropic_forest.png 8bpp 380  330  12   6  -5  -8 normal
    -1 * 7	 02 05 43 01 00 00 00
 
    -1 * 14	 02 05 44 81 81 00 FF 01 40 00 01 01 41 00

media/extra_grf/roadstops.nfo

@@ -8,11 +8,11 @@
 //
    -1 * 0	 0C "Road stop graphics"
    -1 * 3	 05 11 08
-   -1 sprites/roadstops.png 34 8 09 23 13 5 -11
-   -1 sprites/roadstops.png 66 8 09 15 13 5 -2
-   -1 sprites/roadstops.png 98 8 09 19 21 -20 -7
-   -1 sprites/roadstops.png 130 8 09 17 22 -25 -4
-   -1 sprites/roadstops.png 162 8 09 25 32 -5 -9
-   -1 sprites/roadstops.png 210 8 09 26 28 -3 -12
-   -1 sprites/roadstops.png 258 8 09 25 29 -24 -12
-   -1 sprites/roadstops.png 306 8 09 25 32 -25 -9
+   -1 sprites/roadstops.png 8bpp  34    8  13  23   5 -11 normal
+   -1 sprites/roadstops.png 8bpp  66    8  13  15   5  -2 normal
+   -1 sprites/roadstops.png 8bpp  98    8  21  19 -20  -7 normal
+   -1 sprites/roadstops.png 8bpp 130    8  22  17 -25  -4 normal
+   -1 sprites/roadstops.png 8bpp 162    8  32  25  -5  -9 normal
+   -1 sprites/roadstops.png 8bpp 210    8  28  26  -3 -12 normal
+   -1 sprites/roadstops.png 8bpp 258    8  29  25 -24 -12 normal
+   -1 sprites/roadstops.png 8bpp 306    8  32  25 -25  -9 normal

media/extra_grf/shore.nfo

@@ -5,71 +5,57 @@
 // OpenTTD 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, version 2.
 // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
-//
-
-//
-// -- NFO Renum 'settings' --
-// Do not make nforenum warn about the fact that we use an incorrect number of shores
-// @@WARNING DISABLE 60
-// -- End of NFO Renum 'settings' --
 //
 
    -1 * 6	 07 83 01 \7! 00 0C
    -1 * 54	 0C "Missing shore tile graphics for the temperate climate"
    -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 82 8 09 15 64 -31 0
-   -1 sprites/shore.png 162 8 09 31 64 -31 -8
-   -1 sprites/shore.png 242 8 09 23 64 -31 0
-   -1 sprites/shore.png 322 8 09 47 64 -31 -16
-   -1 sprites/shore.png 402 8 09 31 64 -31 -8
-   -1 sprites/shore.png 482 8 09 39 64 -31 -8
-   -1 sprites/shore.png 562 8 09 31 64 -31 -8
-   -1 sprites/shore.png 642 8 09 31 64 -31 -8
-   -1 sprites/shore.png 722 8 09 32 64 -31 -1
-   -1 sprites/shore.png 2 72 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp  82    8  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 162    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 242    8  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 322    8  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 402    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 482    8  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 562    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 642    8  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 722    8  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp   2   72  64  31 -31  -8 normal
    -1 * 6	 07 83 01 \7! 01 0C
    -1 * 55	 0C "Missing shore tile graphics for the sub-arctic climate"
    -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 130 72 09 15 64 -31 0
-   -1 sprites/shore.png 210 72 09 31 64 -31 -8
-   -1 sprites/shore.png 290 72 09 23 64 -31 0
-   -1 sprites/shore.png 370 72 09 47 64 -31 -16
-   -1 sprites/shore.png 450 72 09 31 64 -31 -8
-   -1 sprites/shore.png 530 72 09 39 64 -31 -8
-   -1 sprites/shore.png 610 72 09 31 64 -31 -8
-   -1 sprites/shore.png 690 72 09 31 64 -31 -8
-   -1 sprites/shore.png 2 136 09 32 64 -31 -1
-   -1 sprites/shore.png 82 136 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp 130   72  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 210   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 290   72  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 370   72  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 450   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 530   72  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 610   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690   72  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  136  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp  82  136  64  31 -31  -8 normal
    -1 * 6	 07 83 01 \7! 02 0C
    -1 * 57	 0C "Missing shore tile graphics for the sub-tropical climate"
    -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 210 136 09 15 64 -31 0
-   -1 sprites/shore.png 290 136 09 31 64 -31 -8
-   -1 sprites/shore.png 370 136 09 23 64 -31 0
-   -1 sprites/shore.png 450 136 09 47 64 -31 -16
-   -1 sprites/shore.png 530 136 09 31 64 -31 -8
-   -1 sprites/shore.png 610 136 09 39 64 -31 -8
-   -1 sprites/shore.png 690 136 09 31 64 -31 -8
-   -1 sprites/shore.png 2 200 09 31 64 -31 -8
-   -1 sprites/shore.png 82 200 09 32 64 -31 -1
-   -1 sprites/shore.png 162 200 09 31 64 -31 -8
+   -1 sprites/shore.png 8bpp 210  136  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 290  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 370  136  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 450  136  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 530  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 610  136  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690  136  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp  82  200  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp 162  200  64  31 -31  -8 normal
    -1 * 6	 07 83 01 \7! 03 0C
    -1 * 44	 0C "Missing shore tile graphics for the toyland climate"
    -1 * 3	 05 0D 0A
-   -1 sprites/shore.png 290 200 09 15 64 -31 0
-   -1 sprites/shore.png 370 200 09 31 64 -31 -8
-   -1 sprites/shore.png 450 200 09 23 64 -31 0
-   -1 sprites/shore.png 530 200 09 47 64 -31 -16
-   -1 sprites/shore.png 610 200 09 31 64 -31 -8
-   -1 sprites/shore.png 690 200 09 39 64 -31 -8
-   -1 sprites/shore.png 2 264 09 31 64 -31 -8
-   -1 sprites/shore.png 82 264 09 31 64 -31 -8
-   -1 sprites/shore.png 162 264 09 32 64 -31 -1
-   -1 sprites/shore.png 242 264 09 31 64 -31 -8
-
-//
-// -- NFO Renum 'settings' --
-// Reset warning about incorrect number of shores
-// @@WARNING ENABLE 60
-// -- End of NFO Renum 'settings' --
-//
+   -1 sprites/shore.png 8bpp 290  200  64  15 -31   0 normal
+   -1 sprites/shore.png 8bpp 370  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 450  200  64  23 -31   0 normal
+   -1 sprites/shore.png 8bpp 530  200  64  47 -31 -16 normal
+   -1 sprites/shore.png 8bpp 610  200  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 690  200  64  39 -31  -8 normal
+   -1 sprites/shore.png 8bpp   2  264  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp  82  264  64  31 -31  -8 normal
+   -1 sprites/shore.png 8bpp 162  264  64  32 -31  -1 normal
+   -1 sprites/shore.png 8bpp 242  264  64  31 -31  -8 normal

media/extra_grf/signals.nfo

@@ -8,486 +8,486 @@
 //
    -1 * 0	 0C "Pre-signal, semaphore, and PBS graphics by Michael Blunck"
    -1 * 3	 05 04 F0
-   -1 sprites/signals.png 66 8 01 21 6 -2 -19
-   -1 sprites/signals.png 82 8 01 21 6 -2 -19
-   -1 sprites/signals.png 98 8 01 21 6 -2 -19
-   -1 sprites/signals.png 114 8 01 21 6 -2 -19
-   -1 sprites/signals.png 130 8 01 21 6 -2 -19
-   -1 sprites/signals.png 146 8 01 21 6 -2 -19
-   -1 sprites/signals.png 162 8 01 21 6 -2 -19
-   -1 sprites/signals.png 178 8 01 21 6 -2 -19
-   -1 sprites/signals.png 194 8 01 21 6 -2 -19
-   -1 sprites/signals.png 210 8 01 21 6 -2 -19
-   -1 sprites/signals.png 226 8 01 21 6 -2 -19
-   -1 sprites/signals.png 242 8 01 21 6 -2 -19
-   -1 sprites/signals.png 258 8 01 21 6 -2 -19
-   -1 sprites/signals.png 274 8 01 21 6 -2 -19
-   -1 sprites/signals.png 290 8 01 21 6 -2 -19
-   -1 sprites/signals.png 306 8 01 21 6 -2 -19
-   -1 sprites/signals.png 322 8 01 21 6 -2 -19
-   -1 sprites/signals.png 338 8 01 21 6 -2 -19
-   -1 sprites/signals.png 354 8 01 21 6 -2 -19
-   -1 sprites/signals.png 370 8 01 21 6 -2 -19
-   -1 sprites/signals.png 386 8 01 21 6 -2 -19
-   -1 sprites/signals.png 402 8 01 21 6 -2 -19
-   -1 sprites/signals.png 418 8 01 21 6 -2 -19
-   -1 sprites/signals.png 434 8 01 21 6 -2 -19
-   -1 sprites/signals.png 450 8 01 21 6 -2 -19
-   -1 sprites/signals.png 466 8 01 21 6 -2 -19
-   -1 sprites/signals.png 482 8 01 21 6 -2 -19
-   -1 sprites/signals.png 498 8 01 21 6 -2 -19
-   -1 sprites/signals.png 514 8 01 21 6 -2 -19
-   -1 sprites/signals.png 530 8 01 21 6 -2 -19
-   -1 sprites/signals.png 546 8 01 21 6 -2 -19
-   -1 sprites/signals.png 562 8 01 21 6 -2 -19
-   -1 sprites/signals.png 578 8 01 21 6 -2 -19
-   -1 sprites/signals.png 594 8 01 21 6 -2 -19
-   -1 sprites/signals.png 610 8 01 21 6 -2 -19
-   -1 sprites/signals.png 626 8 01 21 6 -2 -19
-   -1 sprites/signals.png 642 8 01 21 6 -2 -19
-   -1 sprites/signals.png 658 8 01 21 6 -2 -19
-   -1 sprites/signals.png 674 8 01 21 6 -2 -19
-   -1 sprites/signals.png 690 8 01 21 6 -2 -19
-   -1 sprites/signals.png 706 8 01 21 6 -2 -19
-   -1 sprites/signals.png 722 8 01 21 6 -2 -19
-   -1 sprites/signals.png 738 8 01 21 6 -2 -19
-   -1 sprites/signals.png 754 8 01 21 6 -2 -19
-   -1 sprites/signals.png 770 8 01 21 6 -2 -19
-   -1 sprites/signals.png 786 8 01 21 6 -2 -19
-   -1 sprites/signals.png 2 40 01 21 6 -2 -19
-   -1 sprites/signals.png 18 40 01 21 6 -2 -19
-   -1 sprites/signals.png 34 40 01 21 10 -6 -19
-   -1 sprites/signals.png 50 40 01 23 7 -3 -21
-   -1 sprites/signals.png 66 40 01 21 10 1 -19
-   -1 sprites/signals.png 82 40 01 21 9 1 -19
-   -1 sprites/signals.png 98 40 01 21 9 1 -19
-   -1 sprites/signals.png 114 40 01 23 6 1 -21
-   -1 sprites/signals.png 130 40 01 21 10 -7 -19
-   -1 sprites/signals.png 146 40 01 21 10 -7 -19
-   -1 sprites/signals.png 162 40 01 21 2 1 -19
-   -1 sprites/signals.png 178 40 01 24 2 1 -22
-   -1 sprites/signals.png 194 40 01 23 2 1 -21
-   -1 sprites/signals.png 210 40 01 26 2 1 -24
-   -1 sprites/signals.png 226 40 01 21 11 -7 -19
-   -1 sprites/signals.png 242 40 01 21 8 -4 -19
-   -1 sprites/signals.png 258 40 01 21 11 1 -19
-   -1 sprites/signals.png 274 40 01 21 8 1 -19
-   -1 sprites/signals.png 290 40 01 21 12 -6 -19
-   -1 sprites/signals.png 322 40 01 23 9 -3 -21
-   -1 sprites/signals.png 338 40 01 21 12 -1 -19
-   -1 sprites/signals.png 370 40 01 21 11 -1 -19
-   -1 sprites/signals.png 386 40 01 21 11 -1 -19
-   -1 sprites/signals.png 402 40 01 23 8 -1 -21
-   -1 sprites/signals.png 418 40 01 21 12 -7 -19
-   -1 sprites/signals.png 450 40 01 21 12 -7 -19
-   -1 sprites/signals.png 482 40 01 21 4 1 -19
-   -1 sprites/signals.png 498 40 01 24 4 1 -22
-   -1 sprites/signals.png 514 40 01 23 4 -1 -21
-   -1 sprites/signals.png 530 40 01 26 4 -1 -24
-   -1 sprites/signals.png 546 40 01 21 13 -7 -19
-   -1 sprites/signals.png 578 40 01 21 10 -4 -19
-   -1 sprites/signals.png 594 40 01 21 13 -1 -19
-   -1 sprites/signals.png 626 40 01 21 10 -1 -19
-   -1 sprites/signals.png 642 40 01 21 11 -6 -19
-   -1 sprites/signals.png 658 40 01 23 8 -3 -21
-   -1 sprites/signals.png 674 40 01 21 11 0 -19
-   -1 sprites/signals.png 690 40 01 21 10 0 -19
-   -1 sprites/signals.png 706 40 01 21 10 0 -19
-   -1 sprites/signals.png 722 40 01 23 7 0 -21
-   -1 sprites/signals.png 738 40 01 21 11 -7 -19
-   -1 sprites/signals.png 754 40 01 21 11 -7 -19
-   -1 sprites/signals.png 770 40 01 21 4 1 -19
-   -1 sprites/signals.png 786 40 01 24 4 1 -22
-   -1 sprites/signals.png 2 88 01 23 4 -1 -21
-   -1 sprites/signals.png 18 88 01 26 4 -1 -24
-   -1 sprites/signals.png 34 88 01 21 12 -7 -19
-   -1 sprites/signals.png 66 88 01 21 9 -4 -19
-   -1 sprites/signals.png 82 88 01 21 12 0 -19
-   -1 sprites/signals.png 114 88 01 21 9 0 -19
-   -1 sprites/signals.png 130 88 01 21 11 -6 -19
-   -1 sprites/signals.png 146 88 01 23 8 -3 -21
-   -1 sprites/signals.png 162 88 01 21 11 0 -19
-   -1 sprites/signals.png 178 88 01 21 10 0 -19
-   -1 sprites/signals.png 194 88 01 21 10 0 -19
-   -1 sprites/signals.png 210 88 01 23 7 0 -21
-   -1 sprites/signals.png 226 88 01 21 11 -7 -19
-   -1 sprites/signals.png 242 88 01 21 11 -7 -19
-   -1 sprites/signals.png 258 88 01 21 4 1 -19
-   -1 sprites/signals.png 274 88 01 24 4 1 -22
-   -1 sprites/signals.png 290 88 01 23 4 -1 -21
-   -1 sprites/signals.png 306 88 01 26 4 -1 -24
-   -1 sprites/signals.png 322 88 01 21 12 -7 -19
-   -1 sprites/signals.png 354 88 01 21 9 -4 -19
-   -1 sprites/signals.png 370 88 01 21 12 0 -19
-   -1 sprites/signals.png 402 88 01 21 9 0 -19
-   -1 sprites/signals.png 418 88 01 19 6 -2 -17
-   -1 sprites/signals.png 434 88 01 19 6 -2 -17
-   -1 sprites/signals.png 450 88 01 19 6 -2 -17
-   -1 sprites/signals.png 466 88 01 19 6 -2 -17
-   -1 sprites/signals.png 482 88 01 19 6 -2 -17
-   -1 sprites/signals.png 498 88 01 19 6 -2 -17
-   -1 sprites/signals.png 514 88 01 19 6 -2 -17
-   -1 sprites/signals.png 530 88 01 19 6 -2 -17
-   -1 sprites/signals.png 546 88 01 19 6 -2 -17
-   -1 sprites/signals.png 562 88 01 19 6 -2 -17
-   -1 sprites/signals.png 578 88 01 19 6 -2 -17
-   -1 sprites/signals.png 594 88 01 19 6 -2 -17
-   -1 sprites/signals.png 610 88 01 19 6 -2 -17
-   -1 sprites/signals.png 626 88 01 19 6 -2 -17
-   -1 sprites/signals.png 642 88 01 19 6 -2 -17
-   -1 sprites/signals.png 658 88 01 19 6 -2 -17
-   -1 sprites/signals.png 674 88 01 19 6 -2 -17
-   -1 sprites/signals.png 690 88 01 19 6 -2 -17
-   -1 sprites/signals.png 706 88 01 19 6 -2 -17
-   -1 sprites/signals.png 722 88 01 19 6 -2 -17
-   -1 sprites/signals.png 738 88 01 19 6 -2 -17
-   -1 sprites/signals.png 754 88 01 19 6 -2 -17
-   -1 sprites/signals.png 770 88 01 19 6 -2 -17
-   -1 sprites/signals.png 786 88 01 19 6 -2 -17
-   -1 sprites/signals.png 2 136 01 19 6 -2 -17
-   -1 sprites/signals.png 18 136 01 19 6 -2 -17
-   -1 sprites/signals.png 34 136 01 19 6 -2 -17
-   -1 sprites/signals.png 50 136 01 19 6 -2 -17
-   -1 sprites/signals.png 66 136 01 19 6 -2 -17
-   -1 sprites/signals.png 82 136 01 19 6 -2 -17
-   -1 sprites/signals.png 98 136 01 19 6 -2 -17
-   -1 sprites/signals.png 114 136 01 19 6 -2 -17
-   -1 sprites/signals.png 130 136 01 21 6 -2 -19
-   -1 sprites/signals.png 146 136 01 21 6 -2 -19
-   -1 sprites/signals.png 162 136 01 21 6 -2 -19
-   -1 sprites/signals.png 178 136 01 21 6 -2 -19
-   -1 sprites/signals.png 194 136 01 21 6 -2 -19
-   -1 sprites/signals.png 210 136 01 21 6 -2 -19
-   -1 sprites/signals.png 226 136 01 21 6 -2 -19
-   -1 sprites/signals.png 242 136 01 21 6 -2 -19
-   -1 sprites/signals.png 258 136 01 21 6 -2 -19
-   -1 sprites/signals.png 274 136 01 21 6 -2 -19
-   -1 sprites/signals.png 290 136 01 21 6 -2 -19
-   -1 sprites/signals.png 306 136 01 21 6 -2 -19
-   -1 sprites/signals.png 322 136 01 21 6 -2 -19
-   -1 sprites/signals.png 338 136 01 21 6 -2 -19
-   -1 sprites/signals.png 354 136 01 21 6 -2 -19
-   -1 sprites/signals.png 370 136 01 21 6 -2 -19
-   -1 sprites/signals.png 386 136 01 21 6 -2 -19
-   -1 sprites/signals.png 402 136 01 21 6 -2 -19
-   -1 sprites/signals.png 418 136 01 21 6 -2 -19
-   -1 sprites/signals.png 434 136 01 21 6 -2 -19
-   -1 sprites/signals.png 450 136 01 21 6 -2 -19
-   -1 sprites/signals.png 466 136 01 21 6 -2 -19
-   -1 sprites/signals.png 482 136 01 21 6 -2 -19
-   -1 sprites/signals.png 498 136 01 21 6 -2 -19
-   -1 sprites/signals.png 514 136 01 21 6 -2 -19
-   -1 sprites/signals.png 530 136 01 21 6 -2 -19
-   -1 sprites/signals.png 546 136 01 21 6 -2 -19
-   -1 sprites/signals.png 562 136 01 21 6 -2 -19
-   -1 sprites/signals.png 578 136 01 21 6 -2 -19
-   -1 sprites/signals.png 594 136 01 21 6 -2 -19
-   -1 sprites/signals.png 610 136 01 21 6 -2 -19
-   -1 sprites/signals.png 626 136 01 21 6 -2 -19
-   -1 sprites/signals.png 642 136 01 21 10 -6 -19
-   -1 sprites/signals.png 658 136 01 23 7 -3 -21
-   -1 sprites/signals.png 674 136 01 21 10 1 -19
-   -1 sprites/signals.png 690 136 01 21 9 1 -19
-   -1 sprites/signals.png 706 136 01 21 9 1 -19
-   -1 sprites/signals.png 722 136 01 23 6 1 -21
-   -1 sprites/signals.png 738 136 01 21 10 -7 -19
-   -1 sprites/signals.png 754 136 01 21 10 -7 -19
-   -1 sprites/signals.png 770 136 01 21 2 1 -19
-   -1 sprites/signals.png 786 136 01 24 2 1 -22
-   -1 sprites/signals.png 2 184 01 23 2 1 -21
-   -1 sprites/signals.png 18 184 01 26 2 1 -24
-   -1 sprites/signals.png 34 184 01 21 11 -7 -19
-   -1 sprites/signals.png 50 184 01 21 8 -4 -19
-   -1 sprites/signals.png 66 184 01 21 11 1 -19
-   -1 sprites/signals.png 82 184 01 21 8 1 -19
-   -1 sprites/signals.png 98 184 01 21 12 -6 -19
-   -1 sprites/signals.png 130 184 01 23 9 -3 -21
-   -1 sprites/signals.png 146 184 01 21 12 -1 -19
-   -1 sprites/signals.png 178 184 01 21 11 -1 -19
-   -1 sprites/signals.png 194 184 01 21 11 -1 -19
-   -1 sprites/signals.png 210 184 01 23 8 -1 -21
-   -1 sprites/signals.png 226 184 01 21 12 -7 -19
-   -1 sprites/signals.png 258 184 01 21 12 -7 -19
-   -1 sprites/signals.png 290 184 01 21 4 -1 -19
-   -1 sprites/signals.png 306 184 01 24 4 -1 -22
-   -1 sprites/signals.png 322 184 01 23 4 1 -21
-   -1 sprites/signals.png 338 184 01 26 4 1 -24
-   -1 sprites/signals.png 354 184 01 21 13 -7 -19
-   -1 sprites/signals.png 386 184 01 21 10 -4 -19
-   -1 sprites/signals.png 402 184 01 21 13 -1 -19
-   -1 sprites/signals.png 434 184 01 21 10 -1 -19
-   -1 sprites/signals.png 450 184 01 21 11 -6 -19
-   -1 sprites/signals.png 466 184 01 23 8 -3 -21
-   -1 sprites/signals.png 482 184 01 21 11 0 -19
-   -1 sprites/signals.png 498 184 01 21 10 0 -19
-   -1 sprites/signals.png 514 184 01 21 10 0 -19
-   -1 sprites/signals.png 530 184 01 23 7 0 -21
-   -1 sprites/signals.png 546 184 01 21 11 -7 -19
-   -1 sprites/signals.png 562 184 01 21 11 -7 -19
-   -1 sprites/signals.png 578 184 01 21 4 1 -19
-   -1 sprites/signals.png 594 184 01 24 4 1 -22
-   -1 sprites/signals.png 610 184 01 23 4 -1 -21
-   -1 sprites/signals.png 626 184 01 26 4 -1 -24
-   -1 sprites/signals.png 642 184 01 21 12 -7 -19
-   -1 sprites/signals.png 674 184 01 21 9 -4 -19
-   -1 sprites/signals.png 690 184 01 21 12 0 -19
-   -1 sprites/signals.png 722 184 01 21 9 0 -19
-   -1 sprites/signals.png 738 184 01 21 11 -6 -19
-   -1 sprites/signals.png 754 184 01 23 8 -3 -21
-   -1 sprites/signals.png 770 184 01 21 11 0 -19
-   -1 sprites/signals.png 786 184 01 21 10 0 -19
-   -1 sprites/signals.png 2 232 01 21 10 0 -19
-   -1 sprites/signals.png 18 232 01 23 7 0 -21
-   -1 sprites/signals.png 34 232 01 21 11 -7 -19
-   -1 sprites/signals.png 50 232 01 21 11 -7 -19
-   -1 sprites/signals.png 66 232 01 21 4 1 -19
-   -1 sprites/signals.png 82 232 01 24 4 1 -22
-   -1 sprites/signals.png 98 232 01 23 4 -1 -21
-   -1 sprites/signals.png 114 232 01 26 4 -1 -24
-   -1 sprites/signals.png 130 232 01 21 12 -7 -19
-   -1 sprites/signals.png 162 232 01 21 9 -4 -19
-   -1 sprites/signals.png 178 232 01 21 12 0 -19
-   -1 sprites/signals.png 210 232 01 21 9 0 -19
+   -1 sprites/signals.png 8bpp  66    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  82    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  98    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 114    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 130    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 258    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 274    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786    8   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2   40   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18   40   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34   40  10  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp  50   40   7  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp  66   40  10  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82   40   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  98   40   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 114   40   6  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 130   40  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 146   40  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 162   40   2  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 178   40   2  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 194   40   2  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 210   40   2  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 226   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 242   40   8  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 258   40  11  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 274   40   8  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 290   40  12  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 322   40   9  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 338   40  12  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 370   40  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 386   40  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 402   40   8  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 418   40  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 450   40  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 482   40   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 498   40   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 514   40   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 530   40   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 546   40  13  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 578   40  10  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 594   40  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 626   40  10  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 642   40  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 658   40   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 674   40  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 690   40  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 706   40  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 722   40   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 738   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 754   40  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 770   40   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 786   40   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp   2   88   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp  18   88   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp  34   88  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66   88   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp  82   88  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 114   88   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 130   88  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 146   88   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 162   88  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 178   88  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 194   88  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 210   88   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 226   88  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 242   88  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258   88   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 274   88   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 290   88   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 306   88   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 322   88  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 354   88   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 370   88  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 402   88   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 418   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 434   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 450   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 466   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 482   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 498   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 514   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 530   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 546   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 562   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 578   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 594   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 610   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 626   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 642   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 658   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 674   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 690   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 706   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 722   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 738   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 754   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 770   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 786   88   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp   2  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  18  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  34  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  50  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  66  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  82  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  98  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 114  136   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 130  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 258  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 274  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  136   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  136  10  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 658  136   7  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 674  136  10  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 690  136   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 706  136   9  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 722  136   6  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 738  136  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 754  136  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 770  136   2  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 786  136   2  24   1 -22 normal
+   -1 sprites/signals.png 8bpp   2  184   2  23   1 -21 normal
+   -1 sprites/signals.png 8bpp  18  184   2  26   1 -24 normal
+   -1 sprites/signals.png 8bpp  34  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  50  184   8  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp  66  184  11  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82  184   8  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  98  184  12  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 130  184   9  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 146  184  12  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 178  184  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 194  184  11  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 210  184   8  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 226  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 290  184   4  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 306  184   4  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 322  184   4  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 338  184   4  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 354  184  13  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 386  184  10  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 402  184  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 434  184  10  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 450  184  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 466  184   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 482  184  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 498  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 514  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 530  184   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 546  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 562  184  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 578  184   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp 594  184   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp 610  184   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 626  184   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 642  184  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 674  184   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 690  184  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 722  184   9  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 738  184  11  21  -6 -19 normal
+   -1 sprites/signals.png 8bpp 754  184   8  23  -3 -21 normal
+   -1 sprites/signals.png 8bpp 770  184  11  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 786  184  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp   2  232  10  21   0 -19 normal
+   -1 sprites/signals.png 8bpp  18  232   7  23   0 -21 normal
+   -1 sprites/signals.png 8bpp  34  232  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  50  232  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66  232   4  21   1 -19 normal
+   -1 sprites/signals.png 8bpp  82  232   4  24   1 -22 normal
+   -1 sprites/signals.png 8bpp  98  232   4  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 114  232   4  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 130  232  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 162  232   9  21  -4 -19 normal
+   -1 sprites/signals.png 8bpp 178  232  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 210  232   9  21   0 -19 normal
    -1 * 6	 07 85 01 \70 3B F2
    -1 * 6	 07 86 01 \70 04 F1
    -1 * 3	 05 04 F0
-   -1 sprites/signals.png 274 232 01 21 6 -2 -19
-   -1 sprites/signals.png 290 232 01 21 6 -2 -19
-   -1 sprites/signals.png 306 232 01 21 6 -2 -19
-   -1 sprites/signals.png 322 232 01 21 6 -2 -19
-   -1 sprites/signals.png 338 232 01 21 6 -2 -19
-   -1 sprites/signals.png 354 232 01 21 6 -2 -19
-   -1 sprites/signals.png 370 232 01 21 6 -2 -19
-   -1 sprites/signals.png 386 232 01 21 6 -2 -19
-   -1 sprites/signals.png 402 232 01 21 6 -2 -19
-   -1 sprites/signals.png 418 232 01 21 6 -2 -19
-   -1 sprites/signals.png 434 232 01 21 6 -2 -19
-   -1 sprites/signals.png 450 232 01 21 6 -2 -19
-   -1 sprites/signals.png 466 232 01 21 6 -2 -19
-   -1 sprites/signals.png 482 232 01 21 6 -2 -19
-   -1 sprites/signals.png 498 232 01 21 6 -2 -19
-   -1 sprites/signals.png 514 232 01 21 6 -2 -19
-   -1 sprites/signals.png 530 232 01 21 6 -2 -19
-   -1 sprites/signals.png 546 232 01 21 6 -2 -19
-   -1 sprites/signals.png 562 232 01 21 6 -2 -19
-   -1 sprites/signals.png 578 232 01 21 6 -2 -19
-   -1 sprites/signals.png 594 232 01 21 6 -2 -19
-   -1 sprites/signals.png 610 232 01 21 6 -2 -19
-   -1 sprites/signals.png 626 232 01 21 6 -2 -19
-   -1 sprites/signals.png 642 232 01 21 6 -2 -19
-   -1 sprites/signals.png 658 232 01 21 6 -2 -19
-   -1 sprites/signals.png 674 232 01 21 6 -2 -19
-   -1 sprites/signals.png 690 232 01 21 6 -2 -19
-   -1 sprites/signals.png 706 232 01 21 6 -2 -19
-   -1 sprites/signals.png 722 232 01 21 6 -2 -19
-   -1 sprites/signals.png 738 232 01 21 6 -2 -19
-   -1 sprites/signals.png 754 232 01 21 6 -2 -19
-   -1 sprites/signals.png 770 232 01 21 6 -2 -19
-   -1 sprites/signals.png 786 232 01 21 6 -2 -19
-   -1 sprites/signals.png 2 280 01 21 6 -2 -19
-   -1 sprites/signals.png 18 280 01 21 6 -2 -19
-   -1 sprites/signals.png 34 280 01 21 6 -2 -19
-   -1 sprites/signals.png 50 280 01 21 6 -2 -19
-   -1 sprites/signals.png 66 280 01 21 6 -2 -19
-   -1 sprites/signals.png 82 280 01 21 6 -2 -19
-   -1 sprites/signals.png 98 280 01 21 6 -2 -19
-   -1 sprites/signals.png 114 280 01 21 6 -2 -19
-   -1 sprites/signals.png 130 280 01 21 6 -2 -19
-   -1 sprites/signals.png 146 280 01 21 6 -2 -19
-   -1 sprites/signals.png 162 280 01 21 6 -2 -19
-   -1 sprites/signals.png 178 280 01 21 6 -2 -19
-   -1 sprites/signals.png 194 280 01 21 6 -2 -19
-   -1 sprites/signals.png 210 280 01 21 6 -2 -19
-   -1 sprites/signals.png 226 280 01 21 6 -2 -19
-   -1 sprites/signals.png 242 280 01 21 10 -7 -19
-   -1 sprites/signals.png 258 280 01 23 10 -8 -21
-   -1 sprites/signals.png 274 280 01 23 10 -7 -21
-   -1 sprites/signals.png 290 280 01 26 7 -5 -24
-   -1 sprites/signals.png 306 280 01 21 10 -7 -19
-   -1 sprites/signals.png 322 280 01 23 10 -6 -21
-   -1 sprites/signals.png 338 280 01 23 10 1 -21
-   -1 sprites/signals.png 354 280 01 26 7 2 -24
-   -1 sprites/signals.png 370 280 01 23 3 0 -21
-   -1 sprites/signals.png 386 280 01 26 3 0 -24
-   -1 sprites/signals.png 402 280 01 21 3 0 -19
-   -1 sprites/signals.png 418 280 01 24 3 0 -22
-   -1 sprites/signals.png 434 280 01 21 12 0 -19
-   -1 sprites/signals.png 466 280 01 24 9 0 -22
-   -1 sprites/signals.png 482 280 01 21 12 -9 -19
-   -1 sprites/signals.png 514 280 01 24 9 -6 -22
-   -1 sprites/signals.png 530 280 01 21 12 -9 -19
-   -1 sprites/signals.png 562 280 01 23 11 -9 -21
-   -1 sprites/signals.png 578 280 01 23 11 -7 -21
-   -1 sprites/signals.png 594 280 01 26 9 -5 -24
-   -1 sprites/signals.png 610 280 01 21 12 -7 -19
-   -1 sprites/signals.png 642 280 01 23 11 -6 -21
-   -1 sprites/signals.png 658 280 01 23 11 0 -21
-   -1 sprites/signals.png 674 280 01 26 9 0 -24
-   -1 sprites/signals.png 690 280 01 23 5 0 -21
-   -1 sprites/signals.png 706 280 01 26 5 0 -24
-   -1 sprites/signals.png 722 280 01 21 5 -2 -19
-   -1 sprites/signals.png 738 280 01 24 5 -2 -22
-   -1 sprites/signals.png 754 280 01 21 13 -1 -19
-   -1 sprites/signals.png 786 280 01 24 10 -1 -22
-   -1 sprites/signals.png 2 328 01 21 13 -9 -19
-   -1 sprites/signals.png 34 328 01 24 10 -6 -22
-   -1 sprites/signals.png 50 328 01 21 11 -8 -19
-   -1 sprites/signals.png 66 328 01 23 10 -8 -21
-   -1 sprites/signals.png 82 328 01 23 10 -7 -21
-   -1 sprites/signals.png 98 328 01 26 8 -5 -24
-   -1 sprites/signals.png 114 328 01 21 11 -7 -19
-   -1 sprites/signals.png 130 328 01 23 10 -6 -21
-   -1 sprites/signals.png 146 328 01 23 10 1 -21
-   -1 sprites/signals.png 162 328 01 26 8 1 -24
-   -1 sprites/signals.png 178 328 01 23 5 0 -21
-   -1 sprites/signals.png 194 328 01 26 5 0 -24
-   -1 sprites/signals.png 210 328 01 21 5 -2 -19
-   -1 sprites/signals.png 226 328 01 24 5 -2 -22
-   -1 sprites/signals.png 242 328 01 21 12 0 -19
-   -1 sprites/signals.png 274 328 01 24 9 0 -22
-   -1 sprites/signals.png 290 328 01 21 12 -9 -19
-   -1 sprites/signals.png 322 328 01 24 9 -6 -22
-   -1 sprites/signals.png 338 328 01 21 11 -8 -19
-   -1 sprites/signals.png 354 328 01 23 10 -8 -21
-   -1 sprites/signals.png 370 328 01 23 10 -7 -21
-   -1 sprites/signals.png 386 328 01 26 8 -5 -24
-   -1 sprites/signals.png 402 328 01 21 11 -7 -19
-   -1 sprites/signals.png 418 328 01 23 10 -6 -21
-   -1 sprites/signals.png 434 328 01 23 10 1 -21
-   -1 sprites/signals.png 450 328 01 26 8 1 -24
-   -1 sprites/signals.png 466 328 01 23 5 0 -21
-   -1 sprites/signals.png 482 328 01 26 5 0 -24
-   -1 sprites/signals.png 498 328 01 21 5 -2 -19
-   -1 sprites/signals.png 514 328 01 24 5 -2 -22
-   -1 sprites/signals.png 530 328 01 21 12 0 -19
-   -1 sprites/signals.png 562 328 01 24 9 0 -22
-   -1 sprites/signals.png 578 328 01 21 12 -9 -19
-   -1 sprites/signals.png 610 328 01 24 9 -6 -22
-   -1 sprites/signals.png 626 328 01 19 6 -2 -17
-   -1 sprites/signals.png 642 328 01 19 6 -2 -17
-   -1 sprites/signals.png 658 328 01 19 6 -2 -17
-   -1 sprites/signals.png 674 328 01 19 6 -2 -17
-   -1 sprites/signals.png 690 328 01 19 6 -2 -17
-   -1 sprites/signals.png 706 328 01 19 6 -2 -17
-   -1 sprites/signals.png 722 328 01 19 6 -2 -17
-   -1 sprites/signals.png 738 328 01 19 6 -2 -17
-   -1 sprites/signals.png 754 328 01 19 6 -2 -17
-   -1 sprites/signals.png 770 328 01 19 6 -2 -17
-   -1 sprites/signals.png 786 328 01 19 6 -2 -17
-   -1 sprites/signals.png 2 376 01 19 6 -2 -17
-   -1 sprites/signals.png 18 376 01 19 6 -2 -17
-   -1 sprites/signals.png 34 376 01 19 6 -2 -17
-   -1 sprites/signals.png 50 376 01 19 6 -2 -17
-   -1 sprites/signals.png 66 376 01 19 6 -2 -17
-   -1 sprites/signals.png 82 376 01 19 6 -2 -17
-   -1 sprites/signals.png 98 376 01 19 6 -2 -17
-   -1 sprites/signals.png 114 376 01 19 6 -2 -17
-   -1 sprites/signals.png 130 376 01 19 6 -2 -17
-   -1 sprites/signals.png 146 376 01 19 6 -2 -17
-   -1 sprites/signals.png 162 376 01 19 6 -2 -17
-   -1 sprites/signals.png 178 376 01 19 6 -2 -17
-   -1 sprites/signals.png 194 376 01 19 6 -2 -17
-   -1 sprites/signals.png 210 376 01 19 6 -2 -17
-   -1 sprites/signals.png 226 376 01 19 6 -2 -17
-   -1 sprites/signals.png 242 376 01 19 6 -2 -17
-   -1 sprites/signals.png 258 376 01 19 6 -2 -17
-   -1 sprites/signals.png 274 376 01 19 6 -2 -17
-   -1 sprites/signals.png 290 376 01 19 6 -2 -17
-   -1 sprites/signals.png 306 376 01 19 6 -2 -17
-   -1 sprites/signals.png 322 376 01 19 6 -2 -17
-   -1 sprites/signals.png 338 376 01 21 6 -2 -19
-   -1 sprites/signals.png 354 376 01 21 6 -2 -19
-   -1 sprites/signals.png 370 376 01 21 6 -2 -19
-   -1 sprites/signals.png 386 376 01 21 6 -2 -19
-   -1 sprites/signals.png 402 376 01 21 6 -2 -19
-   -1 sprites/signals.png 418 376 01 21 6 -2 -19
-   -1 sprites/signals.png 434 376 01 21 6 -2 -19
-   -1 sprites/signals.png 450 376 01 21 6 -2 -19
-   -1 sprites/signals.png 466 376 01 21 6 -2 -19
-   -1 sprites/signals.png 482 376 01 21 6 -2 -19
-   -1 sprites/signals.png 498 376 01 21 6 -2 -19
-   -1 sprites/signals.png 514 376 01 21 6 -2 -19
-   -1 sprites/signals.png 530 376 01 21 6 -2 -19
-   -1 sprites/signals.png 546 376 01 21 6 -2 -19
-   -1 sprites/signals.png 562 376 01 21 6 -2 -19
-   -1 sprites/signals.png 578 376 01 21 6 -2 -19
-   -1 sprites/signals.png 594 376 01 21 6 -2 -19
-   -1 sprites/signals.png 610 376 01 21 6 -2 -19
-   -1 sprites/signals.png 626 376 01 21 6 -2 -19
-   -1 sprites/signals.png 642 376 01 21 6 -2 -19
-   -1 sprites/signals.png 658 376 01 21 6 -2 -19
-   -1 sprites/signals.png 674 376 01 21 6 -2 -19
-   -1 sprites/signals.png 690 376 01 21 6 -2 -19
-   -1 sprites/signals.png 706 376 01 21 6 -2 -19
-   -1 sprites/signals.png 722 376 01 21 6 -2 -19
-   -1 sprites/signals.png 738 376 01 21 6 -2 -19
-   -1 sprites/signals.png 754 376 01 21 6 -2 -19
-   -1 sprites/signals.png 770 376 01 21 6 -2 -19
-   -1 sprites/signals.png 786 376 01 21 6 -2 -19
-   -1 sprites/signals.png 2 408 01 21 6 -2 -19
-   -1 sprites/signals.png 18 408 01 21 6 -2 -19
-   -1 sprites/signals.png 34 408 01 21 6 -2 -19
-   -1 sprites/signals.png 50 408 01 21 10 -7 -19
-   -1 sprites/signals.png 66 408 01 23 10 -8 -21
-   -1 sprites/signals.png 82 408 01 23 10 -7 -21
-   -1 sprites/signals.png 98 408 01 26 7 -5 -24
-   -1 sprites/signals.png 114 408 01 21 10 -7 -19
-   -1 sprites/signals.png 130 408 01 23 10 -6 -21
-   -1 sprites/signals.png 146 408 01 23 10 1 -21
-   -1 sprites/signals.png 162 408 01 26 7 2 -24
-   -1 sprites/signals.png 178 408 01 23 3 0 -21
-   -1 sprites/signals.png 194 408 01 26 3 0 -24
-   -1 sprites/signals.png 210 408 01 21 3 0 -19
-   -1 sprites/signals.png 226 408 01 24 3 0 -22
-   -1 sprites/signals.png 242 408 01 21 12 0 -19
-   -1 sprites/signals.png 274 408 01 24 9 0 -22
-   -1 sprites/signals.png 290 408 01 21 12 -9 -19
-   -1 sprites/signals.png 322 408 01 24 9 -6 -22
-   -1 sprites/signals.png 338 408 01 21 12 -9 -19
-   -1 sprites/signals.png 370 408 01 23 11 -9 -21
-   -1 sprites/signals.png 386 408 01 23 11 -7 -21
-   -1 sprites/signals.png 402 408 01 26 9 -5 -24
-   -1 sprites/signals.png 418 408 01 21 12 -7 -19
-   -1 sprites/signals.png 450 408 01 23 11 -6 -21
-   -1 sprites/signals.png 466 408 01 23 11 0 -21
-   -1 sprites/signals.png 482 408 01 26 9 0 -24
-   -1 sprites/signals.png 498 408 01 23 5 -1 -21
-   -1 sprites/signals.png 514 408 01 26 5 -1 -24
-   -1 sprites/signals.png 530 408 01 21 5 -1 -19
-   -1 sprites/signals.png 546 408 01 24 5 -1 -22
-   -1 sprites/signals.png 562 408 01 21 13 -1 -19
-   -1 sprites/signals.png 594 408 01 24 10 -1 -22
-   -1 sprites/signals.png 610 408 01 21 13 -9 -19
-   -1 sprites/signals.png 642 408 01 24 10 -6 -22
-   -1 sprites/signals.png 658 408 01 21 11 -8 -19
-   -1 sprites/signals.png 674 408 01 23 10 -8 -21
-   -1 sprites/signals.png 690 408 01 23 10 -7 -21
-   -1 sprites/signals.png 706 408 01 26 8 -5 -24
-   -1 sprites/signals.png 722 408 01 21 11 -7 -19
-   -1 sprites/signals.png 738 408 01 23 10 -6 -21
-   -1 sprites/signals.png 754 408 01 23 10 1 -21
-   -1 sprites/signals.png 770 408 01 26 8 1 -24
-   -1 sprites/signals.png 786 408 01 23 5 0 -21
-   -1 sprites/signals.png 2 456 01 26 5 0 -24
-   -1 sprites/signals.png 18 456 01 21 5 -2 -19
-   -1 sprites/signals.png 34 456 01 24 5 -2 -22
-   -1 sprites/signals.png 50 456 01 21 12 0 -19
-   -1 sprites/signals.png 82 456 01 24 9 0 -22
-   -1 sprites/signals.png 98 456 01 21 12 -9 -19
-   -1 sprites/signals.png 130 456 01 24 9 -6 -22
-   -1 sprites/signals.png 146 456 01 21 11 -8 -19
-   -1 sprites/signals.png 162 456 01 23 10 -8 -21
-   -1 sprites/signals.png 178 456 01 23 10 -7 -21
-   -1 sprites/signals.png 194 456 01 26 8 -5 -24
-   -1 sprites/signals.png 210 456 01 21 11 -7 -19
-   -1 sprites/signals.png 226 456 01 23 10 -6 -21
-   -1 sprites/signals.png 242 456 01 23 10 1 -21
-   -1 sprites/signals.png 258 456 01 26 8 1 -24
-   -1 sprites/signals.png 274 456 01 23 5 0 -21
-   -1 sprites/signals.png 290 456 01 26 5 0 -24
-   -1 sprites/signals.png 306 456 01 21 5 -2 -19
-   -1 sprites/signals.png 322 456 01 24 5 -2 -22
-   -1 sprites/signals.png 338 456 01 21 12 0 -19
-   -1 sprites/signals.png 370 456 01 24 9 0 -22
-   -1 sprites/signals.png 386 456 01 21 12 -9 -19
-   -1 sprites/signals.png 418 456 01 24 9 -6 -22
+   -1 sprites/signals.png 8bpp 274  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 290  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 306  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 338  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786  232   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  50  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  66  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  82  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  98  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 114  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 130  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 146  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 162  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 178  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 194  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 210  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  280   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 242  280  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 258  280  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 274  280  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 290  280   7  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 306  280  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 322  280  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 338  280  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 354  280   7  26   2 -24 normal
+   -1 sprites/signals.png 8bpp 370  280   3  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 386  280   3  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 402  280   3  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 418  280   3  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 434  280  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 466  280   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 482  280  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 514  280   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 530  280  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 562  280  11  23  -9 -21 normal
+   -1 sprites/signals.png 8bpp 578  280  11  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 594  280   9  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 610  280  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 642  280  11  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 658  280  11  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 674  280   9  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 690  280   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 706  280   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 722  280   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  280   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 754  280  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 786  280  10  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp   2  328  13  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp  34  328  10  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp  50  328  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp  66  328  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp  82  328  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp  98  328   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 114  328  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 130  328  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 146  328  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 162  328   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 178  328   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 194  328   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 210  328   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 226  328   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 242  328  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 274  328   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 290  328  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 322  328   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 338  328  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 354  328  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 370  328  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 386  328   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 402  328  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 418  328  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 434  328  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 450  328   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 466  328   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 482  328   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 498  328   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  328   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 530  328  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 562  328   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 578  328  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 610  328   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 626  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 642  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 658  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 674  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 690  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 706  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 722  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 738  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 754  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 770  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 786  328   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp   2  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  18  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  34  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  50  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  66  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  82  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp  98  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 114  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 130  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 146  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 162  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 178  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 194  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 210  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 226  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 242  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 258  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 274  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 290  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 306  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 322  376   6  19  -2 -17 normal
+   -1 sprites/signals.png 8bpp 338  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 354  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 370  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 386  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 402  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 418  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 434  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 450  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 466  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 482  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 498  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 514  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 530  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 546  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 562  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 578  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 594  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 610  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 626  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 642  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 658  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 674  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 690  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 706  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 722  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 738  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 754  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 770  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 786  376   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp   2  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  18  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  408   6  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  50  408  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp  66  408  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp  82  408  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp  98  408   7  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 114  408  10  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 130  408  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 146  408  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 162  408   7  26   2 -24 normal
+   -1 sprites/signals.png 8bpp 178  408   3  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 194  408   3  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 210  408   3  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 226  408   3  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 242  408  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 274  408   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 290  408  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 322  408   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 338  408  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 370  408  11  23  -9 -21 normal
+   -1 sprites/signals.png 8bpp 386  408  11  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 402  408   9  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 418  408  12  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 450  408  11  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 466  408  11  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 482  408   9  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 498  408   5  23  -1 -21 normal
+   -1 sprites/signals.png 8bpp 514  408   5  26  -1 -24 normal
+   -1 sprites/signals.png 8bpp 530  408   5  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 546  408   5  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 562  408  13  21  -1 -19 normal
+   -1 sprites/signals.png 8bpp 594  408  10  24  -1 -22 normal
+   -1 sprites/signals.png 8bpp 610  408  13  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 642  408  10  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 658  408  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 674  408  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 690  408  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 706  408   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 722  408  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 738  408  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 754  408  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 770  408   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 786  408   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp   2  456   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp  18  456   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp  34  456   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp  50  456  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp  82  456   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp  98  456  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 130  456   9  24  -6 -22 normal
+   -1 sprites/signals.png 8bpp 146  456  11  21  -8 -19 normal
+   -1 sprites/signals.png 8bpp 162  456  10  23  -8 -21 normal
+   -1 sprites/signals.png 8bpp 178  456  10  23  -7 -21 normal
+   -1 sprites/signals.png 8bpp 194  456   8  26  -5 -24 normal
+   -1 sprites/signals.png 8bpp 210  456  11  21  -7 -19 normal
+   -1 sprites/signals.png 8bpp 226  456  10  23  -6 -21 normal
+   -1 sprites/signals.png 8bpp 242  456  10  23   1 -21 normal
+   -1 sprites/signals.png 8bpp 258  456   8  26   1 -24 normal
+   -1 sprites/signals.png 8bpp 274  456   5  23   0 -21 normal
+   -1 sprites/signals.png 8bpp 290  456   5  26   0 -24 normal
+   -1 sprites/signals.png 8bpp 306  456   5  21  -2 -19 normal
+   -1 sprites/signals.png 8bpp 322  456   5  24  -2 -22 normal
+   -1 sprites/signals.png 8bpp 338  456  12  21   0 -19 normal
+   -1 sprites/signals.png 8bpp 370  456   9  24   0 -22 normal
+   -1 sprites/signals.png 8bpp 386  456  12  21  -9 -19 normal
+   -1 sprites/signals.png 8bpp 418  456   9  24  -6 -22 normal

media/extra_grf/sloped_tracks.nfo

@@ -8,15 +8,15 @@
 //
    -1 * 0	 0C "Sloped tracks"
    -1 * 3	 05 0F 0C
-   -1 sprites/sloped_tracks.png 50 8 09 29 42 -19 -3
-   -1 sprites/sloped_tracks.png 98 8 09 13 41 -20 5
-   -1 sprites/sloped_tracks.png 146 8 09 14 42 -19 5
-   -1 sprites/sloped_tracks.png 194 8 09 29 42 -21 -3
-   -1 sprites/sloped_tracks.png 242 8 09 25 33 -15 -1
-   -1 sprites/sloped_tracks.png 290 8 09 10 33 -15 7
-   -1 sprites/sloped_tracks.png 338 8 09 10 34 -15 7
-   -1 sprites/sloped_tracks.png 386 8 09 25 34 -15 -1
-   -1 sprites/sloped_tracks.png 434 8 09 23 31 -13 -1
-   -1 sprites/sloped_tracks.png 482 8 09 10 32 -15 7
-   -1 sprites/sloped_tracks.png 530 8 09 10 31 -15 7
-   -1 sprites/sloped_tracks.png 578 8 09 23 31 -16 -1
+   -1 sprites/sloped_tracks.png 8bpp  50    8  42  29 -19  -3 normal
+   -1 sprites/sloped_tracks.png 8bpp  98    8  41  13 -20   5 normal
+   -1 sprites/sloped_tracks.png 8bpp 146    8  42  14 -19   5 normal
+   -1 sprites/sloped_tracks.png 8bpp 194    8  42  29 -21  -3 normal
+   -1 sprites/sloped_tracks.png 8bpp 242    8  33  25 -15  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 290    8  33  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 338    8  34  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 386    8  34  25 -15  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 434    8  31  23 -13  -1 normal
+   -1 sprites/sloped_tracks.png 8bpp 482    8  32  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 530    8  31  10 -15   7 normal
+   -1 sprites/sloped_tracks.png 8bpp 578    8  31  23 -16  -1 normal

media/extra_grf/tramtracks.nfo

@@ -8,116 +8,116 @@
 //
    -1 * 0	 0C "Tram track graphics by PikkaBird"
    -1 * 3	 05 0B 71
-   -1 sprites/tramtracks.png 18 8 09 13 20 0 4
-   -1 sprites/tramtracks.png 50 8 09 13 20 0 4
-   -1 sprites/tramtracks.png 82 8 03 36 64 -18 -8
-   -1 sprites/tramtracks.png 162 8 03 36 62 -16 -8
-   -1 sprites/tramtracks.png 242 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 8 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 56 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 402 56 09 23 64 -31 0
-   -1 sprites/tramtracks.png 482 56 09 23 64 -31 0
-   -1 sprites/tramtracks.png 562 56 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 642 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 56 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 120 09 31 64 -31 0
-   -1 sprites/tramtracks.png 2 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 168 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 168 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 642 168 09 23 64 -31 0
-   -1 sprites/tramtracks.png 722 168 09 23 64 -31 0
-   -1 sprites/tramtracks.png 2 232 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 82 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 162 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 242 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 322 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 402 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 232 09 20 20 0 0
-   -1 sprites/tramtracks.png 594 232 09 31 64 -31 0
-   -1 sprites/tramtracks.png 674 232 09 64 62 2 -49
-   -1 sprites/tramtracks.png 2 312 09 31 64 -31 0
-   -1 sprites/tramtracks.png 82 312 09 64 62 -62 -49
-   -1 sprites/tramtracks.png 162 312 09 64 62 -62 -49
-   -1 sprites/tramtracks.png 242 312 09 64 62 2 -49
-   -1 sprites/tramtracks.png 322 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 312 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 392 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 642 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 392 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 82 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 162 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 472 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 402 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 482 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 472 09 31 64 -31 0
-   -1 sprites/tramtracks.png 722 472 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 722 552 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 82 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 242 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 402 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 562 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 642 616 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 722 616 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 2 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 82 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 162 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 242 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 322 696 09 56 64 -31 -25
-   -1 sprites/tramtracks.png 402 696 09 48 64 -31 -17
-   -1 sprites/tramtracks.png 482 696 09 31 64 -31 0
-   -1 sprites/tramtracks.png 562 696 09 31 64 -31 0
-   -1 sprites/tramtracks.png 642 696 09 39 64 -31 -8
-   -1 sprites/tramtracks.png 722 696 09 23 64 -31 0
-   -1 sprites/tramtracks.png 2 776 09 23 64 -31 0
-   -1 sprites/tramtracks.png 82 776 09 39 64 -31 -8
+   -1 sprites/tramtracks.png 8bpp  18    8  20  13   0   4 normal
+   -1 sprites/tramtracks.png 8bpp  50    8  20  13   0   4 normal
+   -1 sprites/tramtracks.png 8bpp  82    8  64  36 -18  -8 normal
+   -1 sprites/tramtracks.png 8bpp 162    8  62  36 -16  -8 normal
+   -1 sprites/tramtracks.png 8bpp 242    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722    8  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322   56  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 402   56  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482   56  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562   56  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 642   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722   56  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  120  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  168  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  168  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 642  168  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  168  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  232  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp  82  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 162  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 242  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 322  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 402  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  232  20  20   0   0 normal
+   -1 sprites/tramtracks.png 8bpp 594  232  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 674  232  62  64   2 -49 normal
+   -1 sprites/tramtracks.png 8bpp   2  312  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  312  62  64 -62 -49 normal
+   -1 sprites/tramtracks.png 8bpp 162  312  62  64 -62 -49 normal
+   -1 sprites/tramtracks.png 8bpp 242  312  62  64   2 -49 normal
+   -1 sprites/tramtracks.png 8bpp 322  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  312  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  392  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 642  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  392  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp  82  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 162  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  472  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 402  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 482  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  472  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 722  472  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 722  552  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp  82  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 242  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 402  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 562  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 642  616  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 722  616  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp   2  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp  82  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 162  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 242  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 322  696  64  56 -31 -25 normal
+   -1 sprites/tramtracks.png 8bpp 402  696  64  48 -31 -17 normal
+   -1 sprites/tramtracks.png 8bpp 482  696  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 562  696  64  31 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp 642  696  64  39 -31  -8 normal
+   -1 sprites/tramtracks.png 8bpp 722  696  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp   2  776  64  23 -31   0 normal
+   -1 sprites/tramtracks.png 8bpp  82  776  64  39 -31  -8 normal

media/extra_grf/tunnel_portals.nfo

@@ -12,63 +12,63 @@
 // Tropical sprites.
    -1 * 6	 07 83 01 \7! 02 11
    -1 * 3	 05 17 10
-   -1 sprites/tunnel_portals.png 5 88 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 88 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 88 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 88 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 88 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 88 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 88 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 88 01 37 40 -31 -38
-   -1 sprites/tunnel_portals.png 5 170 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 170 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 170 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 170 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 170 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 170 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 170 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 170 01 37 40 -31 -38
+   -1 sprites/tunnel_portals.png 8bpp   5   88  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43   88  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86   88  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124   88  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168   88  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206   88  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249   88  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287   88  40  37 -31 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp   5  170  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  170  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  170  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  170  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  170  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  170  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  170  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  170  40  37 -31 -38 normal
 
 // Temperate grass + snow sprites.
    -1 * 6	 07 83 01 \7= 02 25
    -1 * 3	 05 17 10
-   -1 sprites/tunnel_portals.png 5 6 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 6 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 6 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 6 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 6 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 6 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 6 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 6 01 37 40 -31 -38
-   -1 sprites/tunnel_portals.png 5 129 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 129 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 129 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 129 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 129 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 129 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 129 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 129 01 37 40 -31 -38
+   -1 sprites/tunnel_portals.png 8bpp   5    6  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43    6  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86    6  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124    6  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168    6  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206    6  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249    6  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287    6  40  37 -31 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp   5  129  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  129  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  129  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  129  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  129  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  129  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  129  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  129  40  37 -31 -38 normal
 
 // Arctic grass sprites.
    -1 * 6	 07 83 01 \7! 01 09
    -1 * 4	 05 97 08 00
-   -1 sprites/tunnel_portals.png 5 47 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 47 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 47 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 47 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 47 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 47 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 47 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 47 01 37 40 -31 -38
+   -1 sprites/tunnel_portals.png 8bpp   5   47  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43   47  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86   47  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124   47  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168   47  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206   47  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249   47  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287   47  40  37 -31 -38 normal
 
 // Toyland sprites.
    -1 * 6	 07 83 01 \7! 03 09
    -1 * 4	 05 97 08 00
-   -1 sprites/tunnel_portals.png 5 211 01 33 35 -31 -2
-   -1 sprites/tunnel_portals.png 43 211 01 37 40 -7 -38
-   -1 sprites/tunnel_portals.png 86 211 01 21 35 -31 0
-   -1 sprites/tunnel_portals.png 124 211 01 22 40 -7 -29
-   -1 sprites/tunnel_portals.png 168 211 01 21 35 -2 0
-   -1 sprites/tunnel_portals.png 206 211 01 22 40 -31 -29
-   -1 sprites/tunnel_portals.png 249 211 01 33 35 -2 -2
-   -1 sprites/tunnel_portals.png 287 211 01 37 40 -31 -38
+   -1 sprites/tunnel_portals.png 8bpp   5  211  35  33 -31  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp  43  211  40  37  -7 -38 normal
+   -1 sprites/tunnel_portals.png 8bpp  86  211  35  21 -31   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 124  211  40  22  -7 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 168  211  35  21  -2   0 normal
+   -1 sprites/tunnel_portals.png 8bpp 206  211  40  22 -31 -29 normal
+   -1 sprites/tunnel_portals.png 8bpp 249  211  35  33  -2  -2 normal
+   -1 sprites/tunnel_portals.png 8bpp 287  211  40  37 -31 -38 normal

media/openttd.desktop.filter.awk

@@ -0,0 +1,13 @@
+# $Id: openttd.desktop.translation.awk 19884 2010-05-22 19:59:37Z rubidium $
+
+# This file is part of OpenTTD.
+# OpenTTD 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, version 2.
+# OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
+
+#
+# Awk script to automatically remove duplicate Comment[i]= lines
+#
+
+BEGIN { FS = "="; last = "" }
+{ if (last != $1) { print $0 }; last = $1 }

media/openttd.desktop.translation.awk

@@ -6,10 +6,10 @@
 # See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
 
 #
-# Awk script to automatically generate a single comment line
-# for a translated desktop shortcut. If it does not exist there
+# Awk script to automatically generate a comment lines for
+# a translated desktop shortcut. If it does not exist there
 # is no output.
 #
 
 /##isocode/ { lang = $2; next }
-/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; next}
+/STR_DESKTOP_SHORTCUT_COMMENT/ { sub("^[^:]*:", "", $0); print "Comment[" lang "]=" $0; sub("_.*", "", lang); print "Comment[" lang "]=" $0; next}

os/debian/changelog

@@ -1,3 +1,63 @@
+openttd (1.2.3~RC1) unstable; urgency=low
+
+  * New upstream release 1.2.3-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 17 Oct 2012 00:00:00 +0200
+
+openttd (1.2.2) unstable; urgency=low
+
+  * New upstream release 1.2.2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Thu, 16 Aug 2012 20:00:00 +0200
+
+openttd (1.2.2~RC1) unstable; urgency=low
+
+  * New upstream release 1.2.2-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 01 Aug 2012 00:00:00 +0200
+
+openttd (1.2.1) unstable; urgency=low
+
+  * New upstream release 1.2.1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Fri, 01 Jun 2012 00:00:00 +0200
+
+openttd (1.2.1~RC1) unstable; urgency=low
+
+  * New upstream release 1.2.1-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Wed, 16 Apr 2012 22:00:00 +0200
+
+openttd (1.2.0) unstable; urgency=low
+
+  * New upstream release 1.2.0
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 15 Apr 2012 14:00:00 +0200
+
+openttd (1.2.0~RC4) unstable; urgency=low
+
+  * New upstream release 1.2.0-RC4
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 01 Apr 2012 00:00:00 +0200
+
+openttd (1.2.0~RC3) unstable; urgency=low
+
+  * New upstream release 1.2.0-RC3
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 18 Mar 2012 18:00:00 +0100
+
+openttd (1.2.0~RC2) unstable; urgency=low
+
+  * New upstream release 1.2.0-RC2
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 04 Mar 2012 18:00:00 +0100
+
+openttd (1.2.0~RC1) unstable; urgency=low
+
+  * New upstream release 1.2.0-RC1
+
+ -- Matthijs Kooijman <matthijs@stdin.nl>  Sun, 19 Feb 2012 23:00:00 +0100
+
 openttd (1.2.0~beta4) unstable; urgency=low
 
   * New upstream release 1.2.0-beta4

os/os2/installer/make_installer.cmd

@@ -1,6 +1,6 @@
 @echo off
 
-set OPENTTD_VERSION=1.2.0-beta4
+set OPENTTD_VERSION=1.2.3
 set OPENSFX_VERSION=0.8.0
 set NOSOUND_VERSION=0.8.0
 set OPENGFX_VERSION=1.2.0

os/windows/installer/install.nsi

@@ -1,9 +1,9 @@
 # Version numbers to update
 !define APPV_MAJOR 1
 !define APPV_MINOR 2
-!define APPV_MAINT 0
-!define APPV_BUILD 3
-!define APPV_EXTRA "-beta4"
+!define APPV_MAINT 3
+!define APPV_BUILD 0
+!define APPV_EXTRA "-RC1"
 
 !define APPNAME "OpenTTD"   ; Define application name
 !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}"  ; Define application version
@@ -143,9 +143,6 @@ Section "!OpenTTD" Section1
 	File ${PATH_ROOT}docs\multiplayer.txt
 	Push "$INSTDIR\docs\multiplayer.txt"
 	Call unix2dos
-	File ${PATH_ROOT}docs\32bpp.txt
-	Push "$INSTDIR\docs\32bpp.txt"
-	Call unix2dos
 
 	; Copy the rest of the stuff
 	SetOutPath "$INSTDIR\"
@@ -217,7 +214,6 @@ Section "!OpenTTD" Section1
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Known-bugs.lnk" "$INSTDIR\known-bugs.txt"
 	CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Docs"
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\Multiplayer.lnk" "$INSTDIR\docs\multiplayer.txt"
-	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Docs\32bpp.lnk" "$INSTDIR\docs\32bpp.txt"
 	CreateDirectory "$SMPROGRAMS\$SHORTCUTS\Scripts"
 	CreateShortCut "$SMPROGRAMS\$SHORTCUTS\Scripts\Readme.lnk" "$INSTDIR\scripts\readme.txt"
 	!insertmacro MUI_STARTMENU_WRITE_END

readme.txt

@@ -1,6 +1,6 @@
 OpenTTD readme
-Last updated:    2012-02-12
-Release version: 1.2.0-beta4
+Last updated:    2012-10-17
+Release version: 1.2.3-RC1
 ------------------------------------------------------------------------
 
 
@@ -80,8 +80,10 @@ After you have done all that you can report the bug. Please include the
 following information in your bug report:
  * OpenTTD version (PLEASE test the latest SVN/nightly build)
  * Bug details, including instructions how to reproduce it
- * Platform (Win32, Linux, FreeBSD, ...) and compiler (including version) if
+ * Platform (Windows, Linux, FreeBSD, ...) and compiler (including version) if
    you compiled OpenTTD yourself.
+ * The processor architecture of your OS (32 bits Windows, 64 bits Windows,
+   Linux on an ARM, Mac OS X on a PowerPC, ...)
  * Attach a saved game *and* a screenshot if possible
  * If this bug only occurred recently please note the last version without
    the bug and the first version including the bug. That way we can fix it
@@ -145,9 +147,9 @@ will not be able to reproduce the desync and thus will be unable to fix it.
 
 3.0) Supported platforms
 ---- -------------------
-OpenTTD has been ported to several platforms and operating systems. It shouldn't
-be very difficult to port it to a new platform. The currently working platforms
-are:
+OpenTTD has been ported to several platforms and operating systems. It should
+not be very difficult to port it to a new platform. The currently working
+platforms are:
 
   BeOS                 - SDL or Allegro
   DOS                  - Allegro
@@ -168,7 +170,7 @@ be installed, or you have downloaded an installer, which will automatically
 extract OpenTTD in the given directory.
 
 OpenTTD looks in multiple locations to find the required data files (described
-in section 4.2). Installing any 3rd party files into a "shared" location has
+in section 4.2). Installing any 3rd party files into a 'shared' location has
 the advantage that you only need to do this step once, rather than copying the
 data files into all OpenTTD versions you have.
 Savegames, screenshots, etc are saved relative to the config file (openttd.cfg)
@@ -177,15 +179,16 @@ shared directories, savegames will reside in the save/ directory next to the
 openttd.cfg file there.
 If you want savegames and screenshots in the directory where the OpenTTD binary
 resides, simply have your config file in that location. But if you remove this
-config file, savegames will still be in this directory (see notes in section 4.2)
+config file, savegames will still be in this directory (see notes in
+section 4.2 'OpenTTD directories')
 
 OpenTTD comes without AIs, so if you want to play with AIs you have to download
-them. The easiest way is via the "Check Online Content" button in the main menu.
+them. The easiest way is via the 'Check Online Content' button in the main menu.
 You can select some AIs that you think are compatible with your playing style.
 Another way is manually downloading the AIs from the forum although then you
 need to make sure that you install all the required AI libraries too; they get
-automatically selected (and downloaded) if you get the AIs via the "Check
-Online Content". If you do not have an AI but have configured OpenTTD to start
+automatically selected (and downloaded) if you get the AIs via the 'Check
+Online Content'. If you do not have an AI but have configured OpenTTD to start
 an AI a message will be shown that the 'dummy' AI has been started.
 
 4.1) (Required) 3rd party files
@@ -198,7 +201,7 @@ For OpenTTD you need to acquire some third party data files. For this you have
 the choice of using the original Transport Tycoon Deluxe data files or a set
 of free data files.
 
-Do NOT copy files included with OpenTTD into "shared" directories (explained in
+Do NOT copy files included with OpenTTD into 'shared' directories (explained in
 the following sections) as sooner or later you will run into graphical glitches
 when using other versions of the game.
 
@@ -239,7 +242,7 @@ not work.
 If you want AIs use the in-game content downloader. If for some reason that is
 not possible or you want to use an AI that has not been uploaded to the content
 download system download the tar file and place it in the ai/ directory. If the
-AI needs libraries you'll have to download those too and put them in the
+AI needs libraries you will have to download those too and put them in the
 ai/library/ directory. All AIs and AI Libraries that have been uploaded to
 the content download system can be found at http://noai.openttd.org/downloads/
 The AIs and libraries can be found their in the form of .tar.gz packages.
@@ -247,20 +250,32 @@ OpenTTD can read inside tar files but it does not extract .tar.gz files by
 itself.
 To figure out which libraries you need for an AI you have to start the AI and
 wait for an error message to pop up. The error message will tell you
-"couldn't find library 'lib-name'". Download that library and try again.
+'could not find library "lib-name"'. Download that library and try again.
+
+4.1.5) Game scripts
+------ ------------
+If you want an extra challenge in OpenTTD you can download so-called game
+scripts via the in-game content downloader. These game scripts have varying
+functionality, though they can generally influence town growth, subsidies, add
+goals to reach or provide a different ranking system.
+If you download a game script manually you have to follow the same rules as for
+AIs, except that game scripts are placed in the game/ directory instead of the
+ai/ directory.
+
 
 4.2) OpenTTD directories
 ---- -------------------
-OpenTTD uses its own directory to store its required 3rd party base set files (see section
-4.1 "Required 3rd party files") and non-compulsory extension and configuration files. See
-below for their proper place within this OpenTTD main data directory.
+OpenTTD uses its own directory to store its required 3rd party base set files
+(see section 4.1 'Required 3rd party files') and non-compulsory extension and
+configuration files. See below for their proper place within this OpenTTD main
+data directory.
 
-The main OpenTTD directories can be found in various locations, depending on your operating
-system:
+The main OpenTTD directories can be found in various locations, depending on
+your operating system:
 	1. The current working directory (from where you started OpenTTD)
 		For non-Windows operating systems OpenTTD will not scan for files in this
-		directory if it is your personal directory, i.e. "~/", or when it is the
-		root directory, i.e. "/".
+		directory if it is your personal directory, i.e. '~/', or when it is the
+		root directory, i.e. '/'.
 	2. Your personal directory
 		Windows: C:\My Documents\OpenTTD (95, 98, ME)
 		         C:\Documents and Settings\<username>\My Documents\OpenTTD (2000, XP)
@@ -278,11 +293,11 @@ system:
 	5. The installation directory (Linux only)
 		Linux:   /usr/share/games/openttd
 	6. The application bundle (Mac OSX only)
-		It includes the OpenTTD files (grf+lng) and it will work as long as they aren't
-		touched
+		It includes the OpenTTD files (grf+lng) and it will work as long as they
+		are not touched
 
-Different types of data or extensions go into different subdirectories of the chosen main
-OpenTTD directory:
+Different types of data or extensions go into different subdirectories of the
+chosen main OpenTTD directory:
 	Config File:         (no subdirectory)
 	Screenshots:         (no subdirectory)
 	Base Graphics:       baseset                 (or a subdirectory thereof)
@@ -298,21 +313,24 @@ OpenTTD directory:
 	Automatic Savegames: save/autosave
 	Scenarios:           scenario
 
-The (automatically created) directory content_download is for OpenTTD's internal use and
-no files should be added to it or its subdirectories manually.
+The (automatically created) directory content_download is for OpenTTD's internal
+use and no files should be added to it or its subdirectories manually.
 
 Notes:
-	- Linux in the previous list means .deb, but most paths should be similar for others.
+	- Linux in the previous list means .deb, but most paths should be similar for
+	  others.
 	- The previous search order is also used for NewGRFs and openttd.cfg.
-	- If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3, 5 order.
+	- If openttd.cfg is not found, then it will be created using the 2, 4, 1, 3,
+	  5 order.
 	- Savegames will be relative to the config file only if there is no save/
 	  directory in paths with higher priority than the config file path, but
 	  autosaves and screenshots will always be relative to the config file.
 
 The preferred setup:
-Place 3rd party files in shared directory (or in personal directory if you don't
-have write access on shared directory) and have your openttd.cfg config file in
-personal directory (where the game will then also place savegames and screenshots).
+Place 3rd party files in shared directory (or in personal directory if you do
+not have write access on shared directory) and have your openttd.cfg config
+file in personal directory (where the game will then also place savegames and
+screenshots).
 
 4.3) Portable installations (portable media)
 ---- ---------------------------------------
@@ -334,12 +352,10 @@ makes it easy to bundle files belonging to the same script, NewGRF or base
 set. Music sets are the only exception as they cannot be stored in a tar
 file due to being played by external applications.
 
-OpenTTD sees each tar archive as the 'root' of its search path. This means
-that having a file with the same path in two different tar files means that
-one cannot be opened, after all only one file will be found first. This is
-done to make it possible to have the large 32bpp zoomed graphics in a separate
-file to the (relatively small) unzoomed 8bpp NewGRF. As such it is advisable
-to put an uniquely named folder in the root of the tar and put all the
+OpenTTD sees each tar archive as the 'root' of its search path. This means that
+having a file with the same path in two different tar files means that one
+cannot be opened, after all only one file will be found first. As such it is
+advisable to put an uniquely named folder in the root of the tar and put all the
 content in that folder. For example, all downloaded content has a path that
 concatenates the name of the content and the version, which makes the path
 unique. For custom tar files it is advised to do this as well.
@@ -405,7 +421,7 @@ OpenTTD in debug mode.
 6.0) Configuration file
 ---- ------------------
 The configuration file for OpenTTD (openttd.cfg) is in a simple Windows-like
-.INI format. It's mostly undocumented. Almost all settings can be changed
+.INI format. It is mostly undocumented. Almost all settings can be changed
 ingame by using the 'Advanced Settings' window.
 When you cannot find openttd.cfg you should look in the directories as
 described in section 4.2. If you do not have an openttd.cfg OpenTTD will
@@ -429,24 +445,24 @@ Windows:
   Please read the Makefile for more information.
 
 Solaris, FreeBSD, OpenBSD:
-  Use "gmake", but do a "./configure" before the first build.
+  Use 'gmake', but do a './configure' before the first build.
 
 Linux/Unix:
-  OpenTTD can be built with GNU "make". On non-GNU systems it's called "gmake".
-  However, for the first build one has to do a "./configure" first.
+  OpenTTD can be built with GNU 'make'. On non-GNU systems it is called 'gmake'.
+  However, for the first build one has to do a './configure' first.
 
 MacOS X:
-  Use "make" or Xcode (which will then call make for you)
+  Use 'make' or Xcode (which will then call make for you)
   This will give you a binary for your CPU type (PPC/Intel)
-  However, for the first build one has to do a "./configure" first.
-  To make a universal binary type "./configure --enabled-universal"
-  instead of "./configure".
+  However, for the first build one has to do a './configure' first.
+  To make a universal binary type './configure --enabled-universal'
+  instead of './configure'.
 
 BeOS:
-  Use "make", but do a "./configure" before the first build.
+  Use 'make', but do a './configure' before the first build.
 
 MorphOS:
-  Use "make". However, for the first build one has to do a "./configure" first.
+  Use 'make'. However, for the first build one has to do a './configure' first.
   Note that you need the MorphOS SDK, latest libnix updates (else C++ parts of
   OpenTTD will not build) and the powersdl.library SDK. Optionally libz,
   libpng and freetype2 developer files.
@@ -458,7 +474,7 @@ OS/2:
 DOS:
   A build environment with DJGPP is needed as well as libraries such as
   Allegro, zlib and libpng, which all can be downloaded from the DJGPP
-  website. Compilation is straight forward: use make, but do a "./configure"
+  website. Compilation is straight forward: use make, but do a './configure'
   before the first build. The build binary will need cwsdpmi.exe to be in
   the same directory as the openttd executable. cwsdpmi.exe can be found in
   the os/dos subdirectory. If you compile with stripping turned on a binary
@@ -489,7 +505,7 @@ To recompile the extra graphics needed to play with the original Transport
 Tycoon Deluxe graphics you need GRFCodec (which includes NFORenum) as well.
 GRFCodec can be found at: http://www.openttd.org/download-grfcodec
 The compilation of these extra graphics does generally not happen, unless
-you remove the graphics file using "make maintainer-clean".
+you remove the graphics file using 'make maintainer-clean'.
 
 7.2) Supported compilers
 ---- -------------------
@@ -537,7 +553,7 @@ someone else may have already started translating to the same language.
 
 8.1) Translation
 ---- -----------
-So, now that you've notified the development team about your intention to
+So, now that you have notified the development team about your intention to
 translate (You did, right? Of course you did.) you can pick up english.txt
 (found in the SVN repository under /src/lang) and translate.
 
@@ -571,17 +587,17 @@ Any missing strings are replaced with the English strings. Note that it looks
 for english.txt in the lang subdirectory, which is where your language file
 should also be.
 
-That's all! You should now be able to select the language in the game options.
+That is all! You should now be able to select the language in the game options.
 
 
 9.0) Troubleshooting
 ---- ---------------
 To see all startup options available to you, start OpenTTD with the
-"./openttd -h" option. This might help you tweak some of the settings.
+'./openttd -h' option. This might help you tweak some of the settings.
 
 If the game is acting strange and you feel adventurous you can try the
-"-d [[<name>]=[<level>]" flag, where the higher levels will give you more
-debugging output. The "name" variable can help you to display only some type of
+'-d [[<name>=]<level>]' flag, where the higher levels will give you more
+debugging output. The 'name' variable can help you to display only some type of
 debugging messages. This is mostly undocumented so best is to look in the
 source code file debug.c for the various debugging types. For more information
 look at http://wiki.openttd.org/index.php/Command_line.
@@ -604,17 +620,17 @@ and add a suitable font for the small, medium and / or large font, e.g.:
 	small_font = "Tahoma"
 	medium_font = "Tahoma"
 	large_font = "Tahoma"
-You should use a font name like "Tahoma" or a path to the desired font.
+You should use a font name like 'Tahoma' or a path to the desired font.
 
 Any NewGRF file used in a game is stored inside the savegame and will refuse
-to load if you don't have that NewGRF file available. A list of missing files
+to load if you do not have that NewGRF file available. A list of missing files
 can be viewed in the NewGRF window accessible from the file load dialogue window.
 
 You can try to obtain the missing files from that NewGRF dialogue or - if they
 are not available online - you can search manually through our forum's graphics
 development section (http://www.tt-forums.net/viewforum.php?f=66) or GrfCrawler
 (http://grfcrawler.tt-forums.net/). Put the NewGRF files in OpenTTD's newgrf folder
-(see section 4.2 "OpenTTD directories") and rescan the list of available NewGRFs.
+(see section 4.2 'OpenTTD directories') and rescan the list of available NewGRFs.
 Once you have all missing files, you are set to go.
 
 
@@ -667,6 +683,8 @@ Thanks to:
   George                          - Canal graphics
   Andrew Parkhouse (andythenorth) - River graphics
   David Dallaston (Pikka)         - Tram tracks
+  Marcin Grzegorczyk              - Foundations for tracks on slopes,
+  Daniel Blödorn (Bluescreen)     - Title game
   All Translators                 - For their support to make OpenTTD a truly international game
   Bug Reporters                   - Thanks for all bug reports
   Chris Sawyer                    - For an amazing game!

src/3rdparty/squirrel/squirrel/sqbaselib.cpp

@@ -210,16 +210,22 @@ static SQInteger base_suspend(HSQUIRRELVM v)
 static SQInteger base_array(HSQUIRRELVM v)
 {
 	SQArray *a;
-	SQObject &size = stack_get(v,2);
+	SQInteger nInitialSize = tointeger(stack_get(v,2));
+	SQInteger ret = 1;
+	if (nInitialSize < 0) {
+		v->Raise_Error(_SC("can't create/resize array with/to size %d"), nInitialSize);
+		nInitialSize = 0;
+		ret = -1;
+	}
 	if(sq_gettop(v) > 2) {
 		a = SQArray::Create(_ss(v),0);
-		a->Resize(tointeger(size),stack_get(v,3));
+		a->Resize(nInitialSize,stack_get(v,3));
 	}
 	else {
-		a = SQArray::Create(_ss(v),tointeger(size));
+		a = SQArray::Create(_ss(v),nInitialSize);
 	}
 	v->Push(a);
-	return 1;
+	return ret;
 }
 
 static SQInteger base_type(HSQUIRRELVM v)

src/ai/ai_core.cpp

@@ -39,7 +39,7 @@
 	/* Clients shouldn't start AIs */
 	if (_networking && !_network_server) return;
 
-	AIConfig *config = AIConfig::GetConfig(company);
+	AIConfig *config = AIConfig::GetConfig(company, AIConfig::SSS_FORCE_GAME);
 	AIInfo *info = config->GetInfo();
 	if (info == NULL || (rerandomise_ai && config->IsRandom())) {
 		info = AI::scanner_info->SelectRandomAI();
@@ -283,7 +283,7 @@
 {
 	/* Find the first company which doesn't exist yet */
 	for (CompanyID c = COMPANY_FIRST; c < MAX_COMPANIES; c++) {
-		if (!Company::IsValidID(c)) return AIConfig::GetConfig(c)->GetSetting("start_date");
+		if (!Company::IsValidID(c)) return AIConfig::GetConfig(c, AIConfig::SSS_FORCE_GAME)->GetSetting("start_date");
 	}
 
 	/* Currently no AI can be started, check again in a year. */

src/ai/ai_gui.cpp

@@ -118,13 +118,13 @@ struct AIListWindow : public Window {
 				int y = this->GetWidget<NWidgetBase>(WID_AIL_LIST)->pos_y;
 				/* First AI in the list is hardcoded to random */
 				if (this->vscroll->IsVisible(0)) {
-					DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, this->slot == OWNER_DEITY ? STR_AI_CONFIG_NONE : STR_AI_CONFIG_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_BLACK);
+					DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_LEFT, y + WD_MATRIX_TOP, this->slot == OWNER_DEITY ? STR_AI_CONFIG_NONE : STR_AI_CONFIG_RANDOM_AI, this->selected == -1 ? TC_WHITE : TC_ORANGE);
 					y += this->line_height;
 				}
 				ScriptInfoList::const_iterator it = this->info_list->begin();
 				for (int i = 1; it != this->info_list->end(); i++, it++) {
 					if (this->vscroll->IsVisible(i)) {
-						DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, (*it).second->GetName(), (this->selected == i - 1) ? TC_WHITE : TC_BLACK);
+						DrawString(r.left + WD_MATRIX_LEFT, r.right - WD_MATRIX_RIGHT, y + WD_MATRIX_TOP, (*it).second->GetName(), (this->selected == i - 1) ? TC_WHITE : TC_ORANGE);
 						y += this->line_height;
 					}
 				}
@@ -151,7 +151,7 @@ struct AIListWindow : public Window {
 						y += FONT_HEIGHT_NORMAL + WD_PAR_VSEP_NORMAL;
 					}
 					SetDParamStr(0, selected_info->GetDescription());
-					DrawStringMultiLine(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, r.bottom - WD_FRAMERECT_BOTTOM, STR_JUST_RAW_STRING, TC_BLACK);
+					DrawStringMultiLine(r.left + WD_FRAMETEXT_LEFT, r.right - WD_FRAMETEXT_RIGHT, y, r.bottom - WD_FRAMERECT_BOTTOM, STR_JUST_RAW_STRING, TC_WHITE);
 				}
 				break;
 			}
@@ -431,15 +431,21 @@ struct AISettingsWindow : public Window {
 				const ScriptConfigItem config_item = **it;
 				if (_game_mode == GM_NORMAL && ((this->slot == OWNER_DEITY) || Company::IsValidID(this->slot)) && (config_item.flags & SCRIPTCONFIG_INGAME) == 0) return;
 
+				if (this->clicked_row != num) {
+					DeleteChildWindows(WC_QUERY_STRING);
+					this->clicked_row = num;
+				}
+
 				bool bool_item = (config_item.flags & SCRIPTCONFIG_BOOLEAN) != 0;
 
 				int x = pt.x - wid->pos_x;
 				if (_current_text_dir == TD_RTL) x = wid->current_x - x;
 				x -= 4;
+
 				/* One of the arrows is clicked (or green/red rect in case of bool value) */
+				int old_val = this->ai_config->GetSetting(config_item.name);
 				if (IsInsideMM(x, 0, 21)) {
-					int new_val = this->ai_config->GetSetting(config_item.name);
-					int old_val = new_val;
+					int new_val = old_val;
 					if (bool_item) {
 						new_val = !new_val;
 					} else if (x >= 10) {
@@ -463,8 +469,7 @@ struct AISettingsWindow : public Window {
 					}
 				} else if (!bool_item) {
 					/* Display a query box so users can enter a custom value. */
-					this->clicked_row = num;
-					SetDParam(0, this->ai_config->GetSetting(config_item.name));
+					SetDParam(0, old_val);
 					ShowQueryString(STR_JUST_INT, STR_CONFIG_SETTING_QUERY_CAPTION, 10, this, CS_NUMERAL, QSF_NONE);
 				}
 				this->SetDirty();

src/ai/ai_instance.cpp

@@ -222,7 +222,7 @@ void AIInstance::Died()
 
 	ShowAIDebugWindow(_current_company);
 
-	const AIInfo *info = AIConfig::GetConfig(_current_company)->GetInfo();
+	const AIInfo *info = AIConfig::GetConfig(_current_company, AIConfig::SSS_FORCE_GAME)->GetInfo();
 	if (info != NULL) {
 		ShowErrorMessage(STR_ERROR_AI_PLEASE_REPORT_CRASH, INVALID_STRING_ID, WL_WARNING);
 

src/aircraft.h

@@ -77,7 +77,13 @@ struct Aircraft FINAL : public SpecializedVehicle<Aircraft, VEH_AIRCRAFT> {
 	int GetDisplayMaxSpeed() const { return this->vcache.cached_max_speed; }
 	int GetSpeedOldUnits() const   { return this->vcache.cached_max_speed * 10 / 128; }
 	Money GetRunningCost() const;
-	bool IsInDepot() const { return (this->vehstatus & VS_HIDDEN) != 0 && IsHangarTile(this->tile); }
+
+	bool IsInDepot() const
+	{
+		assert(this->IsPrimaryVehicle());
+		return (this->vehstatus & VS_HIDDEN) != 0 && IsHangarTile(this->tile);
+	}
+
 	bool Tick();
 	void OnNewDay();
 	uint Crash(bool flooded = false);

src/aircraft_cmd.cpp

@@ -365,7 +365,7 @@ bool Aircraft::FindClosestDepot(TileIndex *location, DestinationID *destination,
 static void CheckIfAircraftNeedsService(Aircraft *v)
 {
 	if (Company::Get(v->owner)->settings.vehicle.servint_aircraft == 0 || !v->NeedsAutomaticServicing()) return;
-	if (v->IsInDepot()) {
+	if (v->IsChainInDepot()) {
 		VehicleServiceInDepot(v);
 		return;
 	}
@@ -1894,7 +1894,7 @@ static bool AircraftEventHandler(Aircraft *v, int loop)
 
 	if (v->current_order.IsType(OT_LOADING) || v->current_order.IsType(OT_LEAVESTATION)) return true;
 
-	if (v->state == FLYING) {
+	if (v->state >= ENDTAKEOFF && v->state <= HELIENDLANDING) {
 		/* If we are flying, unconditionally clear the 'dest too far' state. */
 		AircraftHandleDestTooFar(v, false);
 	} else if (v->acache.cached_max_range_sqr != 0) {

src/articulated_vehicles.cpp

@@ -54,6 +54,16 @@ static EngineID GetNextArticulatedPart(uint index, EngineID front_type, Vehicle
 	return GetNewEngineID(front_engine->GetGRF(), front_engine->type, callback);
 }
 
+/**
+ * Does a NewGRF report that this should be an articulated vehicle?
+ * @param engine_type The engine to check.
+ * @return True iff the articulated engine callback flag is set.
+ */
+bool IsArticulatedEngine(EngineID engine_type)
+{
+	return HasBit(EngInfo(engine_type)->callback_mask, CBM_VEHICLE_ARTIC_ENGINE);
+}
+
 /**
  * Count the number of articulated parts of an engine.
  * @param engine_type The engine to get the number of parts of.

src/articulated_vehicles.h

@@ -23,6 +23,7 @@ uint32 GetUnionOfArticulatedRefitMasks(EngineID engine, bool include_initial_car
 uint32 GetIntersectionOfArticulatedRefitMasks(EngineID engine, bool include_initial_cargo_type);
 bool IsArticulatedVehicleCarryingDifferentCargoes(const Vehicle *v, CargoID *cargo_type);
 bool IsArticulatedVehicleRefittable(EngineID engine);
+bool IsArticulatedEngine(EngineID engine_type);
 void CheckConsistencyOfArticulatedVehicle(const Vehicle *v);
 
 

src/autoreplace_cmd.cpp

@@ -662,7 +662,7 @@ CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1
 	CommandCost ret = CheckOwnership(v->owner);
 	if (ret.Failed()) return ret;
 
-	if (!v->IsInDepot()) return CMD_ERROR;
+	if (!v->IsChainInDepot()) return CMD_ERROR;
 	if (v->vehstatus & VS_CRASHED) return CMD_ERROR;
 
 	bool free_wagon = false;
@@ -699,7 +699,7 @@ CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1
 		if (!was_stopped) cost.AddCost(CmdStartStopVehicle(v, true));
 		if (cost.Failed()) return cost;
 
-		assert(v->IsStoppedInDepot());
+		assert(free_wagon || v->IsStoppedInDepot());
 
 		/* We have to construct the new vehicle chain to test whether it is valid.
 		 * Vehicle construction needs random bits, so we have to save the random seeds
@@ -765,7 +765,10 @@ CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
 		cost = RemoveEngineReplacementForCompany(c, old_engine_type, id_g, flags);
 	}
 
-	if (flags & DC_EXEC) GroupStatistics::UpdateAutoreplace(_current_company);
+	if (flags & DC_EXEC) {
+		GroupStatistics::UpdateAutoreplace(_current_company);
+		SetWindowClassesDirty(GetWindowClassForVehicleType(Engine::Get(old_engine_type)->type));
+	}
 	if ((flags & DC_EXEC) && IsLocalCompany()) InvalidateAutoreplaceWindow(old_engine_type, id_g);
 
 	return cost;

src/autoreplace_gui.cpp

@@ -33,7 +33,7 @@ void DrawEngineList(VehicleType type, int x, int r, int y, const GUIEngineList *
 
 static int CDECL EngineNumberSorter(const EngineID *a, const EngineID *b)
 {
-	int r = ListPositionOfEngine(*a) - ListPositionOfEngine(*b);
+	int r = Engine::Get(*a)->list_position - Engine::Get(*b)->list_position;
 
 	return r;
 }
@@ -493,8 +493,8 @@ static const NWidgetPart _nested_replace_rail_vehicle_widgets[] = {
 		NWidget(NWID_VSCROLLBAR, COLOUR_GREY, WID_RV_RIGHT_SCROLLBAR),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL, NC_EQUALSIZE),
-		NWidget(WWT_PANEL, COLOUR_GREY, WID_RV_LEFT_DETAILS), SetMinimalSize(228, 102), SetResize(1, 0), EndContainer(),
-		NWidget(WWT_PANEL, COLOUR_GREY, WID_RV_RIGHT_DETAILS), SetMinimalSize(228, 102), SetResize(1, 0), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_GREY, WID_RV_LEFT_DETAILS), SetMinimalSize(240, 122), SetResize(1, 0), EndContainer(),
+		NWidget(WWT_PANEL, COLOUR_GREY, WID_RV_RIGHT_DETAILS), SetMinimalSize(240, 122), SetResize(1, 0), EndContainer(),
 	EndContainer(),
 	NWidget(NWID_HORIZONTAL),
 		NWidget(WWT_PUSHTXTBTN, COLOUR_GREY, WID_RV_START_REPLACE), SetMinimalSize(139, 12), SetDataTip(STR_REPLACE_VEHICLES_START, STR_REPLACE_HELP_START_BUTTON),
@@ -513,7 +513,7 @@ static const NWidgetPart _nested_replace_rail_vehicle_widgets[] = {
 };
 
 static const WindowDesc _replace_rail_vehicle_desc(
-	WDP_AUTO, 456, 140,
+	WDP_AUTO, 500, 140,
 	WC_REPLACE_VEHICLE, WC_NONE,
 	WDF_UNCLICK_BUTTONS | WDF_CONSTRUCTION,
 	_nested_replace_rail_vehicle_widgets, lengthof(_nested_replace_rail_vehicle_widgets)

src/base_media_base.h

@@ -15,6 +15,8 @@
 #include "fileio_func.h"
 #include "core/smallmap_type.hpp"
 #include "gfx_type.h"
+#include "textfile_type.h"
+#include "textfile_gui.h"
 
 /* Forward declare these; can't do 'struct X' in functions as older GCCs barf on that */
 struct IniFile;
@@ -143,6 +145,22 @@ struct BaseSet {
 	{
 		return file->CheckMD5(subdir, SIZE_MAX);
 	}
+
+	/**
+	 * Search a textfile file next to this base media.
+	 * @param type The type of the textfile to search for.
+	 * @return The filename for the textfile, \c NULL otherwise.
+	 */
+	const char *GetTextfile(TextfileType type) const
+	{
+		for (uint i = 0; i < NUM_FILES; i++) {
+			const char *textfile = ::GetTextfile(type, BASESET_DIR, this->files[i].filename);
+			if (textfile != NULL) {
+				return textfile;
+			}
+		}
+		return NULL;
+	}
 };
 
 /**

src/blitter/32bpp_base.hpp

@@ -136,7 +136,7 @@ public:
 		return ComposeColour(0xFF, colour, colour, colour);
 	}
 
-	static const int DEFAULT_BRIGHTNESS = 64;
+	static const int DEFAULT_BRIGHTNESS = 128;
 
 	static inline uint32 AdjustBrightness(uint32 colour, uint8 brightness)
 	{

src/blitter/32bpp_optimized.cpp

@@ -337,6 +337,7 @@ Sprite *Blitter_32bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPr
 	dest_sprite->y_offs = sprite->y_offs;
 
 	SpriteData *dst = (SpriteData *)dest_sprite->data;
+	memset(dst, 0, sizeof(*dst));
 
 	for (ZoomLevel z = zoom_min; z <= zoom_max; z++) {
 		dst->offset[z][0] = z == zoom_min ? 0 : lengths[z - 1][1] + dst->offset[z - 1][1];

src/blitter/8bpp_optimized.cpp

@@ -141,6 +141,7 @@ Sprite *Blitter_8bppOptimized::Encode(SpriteLoader::Sprite *sprite, AllocatorPro
 	 * and the memory usage is quite low. */
 	static ReusableBuffer<byte> temp_buffer;
 	SpriteData *temp_dst = (SpriteData *)temp_buffer.Allocate(memory);
+	memset(temp_dst, 0, sizeof(*temp_dst));
 	byte *dst = temp_dst->data;
 
 	/* Make the sprites per zoom-level */

src/bootstrap_gui.cpp

@@ -218,7 +218,7 @@ bool HandleBootstrap()
 	if (BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() == 0) goto failure;
 
 	/* If there is no network or no freetype, then there is nothing we can do. Go straight to failure. */
-#if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE) && !defined(__APPLE__)
+#if defined(ENABLE_NETWORK) && defined(WITH_FREETYPE) && !defined(__APPLE__) && (defined(WITH_FONTCONFIG) || defined(WIN32))
 	if (!_network_available) goto failure;
 
 	/* First tell the game we're bootstrapping. */

src/build_vehicle_gui.cpp

@@ -98,7 +98,7 @@ static CargoID _last_filter_criteria[] = {CF_ANY, CF_ANY, CF_ANY, CF_ANY};
  */
 static int CDECL EngineNumberSorter(const EngineID *a, const EngineID *b)
 {
-	int r = ListPositionOfEngine(*a) - ListPositionOfEngine(*b);
+	int r = Engine::Get(*a)->list_position - Engine::Get(*b)->list_position;
 
 	return _internal_sort_order ? -r : r;
 }
@@ -885,8 +885,16 @@ void DrawEngineList(VehicleType type, int l, int r, int y, const GUIEngineList *
 	int sprite_x        = (rtl ? r - sprite_width / 2 : l + sprite_width / 2) - 1;
 	int sprite_y_offset = sprite_y_offsets[type] + step_size / 2;
 
-	int text_left  = l + (rtl ? WD_FRAMERECT_LEFT : sprite_width);
-	int text_right = r - (rtl ? sprite_width : WD_FRAMERECT_RIGHT);
+	int count_width = 0;
+	if (show_count) {
+		SetDParam(0, 999);
+		count_width = GetStringBoundingBox(STR_TINY_BLACK_COMA).width;
+	}
+
+	int text_left  = l + (rtl ? WD_FRAMERECT_LEFT + count_width : sprite_width);
+	int text_right = r - (rtl ? sprite_width : WD_FRAMERECT_RIGHT + count_width);
+	int count_left = l;
+	int count_right = rtl ? text_left : r - WD_FRAMERECT_RIGHT;
 
 	int normal_text_y_offset = (step_size - FONT_HEIGHT_NORMAL) / 2;
 	int small_text_y_offset  = step_size - FONT_HEIGHT_SMALL - WD_FRAMERECT_BOTTOM - 1;
@@ -901,7 +909,7 @@ void DrawEngineList(VehicleType type, int l, int r, int y, const GUIEngineList *
 		DrawVehicleEngine(l, r, sprite_x, y + sprite_y_offset, engine, (show_count && num_engines == 0) ? PALETTE_CRASH : GetEnginePalette(engine, _local_company), EIT_PURCHASE);
 		if (show_count) {
 			SetDParam(0, num_engines);
-			DrawString(text_left, text_right, y + small_text_y_offset, STR_TINY_BLACK_COMA, TC_FROMSTRING, SA_RIGHT);
+			DrawString(count_left, count_right, y + small_text_y_offset, STR_TINY_BLACK_COMA, TC_FROMSTRING, SA_RIGHT | SA_FORCE);
 		}
 	}
 }
@@ -1086,7 +1094,7 @@ struct BuildVehicleWindow : Window {
 
 		this->sel_engine = sel_id;
 
-		/* make engines first, and then wagons, sorted by ListPositionOfEngine() */
+		/* make engines first, and then wagons, sorted by selected sort_criteria */
 		_internal_sort_order = false;
 		EngList_Sort(&this->eng_list, TrainEnginesThenWagonsSorter);
 

src/core/smallvec_type.hpp

@@ -39,21 +39,39 @@ public:
 	 * Copy constructor.
 	 * @param other The other vector to copy.
 	 */
+	SmallVector(const SmallVector &other) : data(NULL), items(0), capacity(0)
+	{
+		this->Assign(other);
+	}
+
+	/**
+	 * Generic copy constructor.
+	 * @param other The other vector to copy.
+	 */
 	template <uint X>
 	SmallVector(const SmallVector<T, X> &other) : data(NULL), items(0), capacity(0)
 	{
-		MemCpyT<T>(this->Append(other.Length()), other.Begin(), other.Length());
+		this->Assign(other);
 	}
 
 	/**
 	 * Assignment.
-	 * @param other The new vector that.
+	 * @param other The other vector to assign.
+	 */
+	SmallVector &operator=(const SmallVector &other)
+	{
+		this->Assign(other);
+		return *this;
+	}
+
+	/**
+	 * Generic assignment.
+	 * @param other The other vector to assign.
 	 */
 	template <uint X>
 	SmallVector &operator=(const SmallVector<T, X> &other)
 	{
-		this->Reset();
-		MemCpyT<T>(this->Append(other.Length()), other.Begin(), other.Length());
+		this->Assign(other);
 		return *this;
 	}
 
@@ -62,6 +80,18 @@ public:
 		free(this->data);
 	}
 
+	/**
+	 * Assign items from other vector.
+	 */
+	template <uint X>
+	inline void Assign(const SmallVector<T, X> &other)
+	{
+		if ((const void *)&other == (void *)this) return;
+
+		this->Clear();
+		if (other.Length() > 0) MemCpyT<T>(this->Append(other.Length()), other.Begin(), other.Length());
+	}
+
 	/**
 	 * Remove all items from the list.
 	 */

src/depend/depend.cpp

@@ -910,7 +910,10 @@ int main(int argc, char *argv[])
 		size = ftell(src);
 		rewind(src);
 		content = (char*)malloc(size * sizeof(*content));
-		fread(content, 1, size, src);
+		if (fread(content, 1, size, src) != (size_t)size) {
+			fprintf(stderr, "Could not read %s\n", filename);
+			exit(-2);
+		}
 		fclose(src);
 	}
 
@@ -919,7 +922,10 @@ int main(int argc, char *argv[])
 
 	if (size != 0) {
 		src = fopen(backup, "wb");
-		fwrite(content, 1, size, src);
+		if (fwrite(content, 1, size, src) != (size_t)size) {
+			fprintf(stderr, "Could not write %s\n", filename);
+			exit(-2);
+		}
 		fclose(src);
 
 		/* Then append it to the real file. */

src/depot_gui.cpp

@@ -480,13 +480,14 @@ struct DepotWindow : Window {
 					this->sel = INVALID_VEHICLE;
 					TrainDepotMoveVehicle(v, sel, gdvp.head);
 				} else if (v != NULL) {
-					int image = v->GetImage(_current_text_dir == TD_RTL ? DIR_E : DIR_W, EIT_IN_DEPOT);
+					bool rtl = _current_text_dir == TD_RTL;
+					int image = v->GetImage(rtl ? DIR_E : DIR_W, EIT_IN_DEPOT);
 					SetObjectToPlaceWnd(image, GetVehiclePalette(v), HT_DRAG, this);
 
 					this->sel = v->index;
 					this->SetDirty();
 
-					_cursor.short_vehicle_offset = v->IsGroundVehicle() ? 16 - v->GetGroundVehicleCache()->cached_veh_length * 2 : 0;
+					_cursor.short_vehicle_offset = v->IsGroundVehicle() ? (16 - v->GetGroundVehicleCache()->cached_veh_length * 2) * (rtl ? -1 : 1) : 0;
 					_cursor.vehchain = _ctrl_pressed;
 				}
 				break;

src/economy.cpp

@@ -360,7 +360,7 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 	}
 	if (new_owner == INVALID_OWNER) RebuildSubsidisedSourceAndDestinationCache();
 
-	/* Take care of rating in towns */
+	/* Take care of rating and transport rights in towns */
 	FOR_ALL_TOWNS(t) {
 		/* If a company takes over, give the ratings to that company. */
 		if (new_owner != INVALID_OWNER) {
@@ -378,6 +378,16 @@ void ChangeOwnershipOfCompanyItems(Owner old_owner, Owner new_owner)
 		/* Reset the ratings for the old owner */
 		t->ratings[old_owner] = RATING_INITIAL;
 		ClrBit(t->have_ratings, old_owner);
+
+		/* Transfer exclusive rights */
+		if (t->exclusive_counter > 0 && t->exclusivity == old_owner) {
+			if (new_owner != INVALID_OWNER) {
+				t->exclusivity = new_owner;
+			} else {
+				t->exclusive_counter = 0;
+				t->exclusivity = INVALID_COMPANY;
+			}
+		}
 	}
 
 	{
@@ -640,8 +650,9 @@ static void CompaniesGenStatistics()
 /**
  * Add monthly inflation
  * @param check_year Shall the inflation get stopped after 170 years?
+ * @return true if inflation is maxed and nothing was changed
  */
-void AddInflation(bool check_year)
+bool AddInflation(bool check_year)
 {
 	/* The cargo payment inflation differs from the normal inflation, so the
 	 * relative amount of money you make with a transport decreases slowly over
@@ -658,15 +669,22 @@ void AddInflation(bool check_year)
 	 * inflation doesn't add anything after that either; it even makes playing
 	 * it impossible due to the diverging cost and income rates.
 	 */
-	if (check_year && (_cur_year - _settings_game.game_creation.starting_year) >= (ORIGINAL_MAX_YEAR - ORIGINAL_BASE_YEAR)) return;
+	if (check_year && (_cur_year - _settings_game.game_creation.starting_year) >= (ORIGINAL_MAX_YEAR - ORIGINAL_BASE_YEAR)) return true;
+
+	if (_economy.inflation_prices == MAX_INFLATION || _economy.inflation_payment == MAX_INFLATION) return true;
 
 	/* Approximation for (100 + infl_amount)% ** (1 / 12) - 100%
 	 * scaled by 65536
 	 * 12 -> months per year
 	 * This is only a good approxiamtion for small values
 	 */
-	_economy.inflation_prices  += min((_economy.inflation_prices  * _economy.infl_amount    * 54) >> 16, MAX_INFLATION);
-	_economy.inflation_payment += min((_economy.inflation_payment * _economy.infl_amount_pr * 54) >> 16, MAX_INFLATION);
+	_economy.inflation_prices  += (_economy.inflation_prices  * _economy.infl_amount    * 54) >> 16;
+	_economy.inflation_payment += (_economy.inflation_payment * _economy.infl_amount_pr * 54) >> 16;
+
+	if (_economy.inflation_prices > MAX_INFLATION) _economy.inflation_prices = MAX_INFLATION;
+	if (_economy.inflation_payment > MAX_INFLATION) _economy.inflation_payment = MAX_INFLATION;
+
+	return false;
 }
 
 /**

src/economy_func.h

@@ -40,7 +40,7 @@ Money GetPrice(Price index, uint cost_factor, const struct GRFFile *grf_file, in
 
 void InitializeEconomy();
 void RecomputePrices();
-void AddInflation(bool check_year = true);
+bool AddInflation(bool check_year = true);
 
 /**
  * Is the economy in recession?

src/elrail.cpp

@@ -111,7 +111,6 @@ static TrackBits GetRailTrackBitsUniversal(TileIndex t, byte *override)
 		case MP_STATION:
 			if (!HasStationRail(t)) return TRACK_BIT_NONE;
 			if (!HasCatenary(GetRailType(t))) return TRACK_BIT_NONE;
-			if (!IsStationTileElectrifiable(t)) return TRACK_BIT_NONE;
 			return TrackToTrackBits(GetRailStationTrack(t));
 
 		default:
@@ -409,7 +408,8 @@ static void DrawCatenaryRailway(const TileInfo *ti)
 			}
 		}
 
-		if (PPPallowed[i] != 0 && HasBit(PCPstatus, i) && !HasBit(OverridePCP, i)) {
+		if (PPPallowed[i] != 0 && HasBit(PCPstatus, i) && !HasBit(OverridePCP, i) &&
+				(!IsRailStationTile(ti->tile) || CanStationTileHavePylons(ti->tile))) {
 			for (Direction k = DIR_BEGIN; k < DIR_END; k++) {
 				byte temp = PPPorder[i][GetTLG(ti->tile)][k];
 
@@ -437,12 +437,15 @@ static void DrawCatenaryRailway(const TileInfo *ti)
 	if (IsTunnelTile(ti->tile)) return;
 
 	/* Don't draw a wire under a low bridge */
-	if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_CATENARY)) {
+	if (MayHaveBridgeAbove(ti->tile) && IsBridgeAbove(ti->tile) && !IsTransparencySet(TO_BRIDGES)) {
 		int height = GetBridgeHeight(GetNorthernBridgeEnd(ti->tile));
 
 		if (height <= GetTileMaxZ(ti->tile) + 1) return;
 	}
 
+	/* Don't draw a wire if the station tile does not want any */
+	if (IsRailStationTile(ti->tile) && !CanStationTileHaveWires(ti->tile)) return;
+
 	SpriteID wire_normal = GetWireBase(ti->tile);
 	SpriteID wire_halftile = (halftile_corner != CORNER_INVALID) ? GetWireBase(ti->tile, TCX_UPPER_HALFTILE) : wire_normal;
 	Track halftile_track;

src/engine.cpp

@@ -927,6 +927,8 @@ void EnginesMonthlyLoop()
 				}
 			}
 		}
+
+		InvalidateWindowClassesData(WC_BUILD_VEHICLE); // rebuild the purchase list (esp. when sorted by reliability)
 	}
 }
 

src/engine_gui.cpp

@@ -166,19 +166,20 @@ static StringID GetAircraftEngineInfoString(const Engine *e)
 	uint capacity = e->GetDisplayDefaultCapacity(&mail_capacity);
 	uint16 range = e->GetRange();
 
-	SetDParam(0, e->GetCost());
-	SetDParam(1, e->GetDisplayMaxSpeed());
-	SetDParam(2, cargo);
-	SetDParam(3, capacity);
-	SetDParam(7, range);
+	uint i = 0;
+	SetDParam(i++, e->GetCost());
+	SetDParam(i++, e->GetDisplayMaxSpeed());
+	if (range > 0) SetDParam(i++, range);
+	SetDParam(i++, cargo);
+	SetDParam(i++, capacity);
 
 	if (mail_capacity > 0) {
-		SetDParam(4, CT_MAIL);
-		SetDParam(5, mail_capacity);
-		SetDParam(6, e->GetRunningCost());
+		SetDParam(i++, CT_MAIL);
+		SetDParam(i++, mail_capacity);
+		SetDParam(i++, e->GetRunningCost());
 		return range > 0 ? STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST : STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST;
 	} else {
-		SetDParam(4, e->GetRunningCost());
+		SetDParam(i++, e->GetRunningCost());
 		return range > 0 ? STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST : STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST;
 	}
 }

src/error.h

@@ -13,6 +13,8 @@
 #define ERROR_H
 
 #include "strings_type.h"
+#include "company_type.h"
+#include "core/geometry_type.hpp"
 
 /** Message severity/type */
 enum WarningLevel {
@@ -22,6 +24,32 @@ enum WarningLevel {
 	WL_CRITICAL, ///< Critical errors, the MessageBox is shown in all cases
 };
 
+/** The data of the error message. */
+class ErrorMessageData {
+protected:
+	uint duration;                  ///< Length of display of the message. 0 means forever,
+	uint64 decode_params[20];       ///< Parameters of the message strings.
+	const char *strings[20];        ///< Copies of raw strings that were used.
+	uint textref_stack_size;        ///< Number of uint32 values to put on the #TextRefStack for the error message.
+	uint32 textref_stack[16];       ///< Values to put on the #TextRefStack for the error message.
+	StringID summary_msg;           ///< General error message showed in first line. Must be valid.
+	StringID detailed_msg;          ///< Detailed error message showed in second line. Can be #INVALID_STRING_ID.
+	Point position;                 ///< Position of the error message window.
+	CompanyID face;                 ///< Company belonging to the face being shown. #INVALID_COMPANY if no face present.
+
+public:
+	ErrorMessageData(const ErrorMessageData &data);
+	~ErrorMessageData();
+	ErrorMessageData(StringID summary_msg, StringID detailed_msg, uint duration = 0, int x = 0, int y = 0, uint textref_stack_size = 0, const uint32 *textref_stack = NULL);
+
+	void SetDParam(uint n, uint64 v);
+	void SetDParamStr(uint n, const char *str);
+
+	void CopyOutDParams();
+};
+
+void ScheduleErrorMessage(const ErrorMessageData &data);
+
 void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel wl, int x = 0, int y = 0, uint textref_stack_size = 0, const uint32 *textref_stack = NULL);
 void ClearErrorMessages();
 void ShowFirstError();

src/error_gui.cpp

@@ -66,72 +66,96 @@ static const WindowDesc _errmsg_face_desc(
 	_nested_errmsg_face_widgets, lengthof(_nested_errmsg_face_widgets)
 );
 
-/** The data of the error message. */
-class ErrorMessageData {
-protected:
-	uint duration;                  ///< Length of display of the message. 0 means forever,
-	uint64 decode_params[20];       ///< Parameters of the message strings.
-	const char *strings[20];        ///< Copies of raw strings that were used.
-	uint textref_stack_size;        ///< Number of uint32 values to put on the #TextRefStack for the error message.
-	uint32 textref_stack[16];       ///< Values to put on the #TextRefStack for the error message.
-	StringID summary_msg;           ///< General error message showed in first line. Must be valid.
-	StringID detailed_msg;          ///< Detailed error message showed in second line. Can be #INVALID_STRING_ID.
-	Point position;                 ///< Position of the error message window.
-	CompanyID face;                 ///< Company belonging to the face being shown. #INVALID_COMPANY if no face present.
-
-public:
-	/**
-	 * Copy the given data into our instace.
-	 * @param data The data to copy.
-	 */
-	ErrorMessageData(const ErrorMessageData &data)
-	{
-		*this = data;
-		for (size_t i = 0; i < lengthof(this->strings); i++) {
-			if (this->strings[i] != NULL) {
-				this->strings[i] = strdup(this->strings[i]);
-				this->decode_params[i] = (size_t)this->strings[i];
-			}
+/**
+ * Copy the given data into our instace.
+ * @param data The data to copy.
+ */
+ErrorMessageData::ErrorMessageData(const ErrorMessageData &data)
+{
+	*this = data;
+	for (size_t i = 0; i < lengthof(this->strings); i++) {
+		if (this->strings[i] != NULL) {
+			this->strings[i] = strdup(this->strings[i]);
+			this->decode_params[i] = (size_t)this->strings[i];
 		}
 	}
+}
 
-	/** Free all the strings. */
-	~ErrorMessageData()
-	{
-		for (size_t i = 0; i < lengthof(this->strings); i++) free(this->strings[i]);
-	}
+/** Free all the strings. */
+ErrorMessageData::~ErrorMessageData()
+{
+	for (size_t i = 0; i < lengthof(this->strings); i++) free(this->strings[i]);
+}
 
-	/**
-	 * Display an error message in a window.
-	 * @param summary_msg  General error message showed in first line. Must be valid.
-	 * @param detailed_msg Detailed error message showed in second line. Can be INVALID_STRING_ID.
-	 * @param duration     The amount of time to show this error message.
-	 * @param x            World X position (TileVirtX) of the error location. Set both x and y to 0 to just center the message when there is no related error tile.
-	 * @param y            World Y position (TileVirtY) of the error location. Set both x and y to 0 to just center the message when there is no related error tile.
-	 * @param textref_stack_size Number of uint32 values to put on the #TextRefStack for the error message; 0 if the #TextRefStack shall not be used.
-	 * @param textref_stack Values to put on the #TextRefStack.
-	 */
-	ErrorMessageData(StringID summary_msg, StringID detailed_msg, uint duration, int x, int y, uint textref_stack_size, const uint32 *textref_stack) :
-		duration(duration),
-		textref_stack_size(textref_stack_size),
-		summary_msg(summary_msg),
-		detailed_msg(detailed_msg)
-	{
-		this->position.x = x;
-		this->position.y = y;
-		if (textref_stack_size > 0) StartTextRefStackUsage(textref_stack_size, textref_stack);
-		CopyOutDParam(this->decode_params, this->strings, detailed_msg == INVALID_STRING_ID ? summary_msg : detailed_msg, lengthof(this->decode_params));
-		if (textref_stack_size > 0) {
-			StopTextRefStackUsage();
-			MemCpyT(this->textref_stack, textref_stack, textref_stack_size);
-		}
+/**
+ * Display an error message in a window.
+ * @param summary_msg  General error message showed in first line. Must be valid.
+ * @param detailed_msg Detailed error message showed in second line. Can be INVALID_STRING_ID.
+ * @param duration     The amount of time to show this error message.
+ * @param x            World X position (TileVirtX) of the error location. Set both x and y to 0 to just center the message when there is no related error tile.
+ * @param y            World Y position (TileVirtY) of the error location. Set both x and y to 0 to just center the message when there is no related error tile.
+ * @param textref_stack_size Number of uint32 values to put on the #TextRefStack for the error message; 0 if the #TextRefStack shall not be used.
+ * @param textref_stack Values to put on the #TextRefStack.
+ */
+ErrorMessageData::ErrorMessageData(StringID summary_msg, StringID detailed_msg, uint duration, int x, int y, uint textref_stack_size, const uint32 *textref_stack) :
+	duration(duration),
+	textref_stack_size(textref_stack_size),
+	summary_msg(summary_msg),
+	detailed_msg(detailed_msg),
+	face(INVALID_COMPANY)
+{
+	this->position.x = x;
+	this->position.y = y;
 
+	memset(this->decode_params, 0, sizeof(this->decode_params));
+	memset(this->strings, 0, sizeof(this->strings));
+
+	if (textref_stack_size > 0) MemCpyT(this->textref_stack, textref_stack, textref_stack_size);
+
+	assert(summary_msg != INVALID_STRING_ID);
+}
+
+/**
+ * Copy error parameters from current DParams.
+ */
+void ErrorMessageData::CopyOutDParams()
+{
+	/* Reset parameters */
+	for (size_t i = 0; i < lengthof(this->strings); i++) free(this->strings[i]);
+	memset(this->decode_params, 0, sizeof(this->decode_params));
+	memset(this->strings, 0, sizeof(this->strings));
+
+	/* Get parameters using type information */
+	if (this->textref_stack_size > 0) StartTextRefStackUsage(this->textref_stack_size, this->textref_stack);
+	CopyOutDParam(this->decode_params, this->strings, this->detailed_msg == INVALID_STRING_ID ? this->summary_msg : this->detailed_msg, lengthof(this->decode_params));
+	if (this->textref_stack_size > 0) StopTextRefStackUsage();
+
+	if (this->detailed_msg == STR_ERROR_OWNED_BY) {
 		CompanyID company = (CompanyID)GetDParamX(this->decode_params, 2);
-		this->face = (this->detailed_msg == STR_ERROR_OWNED_BY && company < MAX_COMPANIES) ? company : INVALID_COMPANY;
-
-		assert(summary_msg != INVALID_STRING_ID);
+		if (company < MAX_COMPANIES) face = company;
 	}
-};
+}
+
+/**
+ * Set a error string parameter.
+ * @param n Parameter index
+ * @param v Parameter value
+ */
+void ErrorMessageData::SetDParam(uint n, uint64 v)
+{
+	this->decode_params[n] = v;
+}
+
+/**
+ * Set a rawstring parameter.
+ * @param n Parameter index
+ * @param str Raw string
+ */
+void ErrorMessageData::SetDParamStr(uint n, const char *str)
+{
+	free(this->strings[n]);
+	this->strings[n] = strdup(str);
+}
 
 /** Define a queue with errors. */
 typedef std::list<ErrorMessageData> ErrorList;
@@ -367,6 +391,7 @@ void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel
 	if (_settings_client.gui.errmsg_duration == 0 && !no_timeout) return;
 
 	ErrorMessageData data(summary_msg, detailed_msg, no_timeout ? 0 : _settings_client.gui.errmsg_duration, x, y, textref_stack_size, textref_stack);
+	data.CopyOutDParams();
 
 	ErrmsgWindow *w = (ErrmsgWindow*)FindWindowById(WC_ERRMSG, 0);
 	if (w != NULL && w->IsCritical()) {
@@ -382,3 +407,23 @@ void ShowErrorMessage(StringID summary_msg, StringID detailed_msg, WarningLevel
 		new ErrmsgWindow(data);
 	}
 }
+
+/**
+ * Schedule a list of errors.
+ * Note: This does not try to display the error now. This is useful if the window system is not yet running.
+ * @param data Error message datas; cleared afterwards
+ */
+void ScheduleErrorMessage(ErrorList &datas)
+{
+	_error_list.splice(_error_list.end(), datas);
+}
+
+/**
+ * Schedule an error.
+ * Note: This does not try to display the error now. This is useful if the window system is not yet running.
+ * @param data Error message data; cleared afterwards
+ */
+void ScheduleErrorMessage(const ErrorMessageData &data)
+{
+	_error_list.push_back(data);
+}

src/fileio.cpp

@@ -683,6 +683,7 @@ uint TarScanner::DoScan(Subdirectory sd)
 	}
 	if (mode & TarScanner::SCENARIO) {
 		num += fs.DoScan(SCENARIO_DIR);
+		num += fs.DoScan(HEIGHTMAP_DIR);
 	}
 	DEBUG(misc, 1, "Scan complete, found %d files", num);
 	return num;

src/fileio_func.h

@@ -116,7 +116,6 @@ DECLARE_ENUM_AS_BIT_SET(TarScanner::Mode)
 
 /* Implementation of opendir/readdir/closedir for Windows */
 #if defined(WIN32)
-#include <windows.h>
 struct DIR;
 
 struct dirent { // XXX - only d_name implemented
@@ -127,19 +126,6 @@ struct dirent { // XXX - only d_name implemented
 	DIR *dir;
 };
 
-struct DIR {
-	HANDLE hFind;
-	/* the dirent returned by readdir.
-	 * note: having only one global instance is not possible because
-	 * multiple independent opendir/readdir sequences must be supported. */
-	dirent ent;
-	WIN32_FIND_DATA fd;
-	/* since opendir calls FindFirstFile, we need a means of telling the
-	 * first call to readdir that we already have a file.
-	 * that's the case iff this is true */
-	bool at_first_entry;
-};
-
 DIR *opendir(const TCHAR *path);
 struct dirent *readdir(DIR *d);
 int closedir(DIR *d);

src/fontcache.cpp

@@ -974,6 +974,14 @@ void UninitFreeType()
 	_library = NULL;
 }
 
+/**
+ * Reset cached glyphs.
+ */
+void ClearFontCache()
+{
+	ResetGlyphCache(true);
+	ResetGlyphCache(false);
+}
 
 static FT_Face GetFontFace(FontSize size)
 {

src/fontcache.h

@@ -44,6 +44,7 @@ extern FreeTypeSettings _freetype;
 
 void InitFreeType(bool monospace);
 void UninitFreeType();
+void ClearFontCache();
 const Sprite *GetGlyph(FontSize size, uint32 key);
 uint GetGlyphWidth(FontSize size, uint32 key);
 bool GetDrawGlyphShadow();
@@ -65,6 +66,7 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
 /* Stub for initializiation */
 static inline void InitFreeType(bool monospace) { extern void ResetFontSizes(bool monospace); ResetFontSizes(monospace); }
 static inline void UninitFreeType() {}
+static inline void ClearFontCache() {}
 
 /** Get the Sprite for a glyph */
 static inline const Sprite *GetGlyph(FontSize size, uint32 key)

src/game/game_core.cpp

@@ -72,7 +72,7 @@
 	/* Clients shouldn't start GameScripts */
 	if (_networking && !_network_server) return;
 
-	GameConfig *config = GameConfig::GetConfig();
+	GameConfig *config = GameConfig::GetConfig(GameConfig::SSS_FORCE_GAME);
 	GameInfo *info = config->GetInfo();
 	if (info == NULL) return;
 

src/game/game_text.cpp

@@ -147,11 +147,6 @@ struct StringListReader : StringReader {
 
 		return buffer;
 	}
-
-	/* virtual */ void HandlePragma(char *str)
-	{
-		strgen_fatal("unknown pragma '%s'", str);
-	}
 };
 
 /** Class for writing an encoded language. */
@@ -183,7 +178,10 @@ struct TranslationWriter : LanguageWriter {
 
 	void Write(const byte *buffer, size_t length)
 	{
-		*this->strings->Append() = strndup((const char*)buffer, length);
+		char *dest = MallocT<char>(length + 1);
+		memcpy(dest, buffer, length);
+		dest[length] = '\0';
+		*this->strings->Append() = dest;
 	}
 };
 

src/gfx.cpp

@@ -45,6 +45,7 @@ SwitchMode _switch_mode;  ///< The next mainloop command.
 PauseModeByte _pause_mode;
 Palette _cur_palette;
 
+static Dimension _max_char_size[FS_END]; ///< Cache of the maximum size of any character of a font.
 static int _max_char_height; ///< Cache of the height of the largest font
 static int _max_char_width;  ///< Cache of the width of the largest font
 static byte _stringwidth_table[FS_END][224]; ///< Cache containing width of often used characters. @see GetCharacterWidth()
@@ -1551,20 +1552,25 @@ void DoPaletteAnimations()
  */
 void LoadStringWidthTable(bool monospace)
 {
-	_max_char_height = 0;
-	_max_char_width  = 0;
-
 	for (FontSize fs = monospace ? FS_MONO : FS_BEGIN; fs < (monospace ? FS_END : FS_MONO); fs++) {
-		_max_char_height = max<int>(_max_char_height, GetCharacterHeight(fs));
+		_max_char_size[fs].width = 0;
+		_max_char_size[fs].height = GetCharacterHeight(fs);
 		for (uint i = 0; i != 224; i++) {
 			_stringwidth_table[fs][i] = GetGlyphWidth(fs, i + 32);
-			_max_char_width = max<int>(_max_char_width, _stringwidth_table[fs][i]);
+			_max_char_size[fs].width = max<int>(_max_char_size[fs].width, _stringwidth_table[fs][i]);
 		}
+
+		/* Needed because they need to be 1 more than the widest. */
+		_max_char_size[fs].width++;
+		_max_char_size[fs].height++;
 	}
 
-	/* Needed because they need to be 1 more than the widest. */
-	_max_char_height++;
-	_max_char_width++;
+	_max_char_width  = 0;
+	_max_char_height = 0;
+	for (FontSize fs = FS_BEGIN; fs < FS_END; fs++) {
+		_max_char_width = max<int>(_max_char_width, _max_char_size[fs].width);
+		_max_char_height = max<int>(_max_char_height, _max_char_size[fs].height);
+	}
 
 	ReInitAllWindows();
 }
@@ -1732,10 +1738,11 @@ void DrawDirtyBlocks()
 		_modal_progress_paint_mutex->BeginCritical();
 		_modal_progress_work_mutex->BeginCritical();
 
-		if (_switch_mode != SM_NONE && !HasModalProgress()) {
-			SwitchToMode(_switch_mode);
-			_switch_mode = SM_NONE;
-		}
+		/* When we ended with the modal progress, do not draw the blocks.
+		 * Simply let the next run do so, otherwise we would be loading
+		 * the new state (and possibly change the blitter) when we hold
+		 * the drawing lock, which we must not do. */
+		if (_switch_mode != SM_NONE && !HasModalProgress()) return;
 	}
 
 	y = 0;

src/gfxinit.cpp

@@ -256,6 +256,7 @@ void GfxLoadSprites()
 	DEBUG(sprite, 2, "Loading sprite set %d", _settings_game.game_creation.landscape);
 
 	SwitchNewGRFBlitter();
+	ClearFontCache();
 	GfxInitSpriteMem();
 	LoadSpriteTables();
 	GfxInitPalettes();

src/goal_gui.cpp

@@ -190,7 +190,7 @@ struct GoalListWindow : Window {
 		num = 0;
 
 		FOR_ALL_GOALS(s) {
-			if (s->company == _local_company) {
+			if (s->company == _local_company && s->company != INVALID_COMPANY) {
 				if (IsInsideMM(pos, 0, cap)) {
 					/* Display the goal */
 					SetDParamStr(0, s->text);

src/ground_vehicle.cpp

@@ -12,6 +12,7 @@
 #include "stdafx.h"
 #include "train.h"
 #include "roadveh.h"
+#include "depot_map.h"
 
 /**
  * Recalculates the cached total power of a vehicle. Should be called when the consist is changed.
@@ -164,6 +165,27 @@ int GroundVehicle<T, Type>::GetAcceleration() const
 	}
 }
 
+/**
+ * Check whether the whole vehicle chain is in the depot.
+ * @return true if and only if the whole chain is in the depot.
+ */
+template <class T, VehicleType Type>
+bool GroundVehicle<T, Type>::IsChainInDepot() const
+{
+	const T *v = this->First();
+	/* Is the front engine stationary in the depot? */
+	assert_compile((int)TRANSPORT_RAIL == (int)VEH_TRAIN);
+	assert_compile((int)TRANSPORT_ROAD == (int)VEH_ROAD);
+	if (!IsDepotTypeTile(v->tile, (TransportType)Type) || v->cur_speed != 0) return false;
+
+	/* Check whether the rest is also already trying to enter the depot. */
+	for (; v != NULL; v = v->Next()) {
+		if (!v->T::IsInDepot() || v->tile != this->tile) return false;
+	}
+
+	return true;
+}
+
 /* Instantiation for Train */
 template struct GroundVehicle<Train, VEH_TRAIN>;
 /* Instantiation for RoadVehicle */

src/ground_vehicle.hpp

@@ -92,6 +92,7 @@ struct GroundVehicle : public SpecializedVehicle<T, Type> {
 	void PowerChanged();
 	void CargoChanged();
 	int GetAcceleration() const;
+	bool IsChainInDepot() const;
 
 	/**
 	 * Common code executed for crashed ground vehicles

src/industry_cmd.cpp

@@ -254,9 +254,8 @@ static void IndustryDrawBubbleGenerator( const TileInfo *ti)
 {
 	if (IsIndustryCompleted(ti->tile)) {
 		AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_BUBBLE, PAL_NONE, 5, _industry_anim_offs_bubbles[GetAnimationFrame(ti->tile)]);
-	} else {
-		AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_SPRING, PAL_NONE, 3, 67);
 	}
+	AddChildSpriteScreen(SPR_IT_BUBBLE_GENERATOR_SPRING, PAL_NONE, 3, 67);
 }
 
 static void IndustryDrawToyFactory(const TileInfo *ti)
@@ -1450,12 +1449,12 @@ static CommandCost CheckIfIndustryTilesAreFree(TileIndex tile, const IndustryTil
  */
 static CommandCost CheckIfIndustryIsAllowed(TileIndex tile, int type, const Town *t)
 {
-	if ((GetIndustrySpec(type)->behaviour & INDUSTRYBEH_TOWN1200_MORE) && t->population < 1200) {
+	if ((GetIndustrySpec(type)->behaviour & INDUSTRYBEH_TOWN1200_MORE) && t->cache.population < 1200) {
 		return_cmd_error(STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200);
 	}
 
 	if ((GetIndustrySpec(type)->behaviour & INDUSTRYBEH_ONLY_NEARTOWN) && DistanceMax(t->xy, tile) > 9) {
-		return_cmd_error(STR_ERROR_SITE_UNSUITABLE);
+		return_cmd_error(STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER);
 	}
 
 	return CommandCost();

src/ini.cpp

@@ -21,6 +21,7 @@
 #endif
 
 #ifdef WIN32
+# include <windows.h>
 # include <shellapi.h>
 # include "core/mem_func.hpp"
 #endif

src/lang/arabic_egypt.txt

@@ -367,6 +367,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :اسماء ال
 STR_FILE_MENU_SAVE_GAME                                         :حفظ
 STR_FILE_MENU_LOAD_GAME                                         :تحميل
 STR_FILE_MENU_QUIT_GAME                                         :اغلاق اللعبة
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :خروج
 ############ range ends here
 
@@ -1200,7 +1201,7 @@ STR_CONFIG_SETTING_HEIGHTMAP_ROTATION                           :{LTBLUE}اتج
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_COUNTER_CLOCKWISE         :عكس عقارب الساعة
 STR_CONFIG_SETTING_HEIGHTMAP_ROTATION_CLOCKWISE                 :مع عقارب الساعة
 STR_CONFIG_SETTING_SE_FLAT_WORLD_HEIGHT                         :{LTBLUE}الأرتفاع الأعلى في محرر الخريطة لسطح المستوي: {ORANGE}{STRING}
-STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE} السماح بتعديل الحدود الحرة للخريطة: {ORANGE} {STRING}
+STR_CONFIG_SETTING_ENABLE_FREEFORM_EDGES                        :{LTBLUE} السماح بتعديل الحدود الحرة للخريطة:  {ORANGE}{STRING}
 STR_CONFIG_SETTING_EDGES_NOT_EMPTY                              :{WHITE}مربع او اكثر غير فارغ في الحدود الشمالية
 STR_CONFIG_SETTING_EDGES_NOT_WATER                              :{WHITE}مربع او اكثر من حدود الخريطة لا يكون بحر
 
@@ -1928,8 +1929,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}غلق
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}فتح
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}لا توضح منطقة التغطية للموقح المقترح
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}وضح منطقة التغطيةللموقع المقترح
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{GOLD}{STRING}{BLACK}يقبل:
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{GOLD}{STRING}{BLACK}الموارد:
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{GOLD}{CARGO_LIST}{BLACK}يقبل:
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{GOLD}{CARGO_LIST}{BLACK}الموارد:
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}اربط المحطات
@@ -2634,6 +2635,7 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW} اشت
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW} ارشي السلطات المحلية لزيادة كفائة الشركة. هناك عقاب شديد اذا ما اكتشفت الرشوة. {} التكلفة: {CURRENCY_LONG}
 
 # Goal window
+STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 
 # Goal question window
 STR_GOAL_QUESTION_CAPTION_QUESTION                              :اسئله
@@ -2671,7 +2673,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}يستقبل
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}عرض لائحة بالبضائع المقبولة
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}يقبل: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}يقبل: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}معدل النقل
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}اظهار معدل النقل للمحطة
@@ -2893,9 +2895,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}الوز
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}التكلفة: {GOLD}{CURRENCY_LONG}{BLACK} السرعة : {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK} السعة {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK} العربات ذات الطاقة: {GOLD}+{POWER}{BLACK} الوزن: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}يمكن تعديلها الى: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}يمكن تعديلها الى: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :كل انواع الحمولة
-STR_PURCHASE_INFO_ALL_BUT                                       :الكل الا {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :الكل الا {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}تأثير الجذب القصى: {GOLD}{FORCE}
 
 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}قائمة اختيار القطارات - اضغط على العربة لعرض معلوماتها
@@ -3137,7 +3139,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK} دخل
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK} الاعتمادية {LTBLUE}{COMMA} % {BLACK} الاعطال منذ اخر صيانة {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK} بني {LTBLUE}{NUM}{BLACK} القيمة {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}السعة: {LTBLUE}بدون
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}السعة: {LTBLUE}بدون{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK} السعة {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK} السعة {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK} السعة {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3180,8 +3182,8 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}السع
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} )تغيير(
 STR_REFIT_TITLE                                                 :{GOLD}اختر نوع الحمولة ...
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}السعة الجديدة: {GOLD}{CARGO_LONG}{}{BLACK}تكلفة التغيير: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}السعة الجديدة: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}تكلفة اعادة التهيئة: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}السعة الجديدة: {GOLD}{CARGO_LONG}{}{BLACK}تكلفة التغيير: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}السعة الجديدة: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}تكلفة اعادة التهيئة: {RED}{CURRENCY_LONG}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}اختر العربة لاعادة تهيئتها. اسحب بالفارة لاختيار عدة عربات. اضغط على مساحة خالية لاختيار كل العربات. اضغط + كنترول لاختيار العربة الحالية وما بعدها.
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}اختر نوع البضاعة لينقلها القطار
@@ -3451,15 +3453,16 @@ STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}انقل
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}انقل الذكاء الاصطناعي المختار للاسفل
 
 
+STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK} اعداد
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK} اعداد خواص الذكاء الصناعي
 
 # Available AIs window
 STR_AI_LIST_TOOLTIP                                             :{BLACK} اضغط لاختيار ذكاء اصطناعي
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}المؤلف: {STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}الاصدار: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}العنوان : {STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}المؤلف: {ORANGE}{STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}الاصدار: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}العنوان : {ORANGE}{STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK} اقبل
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK} اختر الذكاء الصناعي المنتقى
@@ -4322,6 +4325,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4337,6 +4341,7 @@ STR_TINY_BLACK_COMA                                             :{TINY_FONT}{BLA
 STR_TINY_COMMA                                                  :{TINY_FONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
@@ -4355,6 +4360,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}

src/lang/brazilian_portuguese.txt

@@ -101,7 +101,7 @@ STR_QUANTITY_COAL                                               :{WEIGHT_LONG} d
 STR_QUANTITY_MAIL                                               :{COMMA} bolsa{P "" s} de correspondência
 STR_QUANTITY_OIL                                                :{VOLUME_LONG} de petróleo
 STR_QUANTITY_LIVESTOCK                                          :{COMMA} cabeça{P "" s} de gado
-STR_QUANTITY_GOODS                                              :{COMMA} engradado{P "" s} de mercadorias
+STR_QUANTITY_GOODS                                              :{COMMA} caixa{P "" s} de mercadorias
 STR_QUANTITY_GRAIN                                              :{WEIGHT_LONG} de cereais
 STR_QUANTITY_WOOD                                               :{WEIGHT_LONG} de madeira
 STR_QUANTITY_IRON_ORE                                           :{WEIGHT_LONG} de minério de ferro
@@ -119,7 +119,7 @@ STR_QUANTITY_WHEAT                                              :{WEIGHT_LONG} d
 STR_QUANTITY_RUBBER                                             :{VOLUME_LONG} de borracha
 STR_QUANTITY_SUGAR                                              :{WEIGHT_LONG} de açúcar
 STR_QUANTITY_TOYS                                               :{COMMA} brinquedo{P "" s}
-STR_QUANTITY_SWEETS                                             :{COMMA} bolsa{P "" s} de doces
+STR_QUANTITY_SWEETS                                             :{COMMA} pacote{P "" s} de doces
 STR_QUANTITY_COLA                                               :{VOLUME_LONG} de cola
 STR_QUANTITY_CANDYFLOSS                                         :{WEIGHT_LONG} de algodão doce
 STR_QUANTITY_BUBBLES                                            :{COMMA} bolha{P "" s}
@@ -294,7 +294,7 @@ STR_SORT_BY_RANGE                                               :Alcance
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pausar jogo
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Acelerar o jogo
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opções
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Salvar jogo, abandonar jogo, desistir
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Salvar jogo, abandonar jogo, sair
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Exibir mapa, janela extra ou lista de placas
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Exibir lista de cidades
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Exibir subsídios
@@ -317,11 +317,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Construi
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Abrir a barra de paisagismo para elevar ou abaixar terreno, plantar árvores, etc.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Exibir janela de som/música
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Exibir a última mensagem/notícia, exibir opções de mensagem
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informações sobre o terreno, console, Depurar IA, capturas de tela, sobre OpenTTD
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informações sobre o terreno, console, depurar scripts, capturas de tela, sobre OpenTTD
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Trocar a barra de ferramentas
 
 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Salvar cenário, carregar cenário, abandonar editor de cenário, desistir
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Salvar cenário, carregar cenário, sair do editor de cenário, sair
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Editor de Cenário
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Mover a data inicial 1 ano para trás
@@ -341,16 +341,16 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Salvar cenário
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Carregar cenário
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Salvar mapa topográfico
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Carregar mapa de elevação
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Desistir do editor
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Sair do editor de cenários
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
-STR_SCENEDIT_FILE_MENU_QUIT                                     :Desistir
+STR_SCENEDIT_FILE_MENU_QUIT                                     :Sair
 ############ range for SE file menu starts
 
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opções do jogo
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Definições de dificuldade
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Definições avançadas
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Configurações de IA / Jogo
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Configurações de IA /Script do jogo
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Definições do NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Opções de Transparência
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Nomes de cidades exibidos
@@ -361,13 +361,14 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Placas e nomes
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Animação total
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Detalhamento total
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Edifícios transparentes
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Sinais de estações transparentes
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Placas de estações transparentes
 ############ range ends here
 
 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Salvar jogo
 STR_FILE_MENU_LOAD_GAME                                         :Carregar jogo
 STR_FILE_MENU_QUIT_GAME                                         :Abandonar jogo
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Sair
 ############ range ends here
 
@@ -445,9 +446,10 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Histórico de M
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Informação da área do terreno
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Alternar console
-STR_ABOUT_MENU_AI_DEBUG                                         :Depurar I.A.
+STR_ABOUT_MENU_AI_DEBUG                                         :Depurar IA/Script do jogo
 STR_ABOUT_MENU_SCREENSHOT                                       :Captura de tela
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ampliado em captura de tela
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Captura de tela em ampliação padrão
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Captura de tela do mapa inteiro
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Sobre 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Alinhador de "sprites"
@@ -579,7 +581,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Emprést
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Número de veículos que deram lucro ano passado. Isto inckui automóveis, trens, embarcações e aeronaves
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Número de partes de estações recentemente atendidas. Cada parte de uma estação (ex. estação de trem, ponto de ônibus, aeroporto) é contado, mesmo se eles estão conectados como uma estação
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Número de estações recentemente atendidas. Estações de trem, pontos de ônibus, aeroportos, etc. são contados individualmente, mesmo que pertençam à mesma estação.
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}O lucro do veículo com o menor rendimento (apenas veículos com mais de dois anos são considerados)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Quantidade de dinheiro ganho no trimestre com o menor lucro dos últimos 12 trimestres
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Quantidade de dinheiro ganho no trimestre com o maior lucro dos últimos 12 trimestres
@@ -843,7 +845,7 @@ STR_NEWS_STATION_NOW_ACCEPTS_CARGO_AND_CARGO                    :{WHITE}{STATION
 
 STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED                               :{BIG_FONT}{BLACK}A oferta do subsídio expirou:{}{}{STRING} de {STRING} para {STRING} agora não irá atrair um subsídio
 STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE                              :{BIG_FONT}{BLACK}Subsídio removido:{}{} Serviço de {STRING} de {STRING} para {STRING} não é mais subsidiado
-STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Subsídio de serviço oferecido:{}{} Primeiro serviço de {STRING} de {STRING} para {STRING} atrairá subsídio de um ano da autoridade local!
+STR_NEWS_SERVICE_SUBSIDY_OFFERED                                :{BIG_FONT}{BLACK}Subsídio de serviço oferecido:{}{} Primeiro serviço de {STRING} de {STRING} para {STRING} atrairá subsídio de um ano da prefeitura local!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF                           :{BIG_FONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará 50% extra durante o próximo ano ano!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE                         :{BIG_FONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o dobro de tarifas durante o próximo ano!
 STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE                         :{BIG_FONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o triplo de tarifas durante o próximo ano!
@@ -1029,7 +1031,7 @@ STR_DIFFICULTY_LEVEL_SETTING_QUANTITY_OF_SEA_LAKES              :{LTBLUE}Quantid
 STR_DIFFICULTY_LEVEL_SETTING_ECONOMY                            :{LTBLUE}Economia: {ORANGE}{STRING}
 STR_DIFFICULTY_LEVEL_SETTING_TRAIN_REVERSING                    :{LTBLUE}Inverter trem: {ORANGE}{STRING}
 STR_DIFFICULTY_LEVEL_SETTING_DISASTERS                          :{LTBLUE}Desastres: {ORANGE}{STRING}
-STR_DIFFICULTY_LEVEL_SETTING_CITY_APPROVAL                      :{LTBLUE}Atitude das autoridades sobre reestruturamentos: {ORANGE}{STRING}
+STR_DIFFICULTY_LEVEL_SETTING_CITY_APPROVAL                      :{LTBLUE}Atitude das prefeituras sobre reestruturamentos: {ORANGE}{STRING}
 ############ range for difficulty settings ends
 
 STR_NONE                                                        :Nenhum
@@ -1146,7 +1148,7 @@ STR_CONFIG_SETTING_STOP_LOCATION_MIDDLE                         :meio
 STR_CONFIG_SETTING_STOP_LOCATION_FAR_END                        :fim
 STR_CONFIG_SETTING_ROAD_VEHICLE_QUEUEING                        :{LTBLUE}Fila de automóveis (com efeitos de quantidade): {ORANGE}{STRING}
 STR_CONFIG_SETTING_AUTOSCROLL                                   :{LTBLUE}Deslocar janela quando o cursor está na borda do mapa: {ORANGE}{STRING}
-STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Permitir o suborno da autoridade local: {ORANGE}{STRING}
+STR_CONFIG_SETTING_BRIBE                                        :{LTBLUE}Permitir o suborno da prefeitura: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_EXCLUSIVE                              :{LTBLUE}Permtir compra de direitos exclusivos de transporte: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_FUND_BUILDINGS                         :{LTBLUE}Permitir o patrocínio de edifícios: {ORANGE}{STRING}
 STR_CONFIG_SETTING_ALLOW_FUND_ROAD                              :{LTBLUE}Permitir financiamento de reconstrução de estrada local: {ORANGE}{STRING}
@@ -1392,6 +1394,9 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :incompatível c
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :desconhecido
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... nível de compressão '{STRING}' é inválido
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... formato de arquivo '{STRING}' está indisponível. Revertendo para '{STRING}'
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... ignorando conj. de Gráficos Base '{STRING}': não encontrado
+STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... ignorando conj. de Sons Base '{STRING}': não encontrado
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... ignorando conj. de Músicas Base '{STRING}': não encontrado
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1408,7 +1413,7 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Dificuld
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Configurações avançadas
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Configurar NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Checar conteúdo on-line
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Configurações de IA / Jogo
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Configurações de IA / Script do jogo
 STR_INTRO_QUIT                                                  :{BLACK}Sair
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Iniciar um novo jogo. Ctrl+Clique para pular a configuração do mapa
@@ -1428,8 +1433,8 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Exibir o
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Exibe as configurações avançadas
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Exibir configs. dos NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Checar por conteúdo novo e atualizado para baixar
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Exibe configurações de IA e do Jogo
-STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair de 'OpenTTD'
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Exibe configurações de IA e script do jogo
+STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Sair do 'OpenTTD'
 
 STR_INTRO_TRANSLATION                                           :{BLACK}Faltam {NUM} string{P "" s} nessa tradução. Por favor faça o OpenTTD melhor se inscrevendo como tradutor. Leia Readme.txt para mais detalhes.
 
@@ -1799,6 +1804,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Você fo
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Você foi expulso do jogo
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Trapaceiros não são permitidos neste servidor
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Você enviou comandos demais ao servidor
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Você demorou demais para digitar a senha
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Seu computador é lento demais para acompanhar o servidor
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Seu computador demorou demais para baixar o mapa
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Seu computador demorou demais para entrar no servidor
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :erro geral
@@ -1817,6 +1826,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :expulso pelo se
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :estava tentando trapacear
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :servidor cheio
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :enviou comandos demais
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :não recebeu senha a tempo
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :tempo esgotado
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :a baixa do mapa demorou demais
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :o processamento do mapa demorou demais
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Possível perda de conexão
@@ -1897,6 +1910,7 @@ STR_CONTENT_TYPE_HEIGHTMAP                                      :Mapa topográfi
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :Sons padrão
 STR_CONTENT_TYPE_BASE_MUSIC                                     :Músicsas padrão
 STR_CONTENT_TYPE_GAME_SCRIPT                                    :Script do jogo
+STR_CONTENT_TYPE_GS_LIBRARY                                     :GS's disponíveis
 
 # Content downloading progress window
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}Baixando conteúdo...
@@ -1936,8 +1950,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Desativa
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Ativar
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Não destacar área de cobertura da construção proposto
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Destacar área de cobertura da construção proposta
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Aceita: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Suprimentos: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Aceita: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Suprimentos: {GOLD}{CARGO_LIST}
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Unir estação
@@ -2060,9 +2074,9 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Orienta
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Selecionar orientação do estação de ônibus
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Orientação da área de carga
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Selecionar orientação da área de carga
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientação da Estação de Bonde
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Orientação da Estação de Bonde Passageiros
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Selecionar orientação da estação de bonde
-STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientação da Estação de Bonde
+STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Orientação da Estação de Bonde de Carga
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Selecionar orientação da estação de bonde
 
 # Waterways toolbar (last two for SE only)
@@ -2130,7 +2144,7 @@ STR_OBJECT_CLASS_TRNS                                           :Transmissores
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Árvores
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecionar um tipo de árvore para plantar
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Selecionar um tipo de árvore para plantar. Se o local já tiver uma árvore, isso irá adicionar mais árvores do tipo misto indepentendemente do tipo selecionado
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Árvores de tipo aleatório
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Plantar árvores de tipo aleatório, Shift alterna entre construção/preço estimado
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Plantar Aleatoriamente
@@ -2215,7 +2229,7 @@ STR_LAND_AREA_INFORMATION_OWNER                                 :{BLACK}Propriet
 STR_LAND_AREA_INFORMATION_ROAD_OWNER                            :{BLACK}Dono da estrada: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_TRAM_OWNER                            :{BLACK}Dono da linha de bonde: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_RAIL_OWNER                            :{BLACK}Dono da linha ferroviária: {LTBLUE}{STRING}
-STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Autoridade local: {LTBLUE}{STRING}
+STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY                       :{BLACK}Prefeitura: {LTBLUE}{STRING}
 STR_LAND_AREA_INFORMATION_LOCAL_AUTHORITY_NONE                  :Nenhum
 STR_LAND_AREA_INFORMATION_LANDINFO_COORDS                       :{BLACK}Coordenadas: {LTBLUE}{NUM} x {NUM} x {NUM} ({STRING})
 STR_LAND_AREA_INFORMATION_BUILD_DATE                            :{BLACK}Construído: {LTBLUE}{DATE_LONG}
@@ -2448,6 +2462,7 @@ STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Move o N
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Lista dos NewGRF instalados.
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Definir parâmetros
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Exibir parâmetros
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Alterna paleta
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Alterna a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Aplicar alterações
@@ -2520,9 +2535,16 @@ STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} requ
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :o arquivo GRF foi designado para tradução
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Muitas NewGRFs estão carregadas
 STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Carregar {1:STRING} como um NewGRF estático em conjunto com {STRING} pode causar desincronias
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :"Sprite" inesperado (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Propriedade de Ação Desconhecida 0 {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Tentativa de uso de ID inválido (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} contém um sprite corrupto. Todos os sprites corruptos serão exibidos como um "?" vermelho
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Contém multiplas entradas de Ação 8 (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Leitura após o final do pseudo-sprite (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Estão faltando alguns sprites na base de gráficos em uso.{}Por favor atualize a base de gráficos
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Recursos GRF requeridos indisponíveis (sprite {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} foi desativado por {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Formato de layout de sprite inválido/desconhecido (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Cuidado!
@@ -2596,7 +2618,7 @@ STR_TOWN_VIEW_MAIL_LAST_MONTH_MAX                               :{BLACK}Cartas n
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH                              :{BLACK}Carga necessária para prover o crescimento:
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_GENERAL             :{ORANGE}{STRING}{RED} necessário(a)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED_WINTER              :{ORANGE}{STRING}{BLACK} necessário no inverno
-STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} entregue{P "" s}
+STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED_GENERAL            :{ORANGE}{STRING}{GREEN} entregues
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_REQUIRED                     :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{RED} (ainda necessário)
 STR_TOWN_VIEW_CARGO_FOR_TOWNGROWTH_DELIVERED                    :{ORANGE}{CARGO_TINY} / {CARGO_LONG}{GREEN} (entregue{P "" s})
 STR_TOWN_VIEW_TOWN_GROWS_EVERY                                  :{BLACK}Cidade cresce a cada {ORANGE}{COMMA}{BLACK} dia{P "" s}
@@ -2604,8 +2626,8 @@ STR_TOWN_VIEW_TOWN_GROWS_EVERY_FUNDED                           :{BLACK}Cidade c
 STR_TOWN_VIEW_TOWN_GROW_STOPPED                                 :{BLACK}A cidade {RED}não{BLACK} está crescendo
 STR_TOWN_VIEW_NOISE_IN_TOWN                                     :{BLACK}Limite de ruído na cidade: {ORANGE}{COMMA}{BLACK}  max: {ORANGE}{COMMA}
 STR_TOWN_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrar visão no local da cidade. Ctrl+Clique abre uma nova janela no local da cidade
-STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Autoridade local
-STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Exibir informações sobre a autoridade local
+STR_TOWN_VIEW_LOCAL_AUTHORITY_BUTTON                            :{BLACK}Prefeitura
+STR_TOWN_VIEW_LOCAL_AUTHORITY_TOOLTIP                           :{BLACK}Exibir informações sobre a prefeitura
 STR_TOWN_VIEW_RENAME_TOOLTIP                                    :{BLACK}Renomear cidade
 
 STR_TOWN_VIEW_EXPAND_BUTTON                                     :{BLACK}Expandir
@@ -2616,7 +2638,7 @@ STR_TOWN_VIEW_DELETE_TOOLTIP                                    :{BLACK}Remove e
 STR_TOWN_VIEW_RENAME_TOWN_BUTTON                                :Renomear Cidade
 
 # Town local authority window
-STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}autoridade local de {TOWN}
+STR_LOCAL_AUTHORITY_CAPTION                                     :{WHITE}Prefeitura de {TOWN}
 STR_LOCAL_AUTHORITY_COMPANY_RATINGS                             :{BLACK}Avaliações das empresas
 STR_LOCAL_AUTHORITY_COMPANY_RATING                              :{YELLOW}{COMPANY} {COMPANY_NUM}: {ORANGE}{STRING}
 STR_LOCAL_AUTHORITY_ACTIONS_TITLE                               :{BLACK}Ações disponíveis:
@@ -2631,7 +2653,7 @@ STR_LOCAL_AUTHORITY_ACTION_ROAD_RECONSTRUCTION                  :Financiar a rec
 STR_LOCAL_AUTHORITY_ACTION_STATUE_OF_COMPANY                    :Construir estátua do proprietário da empresa
 STR_LOCAL_AUTHORITY_ACTION_NEW_BUILDINGS                        :Financiar novos edifícios
 STR_LOCAL_AUTHORITY_ACTION_EXCLUSIVE_TRANSPORT                  :Comprar exclusividade da rede de transportes
-STR_LOCAL_AUTHORITY_ACTION_BRIBE                                :Subornar a autoridade local
+STR_LOCAL_AUTHORITY_ACTION_BRIBE                                :Subornar a prefeitura
 
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_SMALL_ADVERTISING            :{YELLOW}Iniciar uma pequena campanha publicitária local, para atrair mais passageiros e cargas para seus serviços de transporte.{}Preço: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_MEDIUM_ADVERTISING           :{YELLOW}Iniciar uma campanha publicitária média, para atrair mais passageiros e carga para seus serviços de transporte.{}Preço: {CURRENCY_LONG}
@@ -2639,8 +2661,8 @@ STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_LARGE_ADVERTISING            :{YELLOW}Iniciar
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_ROAD_RECONSTRUCTION          :{YELLOW} Financiar a reconstrução da malha rodoviária urbana. Causa engarrafamentos consideráveis ao tráfego por até 6 meses.{}Preço: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_STATUE_OF_COMPANY            :{YELLOW} Construir uma estátua em honra para sua empresa.{} Preço: {CURRENCY_LONG}
 STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_NEW_BUILDINGS                :{YELLOW} Financiar a construção de edifícios comerciais novos na cidade.{}Preço: {CURRENCY_LONG}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW} Comprar a exclusividade dos serviços durante 1 ano na cidade. A autoridade da cidade permitirá que os passageiros e cargas usem somente estações de sua empresa.{} Preço: {CURRENCY_LONG}
-STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Subornar a autoridade local para aumentar a sua avaliação, correndo o risco de uma penalidade severa se apanhado.{}Preço: {CURRENCY_LONG}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_EXCLUSIVE_TRANSPORT          :{YELLOW} Comprar a exclusividade dos serviços durante 1 ano na cidade. A prefeitura da cidade permitirá que os passageiros e cargas usem somente estações de sua empresa.{} Preço: {CURRENCY_LONG}
+STR_LOCAL_AUTHORITY_ACTION_TOOLTIP_BRIBE                        :{YELLOW}Subornar a prefeitura para aumentar a sua avaliação, correndo o risco de uma penalidade severa se apanhado.{}Preço: {CURRENCY_LONG}
 
 # Goal window
 STR_GOALS_CAPTION                                               :{G=m}{WHITE}Objetivos
@@ -2651,8 +2673,30 @@ STR_GOALS_COMPANY_TITLE                                         :{G=m}{BLACK}Obj
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Clique num objetivo para centralizar a visualização principal numa indústria/cidade.Ctrl+Clique abre uma nova janela na localização da indústria/cidade
 
 # Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Pergunta
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informação
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Alerta
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Erro
 
 ### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Cancelar
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Não
+STR_GOAL_QUESTION_BUTTON_YES                                    :Sim
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Recusar
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Aceitar
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignorar
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Tentar novamente
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Anterior
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Próximo
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Parar
+STR_GOAL_QUESTION_BUTTON_START                                  :Iniciar
+STR_GOAL_QUESTION_BUTTON_GO                                     :Ir
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Continuar
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Reiniciar
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Postergar
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Desistir
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Fechar
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Subsídios
@@ -2682,7 +2726,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Aceita
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Exibir lista de carga aceita
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Aceita: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Aceita: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Avaliações
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Exibir avaliações da estação
@@ -2764,11 +2808,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Nenhum
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Valor da empresa: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% propriedade de {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infraestrutura:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} partes de ferrovia
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} partes de rodovia
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} partes de água
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} partes de estação
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroportos
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} parte{P "" s} de ferrovia
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} parte{P "" s} de rodovia
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} parte{P "" s} de água
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} parte{P "" s} de estação
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} aeroporto{P "" s}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Nenhum
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Construir sede
@@ -2927,9 +2971,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Peso: {G
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Preço: {GOLD}{CURRENCY_LONG}{BLACK} Velocidade: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacidade: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagões energizados: {GOLD}+{POWER}{BLACK} Peso: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Adaptável para: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Adaptável para: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Todos as cargas
-STR_PURCHASE_INFO_ALL_BUT                                       :Todas menos {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Todas menos {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Tração máx : {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Alcance: {GOLD}{COMMA} quadrados
 
@@ -3052,8 +3096,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Preço:
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Preço: {CURRENCY_LONG} Peso: {WEIGHT_SHORT}{}Vel.: {VELOCITY}  Potência: {POWER}  Tração Máx: {6:FORCE}{}Custo de manutenção: {4:CURRENCY_LONG}/yr{}Capacidade: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Preço: {CURRENCY_LONG} Vel. Max.: {VELOCITY}{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Custo de manutenção: {CURRENCY_LONG}/ano
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Preço: {CURRENCY_LONG} Vel. Max.: {VELOCITY}{}Capacidade: {CARGO_LONG}{}Custo de manuteção: {CURRENCY_LONG}/ano
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Preço: {CURRENCY_LONG} Vel. Máx.: {VELOCITY} Alcance: {7:COMMA} quadrados{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Cust de manut.: {CURRENCY_LONG}/ano
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Custo: {CURRENCY_LONG} Vel. Máx.: {VELOCITY} Alcance: {7:COMMA} quadrados{}Capacidade: {CARGO_LONG}{}Custo de manut.: {CURRENCY_LONG}/ano
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Preço: {CURRENCY_LONG} Vel. Máx.: {VELOCITY} Alcance: {COMMA} quadrados{}Capacidade: {CARGO_LONG}, {CARGO_LONG}{}Cust de manut.: {CURRENCY_LONG}/ano
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Custo: {CURRENCY_LONG} Vel. Máx.: {VELOCITY} Alcance: {COMMA} quadrados{}Capacidade: {CARGO_LONG}{}Custo de manut.: {CURRENCY_LONG}/ano
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substituir {STRING}
@@ -3077,7 +3121,7 @@ STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Troca en
 STR_REPLACE_ENGINES                                             :Motores
 STR_REPLACE_WAGONS                                              :Vagões
 
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Escolha o tipo de carga para o qual deseja efetuar a substituição dos motores
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Escolha o tipo de ferrovia para o qual deseja efetuar a substituição dos motores
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Exibe o tipo de motor que substituirá o que está selecionado à esquerda, se algum
 STR_REPLACE_RAIL_VEHICLES                                       :Trens
 STR_REPLACE_ELRAIL_VEHICLES                                     :Locomotivas Elétricas
@@ -3176,7 +3220,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Lucros d
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Confiabilidade: {LTBLUE}{COMMA}%  {BLACK}Quebras desde a última manutenção: {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Construído: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacidade: {LTBLUE}Nenhuma
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacidade: {LTBLUE}Nenhuma{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacidade: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacidade: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacidade: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3219,8 +3263,8 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacida
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Adaptar)
 STR_REFIT_TITLE                                                 :{GOLD}Selecionar tipo de carga:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacidade: {GOLD}{CARGO_LONG}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nova capacidade: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Custo da adaptação: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacidade: {GOLD}{CARGO_LONG}{}{BLACK}Custo da adaptação: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nova capacidade: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Custo da adaptação: {RED}{CURRENCY_LONG}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Selecione os veículos para recuperar. Arrastar com o mouse permite a seleção de vários veículos. Clicar em espaço vazio selecionará todo o veículo. Ctrl+Clique selecionará um veículo e a lista de construção em seguida
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecionar tipo de carga para o trem
@@ -3323,7 +3367,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Ir para depósi
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Ir para hangar mais próximo
 STR_ORDER_CONDITIONAL                                           :Pulo de ordem condicional
 STR_ORDER_SHARE                                                 :Compartilhar ordens
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Inserir nova ordem antes da ordem em destaque, ou adicionar no fim da lista. Ctrl torna ordens da estação 'carregar completamente qualquer carga', ordens de pontos de controle como 'sem parada' e ordens de depósito como 'serviço'. 'Compartilhar ordens' ou Ctrl deixa este veículo compartilhar ordens com o veículo selecionado. Clicar num veículo copia as ordens daquele veículo
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Inserir nova ordem antes da ordem selecionada, ou adicionar no fim da lista. Ctrl torna ordens da estação 'carregar completamente qualquer carga', ordens de pontos de controle como 'sem parada' e ordens de depósito como 'manutenção'. 'Compartilhar ordens' ou Ctrl deixa este veículo compartilhar ordens com o veículo selecionado. Clicar num veículo copia as ordens daquele veículo. Uma ordem de depósito desativa manutenção automática para o veículo
 
 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Exibir todos os veículos com a mesma rota
 
@@ -3403,7 +3447,9 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Horário
 STR_TIMETABLE_NO_TRAVEL                                         :Não viajar
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Viagem (automático; calendarizada pela próxima ordem manual)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Viajar (não calendarizado)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Viaje em até {2:VELOCITY} (sem plano de horário)
 STR_TIMETABLE_TRAVEL_FOR                                        :Viajar para {STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Viaje por {STRING} em até {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :e ficar durante {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :e viajar por {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dia{P "" s}
@@ -3427,7 +3473,11 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Mudar a
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Limpar Horário
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Limpar a quantidade de tempo para a ordem destacada
 
+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Alterar Limite de Vel.
+STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Altera a velocidade máxima de viagem para a ordem selecionada
 
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Limpa Limite de Vel.
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Limpar a velocidade máxima de viagem para a ordem selecionada
 
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Restabelecer Contador de Atraso
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Restabelecer o contador de atraso,então o veículo estará pontual
@@ -3453,11 +3503,11 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Selecion
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}Depurar IA
+STR_AI_DEBUG                                                    :{WHITE}Depurar IA/Script do jogo
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
-STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nome da IA
-STR_AI_DEBUG_SETTINGS                                           :{BLACK}Definições da IA
-STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Alterar as definições da IA
+STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nome do script
+STR_AI_DEBUG_SETTINGS                                           :{BLACK}Definições
+STR_AI_DEBUG_SETTINGS_TOOLTIP                                   :{BLACK}Alterar as definições do script
 STR_AI_DEBUG_RELOAD                                             :{BLACK}Recarregar IA
 STR_AI_DEBUG_RELOAD_TOOLTIP                                     :{BLACK}Desativar a IA, recarregar o script e reiniciar a IA
 STR_AI_DEBUG_BREAK_STR_ON_OFF_TOOLTIP                           :{BLACK}Ativar/desativar pausagem quando uma mensagem de registo da IA corresponder á sequencia de falhas
@@ -3469,14 +3519,16 @@ STR_AI_DEBUG_MATCH_CASE_TOOLTIP                                 :{BLACK}Alternar
 STR_AI_DEBUG_CONTINUE                                           :{BLACK}Continuar
 STR_AI_DEBUG_CONTINUE_TOOLTIP                                   :{BLACK}Despausar e continuar o AI
 STR_AI_DEBUG_SELECT_AI_TOOLTIP                                  :{BLACK}Ver a depuração produzida desta IA
+STR_AI_GAME_SCRIPT                                              :{BLACK}Game Script
+STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Checando o log do Game Script
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Nenhuma IA adequada encontrada para carregar. {} Esta IA é falsa e não irá fazer nada. {} Você pode pode baixar várias IA através do sistema de 'Conteúdo Online'
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Uma das em execução IA's travou. Favor relatar isto ao autor da IA com uma captura de tela da Janela de Depuração da IA
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Debug de IA só é acessível pelo servidor
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Um dos scripts em execução travou. Favor relatar isto ao autor do script com uma captura de tela da Janela de Depuração da I.A./Script do jogo
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Depuração de I.A./Script do jogo só é acessível pelo servidor
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuração da IA
-STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}GameScript que será carregado no próximo jogo
+STR_AI_CONFIG_CAPTION                                           :{WHITE}Configuração da I.A./Script do jogo
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}O script do jogo que será carregado no próximo jogo
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}IAs que serão carregadas no próximo jogo
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Jogador humano
 STR_AI_CONFIG_RANDOM_AI                                         :IA aleatória
@@ -3487,32 +3539,36 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Mover a
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Descer
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Mover a IA selecionada para baixo na lista
 
+STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Script do jogo
 STR_AI_CONFIG_AI                                                :{G=f}{SILVER}IAs
 
 STR_AI_CONFIG_CHANGE                                            :{BLACK}Selecionar {STRING}
 STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :{G=f}IA
+STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Script do jogo
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Carregar outro script
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configurar
-STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurar os parâmetros da IA
+STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configurar os parâmetros do Script
 
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Disponíveis {STRING}
 STR_AI_LIST_CAPTION_AI                                          :{G=f}IAs
-STR_AI_LIST_TOOLTIP                                             :{BLACK}Clique para selecionar uma IA
+STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Script do jogo
+STR_AI_LIST_TOOLTIP                                             :{BLACK}Clique para selecionar um script
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}Versão: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}Autor: {ORANGE}{STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}Versão: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Aceitar
-STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecionar a IA destacada
+STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecionar o script destacado
 STR_AI_LIST_CANCEL                                              :{BLACK}Cancelar
-STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar IA
+STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Não mudar o script
 
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parâmetros
 STR_AI_SETTINGS_CAPTION_AI                                      :{G=f}IA
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Script do jogo
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Fechar
 STR_AI_SETTINGS_RESET                                           :{BLACK}Resetar
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
@@ -3610,8 +3666,8 @@ STR_ERROR_GENERIC_OBJECT_IN_THE_WAY                             :{WHITE}{1:STRIN
 STR_ERROR_NOT_ALLOWED_WHILE_PAUSED                              :{WHITE}Não permitido enquanto pausado
 
 # Local authority errors
-STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}A autoridade local de {TOWN} não autoriza
-STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}a autoridade local de {TOWN} não permite que outro aeroporto seja construído nesta cidade
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS                 :{WHITE}A prefeitura de {TOWN} não autoriza
+STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT                       :{WHITE}a prefeitura de {TOWN} não permite que outro aeroporto seja construído nesta cidade
 STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE                         :{WHITE}A prefeitura de {TOWN} reclama do barulho que será gerado pelo aeroporto
 STR_ERROR_BRIBE_FAILED                                          :{WHITE}Sua tentativa de suborno foi descoberta pela polícia regional
 
@@ -3665,7 +3721,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... só
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... só pode ser construído em cidades com pelo menos 1200 habitantes
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... só pode ser construído em zonas florestais
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... só pode ser construído em áreas desérticas
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... só se pode ser construído em cidades
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... só se pode ser construído em cidades (substituindo casas)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... só pode ser construído próximo aos centros de cidades
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... só pode ser construído em áreas baixas
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... só pode ser colocado perto das bordas do mapa
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... a floresta só pode ser plantada acima do nível de neve
@@ -4370,6 +4427,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4404,6 +4462,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}

src/lang/bulgarian.txt

@@ -365,6 +365,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Прозрач
 STR_FILE_MENU_SAVE_GAME                                         :Запази игра
 STR_FILE_MENU_LOAD_GAME                                         :Отваряне на игра
 STR_FILE_MENU_QUIT_GAME                                         :Прекъсване на играта
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Изход
 ############ range ends here
 
@@ -1208,7 +1209,7 @@ STR_CONFIG_SETTING_SCROLLWHEEL_SCROLLING                        :{LTBLUE}Кол
 STR_CONFIG_SETTING_SCROLLWHEEL_ZOOM                             :променя увеличението
 STR_CONFIG_SETTING_SCROLLWHEEL_SCROLL                           :превърта картата
 STR_CONFIG_SETTING_SCROLLWHEEL_OFF                              :не прави нищо
-STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER                       :{LTBLUE}Превъртане на картата: {ORANGE}{STRING} клетк{P а и}
+STR_CONFIG_SETTING_SCROLLWHEEL_MULTIPLIER                       :{LTBLUE}Превъртане на картата: {ORANGE}{STRING} клетк{P 0:1 а и}
 
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU                          :{LTBLUE}Дясно-щракане емулациа: {ORANGE}{STRING}
 STR_CONFIG_SETTING_RIGHT_MOUSE_BTN_EMU_COMMAND                  :Команда-щракане
@@ -1889,8 +1890,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Изкл
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Включен
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Не отбелязвай зоната от предложеното място
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Отбележи зоната от предложеното място
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Приема: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Запаси: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Приема: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Запаси: {GOLD}{CARGO_LIST}
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Присъедини станцията
@@ -2609,7 +2610,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Приема
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Покажи списък с приетите товари
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Приема: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Приема: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Рейтинги
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Покажи нивото на обслужване
@@ -2829,9 +2830,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Тегл
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Цема {GOLD}{CURRENCY_LONG}{BLACK} Скорост: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Капацитет: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Вагони с мощност: {GOLD}+{POWER}{BLACK} Тегло: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Преобразуваем на: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Преобразуваем на: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Всички видове товар
-STR_PURCHASE_INFO_ALL_BUT                                       :Всичко освен {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Всичко освен {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Макс. теглеща сила: {GOLD}{FORCE}
 
 STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Списък с влакове - натисни върху влак за информация
@@ -3074,7 +3075,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Печа
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Надеждност: {LTBLUE}{COMMA}%  {BLACK}Разваляния от последното сервизиране: {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{G=m}{LTBLUE}{ENGINE} {BLACK}Построен: {LTBLUE}{NUM}{BLACK} Стойност: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Капацитет: {LTBLUE}няма
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Капацитет: {LTBLUE}няма{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Капацитет: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Капацитет: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Капацитет: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3117,8 +3118,8 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Капа
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Преустройване)
 STR_REFIT_TITLE                                                 :{GOLD}Изберете вид товар за превозване:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO_LONG}{}{BLACK}Цена за преустройство: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Нова вместимост: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Цена за преоборудване: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Нов капацитет: {GOLD}{CARGO_LONG}{}{BLACK}Цена за преустройство: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Нова вместимост: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Цена за преоборудване: {RED}{CURRENCY_LONG}
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Избор тип на товар за влак
 STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP                             :{BLACK}Избор тип това за автомобила да превозва
@@ -3357,6 +3358,7 @@ STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Прем
 STR_AI_CONFIG_AI                                                :{SILVER}AI-та
 
 STR_AI_CONFIG_CHANGE                                            :{BLACK}Избери {STRING}
+STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :AI
 STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Програмен език на играта
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Конфигуриране
@@ -3368,9 +3370,9 @@ STR_AI_LIST_CAPTION_AI                                          :AI-та
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Програмни езици на играта
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Кликнете за да изберете AI
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}Автор: {STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}Версия: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}Автор: {ORANGE}{STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}Версия: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Приеми
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Избери маркирания AI
@@ -4211,6 +4213,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4226,6 +4229,7 @@ STR_TINY_BLACK_COMA                                             :{TINY_FONT}{BLA
 STR_TINY_COMMA                                                  :{TINY_FONT}{COMMA}
 STR_BLUE_COMMA                                                  :{BLUE}{COMMA}
 STR_RED_COMMA                                                   :{RED}{COMMA}
+STR_WHITE_COMMA                                                 :{WHITE}{COMMA}
 STR_TINY_BLACK_DECIMAL                                          :{TINY_FONT}{BLACK}{DECIMAL}
 STR_COMPANY_MONEY                                               :{WHITE}{CURRENCY_LONG}
 STR_BLACK_DATE_LONG                                             :{BLACK}{DATE_LONG}
@@ -4244,6 +4248,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}

src/lang/catalan.txt

@@ -294,7 +294,7 @@ STR_SORT_BY_RANGE                                               :Abast
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Para el joc
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Avanç ràpid del joc
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Opcions
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Desa el joc, abandona el joc, sortir
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Desa el joc, abandona el joc, surt
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Mostra el mapa
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Mostra el directori de poblacions
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Mostra les subvencions
@@ -317,11 +317,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Construe
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Obre la barra d'eines del terreny per elevar/rebaixar nivell, plantar arbres, etc.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Mostra la finestra de so/música
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Mostra els darrers missatges/notícies, mostra les opcions de missatges
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informació del terreny, terminal, depuració IA, captures de pantalla, Quant a OpenTTD
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Informació del terreny, terminal, depuració d'scripts, captures de pantalla, quant a OpenTTD
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Commuta barres d'eines
 
 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Desa l'escenari, carrega un escenari, abandona l'editor d'escenaris, sortir
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Desa l'escenari, carrega un escenari, abandona l'editor d'escenaris, surt
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Editor d'Escenaris
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Retarda la data d'inici 1 any
@@ -341,7 +341,7 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Desa l'escenari
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Carrega un escenari
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Desa mapa d'alçades
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Carrega Mapa d'alçades
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Surt de l'editor
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Surt de l'editor d'escenaris
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Surt
 ############ range for SE file menu starts
@@ -350,7 +350,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Surt
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Opcions del Joc
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Paràmetres de dificultat
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Paràmetres avançats
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :IA / Paràmetres del joc
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Paràmetres de la IA/Scripts del joc
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Extensions NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Opcions de transparència
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Mostra els noms de les poblacions
@@ -368,6 +368,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Senyals transpa
 STR_FILE_MENU_SAVE_GAME                                         :Desa el joc
 STR_FILE_MENU_LOAD_GAME                                         :Carrega un joc
 STR_FILE_MENU_QUIT_GAME                                         :Abandona el joc
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Surt
 ############ range ends here
 
@@ -445,7 +446,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Historial de Mi
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Informació de l'àrea de terreny
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Canvia al terminal
-STR_ABOUT_MENU_AI_DEBUG                                         :IA / Depuració de l'script del joc
+STR_ABOUT_MENU_AI_DEBUG                                         :Depuració de la IA/Scripts del joc
 STR_ABOUT_MENU_SCREENSHOT                                       :Captura de pantalla
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zoom màxim en la captura de pantalla
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Zoom predeterminat en les captures de pantalla
@@ -580,7 +581,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Préstec
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Quantitat de vehicles que han donat beneficis el darrer any. Inclou els automòbils, trens, vaixells i avions
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Quantitat de parts d'una es estació revisades. Cada part d'una estació (ex. estació de tren, parada d'autobús, aeroport) es compta, encara que estigui connectada com una sola estació.
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Quantitat d'estacions revisades recentment. Estacions, parades d'autobús, aeroports, etc. es compten separadament, fins hi tot si pertanyen a la mateixa estació.
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}El benefici del vehicle amb els menors ingressos (només s'han considerat els vehicles més antics de 2 anys)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Quantitat de diners fets durant el quatrimestre amb el mínim benefici dels darrers 12 quatrimestres
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Quantitat de diners fets durant el quatrimestre amb el màxim benefici dels darrers 12 quatrimestres
@@ -1393,6 +1394,9 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :incompatible am
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :desconegut
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... el nivell de compressió '{STRING}' no és vàlid
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... el format de joc desat '{STRING}' no està disponible. Tornant a '{STRING}'
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... ignorant el conjunt de gràfics base '{STRING}': no trobats
+STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... ignorant el conjunt de sons base '{STRING}': no trobats
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... ignorant el conjunt de músiques base '{STRING}': no trobats
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1409,7 +1413,7 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Dificult
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Paràmetres avançats
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Extensions NewGRF
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Contingut en línia
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}IA / Paràmetres del joc
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Paràmetres de la IA/Scripts del Joc
 STR_INTRO_QUIT                                                  :{BLACK}Surt
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Comença un joc nou. Ctrl+Clic salta la configuració del mapa
@@ -1429,7 +1433,7 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Mostra l
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Mostra paràmetres avançats
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Mostra els paràmetres NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Comprova si hi ha continguts nous i actualitzats per a descarregar
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Mostra la IA i els paràmetres del joc
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Mostra els paràmetres de la IA/Script del joc
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Surt d'OpenTTD
 
 STR_INTRO_TRANSLATION                                           :{BLACK}A aquesta traducció li falta {NUM} string{P "" s}. Si us plau ajuda a fer millor OpenTTD unint-te com a traductor. Veure readme.txt per més detalls.
@@ -1925,7 +1929,7 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}No s'han
 STR_MISSING_GRAPHICS_SET_CAPTION                                :{WHITE}Gràfics que falten
 STR_MISSING_GRAPHICS_SET_MESSAGE                                :{BLACK}OpenTTD necessita gràfics per funcionar però no se n'ha trobat cap. Vols permetre a OpenTTD descarregar i instal·lar aquests gràfics?
 STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}Si, descarregar els gràfics
-STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, sortir d'OpenTTD
+STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, surt d'OpenTTD
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Opcions de transparència
@@ -1946,8 +1950,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Inactiu
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Actiu
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}No marcar l'àrea de cobertura del lloc proposat
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Marcar l'àrea de cobertura del lloc proposat
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepta: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Provisions: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepta: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Provisions: {GOLD}{CARGO_LIST}
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Ajuntar estació
@@ -2722,7 +2726,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepta
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Mostra la llista de càrregues admeses
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepta: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepta: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ratis
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Mostra els ratis de l'estació
@@ -2967,9 +2971,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Pes: {GO
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Velocitat: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacitat: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Vagons Automotrius: {GOLD}+{POWER}{BLACK} Pes: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Remodelable a: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Remodelable a: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Totes les càrregues
-STR_PURCHASE_INFO_ALL_BUT                                       :Tots menys {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Tots menys {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. Esforç de Tracció: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Abast: {GOLD}{COMMA} cel·les
 
@@ -3092,8 +3096,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cost: {C
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Cost: {CURRENCY_LONG} Pes: {WEIGHT_SHORT}{}Velocitat: {VELOCITY} Potència: {POWER} T.E. Max.: {6:FORCE}{}Cost d'utilització: {4:CURRENCY_LONG}/any{}Capacitat: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cost: {CURRENCY_LONG} Vel. Max: {VELOCITY}{}Capacitat: {CARGO_LONG}, {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cost: {CURRENCY_LONG} Vel. Max: {VELOCITY}{}Capacitat: {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cost: {CURRENCY_LONG} Vel. max: {VELOCITY} Abast: {7:COMMA} cel·les{}Capacitat: {CARGO_LONG}, {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cost: {CURRENCY_LONG} Vel. max: {VELOCITY} Abast: {7:COMMA} cel·les{}Capacitat: {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cost: {CURRENCY_LONG} Vel. max: {VELOCITY} Abast: {COMMA} cel·les{}Capacitat: {CARGO_LONG}, {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cost: {CURRENCY_LONG} Vel. max: {VELOCITY} Abast: {COMMA} cel·les{}Capacitat: {CARGO_LONG}{}Cost d'utilització: {CURRENCY_LONG}/any
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Substitueix {STRING}
@@ -3113,7 +3117,7 @@ STR_REPLACE_VEHICLES_STOP                                       :{BLACK}Para de
 STR_REPLACE_HELP_STOP_BUTTON                                    :{BLACK}Prem per aturar el reemplaçament del tipus de motor seleccionat a l'esquerra
 
 STR_REPLACE_ENGINE_WAGON_SELECT                                 :{BLACK}Substituint: {ORANGE}{STRING}
-STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Alterna entre finestres de substitució de vagons i de motors
+STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Canvia entre finestres de substitució de vagons i de motors
 STR_REPLACE_ENGINES                                             :Motors
 STR_REPLACE_WAGONS                                              :Vagons
 
@@ -3216,7 +3220,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Benefici
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Fiabilitat: {LTBLUE}{COMMA}%  {BLACK}Avaries des de la darrera revisió: {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Fabricat: {LTBLUE}{NUM}{BLACK} Valor: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacitat: {LTBLUE}Cap
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacitat: {LTBLUE}Cap{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacitat: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacitat: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacitat: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3259,8 +3263,10 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacita
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Remodela)
 STR_REFIT_TITLE                                                 :{GOLD}Selecciona el tipus de càrrega a transportar:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacitat: {GOLD}{CARGO_LONG}{}{BLACK}Cost de la remodelació: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nova capacitat: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Cost de remodelació: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova capacitat: {GOLD}{CARGO_LONG}{}{BLACK}Cost de la remodelació: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT                        :{BLACK}Nova capacitat: {GOLD}{CARGO_LONG}{}{BLACK}Retorn de la remodelació: {GREEN}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nova capacitat: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Cost de remodelació: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT               :{BLACK}Nova capacitat: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Retorn de la remodelació: {GREEN}{CURRENCY_LONG}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Selecciona els vehicles a remodelar. Arrossegant amb el ratolí permet la selecció de múltiples vehicles. Clicant en un espai buit es seleccionarà el vehicle sencer. Ctrl+Clic seleccionarà un vehicle i la cadena següent
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Selecciona tipus de càrrega a transportar
@@ -3499,7 +3505,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Seleccio
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}IA / Depuració de l'script del joc
+STR_AI_DEBUG                                                    :{WHITE}IA/Depuració de l'script del joc
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Nom de l'script
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Paràmetres
@@ -3519,12 +3525,12 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Script d
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Comprova el registre de l'script de joc
 
 STR_ERROR_AI_NO_AI_FOUND                                        :No s'ha trobat una IA adequada per carregar.{}Aquesta IA és una IA falsa i no farà res.{}Pots descarregar diverses IAs via el sistema de "Contingut en línia"
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Un dels scripts s'ha penjat. Si us plau reporta això a l'autor de l'script amb una captura de pantalla de la finestra de depuració IA / Script
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}IA / La finestra de depuració només està disponible pel servidor
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Un dels scripts executant-se s'ha penjat. Si us plau reporta això a l'autor de l'script amb una captura de pantalla de la finestra de depuració IA/Script del Joc
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}IA/La finestra de depuració de l'Script del Joc només està disponible pel servidor
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}IA / Configuració del joc
-STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}L'ScriptdeJoc que serà carregat al proper joc
+STR_AI_CONFIG_CAPTION                                           :{WHITE}IA/Configuració dels Scripts del joc
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}L'Script del Joc que serà carregat al proper joc
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}Les IAs que seran carregades al proper joc
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Jugador humà
 STR_AI_CONFIG_RANDOM_AI                                         :IA Aleatòria
@@ -3535,13 +3541,13 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Mou la I
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Mou Avall
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Mou la IA selecionada avall a la llista
 
-STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}ScriptdeJoc
+STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Script del Joc
 STR_AI_CONFIG_AI                                                :{SILVER}IAs
 
 STR_AI_CONFIG_CHANGE                                            :{BLACK}Selecciona {STRING}
 STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :IA
-STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :ScriptdeJoc
+STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Script del Joc
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Carrega un altre script
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configura
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configura els paràmetres de l'script
@@ -3549,12 +3555,12 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configur
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Disponible {STRING}
 STR_AI_LIST_CAPTION_AI                                          :IAs
-STR_AI_LIST_CAPTION_GAMESCRIPT                                  :ScriptsdeJoc
+STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Scripts del Joc
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Clica per a seleccionar un script
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}Versió: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}Autor: {ORANGE}{STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}Versió: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accepta
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecciona l'script realçat
@@ -3564,7 +3570,7 @@ STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}No canv
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Paràmetres
 STR_AI_SETTINGS_CAPTION_AI                                      :IA
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :ScriptdeJoc
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Script del Joc
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Tanca
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
@@ -3576,7 +3582,7 @@ STR_TEXTFILE_README_CAPTION                                     :{WHITE}Llegeixm
 STR_TEXTFILE_CHANGELOG_CAPTION                                  :{WHITE}Registre de canvis del {STRING} de {STRING}
 STR_TEXTFILE_LICENCE_CAPTION                                    :{WHITE}Llicència del {STRING} de {STRING}
 STR_TEXTFILE_VIEW_README                                        :{BLACK}Veure llegeixme
-STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Registra de canvis
+STR_TEXTFILE_VIEW_CHANGELOG                                     :{BLACK}Registre de canvis
 STR_TEXTFILE_VIEW_LICENCE                                       :{BLACK}Llicència
 
 
@@ -3717,7 +3723,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... nom
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... només es pot construir en poblacions de més de 1200 hab.
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... només es pot construir en àrees de selva tropical
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... només es pot construir en àrees de desert
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... només es pot construir en poblacions
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... només es pot construir en poblacions (substituint cases)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... només es pot construir prop del centre de les poblacions
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... només pot ser construït en zones baixes
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... només es pot situar prop dels límits del mapa
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... els boscos només es poden plantar sota la cota de neu
@@ -4422,6 +4429,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4456,6 +4464,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}

src/lang/croatian.txt

@@ -389,7 +389,7 @@ STR_SORT_BY_RANGE                                               :Domet
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Zaustavi igru
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Premotaj igru naprijed
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Postavke
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Spremi igru, napusti igru, prekini igru
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Spremi igru, napusti igru, izađi
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Prikaži kartu, dodatni pogled ili popis znakova
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Prikaži popis gradova
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Prikaži subvencije
@@ -412,11 +412,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Izgradi
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Otvori alatnu traku za krajolik kako bi spustio/izdignuo zemlju, posadio drveće, itd.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Pokaži prozor za zvuk/glazbu
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Pokaži zadnju poruku/vijest, pokaži postavke poruka
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Podaci o zemlji, konzola, debug UI, snimke ekrana, o OpenTTD-u
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Podaci o zemlji, konzola, debug skripte, snimke ekrana, o OpenTTD-u
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Promijeni alatne trake
 
 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Spremi scenarij, učitaj scenarij, napusti uređivanje scenarija, završi
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Spremi scenarij, učitaj scenarij, napusti uređivanje scenarija, izađi
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Uređivanje scenarija
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Pomakni početni datum 1 godinu unatrag
@@ -436,16 +436,16 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Spremi scenarij
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Učitaj scenarij
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Spremi visinsku mapu
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Učitaj visinsku kartu
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Završi s uređivanjem
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Odustani od uređivanja scenarija
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
-STR_SCENEDIT_FILE_MENU_QUIT                                     :Završi
+STR_SCENEDIT_FILE_MENU_QUIT                                     :Izlaz
 ############ range for SE file menu starts
 
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Postavke igre
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Postavke težine
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Napredne postavke
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :UI / postavke igre
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Postavke UI-ja/Skripte igre
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Postavke za NewGRF
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Postavke prozirnosti
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Prikaži imena gradova
@@ -463,6 +463,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Prozirni znakov
 STR_FILE_MENU_SAVE_GAME                                         :Spremi igru
 STR_FILE_MENU_LOAD_GAME                                         :Učitaj igru
 STR_FILE_MENU_QUIT_GAME                                         :Napusti igru
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Izlaz
 ############ range ends here
 
@@ -540,7 +541,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Povijest poruka
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Podaci o zemljištu
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Otvori konzolu
-STR_ABOUT_MENU_AI_DEBUG                                         :Debugiranje UI-ja / skripte igre
+STR_ABOUT_MENU_AI_DEBUG                                         :Debugiranje UI-ja/Skripte igre
 STR_ABOUT_MENU_SCREENSHOT                                       :Slika zaslona
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zumirano do kraja na slici zaslona
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Standardno zumiranje slike zaslona
@@ -675,7 +676,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Zajam:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Ukupno:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Broj vozila koja su ostvarila dobit prošle godine. Ovo uključuje cestovna vozila, vlakove, brodove i zrakoplove.
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Broj nedavno održavanih dijelova postaje. Svaki dio postaje (npr. željeznički kolodvor, autobusna postaja, zračna luka) se računa, čak i ako su spojene kao jedna postaja
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Broj nedavno servisiranih dijelova postaje. Svaki dio postaje (npr. željeznički kolodvor, autobusna postaja, zračna luka) se računa, čak i ako su spojene kao jedna postaja
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Dobit vozila s najnižim prihodom (u obzir su uzeta samo vozila starija od dvije godine)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Količina gotovine uprihodovana u mjesecu s najnižom dobiti u zadnjih 12 kvartala
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Količina gotovine uprihodovana u mjesecu s najvišom dobiti u zadnjih 12 kvartala
@@ -1488,6 +1489,9 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :nekompatibilno
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :nepoznat
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... nivo sažimanja '{STRING}' nije važeći
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... format snimljene igre '{STRING}' nije dostupan. Vraćam u '{STRING}'
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... zaobilazim Osnovni Grafički set '{STRING}': nije pronađen
+STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... zaobilazim Osnovni Zvukovni set '{STRING}': nije pronađen
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... zaobilazim Osnovni Muzički set '{STRING}': nije pronađen
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1504,8 +1508,8 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Težina
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Napredne postavke
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Postavke
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Provjeri online sadržaj
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}UI / postavke igre
-STR_INTRO_QUIT                                                  :{BLACK}Završi
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Postavke UI-ja/Skripte igre
+STR_INTRO_QUIT                                                  :{BLACK}Izlaz
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Započni novu igru. Ctrl+klik preskače konfiguriranje karte
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Učitaj spremljenu igru
@@ -1524,13 +1528,13 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Prikaži
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Prikaži napredne postavke
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Prikaži postavke NewGRF
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Provjeri novi i nadograđeni sadržaj za preuzimanje
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Prikaži UI i postavke igre
-STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Završi 'OpenTTD'
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Prikaži postavke UI-ja/Skripte igre
+STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Izzađi it 'OpenTTD'-a
 
 STR_INTRO_TRANSLATION                                           :{BLACK}Ovom prijevodu nedostaje {NUM} slijed. Molimo, pomognite učiniti OpenTTD boljim tako da se prijavite kao prevoditelj. Pogledajte readme.txt za detalje.
 
 # Quit window
-STR_QUIT_CAPTION                                                :{WHITE}Prekid
+STR_QUIT_CAPTION                                                :{WHITE}Izlaz
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e?
 STR_QUIT_YES                                                    :{BLACK}Da
 STR_QUIT_NO                                                     :{BLACK}Ne
@@ -2041,8 +2045,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Isključ
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Uključeno
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Nemoj označiti područje koje pokriva željeno mjesto
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Označi područje koje pokriva željeno mjesto
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Prihvaća: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Zalihe: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Prihvaća: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Zalihe: {GOLD}{CARGO_LIST}
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Spoji postaju
@@ -2817,7 +2821,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Prihvaća
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Pokaži popis tereta koji se prihvaća
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Prihvaća: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Prihvaća: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ocjene
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Pokaži ocjene postaje
@@ -3062,9 +3066,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Težina:
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Trošak: {GOLD}{CURRENCY_LONG}{BLACK} Brzina: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Nosivost: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK} Pokretni vagoni:.{GOLD}+{POWER}{BLACK} Težina: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Prenamjenjivo u: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Prenamjenjivo u: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Sve vrste tereta
-STR_PURCHASE_INFO_ALL_BUT                                       :Sve osim {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Sve osim {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK} Maks. vučni napor: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Domet: {GOLD}{COMMA} pločica
 
@@ -3187,8 +3191,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cijena:
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Trošak: {CURRENCY_LONG} Težina: {WEIGHT_SHORT}{}Brzina: {VELOCITY}  Snaga: {POWER}  Maks. T.E.: {6:FORCE}{}Trošak uporabe: {4:CURRENCY_LONG}/god{}Nosivost: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Trošak: {CURRENCY_LONG} Maks. brzina: {VELOCITY}{}Nosivost: {CARGO_LONG}, {CARGO_LONG}{}Trošak uporabe: {CURRENCY_LONG}/god
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Trošak: {CURRENCY_LONG} Maks. brzina: {VELOCITY}{}Nosivost: {CARGO_LONG}{}Trošak uporabe: {CURRENCY_LONG}/god
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cijena: {CURRENCY_LONG} Maks. brzina: {VELOCITY} Domet: {7:COMMA} tiles{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Trošak vožnje: {CURRENCY_LONG}/god
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cijena: {CURRENCY_LONG} Maks. Brzina: {VELOCITY} Domet: {7:COMMA} tiles{}Kapacitet: {CARGO_LONG}{}Trošak vožnje: {CURRENCY_LONG}/god
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cijena: {CURRENCY_LONG} Maks. brzina: {VELOCITY} Domet: {COMMA} tiles{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Trošak vožnje: {CURRENCY_LONG}/god
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cijena: {CURRENCY_LONG} Maks. Brzina: {VELOCITY} Domet: {COMMA} tiles{}Kapacitet: {CARGO_LONG}{}Trošak vožnje: {CURRENCY_LONG}/god
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Zamijeni {STRING}
@@ -3311,7 +3315,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Dobit ov
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Pouzdanost: {LTBLUE}{COMMA}%  {BLACK}Broj kvarova od posljednjeg servisa: {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Izgrađen: {LTBLUE}{NUM}{BLACK} Vrijednost: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Nosivost: {LTBLUE}Ništa
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Nosivost: {LTBLUE}Ništa{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Nosivost: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Nosivost: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Nosivost: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3354,8 +3358,10 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Nosivost
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Prenamijeni)
 STR_REFIT_TITLE                                                 :{GOLD}Odaberi vrstu tereta za prijevoz:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova nosivost: {GOLD}{CARGO_LONG}{}{BLACK}Cijena prenamjene: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Novi kapacitet: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Trošak remonta: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nova nosivost: {GOLD}{CARGO_LONG}{}{BLACK}Cijena prenamjene: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT                        :{BLACK}Novi kapacitet: {GOLD}{CARGO_LONG}{}{BLACK}Prihod od remonta: {GREEN}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Novi kapacitet: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Trošak remonta: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT               :{BLACK}Novi kapacitet: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Prihod od remonta: {GREEN}{CURRENCY_LONG}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Odaberi vozila za remont. Povlačenje mišem dozvoljava odabir više vozila. Klik na prazninu će označiti cijelo vozilo. Ctrl+Klik će označiti vozilo i niz koji slijedi.
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Odaberi vrstu tereta koju će vlak prevoziti
@@ -3594,7 +3600,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Odaberi
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}Debugiranje UI-ja / skripte igre
+STR_AI_DEBUG                                                    :{WHITE}Debugiranje UI-ja/Skripte igre
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Ime skripte
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Postavke
@@ -3614,11 +3620,11 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Skripta
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Provjeri zapis Skripte Igre
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Nema prikladne UI za učitavanje.{}Ova UI je samo model i neće ništa učiniti.{}Možete preuzeti nekoliko umjetnih inteligencija pomoću sustava 'Online sadržaji'.
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna od pokrenutih skripti se srušila. Molimo vas da prijavite ovo autoru skripte sa kopijom slike prozora za debugiranje UI/skripte igre.
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Prozor za debugiranje UI-ja / skripte igre je dopušten samo za poslužitelj
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Jedna od pokrenutih skripti se srušila. Molimo vas da prijavite ovo autoru skripte sa slikom prozora za debugiranje UI-ja/Skripte igre.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Prozor za debugiranje UI-ja/Skripte igre je dopušten samo za poslužitelj
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}Konfiguracija UI-ja / igre
+STR_AI_CONFIG_CAPTION                                           :{WHITE}Konfiguracija UI-ja/Skripte igre
 STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Skripta Igre koja će biti učitana u sljedećoj igri
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}UI-jevi koji će biti učitani u sljedećoj igri
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Ljudski igrač
@@ -3647,9 +3653,9 @@ STR_AI_LIST_CAPTION_AI                                          :UI-jevi
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Skripte Igre
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Klikni za izbor skripte
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}Verzija: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}Autor: {ORANGE}{STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}Verzija: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Prihvati
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Odaberi posvijetljenu skriptu
@@ -3812,7 +3818,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... dopu
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{G=male}{WHITE}... može biti izgrađen samo u gradovima s najmanje 1.200 stanovnika
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... može biti izgrađen samo u predjelima kišnih šuma
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... može biti izgrađen samo u pustinjskim područjima
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... može biti izgrađen samo u gradovima
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... može biti izgrađen samo u gradovima (zamjenjujući kuće)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... može biti izgrađen samo blizu središta gradova
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... može biti izgrađen samo u nizinskim područjima
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... može se postaviti samo blizu rubova karte
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... šume mogu biti posađene jedino iznad linije snijega
@@ -4554,6 +4561,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4588,6 +4596,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}

src/lang/czech.txt

@@ -419,7 +419,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Ukončit
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Možnosti hry
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Nastavení obtížnosti
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Pokročilé nastavení
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :nastavení AI / hry
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :Nastavení AI / hry
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :Nastavení grafik
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Nastavení průhlednosti
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Zobrazení jmen měst
@@ -430,13 +430,14 @@ STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Zobrazovat popi
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Plné animace
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Plné detaily
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Průhledné budovy
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Průhledná jména stanic
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Průhledné popisky
 ############ range ends here
 
 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Uložit hru
 STR_FILE_MENU_LOAD_GAME                                         :Načíst hru
 STR_FILE_MENU_QUIT_GAME                                         :Ukončit hru
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Ukončit program
 ############ range ends here
 
@@ -617,7 +618,7 @@ STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL                           :{TINY_FONT}{BLA
 STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}Platba za doručeni 10 jednotek (nebo 10 000 litru) nákladu do vzdálenosti 20 čtverecků
 STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}Zobraz vše
 STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Vypni vše
-STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Zobraz všechny položky na grafu přepravních sazeb
+STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Zobraz všechny druhy nákladu na grafu přepravních sazeb
 STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Skryje všechny položky na grafu přepravních sazeb
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Zobrazit nebo skrýt graf pro určitý druh nákladu
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}
@@ -661,7 +662,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Dluh:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Celkem:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Počet dopravních prostředků, které vykázaly poslední rok zisk; zahrnuje silniční vozidla, vlaky, lodě a letadla
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Počet součástí obsluhovaných stanic. Každá součást stanice (napr. nádraží, autobusová zastávka, letiště) se započítává, i když patří jediné stanici
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Počet nedávno obsloužených stanic. Nádraží, autobusové zastávky, letiště a podobně se počítají zvlášť, i když patří k jediné stanici
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Minimální hrubý zisk (= s provoz. náklady) vozidla s nejnižším příjmem (staršího 2 let)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Čistý zisk (= bez provoz. nakladů) v nejslabším čtvrtletí za posledních 12 čtvrtletí
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Čistý zisk ve čtvrtletí s největším příjmem za posledních 12 čtvrtletí
@@ -909,6 +910,7 @@ STR_NEWS_VEHICLE_IS_GETTING_VERY_OLD_AND                        :{WHITE}{VEHICLE
 STR_NEWS_TRAIN_IS_STUCK                                         :{WHITE}{VEHICLE} nemůže najít cestu
 STR_NEWS_VEHICLE_IS_LOST                                        :{WHITE}{VEHICLE} se ztratil{G 0 "" a o i y y a}
 STR_NEWS_VEHICLE_IS_UNPROFITABLE                                :{WHITE}{VEHICLE} - loňský zisk {CURRENCY_LONG}
+STR_NEWS_AIRCRAFT_DEST_TOO_FAR                                  :{WHITE}{VEHICLE} se nemůže dostat do dalšího cíle, protože je mimo dosah
 
 STR_NEWS_ORDER_REFIT_FAILED                                     :{WHITE}{VEHICLE} stojí kvůli selhání příkazu na změnu nákladu
 STR_NEWS_VEHICLE_AUTORENEW_FAILED                               :{WHITE}Obnovení selhalo pro {VEHICLE}{}{STRING}
@@ -1473,6 +1475,9 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :nekompatibilní
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :neznámé
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... úroveň komprese '{STRING}' není platná
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... formát uložené hry '{STRING}' není dostupný. Návrat na '{STRING}'
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... ignorování základní grafické sady '{STRING}': nenalezeno
+STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... ignorování základní hudební sady '{STRING}': nenalazeno
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... ignorování základní hudební sady '{STRING}': nenalezeno
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1489,7 +1494,7 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Obtížn
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Pokročilé nastavení
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}Nastavení grafik
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Stahovat součásti
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}nastavení AI / hry
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}Nastavení AI / hry
 STR_INTRO_QUIT                                                  :{BLACK}Ukončit
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Hrát novou hru. Pomocí Ctrl přeskočíš nastavení mapy
@@ -1880,6 +1885,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Jsi blok
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Byl jsi vyhozen ze hry
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Používání cheatů není na tomto serveru povoleno
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Posíláte serveru příliš mnoho příkazů
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Vložení hesla ti trvalo příliš dlouho
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Tvůj počítač je přiliš pomalý pro udržení kroku se serverem
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Tvému počítači trvalo stahování mapy příliš dlouho
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Tvému počítači trvalo připojování na server příliš dlouho
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :všeobecná chyba
@@ -1898,6 +1907,8 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :vyhozen servere
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :se pokoušel podvádět
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :na serveru je plno
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :posílal příliš mnoho příkazů
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :neobdrženo žádné heslo v časovém limitu
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :všeobecný timeout
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :stahování mapy trvalo příliš dlouho
 STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :zpracování mapy trvalo příliš dlouho
 ############ End of leave-in-this-order
@@ -2003,7 +2014,7 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Ne, ukon
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Nastavení průhlednosti
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Změna průhlednosti jmen stanic. Nastavení se zamkne Ctrl+kliknutím
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Změna průhlednosti popisků. Nastavení se zamkne Ctrl+kliknutím
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Změna průhlednosti stromů. Nastavení se zamkne Ctrl+kliknutím
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Změna průhlednosti domů. Nastavení se zamkne Ctrl+kliknutím
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Změna průhlednosti továren. Nastavení se zamkne Ctrl+kliknutím
@@ -2020,8 +2031,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Vypnuto
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Zapnuto
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Nezvýrazňovat oblast pokrytí
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Zvýraznit oblast pokrytí
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Přijímá: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Poskytuje: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Přijímá: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Poskytuje: {GOLD}{CARGO_LIST}
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Spojování stanic
@@ -2214,7 +2225,7 @@ STR_OBJECT_CLASS_TRNS                                           :Vysílače
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Stromy
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Zvol typ stromu na vysazení
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Zvol druh stromu na vysazení. Pokud se na políčku už nějaký strom nachází, přidá se k němu několik různých druhů bez ohledu na výběr druhu
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Různé stromy
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Umístit nahodné stromy. Stisknutý Shift pro zobrazení odhadu ceny
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Náhodné stromy
@@ -2538,6 +2549,7 @@ STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Posunout
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}Seznam grafických souborů, které jsou nainstalovány.
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Nastavit parametry
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Zobrazit parametry
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Přepnout paletu
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}U vybrané grafiky přepne paletu.{}Je to užitečné, když se ti ve hře zobrazuje růžově
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Potvrdit změny
@@ -2610,9 +2622,16 @@ STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} pot
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :grafika, která se měla přeložit
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :Je nahráno příliš mnoho grafik
 STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Nahrání {1:STRING} jako statické grafiky spolu s {STRING} může způsobit chybu synchronizace
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Neočekávaný sprite (sprite {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Neznámá Akce 0 vlastnost {4:HEX} (sprite {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Pokus o použití neplatného ID (sprite {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} obsahuje poškozený sprite. Všechny takové se zobrazí jako červený otazník (?)
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Obsahuje vícero Akce 8 záznamů (sprite {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Čtení konce pseudo-spritu (sprite {3:NUM})
 STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Právě používanému základnímu grafickému setu chybí obrázky.{}Prosím, updatujte ho
+STR_NEWGRF_ERROR_GRM_FAILED                                     :Požadované zdroje GRF nejsou dostupné (sprite {3:NUM})
 STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} byla vypnuta {STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Neplatný/neznámý sprite layout formát (sprite {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Varování!
@@ -2738,8 +2757,13 @@ STR_GOALS_GLOBAL_TITLE                                          :{BLACK}Globáln
 STR_GOALS_TEXT                                                  :{ORANGE}{STRING}
 STR_GOALS_NONE                                                  :{ORANGE}- Žádné -
 STR_GOALS_COMPANY_TITLE                                         :{BLACK}Cíle společnosti:
+STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klikni na cíl pro zaměření pohledu na průmysl/město/pole. Ctrl+Klik otevře nové okno s pohledem na průmyslu/městu/poli.
 
 # Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Dotaz
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Informace
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Varování
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Chyba
 
 ### Start of Goal Question button list
 STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Zrušit
@@ -2748,10 +2772,18 @@ STR_GOAL_QUESTION_BUTTON_NO                                     :Ne
 STR_GOAL_QUESTION_BUTTON_YES                                    :Ano
 STR_GOAL_QUESTION_BUTTON_DECLINE                                :Odmítnout
 STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Příjmout
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignorovat
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Zkusit znovu
 STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Předchozí
 STR_GOAL_QUESTION_BUTTON_NEXT                                   :Další
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Zastavit
+STR_GOAL_QUESTION_BUTTON_START                                  :Spustit
+STR_GOAL_QUESTION_BUTTON_GO                                     :Jdi
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Pokračovat
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Restartovat
 STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Odložit
 STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Vzdát se
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Zavřít
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Dotace
@@ -2781,7 +2813,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Přijímá
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Ukázat seznam přijímaného nákladu
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Přijímá: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Přijímá: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Hodnocení
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Ukázat hodnocení společností
@@ -2890,8 +2922,8 @@ STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Změnit
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Koupit 25% podíl ve společnosti
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Prodat 25% podíl ve společnosti
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Koupit 25% podíl v této společnosti. Stisknutý Shift pro zobrazení odhadu ceny
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Prodat 25% podíl v této společnosti. Stisknutý Shift pro zobrazení odhadu ceny
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Koupit 25% podíl v této společnosti. Stisknutý Shift+Kliknutí pro zobrazení odhadované ceny
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Prodat 25% podíl v této společnosti. Stisknutý Shift+Kliknutí pro zobrazení odhadované ceny
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Jméno společnosti
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Jméno prezidenta
@@ -3026,18 +3058,19 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Hmotnost
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cena: {GOLD}{CURRENCY_LONG}{BLACK} Rychlost: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacita: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Poháněné vagony: {GOLD}+{POWER}{BLACK} Hmotnost: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Refitovatelné na: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Refitovatelné na: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Všechny druhy nákladu
-STR_PURCHASE_INFO_ALL_BUT                                       :Všechny kromě {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Všechny kromě {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. tažná síla: {GOLD}{FORCE}
+STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Dosah: {GOLD}{COMMA} polí
 
-STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Seznam vlaků - stiskni na vlaku pro informace
-STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Seznam silničních vozidel - klepni na vozidlo pro informace
-STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Seznam lodí - informace získáš klepnutím na jméno lodi
-STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Seznam letadel - klepni na letadlo pro informace
+STR_BUY_VEHICLE_TRAIN_LIST_TOOLTIP                              :{BLACK}Seznam vlaků - pro informace klikni na název vlaku
+STR_BUY_VEHICLE_ROAD_VEHICLE_LIST_TOOLTIP                       :{BLACK}Seznam silničních vozidel - klikni na vozidlo pro informace
+STR_BUY_VEHICLE_SHIP_LIST_TOOLTIP                               :{BLACK}Seznam lodí - informace získáš kliknutím na jméno lodi
+STR_BUY_VEHICLE_AIRCRAFT_LIST_TOOLTIP                           :{BLACK}Seznam letadel - klikni na letadlo pro informace
 
-STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Koupit vůz
-STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Koupit silniční vozidlo
+STR_BUY_VEHICLE_TRAIN_BUY_VEHICLE_BUTTON                        :{BLACK}Koupit vozidlo
+STR_BUY_VEHICLE_ROAD_VEHICLE_BUY_VEHICLE_BUTTON                 :{BLACK}Koupit vozidlo
 STR_BUY_VEHICLE_SHIP_BUY_VEHICLE_BUTTON                         :{BLACK}Koupit loď
 STR_BUY_VEHICLE_AIRCRAFT_BUY_VEHICLE_BUTTON                     :{BLACK}Koupit letadlo
 
@@ -3110,7 +3143,7 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klonovat
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klonovat letadlo
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Vytvoří se kopie vlaku se všemi vagony. Klepni na toto tlačítko a pak na vlak v nebo vně depa. Se stisknutým Ctrl se budou sdílet příkazy. Stisknutý Shift pro zobrazení odhadu ceny
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Vytvoří se kopie silničního vozidla. Klepni na toto tlačítko a pak na vozidlo v nebo vně depa. Se stisknutým Ctrl se budou sdílet příkazy. Stisknutý Shift pro zobrazení odhadu ceny
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Vytvoří se kopie silničního vozidla. Klepni na toto tlačítko a pak na vozidlo v nebo vně depa. Se stisknutým Ctrl se budou sdílet příkazy. Stisknutý Shift pro zobrazení odhadované ceny
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Vytvoří se kopie lodě. Klepni na toto tlačítko a pak na loď v nebo vně lodního depa. Se stisknutým Ctrl se budou sdílet příkazy. Stisknutý Shift pro zobrazení odhadu ceny
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Vytvoří se kopie letadla. Klepni na toto tlačítko a pak na letadlo v nebo vně hangáru. Se stisknutým Ctrl se budou sdílet příkazy. Stisknutý Shift pro zobrazení odhadu ceny
 
@@ -3156,6 +3189,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cena: {C
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Cena: {CURRENCY_LONG} Váha: {WEIGHT_SHORT}{}Rychlost: {VELOCITY}  Síla: {POWER}  Maximální tažná síla: {6:FORCE}{}Provozní náklady: {4:CURRENCY_LONG}/rok{}Kapacita: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cena: {CURRENCY_LONG} Max. rychlost: {VELOCITY}{}Kapacita: {CARGO_LONG}, {CARGO_LONG}{}Cena provozu: {CURRENCY_LONG} ročně
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cena: {CURRENCY_LONG} Max. rychlost: {VELOCITY}{}Kapacita: {CARGO_LONG}{}Cena provozu: {CURRENCY_LONG} ročně
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cena {CURRENCY_LONG} Max. Rychlost: {VELOCITY} Dosah: {COMMA} polí{}Kapacita: {CARGO_LONG}, {CARGO_LONG}{}Provozní náklady: {CURRENCY_LONG}/rok
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cena {CURRENCY_LONG} Max. Rychlost {VELOCITY} Dosah: {COMMA} polí{}Kapacita: {CARGO_LONG}{}Provozní náklady: {CURRENCY_LONG}/rok
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vyměňování {STRING}
@@ -3179,7 +3214,7 @@ STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Přepne
 STR_REPLACE_ENGINES                                             :lokomotivy
 STR_REPLACE_WAGONS                                              :vagony
 
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vyber typ kolejí, pro které chceš vybírat lokomotivy na výměnu
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vyber typ kolejí, pro které chceš měnit lokomotivy
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Tady je zobrazeno, za jakou lokomotivu se ta v levém seznamu vyměňuje
 STR_REPLACE_RAIL_VEHICLES                                       :Železniční lokomotivy
 STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrické lokomotivy
@@ -3192,13 +3227,13 @@ STR_REPLACE_REMOVE_WAGON_HELP                                   :{BLACK}Funkce a
 # Vehicle view
 STR_VEHICLE_VIEW_CAPTION                                        :{WHITE}{VEHICLE}
 
-STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Vystředit pohled na vlak. Ctrl+Klik otevře nový pohled
-STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Vystředit pohled na vozidlo. Ctrl+Klik otevře nový pohled
-STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Vystředit pohled na loď. Ctrl+Klik otevře nový pohled
-STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Vystředit pohled na letadlo. Ctrl+Klik otevře nový pohled
+STR_VEHICLE_VIEW_TRAIN_LOCATION_TOOLTIP                         :{BLACK}Vycentrovat pohled na vlak. Ctrl+Klik otevře nový pohled
+STR_VEHICLE_VIEW_ROAD_VEHICLE_LOCATION_TOOLTIP                  :{BLACK}Vycentrovat pohled na vozidlo. Ctrl+Klik otevře nový pohled
+STR_VEHICLE_VIEW_SHIP_LOCATION_TOOLTIP                          :{BLACK}Vycentrovat pohled na loď. Ctrl+Klik otevře nový pohled
+STR_VEHICLE_VIEW_AIRCRAFT_LOCATION_TOOLTIP                      :{BLACK}Vycentrovat pohled na letadlo. Ctrl+Klik otevře nový pohled
 
-STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Pošli vlak do depa
-STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Pošli vozidlo do garáže
+STR_VEHICLE_VIEW_TRAIN_SEND_TO_DEPOT_TOOLTIP                    :{BLACK}Poslat vlak do depa. Ctrl+Klik pouze pro provedení oprav
+STR_VEHICLE_VIEW_ROAD_VEHICLE_SEND_TO_DEPOT_TOOLTIP             :{BLACK}Pošli vozidlo do garáže. Ctrl+Klik pouze provede opravy
 STR_VEHICLE_VIEW_SHIP_SEND_TO_DEPOT_TOOLTIP                     :{BLACK}Poslat loď do doku
 STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP                 :{BLACK}Poslat letadlo do hangáru
 
@@ -3270,6 +3305,7 @@ STR_VEHICLE_INFO_AGE                                            :{COMMA} {P rok
 STR_VEHICLE_INFO_AGE_RED                                        :{RED}{COMMA} {P rok roky let} ({COMMA})
 
 STR_VEHICLE_INFO_MAX_SPEED                                      :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY}
+STR_VEHICLE_INFO_MAX_SPEED_RANGE                                :{BLACK}Max. rychlost: {LTBLUE}{VELOCITY} {BLACK}Dosah: {LTBLUE}{COMMA} polí
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED                         :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_SHORT} {BLACK}Výkon: {LTBLUE}{POWER}{BLACK} Max. rychlost: {LTBLUE}{VELOCITY}
 STR_VEHICLE_INFO_WEIGHT_POWER_MAX_SPEED_MAX_TE                  :{BLACK}Hmotnost: {LTBLUE}{WEIGHT_SHORT} {BLACK}Výkon: {LTBLUE}{POWER}{BLACK} Max. rychlost: {LTBLUE}{VELOCITY} {BLACK}Max. tažná síla: {LTBLUE}{FORCE}
 
@@ -3277,7 +3313,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Letošn
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Spolehlivost: {LTBLUE}{COMMA}%  {BLACK}Poruch od posledního servisu: {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Koupeno: {LTBLUE}{NUM}{BLACK} Cena: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Kapacita: {LTBLUE}nic
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Kapacita: {LTBLUE}nic{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Kapacita: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Kapacita: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Kapacita: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3320,8 +3356,9 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacita
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Přestavět)
 STR_REFIT_TITLE                                                 :{GOLD}Zvolit druh nákladu:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nová kapacita: {GOLD}{CARGO_LONG}{}{BLACK}Cena přestavby: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nová kapacita: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Cena za předělání: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nová kapacita: {GOLD}{CARGO_LONG}{}{BLACK}Cena přestavby: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nová kapacita: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Cena za předělání: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT               :{BLACK}Nová kapacita: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Výnos z přestavby: {GREEN}{CURRENCY_LONG}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Vybere vozidla k obnově. Tažení myší vybere více vozidel. Kliknutí na prázdné místo vybere celé vozidlo. Ctrl+Click vybere vozidlo a následující řetěz
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Zvolit typ nákladu, na který vlak přestavět
@@ -3486,6 +3523,7 @@ STR_ORDER_STOP_LOCATION_NEAR_END                                :[na začátku]
 STR_ORDER_STOP_LOCATION_MIDDLE                                  :[uprostřed]
 STR_ORDER_STOP_LOCATION_FAR_END                                 :[na konci]
 
+STR_ORDER_OUT_OF_RANGE                                          :{RED} (Další cíl je mimo dosah)
 
 STR_ORDER_CONDITIONAL_UNCONDITIONAL                             :Skočit na příkaz {COMMA}
 STR_ORDER_CONDITIONAL_NUM                                       :Skočit na příkaz {COMMA}, když {STRING.small} {STRING} {COMMA}
@@ -3503,7 +3541,9 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Jízdní
 STR_TIMETABLE_NO_TRAVEL                                         :Nikam nejet
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Jet do (automatický; jizdní řád podle následujícího ručního příkazu)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Jet do (mimo jízdní řád)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Jet maximálně {2:VELOCITY} (mimo jízdní řád)
 STR_TIMETABLE_TRAVEL_FOR                                        :Jet do {STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Jeď {STRING} a maximálně {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :a zůstat {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :a jet {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} d{P en ny nů}
@@ -3527,7 +3567,11 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Změnit
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Smazat čas
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Zrušit čas pro splnění jízdního příkazu
 
+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Změnit rychlostní limit
+STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Změnit maximální cestovní rychlost u vybraného příkazu
 
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Odstranit rychlostní limit
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Odstranit maximální cestovní rychlost u vybraného příkazu
 
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Zapomenout zpoždění
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Smazat zpoždění, takže vozidlo pojede na čas
@@ -3606,9 +3650,9 @@ STR_AI_LIST_CAPTION_AI                                          :AI
 STR_AI_LIST_CAPTION_GAMESCRIPT                                  :herní skripty
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Skript vybereš kliknutím
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}Autor: {STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}Verze: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}Autor: {ORANGE}{STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}Verze: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Potvrdit
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vybrat označený skript
@@ -3622,6 +3666,7 @@ STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :herní skript
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Zavřít
 STR_AI_SETTINGS_RESET                                           :{BLACK}Obnovit nastavení
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
+STR_AI_SETTINGS_START_DELAY                                     :Počet dní kdy se spustí tato AI po předchozí (plus/mínus): {ORANGE}{STRING}
 
 
 # Textfile window
@@ -3770,7 +3815,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... je p
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... může být budováno jen ve městech s populací 1200 lidí a více
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... může se vybudovat jedině v pralese
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... může se postavit jedině v poušti
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... může se postavit jedině ve městě
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... může se postavit jedině ve městě (místo nějakých domů)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... může být postaveno pouze poblíž centra města
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... může se postavit jen v nížinách
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... může být umístěno pouze poblíž okrajů mapy
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... les lze vysadit pouze nad sněžnou čárou
@@ -4599,6 +4645,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4633,6 +4680,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}

src/lang/danish.txt

@@ -316,11 +316,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Byg luft
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Åbn landskabsværktøjslinjen for at hæve/sænke terræn, plante træer, osv.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Vis lyd-/musikvindue
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Vis seneste besked/nyhedsrapport, vis beskedvalg
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Landområde information, konsol, debug af kunstig intelligens, tag billede, om OpenTTD
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Information om landområde, konsol, debug af script, skærmbillede, om OpenTTD
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Skift værktøjslinier
 
 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Gem scenarie, hent scenarie, forlad scenarie editoren, afslut
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Gem scenarie, hent scenarie, forlad scenarieeditoren, afslut
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Scenarieeditor
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Flyt startdatoen 1 år tilbage
@@ -340,7 +340,7 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Gem scenarie
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Hent scenarie
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Gem højdekort
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Hent højdekort
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Afslut editoren
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Forlad scenarieeditor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Afslut
 ############ range for SE file menu starts
@@ -349,24 +349,25 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Afslut
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spilvalg
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Sværhedsgrad
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Avancerede indstillinger
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :AI / Spil-indstillinger
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :AI/spilscript-indstillinger
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF indstillinger
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Gennemsigtighedsvalg
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Bynavne vist
 STR_SETTINGS_MENU_STATION_NAMES_DISPLAYED                       :Stationsnavne vist
-STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Kontrolsteder vist
-STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Skilte vist
+STR_SETTINGS_MENU_WAYPOINTS_DISPLAYED                           :Waypointnavne vist
+STR_SETTINGS_MENU_SIGNS_DISPLAYED                               :Viste skilte
 STR_SETTINGS_MENU_SHOW_COMPETITOR_SIGNS                         :Modstander skilte og navne vist
 STR_SETTINGS_MENU_FULL_ANIMATION                                :Fuld animation
 STR_SETTINGS_MENU_FULL_DETAIL                                   :Fuld detalje
 STR_SETTINGS_MENU_TRANSPARENT_BUILDINGS                         :Gennemsigtige bygninger
-STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Gennemsigtige stationsskilte
+STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Gennemsigtige skilte
 ############ range ends here
 
 ############ range for file menu starts
 STR_FILE_MENU_SAVE_GAME                                         :Gem spil
 STR_FILE_MENU_LOAD_GAME                                         :Hent spil
 STR_FILE_MENU_QUIT_GAME                                         :Forlad spillet
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Afslut
 ############ range ends here
 
@@ -444,9 +445,10 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Tidligere beske
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Landområde information
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Tænd/Sluk konsol
-STR_ABOUT_MENU_AI_DEBUG                                         :Computerspiller / spilscript-debug
+STR_ABOUT_MENU_AI_DEBUG                                         :Computerspiller/spilscript debug
 STR_ABOUT_MENU_SCREENSHOT                                       :Skærmbillede (Ctrl-S)
-STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Zoomet skærmbillede
+STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Fuldt zoomet skærmbillede
+STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Standard zoom skærmbillede
 STR_ABOUT_MENU_GIANT_SCREENSHOT                                 :Kæmpe skærmbillede (Ctrl-G)
 STR_ABOUT_MENU_ABOUT_OPENTTD                                    :Om 'OpenTTD'
 STR_ABOUT_MENU_SPRITE_ALIGNER                                   :Tilpas grafikelement
@@ -517,7 +519,7 @@ STR_MONTH_DEC                                                   :december
 
 # Graph window
 STR_GRAPH_KEY_BUTTON                                            :{BLACK}Nøgle
-STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Viser nøglen til grafen
+STR_GRAPH_KEY_TOOLTIP                                           :{BLACK}Vis nøglen til grafer
 STR_GRAPH_X_LABEL_MONTH                                         :{TINY_FONT}{STRING}{} {STRING}
 STR_GRAPH_X_LABEL_MONTH_YEAR                                    :{TINY_FONT}{STRING}{} {STRING}{}{NUM}
 STR_GRAPH_Y_LABEL                                               :{TINY_FONT}{STRING}
@@ -578,7 +580,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Lån:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}I alt:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Antal af køretøjer der gav afkast sidste år; dette inkludere vejkøretøjer, tog, skibe og fly
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Antallet af sidst servicerede stationer. Alle dele af en station (f.eks. banegård, rutebilstation, lufthavn) tæller med, selvom de er sammensat som én station
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Antal nyligt servicerede stationer. Togstationer, busstoppesteder, lufthavne og så videre tælles separat, selv om de tilhører den samme station
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}Afkast for køretøjet med laveste indkomst (af alle køretøjer ældre end 2 år)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Indkomst i kvartallet med det laveste afkast i de sidste 12 kvartaler
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Indkomst i kvartallet med det højeste afkast i de sidste 12 kvartaler
@@ -966,7 +968,7 @@ STR_GAME_OPTIONS_BASE_SFX                                       :{BLACK}Basis-ly
 STR_GAME_OPTIONS_BASE_SFX_TOOLTIP                               :{BLACK}Vælg basis-lydsættet der skal bruges
 STR_GAME_OPTIONS_BASE_SFX_DESCRIPTION_TOOLTIP                   :{BLACK}Mere information om basis-lydsættet
 
-STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basismusik-sæt
+STR_GAME_OPTIONS_BASE_MUSIC                                     :{BLACK}Basis-musiksæt
 STR_GAME_OPTIONS_BASE_MUSIC_TOOLTIP                             :{BLACK}Vælg basismusik-sæt
 STR_GAME_OPTIONS_BASE_MUSIC_STATUS                              :{RED}{NUM} beskadiget fil{P "" s}
 STR_GAME_OPTIONS_BASE_MUSIC_DESCRIPTION_TOOLTIP                 :{BLACK}Yderligere information om basismusik-sættet
@@ -1339,7 +1341,7 @@ STR_CONFIG_SETTING_ZOOM_LVL_OUT_8X                              :8x
 STR_CONFIG_SETTING_TOWN_GROWTH                                  :{LTBLUE}Byvækst tempo: {ORANGE}{STRING}
 STR_CONFIG_SETTING_TOWN_GROWTH_NONE                             :Ingen
 STR_CONFIG_SETTING_TOWN_GROWTH_SLOW                             :Langsom
-STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :Normal
+STR_CONFIG_SETTING_TOWN_GROWTH_NORMAL                           :Mængden af byer der vil blive bestragtet som storbyer, og derfor er større og vokser hurtigere
 STR_CONFIG_SETTING_TOWN_GROWTH_FAST                             :Hurtig
 STR_CONFIG_SETTING_TOWN_GROWTH_VERY_FAST                        :Meget hurtig
 STR_CONFIG_SETTING_LARGER_TOWNS                                 :{LTBLUE}Andel af byer der vil vokse dobbelt så hurtigt: {ORANGE}1 af {STRING}
@@ -1391,6 +1393,9 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :inkompatibel me
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :ukendt
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... komprimeringsniveau '{STRING}' er ikke gyldigt
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... savegame format '{STRING}' er ikke tilgængeligt. Går tilbage til '{STRING}'
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... ignorere Basis Grafik sæt '{STRING}': ikke fundet
+STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... ignorere Basis Lyde sæt '{STRING}': ikke fundet
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... ignorere Basis Musik sæt '{STRING}': ikke fundet
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1407,7 +1412,7 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Sværhed
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Avancerede indstillinger
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF indstillinger
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Tjek Online Indhold
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}AI / Spil-indstillinger
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}AI/Spilscript indstillinger
 STR_INTRO_QUIT                                                  :{BLACK}Afslut
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start et nyt spil. Ctrl+Klik springer kortindstillingerne over.
@@ -1427,7 +1432,7 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Vis valg
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Vis avancerede indstillinger
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Vis NewGRF-indstillinger
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Tjek for nyt og opdateret indhold til download
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Vis AI- og spilindstillinger
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Vis computerspiller/spilscript indstillinger
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Afslut 'OpenTTD'
 
 STR_INTRO_TRANSLATION                                           :{BLACK}Denne oversættelse mangler {NUM} streng{P "" e}. Hjælp venligst med at gøre OpenTTD bedre ved at tilmelde dig som oversætter. Se readme.txt for detaljer.
@@ -1546,7 +1551,7 @@ STR_FACE_HAIR_TOOLTIP                                           :{BLACK}Ændre h
 STR_FACE_EYEBROWS                                               :Øjenbryn:
 STR_FACE_EYEBROWS_TOOLTIP                                       :{BLACK}Ændre øjenbryn
 STR_FACE_EYECOLOUR                                              :Øjenfarve:
-STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Ændrer øjenfarve
+STR_FACE_EYECOLOUR_TOOLTIP                                      :{BLACK}Skift øjenfarve
 STR_FACE_GLASSES                                                :Briller:
 STR_FACE_GLASSES_TOOLTIP                                        :{BLACK}Slå briller til
 STR_FACE_GLASSES_TOOLTIP_2                                      :{BLACK}Ændre briller
@@ -1798,6 +1803,10 @@ STR_NETWORK_ERROR_SERVER_BANNED                                 :{WHITE}Du har f
 STR_NETWORK_ERROR_KICKED                                        :{WHITE}Du blev smidt ud af spillet
 STR_NETWORK_ERROR_CHEATER                                       :{WHITE}Snyderi er ikke tilladt på denne server
 STR_NETWORK_ERROR_TOO_MANY_COMMANDS                             :{WHITE}Du sendte for mange kommandoer til serveren
+STR_NETWORK_ERROR_TIMEOUT_PASSWORD                              :{WHITE}Du tog for lang tid om at indtaste adgangskoden
+STR_NETWORK_ERROR_TIMEOUT_COMPUTER                              :{WHITE}Din computer er for langsom at holde trit med serveren
+STR_NETWORK_ERROR_TIMEOUT_MAP                                   :{WHITE}Din computer tog for lang tid om at downloade kortet
+STR_NETWORK_ERROR_TIMEOUT_JOIN                                  :{WHITE}Din computer var for længe om at forbinde til serveren
 
 ############ Leave those lines in this order!!
 STR_NETWORK_ERROR_CLIENT_GENERAL                                :generel fejl
@@ -1816,6 +1825,10 @@ STR_NETWORK_ERROR_CLIENT_KICKED                                 :smidt ud af ser
 STR_NETWORK_ERROR_CLIENT_CHEATER                                :prøvede at snyde
 STR_NETWORK_ERROR_CLIENT_SERVER_FULL                            :serveren er fuld
 STR_NETWORK_ERROR_CLIENT_TOO_MANY_COMMANDS                      :sendte for mange kommandoer
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_PASSWORD                       :modtog ingen adgangskode i tide
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_COMPUTER                       :generel timeout
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_MAP                            :det tog for lang tid at downloade kortet
+STR_NETWORK_ERROR_CLIENT_TIMEOUT_JOIN                           :det tog for lang tid at bearbejde kortet
 ############ End of leave-in-this-order
 
 STR_NETWORK_ERROR_CLIENT_GUI_LOST_CONNECTION_CAPTION            :{WHITE}Mulig forbindelses tab
@@ -1895,6 +1908,8 @@ STR_CONTENT_TYPE_SCENARIO                                       :Scenarie
 STR_CONTENT_TYPE_HEIGHTMAP                                      :Højdekort
 STR_CONTENT_TYPE_BASE_SOUNDS                                    :Basislyde
 STR_CONTENT_TYPE_BASE_MUSIC                                     :Basismusik
+STR_CONTENT_TYPE_GAME_SCRIPT                                    :Spilscript
+STR_CONTENT_TYPE_GS_LIBRARY                                     :GS bibliotek
 
 # Content downloading progress window
 STR_CONTENT_DOWNLOAD_TITLE                                      :{WHITE}Downloader indhold...
@@ -1917,11 +1932,11 @@ STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}Nej, afs
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Gennemsigtighedsvalg
-STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Skift gennemsigtighed for stationsskilte. CTRL+Klik for at låse værdi.
+STR_TRANSPARENT_SIGNS_TOOLTIP                                   :{BLACK}Skift gennemsigtighed for skilte. CTRL+Klik for at låse værdi.
 STR_TRANSPARENT_TREES_TOOLTIP                                   :{BLACK}Skift gennemsigtighed for træer. CTRL+Klik for at låse værdi.
 STR_TRANSPARENT_HOUSES_TOOLTIP                                  :{BLACK}Skift gennemsigtighed for huse. CTRL+Klik for at låse værdi.
 STR_TRANSPARENT_INDUSTRIES_TOOLTIP                              :{BLACK}Skift gennemsigtighed for industrier. CTRL+Klik for at låse værdi.
-STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Skift gennemsigtighed for konstruktioner som stationer, remiser og kontrolsteder. Ctrl+klik låser.
+STR_TRANSPARENT_BUILDINGS_TOOLTIP                               :{BLACK}Skift gennemsigtighed for konstruktioner som stationer, remiser og waypoint. Ctrl+klik låser.
 STR_TRANSPARENT_BRIDGES_TOOLTIP                                 :{BLACK}Skift gennemsigtighed for broer. CTRL+Klik for at låse værdi.
 STR_TRANSPARENT_STRUCTURES_TOOLTIP                              :{BLACK}Skift gennemsigtighed for strukturer som fyrtårne og antenner. CTRL+Klik for at låse værdi.
 STR_TRANSPARENT_CATENARY_TOOLTIP                                :{BLACK}Slå transparens til/fra for køreledninger. CTRL+klik for at låse.
@@ -1934,15 +1949,15 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Fra
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Til
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Marker ikke dækningsområdet af den foreslåede placering
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Marker dækningsområdet af den foreslåede placering
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepterer: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Forsyninger: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepterer: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Forsyninger: {GOLD}{CARGO_LIST}
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Sammenkæd station
 STR_JOIN_STATION_CREATE_SPLITTED_STATION                        :{YELLOW}Byg en separat station
 
-STR_JOIN_WAYPOINT_CAPTION                                       :{WHITE}Forbind kontrolsted
-STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Byg et separat kontrolsted
+STR_JOIN_WAYPOINT_CAPTION                                       :{WHITE}Forbind waypoint
+STR_JOIN_WAYPOINT_CREATE_SPLITTED_WAYPOINT                      :{YELLOW}Byg et separat waypoint
 
 # Rail construction toolbar
 STR_RAIL_TOOLBAR_RAILROAD_CONSTRUCTION_CAPTION                  :Jernbanekonstruktion
@@ -1953,12 +1968,12 @@ STR_RAIL_TOOLBAR_MAGLEV_CONSTRUCTION_CAPTION                    :Magnetskinnekon
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK                   :{BLACK}Byg jernbane. Ctrl skifter mellem at bygge og fjerne elementer. Shift skifter mellem at bygge og vise prisoverslag.
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL                         :{BLACK}Byg jernbane med auto-jernbane-værktøj. Ctrl skifter mellem at bygge og fjerne elementer. Shift skifter mellem at bygge og vise prisoverslag.
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING         :{BLACK}Byg en remise (til køb og servicering af tog). Shift skifter mellem at bygge og vise prisoverslag.
-STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Ombyg jernbane til kontrolsted. Ctrl muliggør sammenslutning af kontrolsteder. Shift skifter mellem at bygge og vise prisoverslag.
+STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT               :{BLACK}Ombyg jernbane til waypoint. Ctrl muliggør sammenslutning af waypoint. Shift skifter mellem at bygge og vise prisoverslag.
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION                 :{BLACK}Byg en banegård. Ctrl muliggør sammenslutning af stationer. Shift skifter mellem at bygge og vise prisoverslag.
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS                 :{BLACK}Byg jernbanesignaler. Ctrl skifter mellem semaforer og lyssignaler.{}Hvis musen trækkes langs en lige strækning, bygges signaler med jævne mellemrum. Hold Ctrl nede for at bygge signaler indtil næste kryds.{}Ctrl+klik skifter mellem at åbne eller ikke åbne signalvælgeren. Shift skifter mellem at bygge og vise prisoverslag.
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE                  :{BLACK}Byg jernbanebro. Shift skifter mellem at bygge og vise prisoverslag.
 STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL                  :{BLACK}Byg jernbanetunnel. Shift skifter mellem at bygge og vise prisoverslag.
-STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Skift mellem at bygge og fjerne jernbaneskinner, signaler, kontrolsteder og stationer. Hold Ctrl nede for også at fjerne togspor fra kontrolsteder og stationer.
+STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR                :{BLACK}Skift mellem at bygge og fjerne jernbaneskinner, signaler, waypoints og stationer. Hold Ctrl nede for også at fjerne togspor fra waypoints og stationer.
 STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL                           :{BLACK}Ombyg/opgradér typen af jernbane. Shift skifter mellem at bygge og vise prisoverslag.
 
 STR_RAIL_NAME_RAILROAD                                          :Jernbane
@@ -1971,8 +1986,8 @@ STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION                       :{WHITE}Retning
 STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP                       :{BLACK}Vælg orientering af remise
 
 # Rail waypoint construction window
-STR_WAYPOINT_CAPTION                                            :{WHITE}Kontrolsted
-STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vælg udseende af kontrolsteder
+STR_WAYPOINT_CAPTION                                            :{WHITE}Waypoint
+STR_WAYPOINT_GRAPHICS_TOOLTIP                                   :{BLACK}Vælg udseende af waypoint
 
 # Rail station construction window
 STR_STATION_BUILD_RAIL_CAPTION                                  :{WHITE}Valg af banegård
@@ -1989,7 +2004,7 @@ STR_STATION_BUILD_STATION_CLASS_TOOLTIP                         :{BLACK}Vælg hv
 STR_STATION_BUILD_STATION_TYPE_TOOLTIP                          :{BLACK}Vælg hvilken stationstype du vil bygge
 
 STR_STATION_CLASS_DFLT                                          :Standard station
-STR_STATION_CLASS_WAYP                                          :Kontrolsteder
+STR_STATION_CLASS_WAYP                                          :Waypoints
 
 # Signal window
 STR_BUILD_SIGNAL_CAPTION                                        :{WHITE}Signalvælger
@@ -2058,7 +2073,7 @@ STR_STATION_BUILD_BUS_ORIENTATION                               :{WHITE}Retning
 STR_STATION_BUILD_BUS_ORIENTATION_TOOLTIP                       :{BLACK}Vælg retning af rutebilstation
 STR_STATION_BUILD_TRUCK_ORIENTATION                             :{WHITE}Retning af fragtcentral
 STR_STATION_BUILD_TRUCK_ORIENTATION_TOOLTIP                     :{BLACK}Vælg retning af fragtcentral
-STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Retning af sporvognsstation
+STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION                    :{WHITE}Retning af passager-sporvognsstation
 STR_STATION_BUILD_PASSENGER_TRAM_ORIENTATION_TOOLTIP            :{BLACK}Vælg retning af sporvognsstation
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION                        :{WHITE}Retning af sporvognsstation
 STR_STATION_BUILD_CARGO_TRAM_ORIENTATION_TOOLTIP                :{BLACK}Vælg retning af sporvognsstation
@@ -2128,7 +2143,7 @@ STR_OBJECT_CLASS_TRNS                                           :Sendere
 
 # Tree planting window (last two for SE only)
 STR_PLANT_TREE_CAPTION                                          :{WHITE}Træer
-STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vælg typen af træer der skal plantes
+STR_PLANT_TREE_TOOLTIP                                          :{BLACK}Vælg typen af træer der skal plantes. Hvis feltet allerede har et træ, vil dette tilføje flere træer i blandede typer, uafhængigt af den valgte type
 STR_TREES_RANDOM_TYPE                                           :{BLACK}Træer af tilfældig type
 STR_TREES_RANDOM_TYPE_TOOLTIP                                   :{BLACK}Placer træer af tilfældig type. Shift skifter mellem at bygge og vise prisoverslag.
 STR_TREES_RANDOM_TREES_BUTTON                                   :{BLACK}Tilfældige træer
@@ -2281,7 +2296,7 @@ STR_LAI_STATION_DESCRIPTION_TRUCK_LOADING_AREA                  :Fragtcentral
 STR_LAI_STATION_DESCRIPTION_BUS_STATION                         :Rutebilstation
 STR_LAI_STATION_DESCRIPTION_SHIP_DOCK                           :Havn
 STR_LAI_STATION_DESCRIPTION_BUOY                                :Bøje
-STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Kontrolsted
+STR_LAI_STATION_DESCRIPTION_WAYPOINT                            :Waypoint
 
 STR_LAI_WATER_DESCRIPTION_WATER                                 :Vand
 STR_LAI_WATER_DESCRIPTION_CANAL                                 :Kanal
@@ -2416,7 +2431,7 @@ STR_GENERATION_TREE_GENERATION                                  :{BLACK}Trægene
 STR_GENERATION_OBJECT_GENERATION                                :{BLACK}Ikke-flytbar generering
 STR_GENERATION_CLEARING_TILES                                   :{BLACK}Generer råt og stenet område
 STR_GENERATION_SETTINGUP_GAME                                   :{BLACK}Klargør spil
-STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Kører flise-løkken
+STR_GENERATION_PREPARING_TILELOOP                               :{BLACK}Kører felt-løkken
 STR_GENERATION_PREPARING_SCRIPT                                 :{BLACK}Kørende script
 STR_GENERATION_PREPARING_GAME                                   :{BLACK}Forbereder spil
 
@@ -2446,6 +2461,7 @@ STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP                            :{BLACK}Flyt det
 STR_NEWGRF_SETTINGS_FILE_TOOLTIP                                :{BLACK}En liste over de NewGRF sæt der er installeret.
 
 STR_NEWGRF_SETTINGS_SET_PARAMETERS                              :{BLACK}Indstil parameter
+STR_NEWGRF_SETTINGS_SHOW_PARAMETERS                             :{BLACK}Vis parametre
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE                              :{BLACK}Slå palette til/fra
 STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP                      :{BLACK}Slå palette til/fra i den valgte NewGRF.{}Gør dette når grafik fra denne NewGRF ser lyserøde ud i spillet
 STR_NEWGRF_SETTINGS_APPLY_CHANGES                               :{BLACK}Anvend ændringer
@@ -2518,9 +2534,16 @@ STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER                            :{1:STRING} kræ
 STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE                          :GRF filen, som den er lavet til at oversætte,
 STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED                        :For mange NewGRF sæt er indlæst.
 STR_NEWGRF_ERROR_STATIC_GRF_CAUSES_DESYNC                       :Indlæsning af {1:STRING} som statisk NewGRF med {STRING} kan forårsage de-sykronisering.
+STR_NEWGRF_ERROR_UNEXPECTED_SPRITE                              :Uventet grafikelement (grafikelement {3:NUM})
+STR_NEWGRF_ERROR_UNKNOWN_PROPERTY                               :Ukendt handling 0 egenskab {4:HEX} (grafikelement {3:NUM})
+STR_NEWGRF_ERROR_INVALID_ID                                     :Forsøg på at bruge ugyldigt ID (grafikelement {3:NUM})
 STR_NEWGRF_ERROR_CORRUPT_SPRITE                                 :{YELLOW}{STRING} indeholder en ødelagt sprite. Alle ødelagte sprites vil blive vist som et rødt spørgsmålstegn (?).
-STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Det brugte basis graftik sæt mangler en række elementer.{}Updater venligst grafik sættet
-STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} blev deaktiveret af {STRING}
+STR_NEWGRF_ERROR_MULTIPLE_ACTION_8                              :Indeholder adskillige handling 8 indgange (grafikelement {3:NUM})
+STR_NEWGRF_ERROR_READ_BOUNDS                                    :Læs forbi slutningen af pseudo-grafikelement (grafikelement {3:NUM})
+STR_NEWGRF_ERROR_MISSING_SPRITES                                :{WHITE}Det brugte basis grafiksæt mangler en række elementer.{}Opdater venligst grafiksættet.
+STR_NEWGRF_ERROR_GRM_FAILED                                     :De ønskede GRF ressourcer er ikke tilgængelige (grafikelement {3:NUM})
+STR_NEWGRF_ERROR_FORCEFULLY_DISABLED                            :{1:STRING} blev deaktiveret af {2:STRING}
+STR_NEWGRF_ERROR_INVALID_SPRITE_LAYOUT                          :Ugyldigt / ukendt grafikelement layoutformat (grafikelement {3:NUM})
 
 # NewGRF related 'general' warnings
 STR_NEWGRF_POPUP_CAUTION_CAPTION                                :{WHITE}Advarsel!
@@ -2649,8 +2672,30 @@ STR_GOALS_COMPANY_TITLE                                         :{BLACK}Selskabs
 STR_GOALS_TOOLTIP_CLICK_ON_SERVICE_TO_CENTER                    :{BLACK}Klik på mål for at centrere hovedvinduet over industri/by/felt Ctrl+klik åbner et nyt vindue over industri/by/felt lokation
 
 # Goal question window
+STR_GOAL_QUESTION_CAPTION_QUESTION                              :Spørgsmål
+STR_GOAL_QUESTION_CAPTION_INFORMATION                           :Information
+STR_GOAL_QUESTION_CAPTION_WARNING                               :Advarsel
+STR_GOAL_QUESTION_CAPTION_ERROR                                 :Mål-spørgsmåls-overskriftsfejl
 
 ### Start of Goal Question button list
+STR_GOAL_QUESTION_BUTTON_CANCEL                                 :Annuller
+STR_GOAL_QUESTION_BUTTON_OK                                     :OK
+STR_GOAL_QUESTION_BUTTON_NO                                     :Nej
+STR_GOAL_QUESTION_BUTTON_YES                                    :Ja
+STR_GOAL_QUESTION_BUTTON_DECLINE                                :Afvis
+STR_GOAL_QUESTION_BUTTON_ACCEPT                                 :Accepter
+STR_GOAL_QUESTION_BUTTON_IGNORE                                 :Ignorer
+STR_GOAL_QUESTION_BUTTON_RETRY                                  :Prøv igen
+STR_GOAL_QUESTION_BUTTON_PREVIOUS                               :Forrige
+STR_GOAL_QUESTION_BUTTON_NEXT                                   :Næste
+STR_GOAL_QUESTION_BUTTON_STOP                                   :Stop
+STR_GOAL_QUESTION_BUTTON_START                                  :Start
+STR_GOAL_QUESTION_BUTTON_GO                                     :Kør
+STR_GOAL_QUESTION_BUTTON_CONTINUE                               :Fortsæt
+STR_GOAL_QUESTION_BUTTON_RESTART                                :Genstart
+STR_GOAL_QUESTION_BUTTON_POSTPONE                               :Udskyd
+STR_GOAL_QUESTION_BUTTON_SURRENDER                              :Overgiv dig
+STR_GOAL_QUESTION_BUTTON_CLOSE                                  :Luk
 
 # Subsidies window
 STR_SUBSIDIES_CAPTION                                           :{WHITE}Tilskudsordninger
@@ -2680,7 +2725,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepterer
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Vis liste over accepteret last
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepterer: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepterer: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Bedømmelse
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Vis stationens bedømmelse
@@ -2711,11 +2756,11 @@ STR_STATION_VIEW_RENAME_STATION_CAPTION                         :Omdøb statione
 # Waypoint/buoy view window
 STR_WAYPOINT_VIEW_CAPTION                                       :{WHITE}{WAYPOINT}
 STR_WAYPOINT_VIEW_CENTER_TOOLTIP                                :{BLACK}Centrer skærmen over vejpunktets lokalitet. Ctrl+Klik åbner et nyt vindue ved waypointets lokalitet.
-STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Omdøb kontrolsted
+STR_WAYPOINT_VIEW_CHANGE_WAYPOINT_NAME                          :{BLACK}Omdøb waypoint
 STR_BUOY_VIEW_CENTER_TOOLTIP                                    :{BLACK}Centrer skræmen over bøjens lokalitet. Ctrl+Klik åbner et nyt vindue ved bøjens lokalitet.
 STR_BUOY_VIEW_CHANGE_BUOY_NAME                                  :{BLACK}Ændre navnet på bøjen
 
-STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Omdøb kontrolsted
+STR_EDIT_WAYPOINT_NAME                                          :{WHITE}Omdøb waypoint
 
 # Finances window
 STR_FINANCES_CAPTION                                            :{WHITE}{COMPANY} Finanser {BLACK}{COMPANY_NUM}
@@ -2762,11 +2807,11 @@ STR_COMPANY_VIEW_VEHICLES_NONE                                  :{WHITE}Ingen
 STR_COMPANY_VIEW_COMPANY_VALUE                                  :{GOLD}Selskabsværdi: {WHITE}{CURRENCY_LONG}
 STR_COMPANY_VIEW_SHARES_OWNED_BY                                :{WHITE}({COMMA}% ejes af {COMPANY})
 STR_COMPANY_VIEW_INFRASTRUCTURE                                 :{GOLD}Infrastruktur:
-STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} spor-stykker
-STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} vej-stykker
-STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} vand-felter
-STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} station-felter
-STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} lufthavne
+STR_COMPANY_VIEW_INFRASTRUCTURE_RAIL                            :{WHITE}{COMMA} spor-stykke{P "" r}
+STR_COMPANY_VIEW_INFRASTRUCTURE_ROAD                            :{WHITE}{COMMA} vej-stykke{P "" r}
+STR_COMPANY_VIEW_INFRASTRUCTURE_WATER                           :{WHITE}{COMMA} vand-felt{P "" er}
+STR_COMPANY_VIEW_INFRASTRUCTURE_STATION                         :{WHITE}{COMMA} station-felt{P "" er}
+STR_COMPANY_VIEW_INFRASTRUCTURE_AIRPORT                         :{WHITE}{COMMA} lufthavn{P "" e}
 STR_COMPANY_VIEW_INFRASTRUCTURE_NONE                            :{WHITE}Ingen
 
 STR_COMPANY_VIEW_BUILD_HQ_BUTTON                                :{BLACK}Byg HK
@@ -2781,16 +2826,16 @@ STR_COMPANY_VIEW_INFRASTRUCTURE_TOOLTIP                         :{BLACK}Se detal
 STR_COMPANY_VIEW_NEW_FACE_BUTTON                                :{BLACK}Nyt ansigt
 STR_COMPANY_VIEW_NEW_FACE_TOOLTIP                               :{BLACK}Vælg nyt ansigt til direktøren
 STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON                           :{BLACK}Farvetema
-STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Ændrer selskabets farve på køretøjer
+STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP                          :{BLACK}Skift selskabets farve på køretøjer
 STR_COMPANY_VIEW_COMPANY_NAME_BUTTON                            :{BLACK}Selskabsnavn
-STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP                           :{BLACK}Ændrer selskabets navn
+STR_COMPANY_VIEW_COMPANY_NAME_TOOLTIP                           :{BLACK}Skift selskabets navn
 STR_COMPANY_VIEW_PRESIDENT_NAME_BUTTON                          :{BLACK}Direktørnavn
-STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Ændrer direktørens navn
+STR_COMPANY_VIEW_PRESIDENT_NAME_TOOLTIP                         :{BLACK}Skift direktørens navn
 
 STR_COMPANY_VIEW_BUY_SHARE_BUTTON                               :{BLACK}Køb 25% aktier i selskabet
 STR_COMPANY_VIEW_SELL_SHARE_BUTTON                              :{BLACK}Sælg 25% aktier i selskabet
-STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Køb 25% aktier i dette selskab. Shift skifter mellem at købe og vise prisoverslag.
-STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Sælg 25% aktier i dette selskab. Shift skifter mellem at sælge og vise prisoverslag.
+STR_COMPANY_VIEW_BUY_SHARE_TOOLTIP                              :{BLACK}Køb 25% aktier i dette selskab. Shift+Klik viser de anslåede omkostninger uden at købe nogle aktier
+STR_COMPANY_VIEW_SELL_SHARE_TOOLTIP                             :{BLACK}Sælg 25% aktier i dette selskab. Shift+Klik viser de anslåede indtægter uden at sælge nogle aktier
 
 STR_COMPANY_VIEW_COMPANY_NAME_QUERY_CAPTION                     :Selskabsnavn
 STR_COMPANY_VIEW_PRESIDENT_S_NAME_QUERY_CAPTION                 :Direktørens navn
@@ -2925,9 +2970,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Vægt: {
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Pris: {GOLD}{CURRENCY_LONG}{BLACK} Hastighed: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Kapacitet: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Motoriserede Vogne: {GOLD}+{POWER}{BLACK} Vægt: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Kan ombygges til: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Kan ombygges til: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Alle lasttyper
-STR_PURCHASE_INFO_ALL_BUT                                       :Alle undtagen {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Alle undtagen {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Maks. trækkraft: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Rækkevidde: {GOLD}{COMMA} felter
 
@@ -3010,7 +3055,7 @@ STR_DEPOT_CLONE_SHIP                                            :{BLACK}Klon ski
 STR_DEPOT_CLONE_AIRCRAFT                                        :{BLACK}Klon fly
 
 STR_DEPOT_CLONE_TRAIN_DEPOT_INFO                                :{BLACK}Dette vil købe en kopi af toget inklusiv alle vogne. Klik på denne knap og så på et tog indeni eller udenfor remisen. Ctrl-klik vil kopiere ordrer. Shift-klik vil vise prisoverslag.
-STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Dette vil købe en kopi af køretøjet. Klik på denne knap og så på et køretøj indeni eller udenfor værkstedet. Ctrl-klik vil dele ordrer. Shift-klik vil vise prisoverslag.
+STR_DEPOT_CLONE_ROAD_VEHICLE_DEPOT_INFO                         :{BLACK}Dette vil købe en kopi af køretøjet. Klik på denne knap og så på et køretøj indeni eller udenfor værkstedet. Ctrl-klik vil dele ordrer. Shift-klik viser anslået pris uden køb
 STR_DEPOT_CLONE_SHIP_DEPOT_INFO                                 :{BLACK}Dette vil købe en kopi af skibet. Klik på denne knap og så på et skib indeni eller udenfor dokken. Ctrl-klik vil dele ordrer. Shift-klik vil vise prisoverslag.
 STR_DEPOT_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW                     :{BLACK}Dette vil købe en kopi af et fly. Klik på denne knap og så på et fly indeni eller udenfor hangaren. Ctrl-klik vil dele ordrer. Shift-klik vil vise prisoverslag.
 
@@ -3050,8 +3095,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Pris: {C
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Pris: {CURRENCY_LONG} Vægt: {WEIGHT_SHORT}{}Hastighed: {VELOCITY}  Hestekræfter: {POWER}  Maks. Trækkraft: {6:FORCE}{}Driftsomkostning: {4:CURRENCY_LONG}/år{}Kapacitet: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Pris: {CURRENCY_LONG} Maks. hast.: {VELOCITY}{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Driftsomkostninger: {CURRENCY_LONG}/år
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Pris: {CURRENCY_LONG} Maks. hast.: {VELOCITY}{}Kapacitet: {CARGO_LONG}{}Driftsomkostninger: {CURRENCY_LONG}/år
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Pris: {CURRENCY_LONG} Max. hastighed: {VELOCITY} Rækkevidde: {7:COMMA} felter{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Faste udgifter: {CURRENCY_LONG}/år
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Pris: {CURRENCY_LONG} Max. hastighed: {VELOCITY} Rækkevidde: {7:COMMA} felter{}Capacity: {CARGO_LONG}{}Running Cost: {CURRENCY_LONG}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Pris: {CURRENCY_LONG} Max. hastighed: {VELOCITY} Rækkevidde: {COMMA} felter{}Kapacitet: {CARGO_LONG}, {CARGO_LONG}{}Faste udgifter: {CURRENCY_LONG}/år
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Pris: {CURRENCY_LONG} Max. hastighed: {VELOCITY} Rækkevidde: {COMMA} felter{}Capacity: {CARGO_LONG}{}Running Cost: {CURRENCY_LONG}/yr
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Udskift {STRING}
@@ -3075,7 +3120,7 @@ STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Skift im
 STR_REPLACE_ENGINES                                             :Lokomotiver
 STR_REPLACE_WAGONS                                              :Vogne
 
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vælg den skinnetype, hvor du vil udskifte lokomotiver
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Vælg den skinne type, du ønsker at udskifte lokomotiver til
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Viser hvilket køretøj det valgte køretøj til venstre bliver udskiftet med, hvis det udskiftes
 STR_REPLACE_RAIL_VEHICLES                                       :Jernbane
 STR_REPLACE_ELRAIL_VEHICLES                                     :Eltog
@@ -3174,7 +3219,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Overskud
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Pålidelighed: {LTBLUE}{COMMA}%  {BLACK}Nedbrud siden sidste service: {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Kapacitet: {LTBLUE}Ingen
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Kapacitet: {LTBLUE}Ingen{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Kapacitet: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Kapacitet: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Kapacitet: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3217,8 +3262,10 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Kapacite
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Ombyg)
 STR_REFIT_TITLE                                                 :{GOLD}Vælg den lasttype der skal transporteres:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ny kapacitet: {GOLD}{CARGO_LONG}{}{BLACK}Pris for ombyggelse: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nye kapacitet: {GOLD}{CARGO_LONG},{GOLD}{CARGO_LONG}{}{BLACK}Pris for at ombygge: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Ny kapacitet: {GOLD}{CARGO_LONG}{}{BLACK}Pris for ombyggelse: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT                        :{BLACK}Ny kapacitet: {GOLD}{CARGO_LONG}{}{BLACK}Indtægt fra ombygning: {GREEN}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nye kapacitet: {GOLD}{CARGO_LONG},{GOLD}{CARGO_LONG}{}{BLACK}Pris for at ombygge: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT               :{BLACK}Ny kapacitet: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Indtægt fra ombygning: {GREEN}{CURRENCY_LONG}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Vælg køretøjer der skal ombygges. klik og træk med musen for at vælge flere køretøjer. Klik på et tomt felt for at vælge hele køretøjet. Ctrl + klik vælger et køretøj og den efterfølgende kæde
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Vælg den lasttype toget skal kører med
@@ -3321,7 +3368,7 @@ STR_ORDER_GO_TO_NEAREST_DEPOT                                   :Gå til nærmes
 STR_ORDER_GO_TO_NEAREST_HANGAR                                  :Flyv til nærmeste hangar
 STR_ORDER_CONDITIONAL                                           :Betinget ordrespring
 STR_ORDER_SHARE                                                 :Del ordrer
-STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Indsæt en ny ordre før den markerede, eller i slutningen af ordrelisten. Ctrl laver stationsordrer med 'Vilkårlig fuld last', kontrolsted ordrer med 'Uden stop', og depotordrer med 'Service'
+STR_ORDERS_GO_TO_TOOLTIP                                        :{BLACK}Indsæt en ny ordre før den markerede, eller i slutningen af ordrelisten. Ctrl laver stationsordrer med 'Vilkårlig fuld last', waypoint ordrer med 'Uden stop', og depotordrer med 'Service'. 'Deleordrer' eller Ctrl lader dette køretøj dele ordrer med det valgte køretøj. At klikke på et køretøj kopierer ordrer fra det pågældende køretøj. En depot ordre deaktiverer automatisk servicering af køretøjet
 
 STR_ORDERS_VEH_WITH_SHARED_ORDERS_LIST_TOOLTIP                  :{BLACK}Vis alle transportmidler, der deler denne ruteplan
 
@@ -3401,7 +3448,9 @@ STR_TIMETABLE_TOOLTIP                                           :{BLACK}Kørepla
 STR_TIMETABLE_NO_TRAVEL                                         :Rejs ikke
 STR_TIMETABLE_NOT_TIMETABLEABLE                                 :Rejs (automatisk; planlagt med næste manuelle ordre)
 STR_TIMETABLE_TRAVEL_NOT_TIMETABLED                             :Rejs (ikke iflg. køreplan)
+STR_TIMETABLE_TRAVEL_NOT_TIMETABLED_SPEED                       :Rejs med højst {2:VELOCITY} (ikke skemalagt)
 STR_TIMETABLE_TRAVEL_FOR                                        :Rejs i {STRING}
+STR_TIMETABLE_TRAVEL_FOR_SPEED                                  :Rejs mod {STRING} med højst {VELOCITY}
 STR_TIMETABLE_STAY_FOR                                          :og vent i {STRING}
 STR_TIMETABLE_AND_TRAVEL_FOR                                    :og rejs i {STRING}
 STR_TIMETABLE_DAYS                                              :{COMMA} dag{P "" e}
@@ -3425,7 +3474,11 @@ STR_TIMETABLE_WAIT_TIME_TOOLTIP                                 :{BLACK}Ændre h
 STR_TIMETABLE_CLEAR_TIME                                        :{BLACK}Nulstil tid
 STR_TIMETABLE_CLEAR_TIME_TOOLTIP                                :{BLACK}Nulstil tiden for den markerede ordre
 
+STR_TIMETABLE_CHANGE_SPEED                                      :{BLACK}Ændr hastighedsbegrænsning
+STR_TIMETABLE_CHANGE_SPEED_TOOLTIP                              :{BLACK}Ændr den maksimale rejsehastighed for den markerede ordre
 
+STR_TIMETABLE_CLEAR_SPEED                                       :{BLACK}Nulstil hastighedsbegrænsning
+STR_TIMETABLE_CLEAR_SPEED_TOOLTIP                               :{BLACK}Nulstil den maksimale rejsehastighed for den markerede ordre
 
 STR_TIMETABLE_RESET_LATENESS                                    :{BLACK}Nulstil forsinkelse
 STR_TIMETABLE_RESET_LATENESS_TOOLTIP                            :{BLACK}Nulstil forsinkelses-tæller, så transportmidlet kommer til tiden
@@ -3451,7 +3504,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Vælg å
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}Computerspiller / Spilscript-debug
+STR_AI_DEBUG                                                    :{WHITE}Computerspiller/Spilscript-debug
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Navn på scriptet
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Indstillinger
@@ -3471,12 +3524,12 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Spil Scr
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Tjek SpilScript-loggen
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Ingen passende AI kan findes.{}Denne AI er en pladsholder, og vil ikke gøre noget.{} Du kan downloade indtil flere AI'er fra 'Online Indhold'-systemet.
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}En computerstyret spiller gik ned. Rapporter det venligst til udvikleren af computerspilleren med et skærmbilledet af computerspiller-debugvinduet.
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Computerspiller/script-debugvindue er kun tilgængeligt på serveren
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}En af de kørende scripts gik ned. Rapporter det venligst til script-udvikleren sammen med et skærmbillede af AI/spilscript-debugvinduet.
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}Computerspiller/script-debugvindue er kun tilgængeligt for serveren
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}Computerspiller-konfiguration
-STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}GameScripter der vil bliver indlæst i næste spil
+STR_AI_CONFIG_CAPTION                                           :{WHITE}Konfiguration af computerspiller/spilscript
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Spilscriptet der vil bliver indlæst i næste spil
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}AIer der vil bliver loaded i næste spil
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Menneskelig spiller
 STR_AI_CONFIG_RANDOM_AI                                         :Tilfældig computerspiller
@@ -3487,13 +3540,13 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Flyt val
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Flyt nedad
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Flyt valgte computerspiller ned i listen
 
-STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}SpilScript
+STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Spilscript
 STR_AI_CONFIG_AI                                                :{SILVER}AIer
 
 STR_AI_CONFIG_CHANGE                                            :{BLACK}Vælg {STRING}
 STR_AI_CONFIG_CHANGE_NONE                                       :Ingen ændringer
 STR_AI_CONFIG_CHANGE_AI                                         :AI
-STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :SpilScript
+STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Spilscript
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Indlæs et andet script
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Konfigurer computerspiller
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfigurer parametre for script'et
@@ -3501,12 +3554,12 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Konfigur
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Tilgængelig {STRING}
 STR_AI_LIST_CAPTION_AI                                          :AIer
-STR_AI_LIST_CAPTION_GAMESCRIPT                                  :SpilScripts
+STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Spilscripts
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Klik for at vælge et script
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}Skaber: {STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}Version: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}Skaber: {ORANGE}{STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}Version: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accepter
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Vælg markeret script
@@ -3516,7 +3569,7 @@ STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Skift ik
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parametre
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :SpilScript
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Spilscript
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Luk
 STR_AI_SETTINGS_RESET                                           :{BLACK}Nulstil
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
@@ -3669,7 +3722,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... kun
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... kan kun bygges i byer med mindst 1200 indbyggere
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... kan kun bygges i regnskovsområder
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... kan kun bygges i ørkenområder
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... kan kun bygges i byer
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... kan kun bygges i byer (erstatter huse)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... kan kun bygges nær centrum af byer
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... kan kun bygges i lavtliggende områder
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... kan kun placeres nær kanten af kortet
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... skov kan kun plantes over snelinjen
@@ -3719,15 +3773,15 @@ STR_ERROR_MUST_DEMOLISH_DOCK_FIRST                              :{WHITE}Det er n
 STR_ERROR_MUST_DEMOLISH_AIRPORT_FIRST                           :{WHITE}Det er nødvendigt at rive lufthavnen ned først
 
 # Waypoint related errors
-STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Støder op til mere en et eksisterende kontrolsted
-STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}For tæt på et andet kontrolsted
+STR_ERROR_WAYPOINT_ADJOINS_MORE_THAN_ONE_EXISTING               :{WHITE}Støder op til mere end et eksisterende waypoint
+STR_ERROR_TOO_CLOSE_TO_ANOTHER_WAYPOINT                         :{WHITE}For tæt på et andet waypoint
 
-STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kan ikke bygge kontrolsted for tog her...
+STR_ERROR_CAN_T_BUILD_TRAIN_WAYPOINT                            :{WHITE}Kan ikke bygge waypoint for tog her...
 STR_ERROR_CAN_T_POSITION_BUOY_HERE                              :{WHITE}Kan ikke placere en bøje her...
-STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan ikke omdøbe kontrolsted...
+STR_ERROR_CAN_T_CHANGE_WAYPOINT_NAME                            :{WHITE}Kan ikke omdøbe waypoint...
 
-STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan ikke fjerne kontrolsted for tog her...
-STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Kontrolsted skal fjernes først
+STR_ERROR_CAN_T_REMOVE_TRAIN_WAYPOINT                           :{WHITE}Kan ikke fjerne waypoint for tog her...
+STR_ERROR_MUST_REMOVE_RAILWAYPOINT_FIRST                        :{WHITE}Jernbanewaypoint skal fjernes først
 STR_ERROR_BUOY_IN_THE_WAY                                       :{WHITE}... der er en bøje i vejen
 STR_ERROR_BUOY_IS_IN_USE                                        :{WHITE}... bøjen er i brug af et andet firma!
 
@@ -3777,7 +3831,7 @@ STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Kan ikke
 STR_ERROR_THERE_IS_NO_RAILROAD_TRACK                            :{WHITE}... der er ikke noget spor
 STR_ERROR_THERE_ARE_NO_SIGNALS                                  :{WHITE}... der er ingen signaler
 
-STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kan ikke ombygge jernbanetype her...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Kan ikke konvertere jernbanetype her...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Det er nødvendigt at fjerne vejen først
@@ -4322,8 +4376,8 @@ STR_FORMAT_BUOY_NAME_SERIAL                                     :{TOWN} Bøje #{
 STR_FORMAT_COMPANY_NUM                                          :(Firma {COMMA})
 STR_FORMAT_GROUP_NAME                                           :Gruppe {COMMA}
 STR_FORMAT_INDUSTRY_NAME                                        :{TOWN} {STRING}
-STR_FORMAT_WAYPOINT_NAME                                        :Kontrolsted {TOWN}
-STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :Kontrolsted {TOWN} #{COMMA}
+STR_FORMAT_WAYPOINT_NAME                                        :{TOWN} Waypoint
+STR_FORMAT_WAYPOINT_NAME_SERIAL                                 :{TOWN} Waypoint #{COMMA}
 
 STR_FORMAT_DEPOT_NAME_TRAIN                                     :{TOWN} Tog Depot
 STR_FORMAT_DEPOT_NAME_TRAIN_SERIAL                              :{TOWN} Tog Depot #{COMMA}
@@ -4374,6 +4428,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4408,6 +4463,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}

src/lang/dutch.txt

@@ -316,11 +316,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Bouw vli
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Open de landschapsbalk om land te verhogen/verlagen, bomen te planten, etc.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Toon geluid/muziekscherm
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Toon laatste (nieuws)bericht, toon berichtinstellingen
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Landinformatie, console, AI-debug, screenshots, over OpenTTD
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Landinformatie, console, script-debug, screenshots, over OpenTTD
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Verwissel knoppenbalk
 
 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Sla scenario op, open scenario, scenario-editor verlaten, afsluiten
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Sla scenario op, laad scenario, scenario-editor verlaten, afsluiten
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Scenario-editor
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Zet startdatum 1 jaar terug
@@ -340,7 +340,7 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Scenario opslaa
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Scenario openen
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Hoogtekaart opslaan
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Laad hoogtekaart
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Sluit editor
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Sluit scenario editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
 STR_SCENEDIT_FILE_MENU_QUIT                                     :Afsluiten
 ############ range for SE file menu starts
@@ -349,7 +349,7 @@ STR_SCENEDIT_FILE_MENU_QUIT                                     :Afsluiten
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Spelopties
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Moeilijkheidsgraad
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Geavanceerde instellingen
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :AI / Spel instellingen
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :AI/Game script instellingen
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF instellingen
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Doorzichtigheidsopties
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Toon plaatsnamen
@@ -367,6 +367,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparante bo
 STR_FILE_MENU_SAVE_GAME                                         :Spel opslaan
 STR_FILE_MENU_LOAD_GAME                                         :Spel laden
 STR_FILE_MENU_QUIT_GAME                                         :Verlaat spel
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Afsluiten
 ############ range ends here
 
@@ -444,7 +445,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Berichtengeschi
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Landinformatie
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Schakel console aan/uit
-STR_ABOUT_MENU_AI_DEBUG                                         :AI / GameScript debug
+STR_ABOUT_MENU_AI_DEBUG                                         :AI/Game Script debug
 STR_ABOUT_MENU_SCREENSHOT                                       :Screenshot
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Ingezoomd screenshot
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Screenshot met standaard zoom
@@ -579,7 +580,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Lening:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Totaal:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Aantal voertuigen met winst in het afgelopen jaar. Hierbij tellen wegvoertuigen, treinen, schepen en vliegtuigen allemaal mee
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Aantal recentelijk bezochte stationsonderdelen. Elk deel van een station (bijv. treinstation, bushalte, vliegveld) wordt geteld, zelfs als deze met elkaar zijn verbonden tot één station
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Aantal recentelijk bezochte stationsonderdelen. Elk deel van een station (bijv. treinstation, bushalte, vliegveld) wordt geteld, zelfs als deze tot een station behoren
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}De winst van het voertuig met het laagste inkomen (van alle voertuigen ouder dan 2 jaar)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}De hoeveelheid geld die is verdiend in het kwartaal met de laagste winst van de afgelopen 12 kwartalen
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}De hoeveelheid geld die is verdiend in het kwartaal met de hoogste winst van de afgelopen 12 kwartalen
@@ -906,8 +907,8 @@ STR_GAME_OPTIONS_MEASURING_UNITS_SI                             :SI
 
 STR_GAME_OPTIONS_ROAD_VEHICLES_FRAME                            :{BLACK}Wegvoertuigen
 STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_TOOLTIP                 :{BLACK}Kies aan welke kant de wegvoertuigen moeten rijden
-STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT                    :Rijden links
-STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_RIGHT                   :Rijden rechts
+STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_LEFT                    :Links rijden
+STR_GAME_OPTIONS_ROAD_VEHICLES_DROPDOWN_RIGHT                   :Rechts rijden
 
 STR_GAME_OPTIONS_TOWN_NAMES_FRAME                               :{BLACK}Plaatsnamen
 STR_GAME_OPTIONS_TOWN_NAMES_DROPDOWN_TOOLTIP                    :{BLACK}Kies type plaatsnamen
@@ -1392,6 +1393,9 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :niet compatibel
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :onbekend
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... compressie niveau '{STRING}' is niet geldig
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... savegame formaat '{STRING}' is niet beschikbaar. Valt terug naar '{STRING}'
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... negeert Basis Grafische set '{STRING}': niet gevonden
+STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... negeert Basis Geluid set '{STRING}': niet gevonden
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... negeert Basis Muziek set '{STRING}': niet gevonden
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1408,7 +1412,7 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Moeilijk
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Geavanceerde instellingen
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF-instellingen
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Online inhoud zoeken
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}AI / Spel Instellingen
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}AI/Spel script Instellingen
 STR_INTRO_QUIT                                                  :{BLACK}Afsluiten
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start een nieuw spel. Ctrl+klik slaat de kaartconfiguratie over
@@ -1428,7 +1432,7 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Toon moe
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Toon geavanceerde instellingen
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Toon NewGRF-instellingen
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Zoeken naar nieuwe en aangepaste inhoud om te downloaden
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Toon AI en spel instellingen
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Toon AI/Game script instellingen
 STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Verlaat 'OpenTTD'
 
 STR_INTRO_TRANSLATION                                           :{BLACK}Deze vertaling mist {NUM} tekst{P "" en}. Help aub om OpenTTD beter te maken door je al vertaler aan te melden. Zie readme.txt voor details.
@@ -1945,8 +1949,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Uit
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}Aan
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Markeer het dekkingsgebied van de voorgestelde locatie niet
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Markeer het dekkingsgebied van de voorgestelde locatie
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepteert: {GOLD}{STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Biedt aan: {GOLD}{STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepteert: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Biedt aan: {GOLD}{CARGO_LIST}
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Station samenvoegen
@@ -2721,7 +2725,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepteert
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Laat lijst van gevraagde goederen zien
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepteert: {WHITE}{STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepteert: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Rangen
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Bekijk stationsreputaties
@@ -2966,9 +2970,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Gewicht:
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Kosten: {GOLD}{CURRENCY_LONG}{BLACK} Snelheid: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capaciteit: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Aangedreven wagons: {GOLD}+{POWER}{BLACK} Gewicht: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Om te bouwen voor: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Om te bouwen naar: {GOLD}{STRING}
 STR_PURCHASE_INFO_ALL_TYPES                                     :Alle vrachttypen
-STR_PURCHASE_INFO_ALL_BUT                                       :Alles behalve {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :Alles behalve {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. trekkracht: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Bereik: {GOLD}{COMMA} tegels
 
@@ -3091,8 +3095,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Prijs: {
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Prijs: {CURRENCY_LONG} Gewicht: {WEIGHT_SHORT}{}Snelheid: {VELOCITY}  Kracht: {POWER}  Max. T.E.: {6:FORCE}{}Bedrijfskosten: {4:CURRENCY_LONG}/yr{}Capaciteit: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Kosten: {CURRENCY_LONG} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO_LONG}, {CARGO_LONG}{}Gebruikskosten: {CURRENCY_LONG}/yr
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Kosten: {CURRENCY_LONG} Max. Snelheid: {VELOCITY}{}Capaciteit: {CARGO_LONG}{}Gebruikskosten: {CURRENCY_LONG}/jaar
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Kosten: {CURRENCY_LONG} Max. Snelheid: {VELOCITY} Bereik: {7:COMMA} tegels{}Capaciteit: {CARGO_LONG}, {CARGO_LONG}{}Bedrijfskosten: {CURRENCY_LONG}/jr
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Kosten: {CURRENCY_LONG} Max. Snelheid: {VELOCITY} Bereik: {7:COMMA} tegels{}Capaciteit: {CARGO_LONG}{}Bedrijfskosten: {CURRENCY_LONG}/jr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Kosten: {CURRENCY_LONG} Max. Snelheid: {VELOCITY} Bereik: {COMMA} tegels{}Capaciteit: {CARGO_LONG}, {CARGO_LONG}{}Bedrijfskosten: {CURRENCY_LONG}/jr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Kosten: {CURRENCY_LONG} Max. Snelheid: {VELOCITY} Bereik: {COMMA} tegels{}Capaciteit: {CARGO_LONG}{}Bedrijfskosten: {CURRENCY_LONG}/jr
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Vervang {STRING}
@@ -3116,7 +3120,7 @@ STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Wissel t
 STR_REPLACE_ENGINES                                             :Motoren
 STR_REPLACE_WAGONS                                              :Wagons
 
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Selecteer een spoortype waar je locomotieven voor wilt selecteren
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Selecteer een spoortype waar je locomotieven voor wilt vervangen
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Dit geeft weer waarmee de aan de linkerkant geselecteerde locomotief vervangen wordt
 STR_REPLACE_RAIL_VEHICLES                                       :Railvoertuigen
 STR_REPLACE_ELRAIL_VEHICLES                                     :Elektrische railvoertuigen
@@ -3215,7 +3219,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Winst di
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Betrouwbaarheid: {LTBLUE}{COMMA}%  {BLACK}Aantal keren motorpech sinds laatste onderhoud: {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Gebouwd: {LTBLUE}{NUM}{BLACK} Waarde: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capaciteit: {LTBLUE}Geen
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capaciteit: {LTBLUE}Geen{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capaciteit: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capaciteit: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capaciteit: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3258,8 +3262,10 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacite
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Ombouwen)
 STR_REFIT_TITLE                                                 :{GOLD}Selecteer goederentype om te vervoeren:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Ombouwkosten: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}{}{BLACK}Ombouwkosten: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT                        :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}{}{BLACK}Inkomsten na ombouwen: {GREEN}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Ombouwkosten: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT               :{BLACK}Nieuwe capaciteit: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Inkomsten na ombouwen: {GREEN}{CURRENCY_LONG}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Kies het voertuig om om te bouwen. Slepen met de muis geeft de mogelijkheid om meerdere voertuigen te selecteren. Klikken op een lege ruimte selecteert het hele voertuig. Ctrl+klik selecteert een voertuig en de volgende keten
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Kies goederentype dat deze trein moet vervoeren
@@ -3498,7 +3504,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Selectee
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}AI / GameScript Debug
+STR_AI_DEBUG                                                    :{WHITE}AI/Game Script Debug
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Naam van het script
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Instellingen
@@ -3518,12 +3524,12 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Game Scr
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Controleer het Game Script log
 
 STR_ERROR_AI_NO_AI_FOUND                                        :Geen geschikte AI gevonden. {} Deze AI is een 'dummy' en voert niets uit.{}Verschillende AI's kunnen worden gedownload via het 'Online Content' systeem
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Eén van de actieve scripts is vastgelopen. Meld dit a.u.b. bij de auteur van dit script met een schermprint van het AI / GameScript Debugscherm
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI / GameScript debugvenster is alleen beschikbaar voor de server
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}Eén van de actieve scripts is vastgelopen. Meld dit a.u.b. bij de auteur van dit script met een schermprint van het AI/Spel script Debugscherm
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI/Spel script debugvenster is alleen beschikbaar voor de server
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}AI / Spel configuratie
-STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Het GameScript dat in het volgende spel geladen wordt
+STR_AI_CONFIG_CAPTION                                           :{WHITE}AI/Spel script configuratie
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}Het Game Script dat in het volgende spel geladen wordt
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}De AI's die in het volgende spel geladen worden
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Menselijke speler
 STR_AI_CONFIG_RANDOM_AI                                         :Willekeurige AI
@@ -3534,13 +3540,13 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Geselect
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Omlaag verplaatsen
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}De geselecteerde AI naar omlaag verplaatsen in de lijst
 
-STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}GameScript
+STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Game Script
 STR_AI_CONFIG_AI                                                :{SILVER}AI's
 
 STR_AI_CONFIG_CHANGE                                            :{BLACK}Kies{STRING}
 STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :AI
-STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :GameScript
+STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Game Script
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Laad een ander script
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configureer
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configureer de parameters van het script
@@ -3548,12 +3554,12 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configur
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Beschikbaar {STRING}
 STR_AI_LIST_CAPTION_AI                                          :AI's
-STR_AI_LIST_CAPTION_GAMESCRIPT                                  :GameScripts
+STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Game Scripts
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Klik om een script te selecteren
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}Auteur: {STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}Versie: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}URL: {STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}Auteur: {ORANGE}{STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}Versie: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accepteer
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Selecteer gemarkeerd script
@@ -3563,7 +3569,7 @@ STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Script n
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :GameScript
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Game Script
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Sluiten
 STR_AI_SETTINGS_RESET                                           :{BLACK}Herstellen
 STR_AI_SETTINGS_SETTING                                         :{STRING}: {ORANGE}{STRING}
@@ -3716,7 +3722,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... slec
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... kan alleen in plaatsen met meer dan 1.200 inwoners worden gebouwd
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... kan alleen in regenwouden gebouwd worden
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... kan alleen in woestijnen gebouwd worden
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... kan alleen in plaatsen gebouwd worden
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... kan alleen in plaatsen gebouwd worden (vervangt huizen)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... kan alleen worden gebouwd in het centrum van de stad
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... kan alleen in laaggelegen gebieden gebouwd worden
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... kan alleen aan de rand van de kaart geplaatst worden
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... bossen kunnen alleen boven de sneeuwgrens worden geplant
@@ -4421,6 +4428,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4455,6 +4463,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{STRING}
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}

src/lang/english.txt

@@ -293,7 +293,7 @@ STR_SORT_BY_RANGE                                               :Range
 STR_TOOLBAR_TOOLTIP_PAUSE_GAME                                  :{BLACK}Pause game
 STR_TOOLBAR_TOOLTIP_FORWARD                                     :{BLACK}Fast forward the game
 STR_TOOLBAR_TOOLTIP_OPTIONS                                     :{BLACK}Options
-STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Save game, abandon game, quit
+STR_TOOLBAR_TOOLTIP_SAVE_GAME_ABANDON_GAME                      :{BLACK}Save game, abandon game, exit
 STR_TOOLBAR_TOOLTIP_DISPLAY_MAP                                 :{BLACK}Display map, extra viewport or list of signs
 STR_TOOLBAR_TOOLTIP_DISPLAY_TOWN_DIRECTORY                      :{BLACK}Display town directory
 STR_TOOLBAR_TOOLTIP_DISPLAY_SUBSIDIES                           :{BLACK}Display subsidies
@@ -316,11 +316,11 @@ STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS                              :{BLACK}Build ai
 STR_TOOLBAR_TOOLTIP_LANDSCAPING                                 :{BLACK}Open the landscaping toolbar to raise/lower land, plant trees, etc.
 STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW                     :{BLACK}Show sound/music window
 STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS                      :{BLACK}Show last message/news report, show message options
-STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Land area information, console, AI debug, screenshots, about OpenTTD
+STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION                      :{BLACK}Land area information, console, script debug, screenshots, about OpenTTD
 STR_TOOLBAR_TOOLTIP_SWITCH_TOOLBAR                              :{BLACK}Switch toolbars
 
 # Extra tooltips for the scenario editor toolbar
-STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Save scenario, load scenario, abandon scenario editor, quit
+STR_SCENEDIT_TOOLBAR_TOOLTIP_SAVE_SCENARIO_LOAD_SCENARIO        :{BLACK}Save scenario, load scenario, abandon scenario editor, exit
 STR_SCENEDIT_TOOLBAR_OPENTTD                                    :{YELLOW}OpenTTD
 STR_SCENEDIT_TOOLBAR_SCENARIO_EDITOR                            :{YELLOW}Scenario Editor
 STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD    :{BLACK}Move the starting date backward 1 year
@@ -340,16 +340,16 @@ STR_SCENEDIT_FILE_MENU_SAVE_SCENARIO                            :Save scenario
 STR_SCENEDIT_FILE_MENU_LOAD_SCENARIO                            :Load scenario
 STR_SCENEDIT_FILE_MENU_SAVE_HEIGHTMAP                           :Save heightmap
 STR_SCENEDIT_FILE_MENU_LOAD_HEIGHTMAP                           :Load heightmap
-STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Quit editor
+STR_SCENEDIT_FILE_MENU_QUIT_EDITOR                              :Abandon scenario editor
 STR_SCENEDIT_FILE_MENU_SEPARATOR                                :
-STR_SCENEDIT_FILE_MENU_QUIT                                     :Quit
+STR_SCENEDIT_FILE_MENU_QUIT                                     :Exit
 ############ range for SE file menu starts
 
 ############ range for settings menu starts
 STR_SETTINGS_MENU_GAME_OPTIONS                                  :Game options
 STR_SETTINGS_MENU_DIFFICULTY_SETTINGS                           :Difficulty settings
 STR_SETTINGS_MENU_CONFIG_SETTINGS                               :Advanced settings
-STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :AI / Game settings
+STR_SETTINGS_MENU_SCRIPT_SETTINGS                               :AI/Game script settings
 STR_SETTINGS_MENU_NEWGRF_SETTINGS                               :NewGRF settings
 STR_SETTINGS_MENU_TRANSPARENCY_OPTIONS                          :Transparency options
 STR_SETTINGS_MENU_TOWN_NAMES_DISPLAYED                          :Town names displayed
@@ -367,6 +367,7 @@ STR_SETTINGS_MENU_TRANSPARENT_SIGNS                             :Transparent sig
 STR_FILE_MENU_SAVE_GAME                                         :Save game
 STR_FILE_MENU_LOAD_GAME                                         :Load game
 STR_FILE_MENU_QUIT_GAME                                         :Abandon game
+STR_FILE_MENU_SEPARATOR                                         :
 STR_FILE_MENU_EXIT                                              :Exit
 ############ range ends here
 
@@ -444,7 +445,7 @@ STR_NEWS_MENU_MESSAGE_HISTORY_MENU                              :Message history
 STR_ABOUT_MENU_LAND_BLOCK_INFO                                  :Land area information
 STR_ABOUT_MENU_SEPARATOR                                        :
 STR_ABOUT_MENU_TOGGLE_CONSOLE                                   :Toggle console
-STR_ABOUT_MENU_AI_DEBUG                                         :AI / GameScript debug
+STR_ABOUT_MENU_AI_DEBUG                                         :AI/Game script debug
 STR_ABOUT_MENU_SCREENSHOT                                       :Screenshot
 STR_ABOUT_MENU_ZOOMIN_SCREENSHOT                                :Fully zoomed in screenshot
 STR_ABOUT_MENU_DEFAULTZOOM_SCREENSHOT                           :Default zoom screenshot
@@ -535,8 +536,8 @@ STR_GRAPH_CARGO_PAYMENT_RATES_X_LABEL                           :{TINY_FONT}{BLA
 STR_GRAPH_CARGO_PAYMENT_RATES_TITLE                             :{TINY_FONT}{BLACK}Payment for delivering 10 units (or 10,000 litres) of cargo a distance of 20 squares
 STR_GRAPH_CARGO_ENABLE_ALL                                      :{TINY_FONT}{BLACK}Enable all
 STR_GRAPH_CARGO_DISABLE_ALL                                     :{TINY_FONT}{BLACK}Disable all
-STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Display all cargos on the cargo payment rates graph
-STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Display no cargos on the cargo payment rates graph
+STR_GRAPH_CARGO_TOOLTIP_ENABLE_ALL                              :{BLACK}Display all cargoes on the cargo payment rates graph
+STR_GRAPH_CARGO_TOOLTIP_DISABLE_ALL                             :{BLACK}Display no cargoes on the cargo payment rates graph
 STR_GRAPH_CARGO_PAYMENT_TOGGLE_CARGO                            :{BLACK}Toggle graph for cargo type on/off
 STR_GRAPH_CARGO_PAYMENT_CARGO                                   :{TINY_FONT}{BLACK}{STRING}
 
@@ -579,7 +580,7 @@ STR_PERFORMANCE_DETAIL_LOAN                                     :{BLACK}Loan:
 STR_PERFORMANCE_DETAIL_TOTAL                                    :{BLACK}Total:
 ############ End of order list
 STR_PERFORMANCE_DETAIL_VEHICLES_TOOLTIP                         :{BLACK}Number of vehicles that turned a profit last year. This includes road vehicles, trains, ships and aircraft
-STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Number of recently-serviced station parts. Every part of a station (e.g. train station, bus stop, airport) is counted, even if they are connected as one station
+STR_PERFORMANCE_DETAIL_STATIONS_TOOLTIP                         :{BLACK}Number of recently-serviced stations. Train stations, bus stops, airports and so on are counted separately even if they belong to the same station
 STR_PERFORMANCE_DETAIL_MIN_PROFIT_TOOLTIP                       :{BLACK}The profit of the vehicle with the lowest income (only vehicles older than two years are considered)
 STR_PERFORMANCE_DETAIL_MIN_INCOME_TOOLTIP                       :{BLACK}Amount of cash made in the quarter with the lowest profit of the last 12 quarters
 STR_PERFORMANCE_DETAIL_MAX_INCOME_TOOLTIP                       :{BLACK}Amount of cash made in the quarter with the highest profit of the last 12 quarters
@@ -1392,6 +1393,9 @@ STR_CONFIG_ERROR_INVALID_GRF_INCOMPATIBLE                       :incompatible to
 STR_CONFIG_ERROR_INVALID_GRF_UNKNOWN                            :unknown
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_LEVEL             :{WHITE}... compression level '{RAW_STRING}' is not valid
 STR_CONFIG_ERROR_INVALID_SAVEGAME_COMPRESSION_ALGORITHM         :{WHITE}... savegame format '{RAW_STRING}' is not available. Reverting to '{RAW_STRING}'
+STR_CONFIG_ERROR_INVALID_BASE_GRAPHICS_NOT_FOUND                :{WHITE}... ignoring Base Graphics set '{RAW_STRING}': not found
+STR_CONFIG_ERROR_INVALID_BASE_SOUNDS_NOT_FOUND                  :{WHITE}... ignoring Base Sounds set '{RAW_STRING}': not found
+STR_CONFIG_ERROR_INVALID_BASE_MUSIC_NOT_FOUND                   :{WHITE}... ignoring Base Music set '{RAW_STRING}': not found
 
 # Intro window
 STR_INTRO_CAPTION                                               :{WHITE}OpenTTD {REV}
@@ -1408,8 +1412,8 @@ STR_INTRO_DIFFICULTY                                            :{BLACK}Difficul
 STR_INTRO_ADVANCED_SETTINGS                                     :{BLACK}Advanced Settings
 STR_INTRO_NEWGRF_SETTINGS                                       :{BLACK}NewGRF Settings
 STR_INTRO_ONLINE_CONTENT                                        :{BLACK}Check Online Content
-STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}AI / Game Settings
-STR_INTRO_QUIT                                                  :{BLACK}Quit
+STR_INTRO_SCRIPT_SETTINGS                                       :{BLACK}AI/Game Script Settings
+STR_INTRO_QUIT                                                  :{BLACK}Exit
 
 STR_INTRO_TOOLTIP_NEW_GAME                                      :{BLACK}Start a new game. Ctrl+Click skips map configuration
 STR_INTRO_TOOLTIP_LOAD_GAME                                     :{BLACK}Load a saved game
@@ -1428,13 +1432,13 @@ STR_INTRO_TOOLTIP_DIFFICULTY_OPTIONS                            :{BLACK}Display
 STR_INTRO_TOOLTIP_ADVANCED_SETTINGS                             :{BLACK}Display advanced settings
 STR_INTRO_TOOLTIP_NEWGRF_SETTINGS                               :{BLACK}Display NewGRF settings
 STR_INTRO_TOOLTIP_ONLINE_CONTENT                                :{BLACK}Check for new and updated content to download
-STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Display AI and Game settings
-STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Quit 'OpenTTD'
+STR_INTRO_TOOLTIP_SCRIPT_SETTINGS                               :{BLACK}Display AI/Game script settings
+STR_INTRO_TOOLTIP_QUIT                                          :{BLACK}Exit 'OpenTTD'
 
 STR_INTRO_TRANSLATION                                           :{BLACK}This translation misses {NUM} string{P "" s}. Please help make OpenTTD better by signing up as translator. See readme.txt for details.
 
 # Quit window
-STR_QUIT_CAPTION                                                :{WHITE}Quit
+STR_QUIT_CAPTION                                                :{WHITE}Exit
 STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD                  :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}?
 STR_QUIT_YES                                                    :{BLACK}Yes
 STR_QUIT_NO                                                     :{BLACK}No
@@ -1924,7 +1928,7 @@ STR_CONTENT_ERROR_COULD_NOT_EXTRACT                             :{WHITE}Could no
 STR_MISSING_GRAPHICS_SET_CAPTION                                :{WHITE}Missing graphics
 STR_MISSING_GRAPHICS_SET_MESSAGE                                :{BLACK}OpenTTD requires graphics to function but none could be found. Do you allow OpenTTD to download and install these graphics?
 STR_MISSING_GRAPHICS_YES_DOWNLOAD                               :{BLACK}Yes, download the graphics
-STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, quit OpenTTD
+STR_MISSING_GRAPHICS_NO_QUIT                                    :{BLACK}No, exit OpenTTD
 
 # Transparency settings window
 STR_TRANSPARENCY_CAPTION                                        :{WHITE}Transparency Options
@@ -1945,8 +1949,8 @@ STR_STATION_BUILD_COVERAGE_OFF                                  :{BLACK}Off
 STR_STATION_BUILD_COVERAGE_ON                                   :{BLACK}On
 STR_STATION_BUILD_COVERAGE_AREA_OFF_TOOLTIP                     :{BLACK}Don't highlight coverage area of proposed site
 STR_STATION_BUILD_COVERAGE_AREA_ON_TOOLTIP                      :{BLACK}Highlight coverage area of proposed site
-STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepts: {GOLD}{RAW_STRING}
-STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Supplies: {GOLD}{RAW_STRING}
+STR_STATION_BUILD_ACCEPTS_CARGO                                 :{BLACK}Accepts: {GOLD}{CARGO_LIST}
+STR_STATION_BUILD_SUPPLIES_CARGO                                :{BLACK}Supplies: {GOLD}{CARGO_LIST}
 
 # Join station window
 STR_JOIN_STATION_CAPTION                                        :{WHITE}Join station
@@ -2721,7 +2725,7 @@ STR_STATION_VIEW_EN_ROUTE_FROM                                  :{YELLOW}({CARGO
 
 STR_STATION_VIEW_ACCEPTS_BUTTON                                 :{BLACK}Accepts
 STR_STATION_VIEW_ACCEPTS_TOOLTIP                                :{BLACK}Show list of accepted cargo
-STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepts: {WHITE}{RAW_STRING}
+STR_STATION_VIEW_ACCEPTS_CARGO                                  :{BLACK}Accepts: {WHITE}{CARGO_LIST}
 
 STR_STATION_VIEW_RATINGS_BUTTON                                 :{BLACK}Ratings
 STR_STATION_VIEW_RATINGS_TOOLTIP                                :{BLACK}Show station ratings
@@ -2966,9 +2970,9 @@ STR_PURCHASE_INFO_WEIGHT_CWEIGHT                                :{BLACK}Weight:
 STR_PURCHASE_INFO_COST_SPEED                                    :{BLACK}Cost: {GOLD}{CURRENCY_LONG}{BLACK} Speed: {GOLD}{VELOCITY}
 STR_PURCHASE_INFO_AIRCRAFT_CAPACITY                             :{BLACK}Capacity: {GOLD}{CARGO_LONG}, {CARGO_LONG}
 STR_PURCHASE_INFO_PWAGPOWER_PWAGWEIGHT                          :{BLACK}Powered Wagons: {GOLD}+{POWER}{BLACK} Weight: {GOLD}+{WEIGHT_SHORT}
-STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Refittable to: {GOLD}
+STR_PURCHASE_INFO_REFITTABLE_TO                                 :{BLACK}Refittable to: {GOLD}{STRING2}
 STR_PURCHASE_INFO_ALL_TYPES                                     :All cargo types
-STR_PURCHASE_INFO_ALL_BUT                                       :All but {GOLD}
+STR_PURCHASE_INFO_ALL_BUT                                       :All but {CARGO_LIST}
 STR_PURCHASE_INFO_MAX_TE                                        :{BLACK}Max. Tractive Effort: {GOLD}{FORCE}
 STR_PURCHASE_INFO_AIRCRAFT_RANGE                                :{BLACK}Range: {GOLD}{COMMA} tiles
 
@@ -3091,8 +3095,8 @@ STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER                      :{BLACK}Cost: {C
 STR_ENGINE_PREVIEW_COST_WEIGHT_SPEED_POWER_MAX_TE               :{BLACK}Cost: {CURRENCY_LONG} Weight: {WEIGHT_SHORT}{}Speed: {VELOCITY}  Power: {POWER}  Max. T.E.: {6:FORCE}{}Running Cost: {4:CURRENCY_LONG}/yr{}Capacity: {5:CARGO_LONG}
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_CAPACITY_RUNCOST     :{BLACK}Cost: {CURRENCY_LONG} Max. Speed: {VELOCITY}{}Capacity: {CARGO_LONG}, {CARGO_LONG}{}Running Cost: {CURRENCY_LONG}/yr
 STR_ENGINE_PREVIEW_COST_MAX_SPEED_CAPACITY_RUNCOST              :{BLACK}Cost: {CURRENCY_LONG} Max. Speed: {VELOCITY}{}Capacity: {CARGO_LONG}{}Running Cost: {CURRENCY_LONG}/yr
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cost: {CURRENCY_LONG} Max. Speed: {VELOCITY} Range: {7:COMMA} tiles{}Capacity: {CARGO_LONG}, {CARGO_LONG}{}Running Cost: {CURRENCY_LONG}/yr
-STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cost: {CURRENCY_LONG} Max. Speed: {VELOCITY} Range: {7:COMMA} tiles{}Capacity: {CARGO_LONG}{}Running Cost: {CURRENCY_LONG}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_CAPACITY_RUNCOST:{BLACK}Cost: {CURRENCY_LONG} Max. Speed: {VELOCITY} Range: {COMMA} tiles{}Capacity: {CARGO_LONG}, {CARGO_LONG}{}Running Cost: {CURRENCY_LONG}/yr
+STR_ENGINE_PREVIEW_COST_MAX_SPEED_RANGE_CAPACITY_RUNCOST        :{BLACK}Cost: {CURRENCY_LONG} Max. Speed: {VELOCITY} Range: {COMMA} tiles{}Capacity: {CARGO_LONG}{}Running Cost: {CURRENCY_LONG}/yr
 
 # Autoreplace window
 STR_REPLACE_VEHICLES_WHITE                                      :{WHITE}Replace {STRING}
@@ -3116,7 +3120,7 @@ STR_REPLACE_ENGINE_WAGON_SELECT_HELP                            :{BLACK}Switch b
 STR_REPLACE_ENGINES                                             :Engines
 STR_REPLACE_WAGONS                                              :Wagons
 
-STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Choose the railtype you want to replace engines for
+STR_REPLACE_HELP_RAILTYPE                                       :{BLACK}Choose the rail type you want to replace engines for
 STR_REPLACE_HELP_REPLACE_INFO_TAB                               :{BLACK}Displays which engine the left selected engine is being replaced with, if any
 STR_REPLACE_RAIL_VEHICLES                                       :Rail Vehicles
 STR_REPLACE_ELRAIL_VEHICLES                                     :Electrified Rail Vehicles
@@ -3215,7 +3219,7 @@ STR_VEHICLE_INFO_PROFIT_THIS_YEAR_LAST_YEAR                     :{BLACK}Profit t
 STR_VEHICLE_INFO_RELIABILITY_BREAKDOWNS                         :{BLACK}Reliability: {LTBLUE}{COMMA}%  {BLACK}Breakdowns since last service: {LTBLUE}{COMMA}
 
 STR_VEHICLE_INFO_BUILT_VALUE                                    :{LTBLUE}{ENGINE} {BLACK}Built: {LTBLUE}{NUM}{BLACK} Value: {LTBLUE}{CURRENCY_LONG}
-STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacity: {LTBLUE}None
+STR_VEHICLE_INFO_NO_CAPACITY                                    :{BLACK}Capacity: {LTBLUE}None{STRING}
 STR_VEHICLE_INFO_CAPACITY                                       :{BLACK}Capacity: {LTBLUE}{CARGO_LONG}{3:STRING}
 STR_VEHICLE_INFO_CAPACITY_MULT                                  :{BLACK}Capacity: {LTBLUE}{CARGO_LONG}{3:STRING} (x{4:NUM})
 STR_VEHICLE_INFO_CAPACITY_CAPACITY                              :{BLACK}Capacity: {LTBLUE}{CARGO_LONG}, {CARGO_LONG}{STRING}
@@ -3258,8 +3262,10 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY               :{BLACK}Capacity
 # Vehicle refit
 STR_REFIT_CAPTION                                               :{WHITE}{VEHICLE} (Refit)
 STR_REFIT_TITLE                                                 :{GOLD}Select cargo type to carry:
-STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}New capacity: {GOLD}{CARGO_LONG}{}{BLACK}Cost of refit: {GOLD}{CURRENCY_LONG}
-STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}New capacity: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Cost of refit: {GOLD}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_REFIT                            :{BLACK}New capacity: {GOLD}{CARGO_LONG}{}{BLACK}Cost of refit: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_REFIT                        :{BLACK}New capacity: {GOLD}{CARGO_LONG}{}{BLACK}Income from refit: {GREEN}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT                   :{BLACK}New capacity: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Cost of refit: {RED}{CURRENCY_LONG}
+STR_REFIT_NEW_CAPACITY_INCOME_FROM_AIRCRAFT_REFIT               :{BLACK}New capacity: {GOLD}{CARGO_LONG}, {GOLD}{CARGO_LONG}{}{BLACK}Income from refit: {GREEN}{CURRENCY_LONG}
 STR_REFIT_SELECT_VEHICLES_TOOLTIP                               :{BLACK}Select the vehicles to refit. Dragging with the mouse allows to select multiple vehicles. Clicking on an empty space will select the whole vehicle. Ctrl+Click will select a vehicle and the following chain
 
 STR_REFIT_TRAIN_LIST_TOOLTIP                                    :{BLACK}Select type of cargo for train to carry
@@ -3498,7 +3504,7 @@ STR_DATE_YEAR_TOOLTIP                                           :{BLACK}Select y
 
 
 # AI debug window
-STR_AI_DEBUG                                                    :{WHITE}AI / GameScript Debug
+STR_AI_DEBUG                                                    :{WHITE}AI/Game Script Debug
 STR_AI_DEBUG_NAME_AND_VERSION                                   :{BLACK}{RAW_STRING} (v{NUM})
 STR_AI_DEBUG_NAME_TOOLTIP                                       :{BLACK}Name of the script
 STR_AI_DEBUG_SETTINGS                                           :{BLACK}Settings
@@ -3518,12 +3524,12 @@ STR_AI_GAME_SCRIPT                                              :{BLACK}Game Scr
 STR_AI_GAME_SCRIPT_TOOLTIP                                      :{BLACK}Check the Game Script log
 
 STR_ERROR_AI_NO_AI_FOUND                                        :No suitable AI found to load.{}This AI is a dummy AI and won't do anything.{}You can download several AIs via the 'Online Content' system
-STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}One of the running scripts crashed. Please report this to the script author with a screenshot of the AI / GameScript Debug Window
-STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI / GameScript Debug window is only available for the server
+STR_ERROR_AI_PLEASE_REPORT_CRASH                                :{WHITE}One of the running scripts crashed. Please report this to the script author with a screenshot of the AI/Game Script Debug Window
+STR_ERROR_AI_DEBUG_SERVER_ONLY                                  :{YELLOW}AI/Game Script Debug window is only available for the server
 
 # AI configuration window
-STR_AI_CONFIG_CAPTION                                           :{WHITE}AI / Game Configuration
-STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}The GameScript that will be loaded in the next game
+STR_AI_CONFIG_CAPTION                                           :{WHITE}AI/Game Script Configuration
+STR_AI_CONFIG_GAMELIST_TOOLTIP                                  :{BLACK}The Game Script that will be loaded in the next game
 STR_AI_CONFIG_AILIST_TOOLTIP                                    :{BLACK}The AIs that will be loaded in the next game
 STR_AI_CONFIG_HUMAN_PLAYER                                      :Human player
 STR_AI_CONFIG_RANDOM_AI                                         :Random AI
@@ -3534,13 +3540,13 @@ STR_AI_CONFIG_MOVE_UP_TOOLTIP                                   :{BLACK}Move sel
 STR_AI_CONFIG_MOVE_DOWN                                         :{BLACK}Move Down
 STR_AI_CONFIG_MOVE_DOWN_TOOLTIP                                 :{BLACK}Move selected AI down in the list
 
-STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}GameScript
+STR_AI_CONFIG_GAMESCRIPT                                        :{SILVER}Game Script
 STR_AI_CONFIG_AI                                                :{SILVER}AIs
 
 STR_AI_CONFIG_CHANGE                                            :{BLACK}Select {STRING}
 STR_AI_CONFIG_CHANGE_NONE                                       :
 STR_AI_CONFIG_CHANGE_AI                                         :AI
-STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :GameScript
+STR_AI_CONFIG_CHANGE_GAMESCRIPT                                 :Game Script
 STR_AI_CONFIG_CHANGE_TOOLTIP                                    :{BLACK}Load another script
 STR_AI_CONFIG_CONFIGURE                                         :{BLACK}Configure
 STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configure the parameters of the Script
@@ -3548,12 +3554,12 @@ STR_AI_CONFIG_CONFIGURE_TOOLTIP                                 :{BLACK}Configur
 # Available AIs window
 STR_AI_LIST_CAPTION                                             :{WHITE}Available {STRING}
 STR_AI_LIST_CAPTION_AI                                          :AIs
-STR_AI_LIST_CAPTION_GAMESCRIPT                                  :GameScripts
+STR_AI_LIST_CAPTION_GAMESCRIPT                                  :Game Scripts
 STR_AI_LIST_TOOLTIP                                             :{BLACK}Click to select a script
 
-STR_AI_LIST_AUTHOR                                              :{BLACK}Author: {RAW_STRING}
-STR_AI_LIST_VERSION                                             :{BLACK}Version: {NUM}
-STR_AI_LIST_URL                                                 :{BLACK}URL: {RAW_STRING}
+STR_AI_LIST_AUTHOR                                              :{LTBLUE}Author: {ORANGE}{RAW_STRING}
+STR_AI_LIST_VERSION                                             :{LTBLUE}Version: {ORANGE}{NUM}
+STR_AI_LIST_URL                                                 :{LTBLUE}URL: {ORANGE}{RAW_STRING}
 
 STR_AI_LIST_ACCEPT                                              :{BLACK}Accept
 STR_AI_LIST_ACCEPT_TOOLTIP                                      :{BLACK}Select highlighted script
@@ -3563,7 +3569,7 @@ STR_AI_LIST_CANCEL_TOOLTIP                                      :{BLACK}Don't ch
 # AI Parameters
 STR_AI_SETTINGS_CAPTION                                         :{WHITE}{STRING} Parameters
 STR_AI_SETTINGS_CAPTION_AI                                      :AI
-STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :GameScript
+STR_AI_SETTINGS_CAPTION_GAMESCRIPT                              :Game Script
 STR_AI_SETTINGS_CLOSE                                           :{BLACK}Close
 STR_AI_SETTINGS_RESET                                           :{BLACK}Reset
 STR_AI_SETTINGS_SETTING                                         :{RAW_STRING}: {ORANGE}{STRING1}
@@ -3716,7 +3722,8 @@ STR_ERROR_ONLY_ONE_ALLOWED_PER_TOWN                             :{WHITE}... only
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS_WITH_POPULATION_OF_1200    :{WHITE}... can only be built in towns with a population of at least 1200
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_RAINFOREST                       :{WHITE}... can only be built in rainforest areas
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_DESERT                           :{WHITE}... can only be built in desert areas
-STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... can only be built in towns
+STR_ERROR_CAN_ONLY_BE_BUILT_IN_TOWNS                            :{WHITE}... can only be built in towns (replacing houses)
+STR_ERROR_CAN_ONLY_BE_BUILT_NEAR_TOWN_CENTER                    :{WHITE}... can only be built near the center of towns
 STR_ERROR_CAN_ONLY_BE_BUILT_IN_LOW_AREAS                        :{WHITE}... can only be built in low areas
 STR_ERROR_CAN_ONLY_BE_POSITIONED                                :{WHITE}... can only be positioned near edges of map
 STR_ERROR_FOREST_CAN_ONLY_BE_PLANTED                            :{WHITE}... forest can only be planted above snow-line
@@ -3824,7 +3831,7 @@ STR_ERROR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE                     :{WHITE}Can't co
 STR_ERROR_THERE_IS_NO_RAILROAD_TRACK                            :{WHITE}... there is no railway track
 STR_ERROR_THERE_ARE_NO_SIGNALS                                  :{WHITE}... there are no signals
 
-STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Can't convert railtype here...
+STR_ERROR_CAN_T_CONVERT_RAIL                                    :{WHITE}Can't convert rail type here...
 
 # Road construction errors
 STR_ERROR_MUST_REMOVE_ROAD_FIRST                                :{WHITE}Must remove road first
@@ -4421,6 +4428,7 @@ STR_JUST_CHECKMARK                                              :{CHECKMARK}
 STR_JUST_COMMA                                                  :{COMMA}
 STR_JUST_CURRENCY_SHORT                                         :{CURRENCY_SHORT}
 STR_JUST_CURRENCY_LONG                                          :{CURRENCY_LONG}
+STR_JUST_CARGO_LIST                                             :{CARGO_LIST}
 STR_JUST_INT                                                    :{NUM}
 STR_JUST_DATE_TINY                                              :{DATE_TINY}
 STR_JUST_DATE_SHORT                                             :{DATE_SHORT}
@@ -4455,6 +4463,7 @@ STR_BLACK_RAW_STRING                                            :{BLACK}{RAW_STR
 STR_GREEN_STRING                                                :{GREEN}{STRING}
 STR_ORANGE_STRING                                               :{ORANGE}{STRING}
 STR_RED_STRING                                                  :{RED}{STRING}
+STR_LTBLUE_STRING                                               :{LTBLUE}{STRING}
 STR_WHITE_STRING                                                :{WHITE}{STRING}
 STR_TINY_BLACK_HEIGHT                                           :{TINY_FONT}{BLACK}{HEIGHT}
 STR_TINY_BLACK_VEHICLE                                          :{TINY_FONT}{BLACK}{VEHICLE}