diff -Nru atanks-6.5~dfsg/atanks.desktop atanks-6.6~dfsg/atanks.desktop
--- atanks-6.5~dfsg/atanks.desktop	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/atanks.desktop	2021-06-28 23:22:07.000000000 +0000
@@ -7,4 +7,3 @@
 Icon=atanks
 Categories=Game;ArcadeGame;
 Terminal=false
-
diff -Nru atanks-6.5~dfsg/cb/atanks.cbp atanks-6.6~dfsg/cb/atanks.cbp
--- atanks-6.5~dfsg/cb/atanks.cbp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/cb/atanks.cbp	2016-11-02 14:57:52.000000000 +0000
@@ -4,13 +4,13 @@
 	<Project>
 		<Option title="atanks" />
 		<Option makefile_is_custom="1" />
-		<Option execution_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+		<Option execution_dir="../../atanks" />
 		<Option pch_mode="2" />
 		<Option compiler="gcc" />
 		<Build>
 			<Target title="veryclean">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -30,8 +30,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="user">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -48,8 +48,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="user LTO">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -66,8 +66,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="user ggdb3">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -84,8 +84,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="user debug">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -102,8 +102,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="AICORE">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -120,8 +120,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="AICORE to Log">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -138,8 +138,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="AICORE FIN">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -156,8 +156,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="AICORE FIN to LOG">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -174,8 +174,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="AIM">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -192,8 +192,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="EMO">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -210,8 +210,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="FIN">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -227,9 +227,27 @@
 					<SilentBuild command="$make -j17 -f $makefile user DEBUG=YES DEBUG_FINANCE=YES &gt; $(CMD_NULL)" />
 				</MakeCommands>
 			</Target>
+			<Target title="EMO FIN">
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
+				<Option object_output="../obj/" />
+				<Option type="1" />
+				<Option compiler="gcc" />
+				<Compiler>
+					<Add option="-g" />
+				</Compiler>
+				<MakeCommands>
+					<Build command="$make -j17 -f $makefile user DEBUG=YES DEBUG_EMOTION=YES DEBUG_FINANCE=YES" />
+					<CompileFile command="$make -f $makefile $file DEBUG=YES DEBUG_EMOTION=YES DEBUG_FINANCE=YES" />
+					<Clean command="$make -f $makefile veryclean DEBUG=YES DEBUG_EMOTION=YES DEBUG_FINANCE=YES" />
+					<DistClean command="$make -f $makefile distclean$target" />
+					<AskRebuildNeeded command="$make -q -f $makefile $target DEBUG=YES DEBUG_EMOTION=YES DEBUG_FINANCE=YES" />
+					<SilentBuild command="$make -j17 -f $makefile user DEBUG=YES DEBUG_EMOTION=YES DEBUG_FINANCE=YES &gt; $(CMD_NULL)" />
+				</MakeCommands>
+			</Target>
 			<Target title="OBJ">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -246,8 +264,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="PHY">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -264,8 +282,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="FIN PHY">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -282,8 +300,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="SAN address">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -300,8 +318,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="SAN leak">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -318,8 +336,8 @@
 				</MakeCommands>
 			</Target>
 			<Target title="SAN thread">
-				<Option output="/home/sed/pryde/PrydeWorX/atanks_aiu/atanks" prefix_auto="1" extension_auto="1" />
-				<Option working_dir="/home/sed/pryde/PrydeWorX/atanks_aiu" />
+				<Option output="../atanks" prefix_auto="1" extension_auto="1" />
+				<Option working_dir="../" />
 				<Option object_output="../obj/" />
 				<Option type="1" />
 				<Option compiler="gcc" />
@@ -339,9 +357,11 @@
 		<Compiler>
 			<Add option="-Wall" />
 		</Compiler>
+		<Unit filename="../Changelog" />
 		<Unit filename="../Makefile" />
 		<Unit filename="../Makefile.bsd" />
-		<Unit filename="../TODO_akut" />
+		<Unit filename="../README" />
+		<Unit filename="../TODO" />
 		<Unit filename="../src/aicore.cpp" />
 		<Unit filename="../src/aicore.h" />
 		<Unit filename="../src/atanks.cpp" />
@@ -428,6 +448,7 @@
 		<Unit filename="../src/virtobj.h" />
 		<Unit filename="../src/winclock.h" />
 		<Unit filename="../text/weapons.txt" />
+		<Unit filename="../text/weapons_de.txt" />
 		<Extensions>
 			<envvars />
 			<code_completion />
diff -Nru atanks-6.5~dfsg/Changelog atanks-6.6~dfsg/Changelog
--- atanks-6.5~dfsg/Changelog	2016-11-02 14:45:19.000000000 +0000
+++ atanks-6.6~dfsg/Changelog	2021-08-12 00:32:35.000000000 +0000
@@ -1,14 +1,56 @@
 NOTE: From now on, new changes appear at the top of this file.
 
+============ Atanks-6.5 released ===================
+
+	Fixes:
+	- Falling damage that was caused by a driller or riot weapon, is now
+	  credited to the shooter of that weapon.
+	- Fixed a crash that happened when SDI units tried to target meteors.
+	- Fixed Makefile so that tar abd zip commands would not include
+	  .git directory in source archives.
+	Additions:
+	- The AI players can move their tank to get to a better position.
+	- New weapon: "Theft Bomb" (Idea and basic patch by Alois Dirnaichner)
+	- Game save files got a version number, so old save games can be
+	  upgraded.
+	Changes:
+	- Raised the power reduction of the Reducer from 25% to 33%.
+	- The radius of the riot and dirt bombs have been raised.
+	- The prices of some items and weapons have been rebalanced.
+	- The height rollers can climb depends on their size now.
+	- All players start with some fuel.
+	- Human players are no longer considered to be like deadly bots, but
+	  to be like the best present bot. In a game with only lower level
+	  bots, they no longer "unite" against the human players right from
+	  the start.
+	- SDI units might skip their shot if the resulting explosion will kill
+	  the SDI owning tank.
+	- SDI units might skip their shot if the resulting explosion will be
+	  nearer to the tank than on the point were the missile would explode
+	  if not shot down.
+	- Fixed bug in debug.h which would prevent compiling on FreeBSD.
+	- Reduced AI difficultly, especially at lower levels. AI was far too
+	  strong for most players. AI aiming now uses a number of aiming attempts
+	  equal to its level rather than a power of its level.
+
+
+============ Atanks-6.5 released ===================
+
 	- Remove old Atanks binary during normal "make clean".
 
 	- Added patch from Debian which makes the build process reproducible.
 	  Thanks to Reiner Herrmann for submitting the patch. Closes
 	  Debian bug #842865.
 
+
 ============ Atanks-6.4 released ===================
 
-	We are happy to announce a new release of Atomic Tanks is now available for download. The new release, version 6.4, carries a number of bug fixes and minor improvements. Perhaps the most visual change is more funky behaviour in the funky bombs and the AI players handle napalm better. 
+	Service release with bug fixes and some improvements for the AI.
+	Fixes:
+	- Fixed a bug that caused the AI to use Napalm in a stupid way.
+	Changes:
+	- The funky bombs are now a lot more 'funky' by randomly switching
+	  horizontal and/or vertical direction in mid-flight.
 
 ============ Atanks-6.3 released ===================
 
diff -Nru atanks-6.5~dfsg/credits.txt atanks-6.6~dfsg/credits.txt
--- atanks-6.5~dfsg/credits.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/credits.txt	2021-06-28 23:22:07.000000000 +0000
@@ -7,7 +7,7 @@
 Mike Wilson (CaptainNeeda+atanks@gmail.com)
 Kevin (sylikc@gmail.com)
 Sven Eden (yamakuzure@users.sourceforge.net)
-Bruno Victal
+Bruno Victal (ubr47k@users.sourceforge.net)
 Bill Buerger
 
 Graphics
@@ -65,7 +65,7 @@
 Tom Hudson (tom@singular.org.uk)
 
 Allegro
-Shawn Hargreaves (shawn@talula.demon.co.uk) - http://allegro.sf.net
+Shawn Hargreaves (shawn@talula.demon.co.uk) - https://liballeg.org
 
 Games for Linux: http://games.linux.sk
 Text Logos: http://www.cooltext.com
diff -Nru atanks-6.5~dfsg/debian/changelog atanks-6.6~dfsg/debian/changelog
--- atanks-6.5~dfsg/debian/changelog	2020-11-14 21:29:30.000000000 +0000
+++ atanks-6.6~dfsg/debian/changelog	2021-09-02 06:33:07.000000000 +0000
@@ -1,3 +1,12 @@
+atanks (6.6~dfsg-1) unstable; urgency=medium
+
+  * New upstream version 6.6~dfsg.
+  * Declare compliance with Debian Policy 4.6.0.
+  * d/control: remove obsolete Breaks and Replaces.
+  * Drop freebsd-hurd.patch. Fixed upstream.
+
+ -- Markus Koschany <apo@debian.org>  Thu, 02 Sep 2021 08:33:07 +0200
+
 atanks (6.5~dfsg-4) unstable; urgency=medium
 
   * Switch to debhelper-compat = 13.
diff -Nru atanks-6.5~dfsg/debian/control atanks-6.6~dfsg/debian/control
--- atanks-6.5~dfsg/debian/control	2020-11-14 21:29:30.000000000 +0000
+++ atanks-6.6~dfsg/debian/control	2021-09-02 06:33:07.000000000 +0000
@@ -10,7 +10,7 @@
 Homepage: http://atanks.sourceforge.net/
 Vcs-Git: https://salsa.debian.org/games-team/atanks.git
 Vcs-Browser: https://salsa.debian.org/games-team/atanks
-Standards-Version: 4.5.0
+Standards-Version: 4.6.0
 
 Package: atanks
 Architecture: any
@@ -18,10 +18,6 @@
  atanks-data (= ${source:Version}),
  ${misc:Depends},
  ${shlibs:Depends}
-Replaces:
- atanks-data(<< 5.7~dfsg-1)
-Breaks:
- atanks-data (<< 5.7~dfsg-1)
 Description: tank-battling game
  Atomic tanks is a multi-player game in which you attempt to destroy
  other tanks while trying to protect your own. You earn money for
diff -Nru atanks-6.5~dfsg/debian/copyright atanks-6.6~dfsg/debian/copyright
--- atanks-6.5~dfsg/debian/copyright	2020-11-14 21:29:30.000000000 +0000
+++ atanks-6.6~dfsg/debian/copyright	2021-09-02 06:33:07.000000000 +0000
@@ -5,9 +5,16 @@
  *.dll have been removed as they do not meet the DFSG
 
 Files: *
-Copyright: 2002,2003 Thomas Hudson,Juraj Michalek
+Copyright: 2002,2003,2020 Thomas Hudson,Juraj Michalek, Bruno Victal
 License: GPL-2+
 
+Files: io.sourceforge.atanks.metainfo.xml
+Copyright: 2020 Bruno Victal <ubr47k@users.sourceforge.net>
+License: CC0-1.0
+ On Debian systems the complete license text of the CC0 1.0 Universal license
+ can be found in /usr/share/common-licenses/CC0-1.0
+
+
 Files: src/extern/*
 Copyright: Kevlin Henney (kevlin@acm.org, kevlin@curbralan.com)
 License: permissive
@@ -19,7 +26,7 @@
 
 Files: debian/*
 Copyright: Mark Purcell <msp@debian.org>
-           2016-2020, Markus Koschany <apo@debian.org>
+           2016-2021, Markus Koschany <apo@debian.org>
 License: GPL-2+
 
 Files: debian/atanks.6
diff -Nru atanks-6.5~dfsg/debian/patches/freebsd-hurd.patch atanks-6.6~dfsg/debian/patches/freebsd-hurd.patch
--- atanks-6.5~dfsg/debian/patches/freebsd-hurd.patch	2020-11-14 21:29:30.000000000 +0000
+++ atanks-6.6~dfsg/debian/patches/freebsd-hurd.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,74 +0,0 @@
-From: Markus Koschany <apo@debian.org>
-Date: Sun, 27 Nov 2016 22:39:17 +0100
-Subject: freebsd hurd
-
-Define PATH_MAX for Hurd port and do not bail out if we build on GNU/Hurd or
-kFreeBSD.
-
-Debian-Bug: https://bugs.debian.org/845924
----
- src/debug.h       | 4 ----
- src/environment.h | 3 +++
- src/files.h       | 4 ++++
- src/main.h        | 4 ++++
- 4 files changed, 11 insertions(+), 4 deletions(-)
-
-diff --git a/src/debug.h b/src/debug.h
-index d86b1df..7cda2ad 100644
---- a/src/debug.h
-+++ b/src/debug.h
-@@ -26,10 +26,6 @@
- # define ATANKS_IS_LINUX
- #endif // Linux
- 
--#if !defined(ATANKS_IS_WINDOWS) && !defined(ATANKS_IS_LINUX)
--# error "Only Windows, Linux and BSD are supported at the moment"
--#endif // Windows versus Linux
--
- 
- /**********************************************************
-  * Define some macros to work around compiler differences *
-diff --git a/src/environment.h b/src/environment.h
-index 5934ee3..7c166c6 100644
---- a/src/environment.h
-+++ b/src/environment.h
-@@ -33,6 +33,9 @@ class VIRTUAL_OBJECT;
- class TANK;
- class PLAYER;
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
- 
- #ifndef HAS_DIRENT
- #  if defined(ATANKS_IS_MSVC)
-diff --git a/src/files.h b/src/files.h
-index a71dd23..e101fcb 100644
---- a/src/files.h
-+++ b/src/files.h
-@@ -19,6 +19,10 @@
- #include "environment.h"
- #include "text.h"
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- /* Global path buffer */
- extern char path_buf[PATH_MAX + 1];
- 
-diff --git a/src/main.h b/src/main.h
-index 1f3fd89..287765e 100644
---- a/src/main.h
-+++ b/src/main.h
-@@ -20,6 +20,10 @@
-  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-  * */
- 
-+#ifndef PATH_MAX
-+#define PATH_MAX 4096
-+#endif
-+
- #ifndef VERSION
- #  error "VERSION information is missing. Fix Makefile."
- #endif
diff -Nru atanks-6.5~dfsg/debian/patches/series atanks-6.6~dfsg/debian/patches/series
--- atanks-6.5~dfsg/debian/patches/series	2020-11-14 21:29:30.000000000 +0000
+++ atanks-6.6~dfsg/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-freebsd-hurd.patch
diff -Nru atanks-6.5~dfsg/debian/rules atanks-6.6~dfsg/debian/rules
--- atanks-6.5~dfsg/debian/rules	2020-11-14 21:29:30.000000000 +0000
+++ atanks-6.6~dfsg/debian/rules	2021-09-02 06:33:07.000000000 +0000
@@ -2,7 +2,7 @@
 
 DEBVERSION := $(shell head -n 1 debian/changelog \
                     | sed -e 's/^[^(]*(\([^)]*\)).*/\1/')
-UPVERSION := $(shell echo $(DEBVERSION) | sed 's/+dfsg-.//')
+UPVERSION := $(shell echo $(DEBVERSION) | sed 's/~dfsg-.//')
 
 PKG=atanks
 FILENAME := $(PKG)_$(UPVERSION)~dfsg.orig.tar.gz
@@ -16,9 +16,6 @@
 	dh_install -XCOPYING
 	rm -fR $(CURDIR)/debian/atanks-data/usr/share/applications/
 
-override_dh_missing:
-	dh_missing --fail-missing
-
 get-orig-source:
 	@@dh_testdir
 	@@[ -d ../tarballs/. ]||mkdir -p ../tarballs
diff -Nru atanks-6.5~dfsg/debian/watch atanks-6.6~dfsg/debian/watch
--- atanks-6.5~dfsg/debian/watch	2020-11-14 21:29:30.000000000 +0000
+++ atanks-6.6~dfsg/debian/watch	2021-09-02 06:33:07.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/.dfsg// \
-   https://sf.net/atanks/atanks-(.*)\.tar\.(?:gz|bz2) debian svn-upgrade
+   https://sf.net/atanks/atanks-(.*)\.tar\.(?:gz|bz2)
diff -Nru atanks-6.5~dfsg/dep/atanks.d atanks-6.6~dfsg/dep/atanks.d
--- atanks-6.5~dfsg/dep/atanks.d	2016-11-02 14:36:07.000000000 +0000
+++ atanks-6.6~dfsg/dep/atanks.d	2021-06-28 22:47:09.000000000 +0000
@@ -1,8 +1,8 @@
 obj/atanks.o dep/atanks.d : src/atanks.cpp src/debug.h src/globals.h src/globaldata.h \
  src/main.h src/globaltypes.h src/externs.h src/environment.h \
  src/network.h src/gfxData.h src/text.h src/optionscreens.h src/menu.h \
- src/optionitem.h src/optionitembase.h src/optiontypes.h \
- src/optionitemmenu.h src/optionitemplayer.h src/button.h src/player.h \
+ src/optionitem.h src/optionitembase.h src/optiontypes.h src/button.h \
+ src/optionitemmenu.h src/optionitemplayer.h src/player.h \
  src/player_types.h src/files.h src/update.h src/tank.h src/physobj.h \
  src/virtobj.h src/floattext.h src/beam.h src/missile.h src/gameloop.h \
  src/clock.h src/client.h
diff -Nru atanks-6.5~dfsg/dep/gfxData.d atanks-6.6~dfsg/dep/gfxData.d
--- atanks-6.5~dfsg/dep/gfxData.d	2016-11-02 14:36:06.000000000 +0000
+++ atanks-6.6~dfsg/dep/gfxData.d	2021-06-28 23:10:06.000000000 +0000
@@ -1,3 +1,3 @@
 obj/gfxData.o dep/gfxData.d : src/gfxData.cpp src/main.h src/debug.h src/globaltypes.h \
- src/externs.h src/globaldata.h src/text.h src/environment.h \
- src/network.h src/gfxData.h
+  src/externs.h src/globaldata.h src/text.h src/environment.h \
+  src/network.h src/gfxData.h
diff -Nru atanks-6.5~dfsg/dep/optionitemcolour.d atanks-6.6~dfsg/dep/optionitemcolour.d
--- atanks-6.5~dfsg/dep/optionitemcolour.d	2016-11-02 14:36:05.000000000 +0000
+++ atanks-6.6~dfsg/dep/optionitemcolour.d	2021-06-28 22:40:05.000000000 +0000
@@ -1,4 +1,4 @@
 obj/optionitemcolour.o dep/optionitemcolour.d : src/optionitemcolour.cpp src/optionitemcolour.h \
  src/optionitembase.h src/environment.h src/main.h src/debug.h \
  src/globaltypes.h src/externs.h src/globaldata.h src/text.h \
- src/network.h src/gfxData.h src/optiontypes.h
+ src/network.h src/gfxData.h src/optiontypes.h src/button.h
diff -Nru atanks-6.5~dfsg/dep/optionitemmenu.d atanks-6.6~dfsg/dep/optionitemmenu.d
--- atanks-6.5~dfsg/dep/optionitemmenu.d	2016-11-02 14:36:05.000000000 +0000
+++ atanks-6.6~dfsg/dep/optionitemmenu.d	2021-06-28 22:40:04.000000000 +0000
@@ -1,5 +1,5 @@
 obj/optionitemmenu.o dep/optionitemmenu.d : src/optionitemmenu.cpp src/optionitemmenu.h \
  src/optionitembase.h src/environment.h src/main.h src/debug.h \
  src/globaltypes.h src/externs.h src/globaldata.h src/text.h \
- src/network.h src/gfxData.h src/optiontypes.h src/menu.h \
- src/optionitem.h src/optionitemplayer.h src/button.h src/clock.h
+ src/network.h src/gfxData.h src/optiontypes.h src/button.h src/menu.h \
+ src/optionitem.h src/optionitemplayer.h src/clock.h
diff -Nru atanks-6.5~dfsg/dep/optionitemplayer.d atanks-6.6~dfsg/dep/optionitemplayer.d
--- atanks-6.5~dfsg/dep/optionitemplayer.d	2016-11-02 14:36:05.000000000 +0000
+++ atanks-6.6~dfsg/dep/optionitemplayer.d	2021-06-28 22:40:04.000000000 +0000
@@ -1,5 +1,5 @@
 obj/optionitemplayer.o dep/optionitemplayer.d : src/optionitemplayer.cpp src/optionitemplayer.h \
  src/optionitembase.h src/environment.h src/main.h src/debug.h \
  src/globaltypes.h src/externs.h src/globaldata.h src/text.h \
- src/network.h src/gfxData.h src/optiontypes.h src/player.h \
+ src/network.h src/gfxData.h src/optiontypes.h src/button.h src/player.h \
  src/player_types.h src/floattext.h src/virtobj.h
diff -Nru atanks-6.5~dfsg/dep/optionscreens.d atanks-6.6~dfsg/dep/optionscreens.d
--- atanks-6.5~dfsg/dep/optionscreens.d	2016-11-02 14:36:05.000000000 +0000
+++ atanks-6.6~dfsg/dep/optionscreens.d	2021-06-28 22:40:04.000000000 +0000
@@ -1,6 +1,6 @@
 obj/optionscreens.o dep/optionscreens.d : src/optionscreens.cpp src/optionscreens.h src/menu.h \
  src/optionitem.h src/optionitembase.h src/environment.h src/main.h \
  src/debug.h src/globaltypes.h src/externs.h src/globaldata.h src/text.h \
- src/network.h src/gfxData.h src/optiontypes.h src/optionitemmenu.h \
- src/optionitemplayer.h src/button.h src/player.h src/player_types.h \
- src/files.h src/sound.h
+ src/network.h src/gfxData.h src/optiontypes.h src/button.h \
+ src/optionitemmenu.h src/optionitemplayer.h src/player.h \
+ src/player_types.h src/files.h src/sound.h
diff -Nru atanks-6.5~dfsg/dep/player.d atanks-6.6~dfsg/dep/player.d
--- atanks-6.5~dfsg/dep/player.d	2016-11-02 14:36:05.000000000 +0000
+++ atanks-6.6~dfsg/dep/player.d	2021-06-28 22:40:04.000000000 +0000
@@ -2,6 +2,5 @@
  src/globaltypes.h src/externs.h src/globaldata.h src/text.h \
  src/network.h src/gfxData.h src/player.h src/player_types.h src/tank.h \
  src/physobj.h src/virtobj.h src/floattext.h src/menu.h src/optionitem.h \
- src/optionitembase.h src/optiontypes.h src/optionitemmenu.h \
- src/optionitemplayer.h src/button.h src/files.h src/missile.h \
- src/aicore.h
+ src/optionitembase.h src/optiontypes.h src/button.h src/optionitemmenu.h \
+ src/optionitemplayer.h src/files.h src/missile.h src/aicore.h
diff -Nru atanks-6.5~dfsg/dep/tank.d atanks-6.6~dfsg/dep/tank.d
--- atanks-6.5~dfsg/dep/tank.d	2016-11-02 14:36:04.000000000 +0000
+++ atanks-6.6~dfsg/dep/tank.d	2021-06-28 23:15:32.000000000 +0000
@@ -1,5 +1,5 @@
 obj/tank.o dep/tank.d : src/tank.cpp src/floattext.h src/main.h src/debug.h \
- src/globaltypes.h src/externs.h src/globaldata.h src/text.h \
- src/environment.h src/network.h src/gfxData.h src/virtobj.h \
- src/explosion.h src/physobj.h src/teleport.h src/missile.h src/player.h \
- src/player_types.h src/beam.h src/tank.h src/sound.h
+  src/globaltypes.h src/externs.h src/globaldata.h src/text.h \
+  src/environment.h src/network.h src/gfxData.h src/virtobj.h \
+  src/explosion.h src/physobj.h src/teleport.h src/missile.h \
+  src/player.h src/player_types.h src/beam.h src/tank.h src/sound.h
diff -Nru atanks-6.5~dfsg/io.sourceforge.atanks.metainfo.xml atanks-6.6~dfsg/io.sourceforge.atanks.metainfo.xml
--- atanks-6.5~dfsg/io.sourceforge.atanks.metainfo.xml	1970-01-01 00:00:00.000000000 +0000
+++ atanks-6.6~dfsg/io.sourceforge.atanks.metainfo.xml	2021-06-28 23:22:07.000000000 +0000
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright 2020 Bruno Victal <ubr47k@users.sourceforge.net> -->
+<component type="desktop-application">
+  <metadata_license>CC0-1.0</metadata_license>
+​  <project_license>GPL-2.0-or-later</project_license>
+  <id>io.sourceforge.atanks</id>
+  <name>Atomic Tanks</name>
+  <summary>Multi-platform Scorched Earth clone similar to the Worms series of games</summary>
+  <description>
+    <p>
+      Annihilate the other tanks to earn money, then spend it on bigger and
+      better shields and weapons to wipe out the opposition.
+    </p>
+    <p>
+      Features a wide array of weapons, AI players, destructible landscape,
+      weather, parachutes, teleports and a wide range of other features.
+    </p>
+    <p>
+      Runs on any platform Allegro4 runs on, including Linux, Windows and Mac OS X.
+    </p>
+  </description>
+
+  <screenshots>
+    <screenshot type="default">
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot29.png</image>
+    </screenshot>
+    <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot28.png</image>
+    </screenshot>
+      <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot30.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot27.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot19.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot20.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot21.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot22.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot23.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot24.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot25.png</image>
+    </screenshot>
+        <screenshot>
+      <image>https://atanks.sourceforge.io/Screenshots/scrnshot26.jpg</image>
+    </screenshot>
+  </screenshots>
+
+  <url type="homepage">https://atanks.sourceforge.io</url>
+  <url type="bugtracker">https://sourceforge.net/p/atanks/bugs/</url>
+
+  <update_contact>ubr47k@users.sourceforge.net</update_contact>
+  <update_contact>jessefrgsmith@yahoo.ca</update_contact>
+
+  <launchable type="desktop-id">atanks.desktop</launchable>
+  <provides>
+    <binary>atanks</binary>
+  </provides>
+
+  <releases>
+    <release version="6.5" date="2016-11-02"/>
+  </releases>
+
+  <categories>
+    <category>Game</category>
+    <category>ArcadeGame</category>
+  </categories>
+
+  <content_rating type="oars-1.1">
+    <content_attribute id="language-profanity">mild</content_attribute>
+    <content_attribute id="language-humor">mild</content_attribute>
+  </content_rating>
+</component>
diff -Nru atanks-6.5~dfsg/Makefile atanks-6.6~dfsg/Makefile
--- atanks-6.5~dfsg/Makefile	2016-11-02 14:44:56.000000000 +0000
+++ atanks-6.6~dfsg/Makefile	2021-08-12 00:31:05.000000000 +0000
@@ -1,7 +1,7 @@
 .PHONY: all install clean veryclean user winuser osxuser ubuntu \
 dist tarball zipfile source-dist i686-dist win32-dist
 
-VERSION := 6.5
+VERSION := 6.6
 
 
 DEBUG   ?= NO
@@ -302,6 +302,8 @@
 install: $(TARGET)
 	$(INSTALL) -d $(DESTDIR)${BINDIR}
 	$(INSTALL) -m 755 atanks $(DESTDIR)${BINDIR}
+	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/metainfo
+	$(INSTALL) -m 644 io.sourceforge.atanks.metainfo.xml $(DESTDIR)$(PREFIX)/share/metainfo
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/applications
 	$(INSTALL) -m 644 atanks.desktop $(DESTDIR)$(PREFIX)/share/applications
 	$(INSTALL) -d $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
@@ -358,10 +360,10 @@
 dist: source-dist i686-dist win32-dist
 
 tarball: veryclean
-	cd .. && tar czf $(FILENAME).tar.gz $(FILENAME) --exclude=.git
+	cd .. && tar --create --file $(FILENAME).tar.gz --auto-compress --exclude-vcs $(FILENAME) 
 
 zipfile: veryclean
-	cd .. && zip -r $(FILENAME)-source.zip $(FILENAME) -x *.git*
+	cd .. && zip -r $(FILENAME)-source.zip $(FILENAME) -x '*.git*'
 
 source-dist: $(TARGET)
 	cd ../; \
diff -Nru atanks-6.5~dfsg/README atanks-6.6~dfsg/README
--- atanks-6.5~dfsg/README	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/README	2016-11-02 14:57:52.000000000 +0000
@@ -1,186 +1,179 @@
 README file for Atomic Tanks
 ============================================
 
+
 What is Atomic Tanks?
 ========================
 
-Atomic Tanks is a game in which you control an overly-powerful
-tank and attempt to blow up other highly powerful tanks. Players
-get to select a number of weapons and defensive items and then
-attack each other in a turn-based manner. The last tank standing
-is the winner.
+Atomic Tanks is a game in which you control an overly-powerful tank and attempt
+to blow up other highly powerful tanks. Players get to select a number of
+weapons and defensive items and then attack each other in a turn-based manner.
+The last tank standing is the winner.
 
 
 
 How to I get/install Atomic Tanks?
 ===================================
 
-To gain a copy of Atomic Tanks, go to our
-website at http://atanks.sourceforge.net
-Click on the "Download" link and select the
-latest version of Atanks.
-
-Note: If you have a pre-compiled (binary) copy
-of Atomic Tanks, you will need the Allegro graphic
-package. See http://allegro.cc/
-Also, if you are going to compile/build Atomic Tanks
-from source code, you will need the Allegro development
-package. These packages can be found at
-http://allegro.cc/files/
-Please also note, those of you running Linux can
-usually get Allegro packages through your distribution's
-package manager. These packages are named (at least on Fedora)
-"allegro" and "allegro-devel" respectively. Debian
-uses, I think, "allegro" and "allegro-dev".
-
-
-If you are using a pre-built, binary copy of Atomic Tanks,
-please see the next section on running the game. Next
-we will cover compiling from source.
-
-
-To compile Atomic Tanks, please make sure you have
-the Allegro libraries installed (see above). Next,
-open a command console (shell) and move into the
-directory containing the Atomic Tanks package.
-This file will probably be named "atanks-5.6.tar.gz".
+To gain a copy of Atomic Tanks, go to our website at
+   http://atanks.sourceforge.net
+Click on the "Download" link and select the latest version of Atanks.
+
+Note: If you have a pre-compiled (binary) copy of Atomic Tanks, you will need
+      the Allegro graphic package.
+      See : http://allegro.cc/
+      Also, if you are going to compile/build Atomic Tanks from source code, you
+      will need the Allegro development package.
+
+If you are using a pre-built, binary copy of Atomic Tanks, please see the next
+section on running the game. Next we will cover compiling from source.
+
+
+To compile Atomic Tanks, please make sure you have the Allegro libraries and
+headers installed (see above).
+Next, open a command console (shell) and move into the directory containing the
+Atomic Tanks package. This file will probably be named "atanks-6.5.tar.gz".
 Then run the following commands:
 
-tar zxf atanks-6.0.tar.gz
-cd atanks-6.0
+tar zxf atanks-6.5.tar.gz
+cd atanks-6.5
 
 Now it depends on your preferences:
 
-Default linux installation.
-The Binary goes to: /usr/games/bin
+1) Default linux installation :
+The Binary goes to  : /usr/bin
 The data files go to: /usr/share/games/atanks
 
 make
 make install
 
-Linux User installation, where everything stays in
-the atanks folder:
+If you are on Ubuntu, or one of Ubuntu's children distributions, and encounter
+sound problems, you can try to to fix this by building and installing Atanks
+with:
 
-make
+make ubuntu
+make install ubuntu
 
-Windows User installation where everything stays in
-the atanks folder:
+2) Linux User installation, where everything stays in the atanks folder :
+
+make user
+
+3) Windows User installation where everything stays in the atanks folder :
 
 make winuser
 
-OSX User installation where everything stays in
-the atanks folder:
+4) OSX User installation where everything stays in the atanks folder :
 
 make osxuser
-(BSD or OS X users may wish to use "gmake osxuser" instead.)
+(You may wish to use "gmake osxuser" instead.)
 
-For people compiling on Ubuntu (or one of Ubuntu's children distributions)
-please compile with
 
-make ubuntu
+Now we can get to running the game. If you encounter an error while running
+"make", then please see the last section of this document, which covers
+reporting bugs.
 
-Now we can get to running the game. If you encounter
-an error while running "make", then please see the
-last section of this document, which covers reporting
-bugs.
 
+How to adapt build and installation paths
+=========================================
 
+There are two different variables which influence how Atanks is built and
+installed. Both are important to package managers in the first place:
 
+PREFIX - This defaults to /usr and influences the basic path. If you would like
+         to install into /usr/local instead, simply call:
+         make PREFIX=/usr/local
+         make install PREFIX=/usr/local
+
+DESTDIR - This defaults to an empty string and can be set for build roots, just
+          like the prefix. If you do not know what that means, you do not need
+          it. ;-)
 
 
 How do I run Atomic Tanks?
 ====================================
 
-You can run the atanks file by typing "./atanks"
-from a command line, or double-clicking the file
-in a file browser. Atomic Tanks tries to use
-reasonable defaults, so there is rarely a need to
-use the command-line options. However, Atomic Tanks
-supports the following options:
-
-./atanks -h   (Print list of credits, command-line options and exit.)
-./atanks -fs  (Run the game using the entire screen. Full screen mode.)
-./atanks --windowed  (Run the game in a window. This is the default).
-./atanks --nosound  (Run the game without sound. Sound is on by default.)
-./atanks --noname   (Do not display player names over the tanks.)
-./atanks --width <number>  (Run the game in a window with a set width in pixels.)
-./atanks --tall <number>  (Run the game in a window with a set height in pixels.)
-./atanks --datadir <data directory>  (Path to the directory with Atank's data files.)
-./atanks --depth <number>  (Sets pixel depth. Use either 16 or 32 here.)
-./atanks --noconfig   (Resets all config options back to defaults.)
-./atanks --nonetwork  (Prevents atanks from setting up a server.)
-./atanks --nobackground  (Does not display the green menu background. May prevent crashes on 64-bit.)
-./atanks --nothread   (Stops threads for running in the background.)
-./atanks --thread     (Enabled use of threads to speed up things.)
-
-Most of these options can be used together, with the exception of "-fs"
-for full screen mode. Simply running "./atanks" is the same as running
-Atomic Tanks with the following options:
+You can run the atanks file by typing "./atanks" from a command line, or by
+double-clicking the file in a file browser.
+Atomic Tanks tries to use reasonable defaults, so there is rarely a need to use
+the command-line options. However, Atomic Tanks supports the following options:
+
+-h  --help           Show this help screen
+-fs                  Full screen
+    --windowed       Run in a window
+-w  --width <width>  Specify the screen width in pixels
+-t  --tall  <height> Specify the screen height in pixels
+                     Adjust the screen size at your own risk
+                     (default is 800x600)
+-d  --depth <depth>  Colour depths, currently either 16 or 32 bit
+    --datadir <path> Path to the data directory
+-c <path>            Path to config and saved game directory
+    --noconfig       Do not load game settings.
+    --nosound        Disable sound
+    --noname         Do not show player name above tank
+    --nonetwork      Disable network connections.
+    --nobackground   Do not display the green menu background.
+
+Most of these options can be used together, with the exception of "-fs" for full
+screen mode. Simply running "./atanks" is the same as running Atomic Tanks with
+the following options:
 ./atanks --windowed --width 800 --tall 600 --datadir . depth 32
 
-Please note that as of version 4.3, threads are disabled by default. Use
-the "--thread" flag to enable background threads.
-
-
 
 How do I go about creating a player for myself?
 ================================================
 
-when you first run Atomic Tanks, the first thing you'll need to
-do is create a player/tank for youself. Click on the "Players"
-button and click "Create New". Enter the name you want and
-pick the colour you'd like your tank to be. That's all you'll
-need to do. Click the "Okay" button. Then click the
-"Back" button and, most importantly, click "Play"!
-
-Once you click play, you'll have a chance to select which
-tanks you'll be playing against. You can get anywhere from 2
-to 10 tanks on the playing field at one time. Don't forget
-to select yourself!
-
-The next screen gives you a chance to buy weapons and defensive
-items. There is no perfect combination, so experiment a little.
-You can buy an item (assuming you have enough funds) by
-left-clicking on the item. To sell the item, right-click on
-the item. When you've completed your selection, click "Done".
+when you first run Atomic Tanks, the first thing you'll need to do is to create
+a player/tank for yourself. If you haven't created a human player, yet, the game
+will present you with the player creation screen automatically. Otherwise click
+on the "Players" button and click "Create New". Enter the name you want and pick
+the colour you'd like your tank to be.
+The teams "Jedi" and "Sith" mean that their members work (somewhat) together,
+while the neutral tanks are all on their own. The "Jedi" AI is a bit more social
+and defensive, while the "Sith" AI is a bit more individualistic and aggressive.
+
+That's all you'll need to do. Click the "Okay" button. Then click the "Back"
+button and, most importantly, click "Play"!
+
+Once you click play, you'll have a chance to select which tanks you'll be
+playing against. You can get anywhere from 2 to 10 tanks on the playing field at
+one time. Don't forget to select yourself!
+
+The next screen gives you a chance to buy weapons and defensive items. There is
+no perfect combination, so experiment a little.
+You can buy an item (assuming you have enough funds) by left-clicking on the
+item. To sell the item, right-click on the item. When you've completed your
+selection, click "Done".
 
 The final screen you'll see is where the action takes place!
-Use the left and right arrow buttons on your keyboard to
-aim your tank's gun. The up and down arrow keys adjust the
-speed (power) of the shot. The space bar fires the tanks gun. If
-you want to change which weapon you will be using, press the
-TAB button or the BACKSPACE button. The round is over when
-there is one tank left standing.
-
-
-
+Use the left and right arrow buttons on your keyboard to aim your tank's gun.
+The up and down arrow keys adjust the speed (power) of the shot. The space bar
+fires the tanks gun. If you want to change which weapon you will be using, press
+the TAB button or the BACKSPACE button. The round is over when there is one tank
+left standing.
 
 
 Keyboard Controls
 =========================================
 
-Atomic Tanks tries to be keybaord friendly and much of
-the tank's controls require the keyboard. Here is a quick
-over-view of which keys do what:
-
-SPACEBAR -- Fires weapons and selects/toggles menu items.
-ENTER -- Is similar to pressing the OK button on a menu.
-UP/DOWN arrows -- Adjusts tank power and cycles through menu items. Scrolls on the buying screen.
-LEFT/RIGHT arrows -- Aim the tank's gun. Also buys and sells on the buying screen or adjusts values in menus.
-ESC  -- Cancel out of a menu.
-
-F1   -- Take a screenshot
-
-F10  -- Tells the computer to take over your tank for the remainder of the round.
-        Also saves games when on the buying screen.
-
-V, v -- The "v" key controls the volume during matches. Pressing lower-case "v"
-        decreases the volume and upper-case "V" increases the volume.
-
-~    -- Show/hide the scoreboard during rounds. On german (and possibly other)
-        keyboards the scoreboard is switched with the key '#'.
-
+Atomic Tanks tries to be keyboard friendly and much of the tank's controls
+require the keyboard. Here is a quick overview of which keys do what:
 
+SPACEBAR   -- Fires weapons and selects/toggles menu items.
+ENTER      -- Is similar to pressing the OK button on a menu.
+UP/DOWN    -- Adjusts tank power, cycles through menu items and scrolls on the
+              buying screen.
+LEFT/RIGHT -- Aim the tank's gun. Also buys and sells on the buying screen or
+              adjusts values in menus.
+ESC        -- Cancel out of a menu.
+F1         -- Takes a screenshot.
+F10        -- Tells the computer to take over your tank for the remainder of the
+              round.
+              Also saves games when on the buying screen.
+V, v       -- The "v" key controls the volume during matches. Pressing
+              lower-case "v" decreases the volume and upper-case "V" increases
+              the volume.
+~          -- Show/hide the scoreboard during rounds. On german (and possibly
+              other) keyboards the scoreboard is switched with the key '#'.
 
 
 How to play a game over a network?
@@ -193,56 +186,60 @@
 Playing over a network requires two or more people. One person must be the Host
 and the other person is the Client. If you are hosting the game, make sure
 you have networking enabled. To check this, go into the Options menu and select
-the Network option. Make sure "Networking" is set to "On". If it was "Off", then change it to "On" and then exit Atanks and re-start the game. Congratulations, you're now running a Host. You can continue to play as you normally would from this point. Clients will connect to your game and take over computer-controled tanks. To connect to you the Clients will need your IP address. To get this, visit the website whatismyip.com.
-
-For clients, to connect to a host, you'll need to first get the IP address of your Host. Once you have that, go to the Option menu and select the Network option. Change the box marked "Server Address" to match the IP address of your Host. Then return to the main menu and click the button labled Network Game. Atanks will then try to connect to the server and introduce you to the game.
-
-Things are still a bit flakey on the Client side. Hopefully it will improve as time goes on.
-
-If the Client cannot connect to the Host, there are a few possible problems. Perhaps there is a firewall in the way? Maybe the Host is using a non-default port number. Perhaps the Client side just isn't working well enough yet. If you run into problems, please let us know about them on the forum.
-
-When you're playing a game (as the client) you'll notice the various tanks
-some in four different colours. The Jedi Team is marked in Green, the
-Sith are marked as Purple, Neutral tanks are Blue and the player's
-tank is indicated with Red. Hopefully this will prevent you from shooting
-your team mates.
-
+the Network option. Make sure "Networking" is set to "On". If it was "Off", then
+change it to "On" and then exit Atanks and re-start the game. Congratulations,
+you're now running a Host. You can continue to play as you normally would from
+this point. Clients will connect to your game and take over computer-controled
+tanks. To connect to you, the Clients will need your IP address. To get this,
+visit the website whatismyip.com.
+
+For clients, to connect to a host, you'll need to first get the IP address of
+your Host. Once you have that, go to the Option menu and select the Network
+option. Change the box marked "Server Address" to match the IP address of your
+Host. Then return to the main menu and click the button labelled Network Game.
+Atanks will then try to connect to the server and introduce you to the game.
+
+Things are still flaky on the Client side. Hopefully it will improve as time
+goes on.
+
+If the Client cannot connect to the Host, there are a few possible problems.
+Perhaps there is a firewall in the way? Maybe the Host is using a non-default
+port number. Perhaps the Client side just isn't working well enough yet. If you
+run into problems, please let us know about them on the forum.
+
+When you're playing a game (as the client) you'll notice the various tanks are
+in four different colours. The Jedi Team is marked in Green, the Sith are marked
+as Purple, Neutral tanks are Blue and the player's tank is indicated with Red.
+Hopefully this will prevent you from shooting your team mates.
 
 
 Known issues
 =========================================
 
-There are some known issues which players should be aware of. We
-are trying to fix these, but in the mean time, it's best to know they
-exist and how to work around them. The issues are, in no particular order.
-
-1. Changing the game's language and then going into the Players menu
-will cause weird text to display and may cause problems. If you change the
-game's language, it's best to Quit the game fro mthe main menu and then
-start Atanks again.
-
-2. The default sound driver doesn't work on Ubuntu Linux and its related
-distributions. If sound isn't working for you, go into the Options menu,
-select Sound. Make sure Sound is turned on and that the Sound Driver is
-switched from AutoDetect to OSS. Then return to the main menu, Quit and
-then re-start the game. If this doesn't resolve the issue, then Quit the
-game and delete all of the files and folders in your computer's /tmp
-folder with the name "pulse".
-
-3. The client side of the network games is buggy. We're working on that.
-
-
+There are some known issues which players should be aware of. We are trying to
+fix these, but in the mean time, it's best to know they exist and how to work
+around them. The issues are, in no particular order.
+
+1. The default sound driver doesn't work on Ubuntu Linux and its related
+distributions. If sound isn't working for you, go into the Options menu, select
+Sound. Make sure Sound is turned on and that the Sound Driver is switched from
+AutoDetect to OSS. Then return to the main menu, Quit and then re-start the
+game. If this doesn't resolve the issue, then Quit the game and delete all of
+the files and folders in your computer's /tmp folder with the name "pulse".
 
+2. The client side of the network games is buggy. We're working on that.
 
 
 Where do I report bugs or send requests?
 =========================================
 
 Atomic Tanks is a great game, but it isn't perfect.
-We, the developers, are always trying to improve the
-experience our game brings to you. If you have
-a problem with installing or playing Atomic Tanks,
-please let us know. Mail me at jessefrgsmith@yahoo.ca
-We encourage you to give your feedback. Please give
-as many details as possible so we can help you.
+We, the developers, are always trying to improve the experience our game brings
+to you. If you have a problem with installing or playing Atomic Tanks, please
+let us know.
+We have a bug tracker on xxx, where issues can be recorded, tracked, and
+discussed.
+Or mail the project lead at jessefrgsmith@yahoo.ca
+We encourage you to give your feedback. Please give as many details as possible
+so we can help you.
 
diff -Nru atanks-6.5~dfsg/src/aicore.cpp atanks-6.6~dfsg/src/aicore.cpp
--- atanks-6.5~dfsg/src/aicore.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/aicore.cpp	2021-08-11 23:30:44.000000000 +0000
@@ -73,6 +73,7 @@
 {
 	int32_t         amount     = 0;     //!< Number of weapons in stock.
 	bool            blastOut   = false; //!< Set to true if blasting out points are awarded.
+	int32_t         delay      = 0;     //!< Used to track delayed weapons.
 	double          dmgCluster = 0.;    //!< Cluster full damage.
 	double          dmgSingle  = 0.;    //!< Single shot damage.
 	double          dmgSpread  = 0.;    //!< Spread full damage.
@@ -174,6 +175,8 @@
 
 /// @brief AICore default constructor
 AICore::AICore() :
+	canMove(ATOMIC_VAR_INIT(true)),
+	isMovedBy(ATOMIC_VAR_INIT(0)),
 	textAllowed(ATOMIC_VAR_INIT(true))
 {
 	// As the opponent counts, and both weapons and items
@@ -197,6 +200,12 @@
 
 	/// 2) Opponents
     for (int32_t i = 0; canWork && (i < env.numGamePlayers); ++i) {
+		// Look for highest AI type
+		if ( (env.players[i]->type <= DEADLY_PLAYER)
+		  && (env.players[i]->type >  bestType) )
+			bestType = env.players[i]->type;
+
+		// Create memory chain
 		try {
 			mem_curr = new opEntry_t(mem_last);
 			if (!mem_head)
@@ -263,9 +272,11 @@
 /** @brief aim the current selection
   * @param[in] is_last if set to true, the best result is accepted, no matter
   * what the outcome might be.
+  * @param[in] can_move if set to true, the AI might try to move the tank into
+  * a better position.
   * @return true if the aiming resulted in a usable hit.
 **/
-bool AICore::aim(bool is_last)
+bool AICore::aim(bool is_last, bool can_move)
 {
 	plStage = PS_AIM;
 
@@ -321,6 +332,32 @@
 		              attempt, findRngAttempts,
 		              GET_DISP_ANGLE(curr_angle), curr_power)
 
+		// Lower ang_mod and pow_mod if the last overshoot isn't that high
+		int32_t abs_last_overshoot = std::abs(last_overshoot);
+		int32_t max_ang_mod        = abs_last_overshoot / (ai_level * 20) + 1;
+		int32_t max_pow_mod        = abs_last_overshoot / (ai_level *  5) + 5;
+
+		// max_pow_mod must be a power of five
+		max_pow_mod += max_pow_mod % 5;
+
+		if (ang_mod > max_ang_mod) {
+			DEBUG_LOG_AIM(player->getName(),
+			              " => ang_mod too high (%d / %d) ; reducing...",
+			              ang_mod, max_ang_mod)
+			ang_mod = max_ang_mod;
+		}
+
+		// pow_mod must be a power of five
+		pow_mod += pow_mod % 5;
+
+		if (pow_mod > max_pow_mod) {
+			DEBUG_LOG_AIM(player->getName(),
+			              " => pow_mod too high (%d / %d) ; reducing...",
+			              pow_mod, max_pow_mod)
+			pow_mod = max_pow_mod;
+		}
+
+
 		// See where we are going:
 		traceWeapon(has_crashed, has_finished);
 		hit_score = calcHitScore(is_last && needSuccess);
@@ -361,6 +398,20 @@
 			pow_mod = (last_pow_mod + pow_mod) / 2 * SIGN(best_overshoot);
 		}
 
+		// Otherwise a movement might be in order
+		else if ( canMove // No failed or finished moving done, yet
+		       && can_move // Half of the oppAttempts are off
+		       && (attempt >= (findRngAttempts / 2)) // Half the aiming, too
+		       && (buried < BURIED_LEVEL) // Not buried
+		       && (!best_prime_hit || (best_score <= 0)) // nothing achieved here
+		       && needSuccess // nothing achieved otherwise so far
+		       && moveTank() /* movement done */ ) {
+			// Reclaim this attempt
+			--attempt;
+			// And continue, we need to retrace the weapon
+			continue;
+		}
+
 
 		// The outcome has to be checked:
 		if (canWork && !isStopped) {
@@ -373,7 +424,7 @@
 			 *    is too steep or flat.
 			 * B) With steel or wrap wall the shot might crash into
 			 *    a wrap ceiling or the wall and ceiling made of steel.
-			 *    Generally this can only fixed by lowering power and
+			 *    Generally this can only be fixed by lowering power and
 			 *    getting away from 45° angles.
 			 * C) The hit is nearer than the last one.
 			 *    This is good. If it even has a positive hit_score,
@@ -488,6 +539,18 @@
 							  ang_mod)
 			}
 
+			// Otherwise check if we actually reach a non-steel wall if the
+			// shot was flipped.
+			else if ( hasFlipped
+			       && (std::abs(curr_overshoot) > std::abs(mem_curr->opX - x))
+			       && (SIGN(reached_x - x) != SIGN(mem_curr->opX - x))) {
+				DEBUG_LOG_AIM(player->getName(),
+				              "Flip shot failed, flipping back from %d° to %d°",
+				              GET_DISP_ANGLE(curr_angle),
+				              GET_DISP_ANGLE(FLIP_ANGLE(curr_angle)))
+				curr_angle = FLIP_ANGLE(curr_angle);
+				hasFlipped = false;
+			}
 
 			// Power modification can be modified by a difference between
 			// the overshoot and the actual modification according to
@@ -506,8 +569,13 @@
 
 				pow_mod += power_diff * focusRate / 2. * SIGNd(pow_mod);
 
+				if (std::abs(pow_mod) > max_pow_mod)
+					pow_mod = max_pow_mod * SIGN(pow_mod);
+
 				DEBUG_LOG_AIM(player->getName(),
-				              "Hopefully fixed power mod: %d",
+				              std::abs(pow_mod) == max_pow_mod
+				              ? "pow_mod %d at maximum!"
+				              : "Hopefully fixed power mod: %d",
 				              pow_mod)
 			}
 
@@ -654,6 +722,7 @@
 {
 	bool is_last   = ((attempt == findTgtAttempts) && needSuccess);
 	plStage        = PS_CALCULATE;
+	hasFlipped     = false;
 	isBlocked      = false;
 	needAim        = false;
 	curr_overshoot = MAX_OVERSHOOT;
@@ -785,8 +854,8 @@
 
 	bool    crashed   = true; // Assume the shot crashed in the ceiling
 	bool    finished  = false;
-	int32_t reached_x = x;
-	int32_t reached_y = y;
+	int32_t local_x   = x;
+	int32_t local_y   = y;
 	double  end_xv    = 0.;
 	double  end_yv    = 0.;
 	bool    can_mod_a = true;
@@ -798,7 +867,7 @@
 	// Cycle until the ceiling isn't hit any more.
 	while ( canWork && !isStopped && crashed
 		&& (can_mod_a || can_mod_p)
-		&& traceShot(curr_angle, finished, top_wrap, reached_x, reached_y,
+		&& traceShot(curr_angle, 0, finished, top_wrap, local_x, local_y,
 	                 end_xv, end_yv)
 		&& finished ) {
 
@@ -808,14 +877,14 @@
 
 		crashed = false;
 
-		if ( (reached_y <= BOXED_TOP) // crashed on top
+		if ( (local_y <= BOXED_TOP) // crashed on top
 		    // wrapped to bottom with dirt above is a ceiling crash, too.
 		  || ( top_wrap && !can_dig // (Unless a penetrator trick shot is tried)
-		    && (reached_y > global.surface[reached_x].load()) )
+		    && (local_y > global.surface[local_x].load()) )
 		    // Steel wall have additional wall crashes
 		  || ( (WALL_STEEL == env.current_wallType)
-		    && ( (reached_x <= 2)
-		      || (reached_x >= (env.screenWidth - 3) ) ) ) ) {
+		    && ( (local_x <= 2)
+		      || (local_x >= (env.screenWidth - 3) ) ) ) ) {
 
 			crashed = true;
 
@@ -864,7 +933,7 @@
 	  && (-curr_overshoot > (mem_curr->distance / 3 * 2)) ) {
 		// Note: With big weapons an near opponents, the radius might
 		// be larger than two thirds the distance, hence two checks.
-		bool free_tank = FABSDISTANCE2(x, y, reached_x, reached_y)
+		bool free_tank = FABSDISTANCE2(x, y, local_x, local_y)
 		                 < weapon[RIOT_CHARGE].radius;
 
 		if (useFreeingTool(free_tank, is_last)) {
@@ -1332,6 +1401,13 @@
 	curr_prime_hit = false;
 	// Note: calcHitDamage() sets curr_prime_hit to true if we hit our target.
 
+	// reset virtual damage on opponents.
+	opEntry_t* opp = mem_head;
+	while (opp) {
+		opp->dmgDone = 0;
+		opp = opp->next;
+	}
+
 	calcHitDamage(end_x, end_y, weapon[weap_curr->type].radius,
 	              weap_curr->dmgSingle, static_cast<weaponType>(weap_curr->type));
 	int32_t hit_score = calcHitScore(is_last && needSuccess);
@@ -1343,8 +1419,10 @@
 
 		// ...unless this is a forced success ...
 		if (is_last)
+                {
 			// at least reduce the score.
-			hit_score = hit_score;
+			// hit_score = hit_score;
+                }
 		else {
 			curr_angle       = old_angle;
 			curr_power       = old_power;
@@ -1646,7 +1724,7 @@
 bool AICore::calcStandard(bool is_last, bool allow_flip_shot)
 {
 	bool result = calcOffset(is_last);
-	needAim = true;
+	needAim     = true;
 
 
 	// --- 1) Get a basic raw angle firing directly ---
@@ -1681,8 +1759,8 @@
 	// ------------------------------------------------------------
 	double angle_mod = (rand() % 13) * focusRate // useless: 0-2, deadly+1: 0-12
 	                 * ((rand() % 2) ? -1. : 1.);
-	while ( (std::abs(angle_mod > 0.))
-	     && ( ( (new_angle > 180)
+	while ( ( std::abs(angle_mod) > 0. )
+	      && ( ( (new_angle > 180)
 	         && ( ( (new_angle + angle_mod) < 190)
 	           || ( (new_angle + angle_mod) > 260) ) )
 	       || ( (new_angle < 180)
@@ -1708,6 +1786,7 @@
 
 		if (std::abs(wrapDist) < std::abs(dist_x)) {
 			wrapped    = true;
+			hasFlipped = true;
 			dist_x     = wrapDist;
 			new_angle = FLIP_ANGLE(new_angle);
 
@@ -1752,7 +1831,8 @@
 		              GET_DISP_ANGLE(new_angle))
 
 		// wrap / unwrap
-		wrapped = !wrapped;
+		wrapped    = !wrapped;
+		hasFlipped = wrapped;
 	}
 
 
@@ -2262,7 +2342,7 @@
 		if ( -1 < (pref = player->getItemPref(idx) ) ) {
 			item_curr->amount     = player->ni[idx];
 			item_curr->preference = pref;
-			item_curr->selectable = item[idx].selectable;
+			item_curr->selectable = item[idx].selectable ? true : false;
 			item_curr->type       = idx;
 
 			// The kamikaze value is only pre-set to true for vengeance
@@ -2453,6 +2533,11 @@
 
 			weap_curr->amount     = player->nm[idx];
 
+			// Chain missiles and such have a delay of the same count they shoot
+			// missiles. However, weapons without a delay get a value of 1 here,
+			// so looping in traceWeapon() is much simpler.
+			weap_curr->delay      = weapon[idx].delay > 0 ? weapon[idx].delay : 1;
+
 			// To be able to track weapons that trigger other sub munitions,
 			// their configuration must be remembered, too:
 			weap_curr->subMunCount= weapon[idx].numSubmunitions;
@@ -2778,11 +2863,41 @@
 }
 
 
+/** @brief Signal the AI that the tank was moved
+  *
+  * The direction signals the following:
+  *
+  * < 0 : Moved to the left
+  * = 0 : Movement not possible
+  * > 0 : Moved to the right.
+  *
+  * @param[in] direction indicate movement direction
+**/
+void AICore::hasMoved(int32_t direction)
+{
+	if (direction) {
+		isMovedBy.store(direction, ATOMIC_WRITE);
+		canMove.store(true, ATOMIC_WRITE);
+	} else {
+		isMovedBy.store(0, ATOMIC_WRITE);
+		canMove.store(false, ATOMIC_WRITE);
+	}
+
+}
+
+
 /// @brief initialize work with the current players data
 bool AICore::initialize()
 {
 	DEBUG_LOG_AI(player->getName(), "Starting think work, setting up.", 0)
 
+#if defined(ATANKS_IS_WINDOWS)
+	// Here srand() is thread local according to MSDN.
+	// This affects cygwin/mingw builds, too.
+	// Thanks to billy Buerger for pointing this out!
+	srand(time(nullptr));
+#endif // Microsoft Windows Build
+
 	/// === Step 1 : Copy relevant data ===
 	ai_level      = static_cast<int32_t>(player->type);
 	ai_level_d    = static_cast<double>(ai_level);
@@ -2792,6 +2907,8 @@
 	blast_med     = 0.;
 	blast_big     = 0.;
 	blast_max     = 0.;
+	canMove.store(true, ATOMIC_WRITE);
+	isMovedBy.store(0, ATOMIC_WRITE);
 	isShocked     = false;
 	revengee      = nullptr;
 	shocker       = nullptr;
@@ -2843,6 +2960,7 @@
 	// Reset setup values:
 	best_round_score     = NEUTRAL_ROUND_SCORE;
 	best_setup_angle     = angle;
+	best_setup_damage    = 0;
 	best_setup_item      = nullptr;
 	best_setup_mem       = nullptr;
 	best_setup_overshoot = MAX_OVERSHOOT;
@@ -2909,7 +3027,7 @@
 			std::this_thread::yield();
 
 		int32_t y_pos = y - (50 + (rand() % 21));
-		new FLOATTEXT(feedback, x, y_pos, .0, yv, col, CENTRE, text_sway, dur);
+		new FLOATTEXT(feedback, x, y_pos, .0, yv, col, CENTRE, text_sway, dur, false);
 		MSLEEP( (dur / 10) + 1 )
 	}
 }
@@ -3607,7 +3725,7 @@
 		MISSILE mind_shot(player, sub_x, startY,
 		                  env.slope[newMissAngle][0] * speed * env.FPS_mod + inh_xv,
 		                  env.slope[newMissAngle][1] * speed * env.FPS_mod + inh_yv,
-		                  subType, MT_MIND_SHOT, ai_level);
+		                  subType, MT_MIND_SHOT, ai_level, 0);
 		mind_shot.update_submun(subPhys, newMissCount);
 
 		// Keep flying/rolling/digging/whatever until the missile hits something
@@ -3670,6 +3788,8 @@
   *
   * @param[in]  trace_angle The angle to use, normally a spread variation of
   *             curr_angle.
+  * @param[in]  delay_idx Index of this shot in a delayed shot. Used to simulate
+  *             "bombing through" terrain.
   * @param[out] finished true if the mind shot got destroyed before reaching
   *             maxBounce wall bounces/wraps.
   * @param[out] top_wrapped Set to true if the the missile wrapped through a
@@ -3683,7 +3803,7 @@
   * @return true if all went well, false if any new() operator failed. If this
   *         method returns false, the AI can no longer work.
 **/
-bool AICore::traceShot(int32_t trace_angle,
+bool AICore::traceShot(int32_t trace_angle, int32_t delay_idx,
                        bool &finished, bool &top_wrapped,
                        int32_t &reached_x_, int32_t &reached_y_,
                        double &end_xv, double &end_yv)
@@ -3692,6 +3812,7 @@
 	double   top_y        = y;
 	double   vel_mod      = static_cast<double>(curr_power) * env.FPS_mod;
 	double   vel_x        = env.slope[trace_angle][0] * vel_mod / 100.;
+	int32_t  aim_dir      = SIGN(vel_x);
 	double   vel_y        = env.slope[trace_angle][1] * vel_mod / 100.;
 	bool     can_top_wrap = ( env.isBoxed
 	                       && (WALL_WRAP == env.current_wallType)
@@ -3702,7 +3823,7 @@
 	tank->getGuntop(trace_angle, top_x, top_y);
 
 	MISSILE mind_shot(player, top_x, top_y, vel_x, vel_y, weap_idx,
-	                  MT_MIND_SHOT, ai_level);
+	                  MT_MIND_SHOT, ai_level, delay_idx);
 
 	// Adapt missile drag if the player has dimpled/slick projectiles
 	if (player->ni[ITEM_DIMPLEP])
@@ -3745,7 +3866,21 @@
 		int32_t hit_dir  = SIGN(mem_curr->opX - reached_x_);
 		int32_t shot_dir = mind_shot.direction();
 
-		curr_overshoot = ABSDISTANCE2(mem_curr->opX + offset_x,
+		// If the shot was flipped, and is therefore shooting into the opposite
+		// direction of the target, the distance between the impact and the wall
+		// shooting at must be added if the shot went away from the target.
+		// However, this only matters if no bounces have been recorded, yet.
+		int32_t flip_offset = 0;
+		if ( hasFlipped && (aim_dir == shot_dir)
+		  && (WALL_STEEL != env.current_wallType)
+		  && (0 == mind_shot.bounced())) {
+			if (reached_x_ < x)
+				flip_offset = 2 * reached_x_;
+			else
+				flip_offset = 2 * (env.screenWidth - reached_x_);
+		}
+
+		curr_overshoot = ABSDISTANCE2(mem_curr->opX + offset_x + flip_offset,
 		                              mem_curr->opY + offset_y,
 		                              reached_x_, reached_y_);
 
@@ -3801,49 +3936,54 @@
 		reached_x  = x;
 		reached_y  = y;
 
-		if (traceShot(tr_a, finished, top_wrap, curr_reached_x, curr_reached_y,
-		              end_xv, end_yv)
-		  && finished) {
-
-			++has_finished;
-
-			// Check whether the shot crashed
-			if ( ( env.isBoxed
-			    && ( (curr_reached_y <= BOXED_TOP ) // crashed on top
-			    // wrapped to bottom with dirt above is a ceiling crash, too.
-			      || ( top_wrap
-			        && ( (weap_curr->type < BURROWER) || (weap_curr->type > PENETRATOR) )
-				    && (curr_reached_y > global.surface[curr_reached_x].load()) ) ) )
-			  // Steel wall have additional wall crashes
-			  || ( (WALL_STEEL == env.current_wallType)
-			    && (weap_curr->subMunCount < 1) // Clusters never crash
-				&& ( (curr_reached_x <= 2)
-				  || (curr_reached_x >= (env.screenWidth - 3) ) ) ) ) {
-
-				++has_crashed;
-			}
-
-			if (weap_curr->subMunCount > 0) {
-				double inh_xv = weapon[weap_curr->type].impartVelocity * end_xv;
-				double inh_yv = weapon[weap_curr->type].impartVelocity * end_yv;
-				// Trace the cluster parts and add their score:
-				traceCluster(weap_curr->subMunType, weap_curr->subMunCount,
-				             curr_reached_x, curr_reached_y, inh_xv, inh_yv);
-			} else
-				// Calculate a score for the hit, crashes are handled later
-				calcHitDamage(curr_reached_x, curr_reached_y,
-				              static_cast<double>(weap_curr->radius),
-				              weap_curr->dmgSingle,
-				              static_cast<weaponType>(weap_curr->type));
-
-			// Note best overshoot if any
-			if (std::abs(curr_overshoot) < std::abs(trace_overshoot)) {
-				trace_overshoot = curr_overshoot;
-				reached_x       = curr_reached_x;
-				reached_y       = curr_reached_y;
-			}
-		} // End of if traceShot
-	} // end of spread loop
+		// Loop again by delay, weapons that have no delay default to 1 here.
+		for (int32_t j = 0 ;
+			 canWork && !isStopped && (j < weap_curr->delay) ;
+			 ++j) {
+			if (traceShot(tr_a, j, finished, top_wrap, curr_reached_x, curr_reached_y,
+						  end_xv, end_yv)
+			  && finished) {
+
+				++has_finished;
+
+				// Check whether the shot crashed
+				if ( ( env.isBoxed
+				    && ( (curr_reached_y <= BOXED_TOP ) // crashed on top
+				      // wrapped to bottom with dirt above is a ceiling crash, too.
+				      || ( top_wrap
+				        && ( (weap_curr->type < BURROWER) || (weap_curr->type > PENETRATOR) )
+				        && (curr_reached_y > global.surface[curr_reached_x].load()) ) ) )
+				  // Steel wall have additional wall crashes
+				  || ( (WALL_STEEL == env.current_wallType)
+				    && (weap_curr->subMunCount < 1) // Clusters never crash
+				    && ( (curr_reached_x <= 2)
+				      || (curr_reached_x >= (env.screenWidth - 3) ) ) ) ) {
+
+						++has_crashed;
+				} // end of omni-crash-check
+
+				if (weap_curr->subMunCount > 0) {
+					double inh_xv = weapon[weap_curr->type].impartVelocity * end_xv;
+					double inh_yv = weapon[weap_curr->type].impartVelocity * end_yv;
+					// Trace the cluster parts and add their score:
+					traceCluster(weap_curr->subMunType, weap_curr->subMunCount,
+								 curr_reached_x, curr_reached_y, inh_xv, inh_yv);
+				} else
+					// Calculate the damage for the hit, crashes are handled later
+					calcHitDamage(curr_reached_x, curr_reached_y,
+								  static_cast<double>(weap_curr->radius),
+								  weap_curr->dmgSingle,
+								  static_cast<weaponType>(weap_curr->type));
+
+				// Note best overshoot if any
+				if (std::abs(curr_overshoot) < std::abs(trace_overshoot)) {
+					trace_overshoot = curr_overshoot;
+					reached_x       = curr_reached_x;
+					reached_y       = curr_reached_y;
+				}
+			} // End of if traceShot
+		} // End of delay loop
+	} // End of spread loop
 
 	// Write back best data found:
 	curr_overshoot = trace_overshoot;
@@ -4223,7 +4363,8 @@
 	 * --- 6) Add or dock points regarding AI level               ---
 	 * --- More powerful opponents are targeted preferably, while ---
 	 * --- weaker ones are not considered to be such a threat.    ---
-	 * --- Note: Human players are handled like deadly bots.      ---
+	 * --- Note: Human players are handled like the best AI       ---
+	 * ---       that is present in the game.                     ---
 	 * -------------------------------------------------------------- */
 	double level_score = 0.;
 	if (!pOpp->onSameTeam) {
@@ -4231,7 +4372,7 @@
 		  && (LAST_PLAYER_TYPE > opponent->type) )
 			level_score = static_cast<double>(opponent->type - player->type);
 		else
-			level_score = static_cast<double>(DEADLY_PLAYER  - player->type);
+			level_score = static_cast<double>(bestType       - player->type);
 
 		// The higher the self preservation, the more urgent deadlier
 		// bots are targeted to get them down early.
@@ -4368,8 +4509,9 @@
 	}
 
 
-	// === If this is the percent bomb, its damage must be adapted, ===
-	// === as it depends on the selected target.                    ===
+	// === If this is the percent bomb, reducer or theft bomb, its  ===
+	// === damage must be adapted, as it depends on the selected    ===
+	// === target and/or current capabilities.                      ===
 	// ================================================================
 	if (PERCENT_BOMB == wType) {
 		pWeap->dmgCluster = 0.;
@@ -4387,6 +4529,15 @@
 		pWeap->dmgSpread  = pWeap->dmgSingle;
 	}
 
+	// === And the theft bomb ===
+	int32_t theft_size = static_cast<int32_t>(player->damageMultiplier * THEFT_AMOUNT);
+	if (THEFT_BOMB == wType) {
+		double steal_amount = std::min(mem_curr->entry->opponent->money, theft_size);
+		pWeap->dmgCluster = 0.;
+		pWeap->dmgSingle  = ROUND(steal_amount / ai_level_d);
+		pWeap->dmgSpread  = pWeap->dmgSingle;
+	}
+
 
 	/* -------------------------------------------------------------
 	 * --- 1) Set score for reaching the target health           ---
@@ -4404,14 +4555,17 @@
 		dmg_diff = (weap_dmg / ai_over_mod) - point_score;
 		if (dmg_diff > 0.)
 			dmg_diff *= shock_bonus;
-	} else if (pWeap->dmgSpread > pWeap->dmgSingle) {
+	} else if (pWeap->dmgSpread > (pWeap->dmgSingle + 0.25) ) {
 		weap_dmg = pWeap->dmgSpread;
 		dmg_diff = (weap_dmg / (ai_over_mod / 2.)) - point_score;
 		if (dmg_diff > 0.)
 			dmg_diff *= shock_bonus;
 	} else if (pWeap->dmgSingle > 1.) {
 		weap_dmg = pWeap->dmgSingle;
-		dmg_diff = weap_dmg / ai_over_mod - point_score;
+		dmg_diff = weap_dmg / ai_over_mod
+		         - (THEFT_BOMB == wType
+		             ? mem_curr->entry->opponent->money
+		             : point_score);
 	} else
 		dmg_diff = -point_score;
 
@@ -4424,10 +4578,11 @@
 		             / ( -(player->defensive - 2.5) // 3.5 full offensive, 2.5 full defensive
 		               * ai_over_mod ); // the higher the level, the more the reduction.
 
-	// If this is a REDUCER or dirt weapon, and the fake damage is
+	// If this is a REDUCER, THEFT_BOMB or dirt weapon, and the fake damage is
 	// higher than the target health, modify the score. The AI wants
 	// to finish off the almost dead and not debuff them
 	if ( (REDUCER == wType)
+	  || (THEFT_BOMB == wType)
 	  || ( (DIRT_BALL <= wType) && (SMALL_DIRT_SPREAD >= wType) ) ) {
 		if (mem_curr->opLife <= blast_min)
 			point_score = 0;
@@ -4439,6 +4594,11 @@
 			point_score /= ai_over_mod;
 	}
 
+	// If this is the theft bomb, but we do not need money urgently,
+	// reduce the score
+	if ( (THEFT_BOMB == wType) && !needMoney)
+		point_score /= ai_level_d + ai_over_mod;
+
 
 	/* -------------------------------------------------------------
 	 * --- 2) check buried state, shaped charges and the driller ---
@@ -4513,6 +4673,8 @@
 			panic_score += weapon[wType].radius
 			             * weapon[wType].spread
 			             * (1.5 + player->defensive);
+		else if (THEFT_BOMB == wType)
+			panic_score += pWeap->dmgSingle * player->selfPreservation;
 	}
 
 
@@ -4636,24 +4798,33 @@
 				              std::abs(ROUND(score)))
 
 				// Note down money made or cost:
-				if (op->team_mod > 0.)
-					money_made += ( std::min(weap_dmg * in_rate, op->opLife)
-					              * static_cast<double>(env.scoreHitUnit) )
-					            + ( (weap_dmg * in_rate) >= op->opLife
-					                ? static_cast<double>(env.scoreUnitDestroyBonus)
-					                : 0.);
-				else if (lt == tank)
-					money_cost += ( std::min(weap_dmg * in_rate, currLife)
-					              * static_cast<double>(env.scoreSelfHit) )
-					            + ( (weap_dmg * in_rate) >= currLife
-					                ? static_cast<double>(env.scoreUnitSelfDestroy)
-					                : 0.);
-				else
-					money_cost += ( std::min(weap_dmg * in_rate, op->opLife)
-					              * static_cast<double>(env.scoreTeamHit) )
-					            + ( (weap_dmg * in_rate) >= op->opLife
-					                ? static_cast<double>(env.scoreUnitSelfDestroy)
-					                : 0.);
+				if (THEFT_BOMB == wType) {
+						double theft_done = std::min(in_rate * theft_size,
+						       static_cast<double>(op->entry->opponent->money));
+					if (op->team_mod > 0.)
+						money_made += theft_done;
+					else if (lt != tank) // No effect on self!
+						money_cost += theft_done / (10. - ai_level_d);
+				} else {
+					if (op->team_mod > 0.)
+						money_made += ( std::min(weap_dmg * in_rate, op->opLife)
+						              * static_cast<double>(env.scoreHitUnit) )
+						            + ( (weap_dmg * in_rate) >= op->opLife
+						                ? static_cast<double>(env.scoreUnitDestroyBonus)
+						                : 0.);
+					else if (lt == tank)
+						money_cost += ( std::min(weap_dmg * in_rate, currLife)
+						              * static_cast<double>(env.scoreSelfHit) )
+						            + ( (weap_dmg * in_rate) >= currLife
+						                ? static_cast<double>(env.scoreUnitSelfDestroy)
+						                : 0.);
+					else
+						money_cost += ( std::min(weap_dmg * in_rate, op->opLife)
+						              * static_cast<double>(env.scoreTeamHit) )
+						            + ( (weap_dmg * in_rate) >= op->opLife
+						                ? static_cast<double>(env.scoreUnitSelfDestroy)
+						                : 0.);
+				} // End of regular weapon check
 			} // End of opponent in explosion
 
 			op = op->next;
@@ -4748,7 +4919,13 @@
 			if ( (selfde_score > 0.) && tgt_in_range)
 				pWeap->kamikaze = true;
 
-		} else
+		} else if (THEFT_BOMB == pWeap->type)
+			// In such a situation a (non-aggravating!) theft might
+			// be considered useful the more defensive and self preservative
+			// a bot is.
+			selfde_score = pWeap->dmgSingle * ai_type_mod
+			             * (2. + player->defensive + player->selfPreservation);
+		else
 			// Unsuitable
 			selfde_score -= pWeap->dmgSpread * ai_type_mod;
 	  }
@@ -4943,6 +5120,110 @@
 }
 
 
+/** @brief Attempt to move the tank
+  *
+  * @return true if the tank was moved
+**/
+bool AICore::moveTank()
+{
+	/* Moving the AI tank is easy. Just set the command and wait for the
+	 * main thread to react.
+	 * However, where shall the tank move and what distance?
+	 *
+	 * - If the target is very near (under two bitmap widths) then move
+	 *   away.
+	 * Otherwise:
+	 * - If the angle is steep (75° and up), assume the shot must go
+	 *   over a hill and move away from the target.
+	 * - If the angle is flat  (15° and down), move towards the target,
+	 *   the way seems clear at least.
+	 * Otherwise:
+	 * - If the overshoot is negative (too short), move towards the target.
+	 * - If the overshoot is positive (too far), move away from the target.
+	 */
+	double min_dist   = tank->getDiameter()
+					  + mem_curr->entry->opponent->tank->getDiameter();
+	int32_t want_dist = 0; // Eventually move in this direction ...
+	int32_t want_dir  = 0; // ... by this amount
+
+	if (mem_curr->distance < min_dist) {
+		// The first case: we are too near and want to move away
+		want_dir  = mem_curr->opX > x ? DIR_LEFT : DIR_RIGHT;
+		want_dist = want_dir
+				  * (min_dist - mem_curr->distance + RAND_AI_1P);
+	} else if ( (curr_angle <= 195) && (curr_angle >= 165) ) {
+		// The second case, the angle is steep
+		want_dir  = mem_curr->opX > x ? DIR_LEFT : DIR_RIGHT;
+		want_dist = want_dir
+				  * ( 20 - std::abs(180 - curr_angle) + RAND_AI_1P);
+	} else if ( (curr_angle <= 105) || (curr_angle >= 255) ) {
+		// The third case, the angle is very flat
+		want_dir  = mem_curr->opX > x ? DIR_RIGHT : DIR_LEFT;
+		want_dist = want_dir
+				  * ( std::abs(curr_angle - 180) - 70 + RAND_AI_1P);
+	} else {
+		// Last two cases use the overshoot as a distance to use
+		want_dist = best_overshoot != MAX_OVERSHOOT
+				  ? best_overshoot : curr_overshoot;
+		want_dir  = SIGN(want_dist);
+		// "tune" the distance
+		want_dist += RAND_AI_1P * want_dir;
+	}
+
+	// Now that direction and distance are set up, go for it.
+	bool tank_was_moved = false;
+
+	DEBUG_LOG_AIM(player->getName(), "Starting to move %s for %d",
+	              DIR_LEFT == want_dir ? "left" : "right", want_dist)
+
+	while (!isStopped && canMove.load(ATOMIC_READ) && want_dist) {
+
+		isMovedBy.store(0, ATOMIC_WRITE);
+		plStage   = DIR_LEFT == want_dir ? PS_MOVE_LEFT : PS_MOVE_RIGHT;
+
+		// Wait for the move to happen
+		while ( !isStopped
+		     && canMove.load(ATOMIC_READ)
+		     && (0 == isMovedBy.load(ATOMIC_READ)))
+			std::this_thread::yield();
+
+		// Do not do double moves!
+		plStage = PS_AIM;
+
+		if (!tank_was_moved && isMovedBy.load(ATOMIC_READ))
+			tank_was_moved = true;
+
+		want_dist -= isMovedBy.load(ATOMIC_READ);
+	} // That's it, really!
+
+	// No matter how much movement was done, this tank
+	// won't move again in this turn.
+	canMove.store(false, ATOMIC_WRITE);
+
+	// However, if the tank was moved, all distances are different now:
+	if (tank_was_moved) {
+
+		// Update current position
+		x = tank->x;
+		y = tank->y;
+
+		// Update all distances
+		opEntry_t* op = mem_head;
+		while (op) {
+			if (  op->entry->opponent->tank
+			  && !op->entry->opponent->tank->destroy )
+				op->distance = FABSDISTANCE2(x, y, op->opX, op->opY);
+			op = op->next;
+		}
+	}
+
+	DEBUG_LOG_AIM(player->getName(), "Moving finished %s (%d distance left)",
+	              want_dist ? "incompletely" : "successfully", want_dist)
+
+	return tank_was_moved;
+}
+
+
 /// @brief Core threading operator
 void AICore::operator()()
 {
@@ -4996,7 +5277,7 @@
 
 							// Now create the instance
 							new FLOATTEXT(text,x, y - 30, .0, -.4, player->color,
-										  CENTRE, TS_NO_SWAY, 150);
+							              CENTRE, TS_NO_SWAY, 150, false);
 						}
 					} catch (...) {
 						perror ( "aicore.cpp: Failed to allocate memory for"
@@ -5024,19 +5305,14 @@
 		// --- Done here and not in initialize so the full ---
 		// --- shock check is already done.                ---
 		// ---------------------------------------------------
-		findOppAttempts = ai_level + 2 - (isShocked ? ai_level / 2 : 0);
-		findRngAttempts = (std::pow(ai_level + 1, 2) + 1)
-		                / (isShocked ? ai_level + 1 : 1)
-		                + (isShocked ? 0 : ai_level + 4);
-		findTgtAttempts = ai_level
-		                - (isShocked ? ai_level - 1 : 0)
-		                + (isShocked ? 0 : 1);
-		findWeapAttempts= ai_level * 2 / (isShocked ? ai_level : 1);
-		focusRate       = ai_level_d * 2.
-		                / static_cast<double>(maxAiLevel * 2);
+		findOppAttempts = ai_level;
+		findRngAttempts = ai_level;
+		findTgtAttempts = ai_level;
+		findWeapAttempts= ai_level;
+		focusRate       = ai_level;
 		errorMultiplier = static_cast<double>(maxAiLevel + 1 - ai_level)
 		                / static_cast<double>(findRngAttempts);
-		maxBounce       = ROUNDu(std::pow(ai_level, 2) / 2.) + 2;
+		maxBounce       = ai_level;
 		/* The results should be [if shocked]:
 		 * findOppAttempts : Useless   3   [2], Deadly + 1:  8    [4]
 		 * findRngAttempts : Useless: 10   [2], Deadly + 1: 60    [7]
@@ -5113,7 +5389,8 @@
 			// --- 3) Aim the current selection                       ---
 			// ----------------------------------------------------------
 			if (done && needAim && !isBlocked)
-				done = aim( (tgt_attempts == findTgtAttempts) && needSuccess );
+				done = aim((tgt_attempts == findTgtAttempts) && needSuccess, // is last?
+				           opp_attempts >= (findOppAttempts / 2) );          // allowed to move?
 			else  if (!needAim || isBlocked) {
 				DEBUG_LOG_AIM(player->getName(), "No aiming done: %s, %s",
 				              needAim   ? "Aiming needed"   : "Aiming NOT needed",
@@ -5162,6 +5439,7 @@
 					&& (tgt_attempts == findTgtAttempts)
 				    && needSuccess) ) {
 					best_setup_angle     = curr_angle;
+					best_setup_damage    = mem_curr->dmgDone;
 					best_setup_item      = item_curr;
 					best_setup_mem       = mem_curr;
 					best_setup_overshoot = best_overshoot;
@@ -5324,17 +5602,29 @@
 		}
 
 
-		// ------------------------------------------------
-		// --- If a weapon is chosen and the target is  ---
-		// --- the revengee, get a message out for them ---
-		// ------------------------------------------------
-		if (!isStopped && weap_curr && revengee && needAim
-		  && (revengee == best_setup_mem->entry)
-		  && best_setup_prime && !needSuccess
-		  && !global.skippingComputerPlay
-		  && (weap_curr->dmgSingle > 1.)
-		  && (weap_curr->dmgSingle >= (mem_curr->opLife * ai_over_mod / 2.))
-		  && RAND_AI_1P) {
+		// ---------------------------------------------------------
+		// --- For the bot to yell out a retaliation phrase, the ---
+		// --- following conditions must be true:                ---
+		// --- 1) A weapon is chosen                             ---
+		// --- 2) The primary target must be hit                 ---
+		// --- 3 a) The target is the revengee and               ---
+		// --- 3 b) the damage is at least 10% per AI level or   ---
+		// --- 4 a) the target is not the revengee and           ---
+		// --- 4 b) the damage is at least 20% per AI level      ---
+		// ---------------------------------------------------------
+		int32_t min_rev_dmg = best_setup_mem
+		                    ? best_setup_mem->opLife * (ai_level - RAND_AI_0P) / 10
+		                    : 0;
+		int32_t min_oth_dmg = best_setup_mem
+		                    ? best_setup_mem->opLife * (ai_level - RAND_AI_0P) /  5
+		                    : 0;
+		if ( !isStopped && !global.skippingComputerPlay             // allowed to issue texts
+		  && weap_curr && needAim && !needSuccess                   // (1) targeting was successful
+		  && best_setup_prime                                       // (2) primary target gets damage
+		  && ( ( revengee && (revengee == best_setup_mem->entry)    // (3 a) revengee targeted
+		      && (best_setup_damage >= min_rev_dmg) )               // (3 b) enough damage done
+		    || ( (!revengee || (revengee != best_setup_mem->entry)) // (4 a) not the revengee
+		      && (best_setup_damage >= min_oth_dmg) ) ) ) {         // (4 b) enough damage done
 			const char* text = player->selectRetaliationPhrase();
 			try {
 				if (text) {
@@ -5344,7 +5634,7 @@
 
 					// Now create the instance
 					new FLOATTEXT(text,x, y - 30, .0, -.4, player->color,
-								  CENTRE, TS_NO_SWAY, 150);
+					              CENTRE, TS_NO_SWAY, 150, false);
 				}
 			} catch (...) {
 				perror ( "aicore.cpp: Failed to allocate memory for"
@@ -5369,7 +5659,7 @@
 				// Now create it
 				new FLOATTEXT (player->selectKamikazePhrase(),
 				               x, y - 30, .0, -.4,
-				               player->color, CENTRE, TS_NO_SWAY, 300);
+				               player->color, CENTRE, TS_NO_SWAY, 300, false);
 			} catch (...) {
 				perror ( "aicore.cpp: Failed allocating memory for"
 				         " kamikazeText in operator().");
@@ -5384,8 +5674,10 @@
 		     // Assume that bots can 'fix' errors from the last round:
 		  && ( (nullptr == mem_curr) || (mem_curr->entry != last_opp) )
 		  && RAND_AI_1N) {
-			double ang_err = (rand() %  8) * errorMultiplier;
-			double pow_err = (rand() % 36) * errorMultiplier;
+			int32_t ang_mod = maxAiLevel - ai_level + 2; // [ 2; 7]
+			int32_t pow_mod = (ang_mod * 5) + 1;         // [11;36]
+			double ang_err = rand() % ang_mod;           // [ 1; 6]
+			double pow_err = rand() % pow_mod;           // [10;35]
 
 			// Angles always go 'up', but never over the top
 			if (angle > (180. + ang_err))
diff -Nru atanks-6.5~dfsg/src/aicore.h atanks-6.6~dfsg/src/aicore.h
--- atanks-6.5~dfsg/src/aicore.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/aicore.h	2016-11-02 14:57:52.000000000 +0000
@@ -89,6 +89,8 @@
   * ai_type_mod   : (from level)   Multiplier [1.0;3.0] according to ai_level_d, used on important decisions to
   *                                strengthen higher bot levels.
   * blast_*       : (0)            Damage values of the available normal missiles.
+  * canMove       : (true)         As long as it is true, allows the AI to consider using fuel/rockets.
+  * isMovedBy     : (0)            Set from the outside via hasMoved() to indicate the result of movement attempts.
   * isShocked     : (false)        Whether the bot is shocked by anothers massive damage they dealt.
   * revengee      : (nullptr)      sOpponent pointer set to a bot this one wants revenge against.
   * shocker       : (nullptr)      sOpponent pointer set to the bot that caused isShocked to become true.
@@ -127,6 +129,7 @@
   *
   * Best achieved values over the full targetting cycle:
   * best_setup_angle     : (angle)
+  * best_setup_damage    : (0)
   * best_setup_item      : (nullptr)
   * best_setup_mem       : (nullptr)
   * best_setup_overshoot : (MAX_OVERSHOOT)
@@ -308,6 +311,7 @@
   *                                       found, yet.
   *      plStage        : (PS_CALCULATE)  AI enters the calculation stage.
   *      isBlocked      : (false)         Will be set to true if the aiming finds out that a hill blocks the path.
+  *      hasFlipped     : (false)         Set to true by calcStandard() if flipped towards a wall.
   *      needAim        : (false)         Will be set to true if a weapon is chosen that needs aiming.
   *      curr_overshoot : (MAX_OVERSHOOT) The overshoot for the current aiming round.
   *      offset_x       : (0)             Some weapons need a horizontal offset to aim at, like the napalm weapons.
@@ -397,6 +401,8 @@
   *
   *          This method does no aiming but sets needed offsets and generates an angle and a power value to begin with.
   *
+  *          hasFlipped : This is set to true, if the bot decides to flip through a wrap wall or towards a bounce/rubber
+  *                       wall. aim() then can check whether to flip back because the wall isn't even reached.
   *       3.6.1 calculate the offsets for the x and y coordinate needed by the chosen weapon. This is done with the
   *             method calcOffset(bool is_last).
   *
@@ -468,9 +474,10 @@
   *
   *     3.8  Eventually return the value of 'result'.
   *
-  *   4  done = calcAim(bool is_last) - called if calcAttack() returned true, needAim is true and isBlocked is false.
+  *   4  done = aim(bool is_last, bool can_move) - called if calcAttack() returned true, needAim is true and isBlocked is false.
   *
   *        Param 1 : True if tgt_attempts equals findTgtAttempts and needSuccess is still true.
+  *        Param 2 : True if opp_attempts is at least halve of findOppAttempts.
   *
   *      Here the aiming is done for the selected weapon against the selected target.
   *
@@ -540,7 +547,18 @@
   *            best_prime_hit = curr_prime_hit
   *            best_score     = hit_score
   *
-  *     4.5  Basically there are four different situations that need different actions.
+  *     4.5 Otherwise, if it does not seem to be possible to find a valid setup within half of the attempts the AI has,
+  *          try to move the tank a little according to the following rules:
+  *
+  *          - If the target is very near (under two bitmap widths) then move away.
+  *          Otherwise:
+  *          - If the angle is steep (75° and up), assume the shot must go over a hill and move away from the target.
+  *          - If the angle is flat  (15° and down), move towards the target, the way seems clear at least.
+  *          Otherwise:
+  *          - If the overshoot is negative (too short), move towards the target.
+  *          - If the overshoot is positive (too far), move away from the target.
+  *
+  *     4.6  Basically there are four different situations that need different actions.
   *          If the shot, or some of the spread or cluster shots, did not finish, it must be tried to change the used
   *          angle and power so the next attempt does finish.
   *          With steel walls or a wrapped ceiling ceiling with dirt on the ground the shot can have crashed. This can
@@ -550,7 +568,7 @@
   *          And finally the hit might be farther away. The last modifications might have been too strong or in the
   *          wrong direction.
   *
-  *       4.5.1 Try to fix unfinished shots using void fixUnfinished(int32_t &ang_mod, int32_t &pow_mod).
+  *       4.6.1 Try to fix unfinished shots using void fixUnfinished(int32_t &ang_mod, int32_t &pow_mod).
   *
   *               Param 1 : Reference to the angle modifier to adapt.
   *               Param 2 : Reference to the power modifier to adapt.
@@ -568,7 +586,7 @@
   *             last_reverted   : true if last_ang_mod is signed differently than the resulting ang_mod.
   *             last_was_better : false
   *
-  *       4.5.2 Try to fix crashed shots using void fixCrashed(int32_t &ang_mod, int32_t &pow_mod).
+  *       4.6.2 Try to fix crashed shots using void fixCrashed(int32_t &ang_mod, int32_t &pow_mod).
   *
   *               Param 1 : Reference to the angle modifier to adapt.
   *               Param 2 : Reference to the power modifier to adapt.
@@ -590,7 +608,7 @@
   *             last_reverted   : true if last_ang_mod is signed differently than the resulting ang_mod.
   *             last_was_better : false
   *
-  *       4.5.3 If the shot did finish and did not crash and hit nearer to the target than the last, a few adaptations
+  *       4.6.3 If the shot did finish and did not crash and hit nearer to the target than the last, a few adaptations
   *             might be needed.
   *
   *             If the resulting hit_score is worse than last_score, it must be ensured, that ang_mod has the same sign
@@ -602,7 +620,7 @@
   *             last_reverted   : true if last_ang_mod is signed differently than the resulting ang_mod.
   *             last_was_better : true if hit_score is lower than last_score, false otherwise.
   *
-  *       4.5.4 If the shot did finish and did not crash but hit farther away than the last, use
+  *       4.6.4 If the shot did finish and did not crash but hit farther away than the last, use
   *             void fixOvershoot(int32_t& ang_mod, int32_t& pow_mod, int32_t hit_score).
   *
   *               Param 1 : Reference to the angle modifier to adapt.
@@ -653,17 +671,17 @@
   *
   *             last_reverted   : true if last_ang_mod is signed differently than the resulting ang_mod.
   *
-  *     4.6  If the current angle is 180°, so pointing straight up, ang_mod is zero and no hit_score greater than zero
+  *     4.7  If the current angle is 180°, so pointing straight up, ang_mod is zero and no hit_score greater than zero
   *          was achieved, a random ang_mod in the interval [2;6] towards the opponent is generated to fix this vertical
   *          shot. Vertical trick shots using wind are only accepted if the resulting hit_score is positive.
   *
-  *     4.7  If the power modification according to the current overshoot and ang_mod is too low, it is strengthened
+  *     4.8  If the power modification according to the current overshoot and ang_mod is too low, it is strengthened
   *          using the difference of the overshoot and pow_mod divided by ang_mod and multiplied by the AI's focusRate.
   *
-  *     4.8  Sanitize ang_mod and pow_mod, both applied must not lead to invalid values. Then apply both to curr_angle
+  *     4.9  Sanitize ang_mod and pow_mod, both applied must not lead to invalid values. Then apply both to curr_angle
   *          and curr_power.
   *
-  *     4.9  Save the current values in the last_* members:
+  *     4.10 Save the current values in the last_* members:
   *
   *            last_ang_mod   = ang_mod
   *            last_overshoot = curr_overshoot
@@ -672,7 +690,7 @@
   *
   *          After this, the loop ends and the work flow restarts at 4.1.
   *
-  *     4.10 When all aiming attempts are used up, an emergency plan to free the tank or unblock its path might be
+  *     4.11 When all aiming attempts are used up, an emergency plan to free the tank or unblock its path might be
   *          triggered if all of the following conditions are true:
   *
   *          - is_last and needSuccess are both true,
@@ -683,13 +701,13 @@
   *          - either the overshoot is greater than the weapons radius without being a ceiling crash, or fixOvershoot()
   *            detected a hill in the path.
   *
-  *     4.11 Eventually, if a new best_round_score is achieved, remember the current settings:
+  *     4.12 Eventually, if a new best_round_score is achieved, remember the current settings:
   *
   *            best_round_score = best_score;
   *            curr_angle       = best_angle;
   *            curr_power       = best_power;
   *
-  *     4.12 Return true if either best_round_score is larger than zero, or both is_last and needSuccess are true.
+  *     4.13 Return true if either best_round_score is larger than zero, or both is_last and needSuccess are true.
   *
   *   5  If the aiming was successful, a few more checks are made.
   *
@@ -764,6 +782,7 @@
 	bool    can_work     () const;
 	void    forbidText   ();
 	bool    hasExited    () const;
+	void    hasMoved     (int32_t direction);
 	bool    start        (PLAYER* player_);
 	bool    status       (int32_t &aItem, int32_t &aAngle,
 	                      int32_t &aPower, ePlayerStages &pl_stage);
@@ -795,7 +814,7 @@
 	 * -----------------------
 	 */
 
-	bool        aim            (bool is_last);
+	bool        aim            (bool is_last, bool can_move);
 	bool        calcAttack     (int32_t attempt);
 	bool        calcBoxed      (bool is_last);
 	void        calcHitDamage  (int32_t hit_x, int32_t hit_y, double weap_rad,
@@ -818,6 +837,7 @@
 	const char* getLevelName   (int32_t level) const;
 	bool        getMemory      ();
 	bool        initialize     ();
+	bool        moveTank       ();
 	void        sanitizeCurr   ();
 	bool        selectItem     (bool is_last);
 	bool        selectTarget   (bool is_last);
@@ -828,7 +848,7 @@
 	void        traceCluster   (int32_t subType, int32_t subCount,
 	                            int32_t sub_x, int32_t sub_y,
 	                            double inh_xv, double inh_yv);
-	bool        traceShot      (int32_t trace_angle,
+	bool        traceShot      (int32_t trace_angle, int32_t delay_idx,
 	                            bool &finished, bool &top_wrapped,
 	                            int32_t &reached_x_, int32_t &reached_y_,
 	                            double &end_xv, double &end_yv);
@@ -851,6 +871,8 @@
 	// Internal values
 	mutex_t    actionMutex;
 	condv_t    actionCondition;
+	playerType bestType         = USELESS_PLAYER; // What the AI considers humans to be.
+	abool_t    canMove;
 	volatile
 	bool       canWork          = true;
 	int32_t    curr_angle       = 90;    //!< The angle that is currently tested
@@ -866,6 +888,7 @@
 	bool       isBlocked        = false; //!< Set to true if a shot can't get through
 	volatile
 	bool       isFinished       = false; //!< Set to true when operator() ends
+	ai32_t     isMovedBy;
 	bool       isShocked        = false;
 	volatile
 	bool       isStopped        = false;
@@ -896,6 +919,7 @@
 	int32_t    buried_l    = 0;       //!< left side buried level
 	int32_t    buried_r    = 0;       //!< right side buried level
 	double     currLife    = 0.;
+	bool       hasFlipped  = false;   //!< Used by calcStandard() and aim() to check for flipping errors.
 	itEntry_t* item_curr   = nullptr; //!< Currently selected entry
 	itEntry_t* item_head   = nullptr; //!< Last selected entry
 	itEntry_t* item_last   = nullptr; //!< Entry with highest score
@@ -937,6 +961,7 @@
 	// Values used to memorize the best setup in a round
 	int32_t    best_round_score     = NEUTRAL_ROUND_SCORE;
 	int32_t    best_setup_angle     = 0;
+	int32_t    best_setup_damage    = 0;
 	itEntry_t* best_setup_item      = nullptr;
 	opEntry_t* best_setup_mem       = nullptr;
 	int32_t    best_setup_overshoot = MAX_OVERSHOOT;
diff -Nru atanks-6.5~dfsg/src/atanks.cpp atanks-6.6~dfsg/src/atanks.cpp
--- atanks-6.5~dfsg/src/atanks.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/atanks.cpp	2021-06-28 22:46:56.000000000 +0000
@@ -289,8 +289,8 @@
 		}
 
 		// Check value length
-		char valTxt[16] = { 0 };
-		snprintf(valTxt, 15, " %14s", Add_Comma(pl_money[z]));
+		char valTxt[32] = { 0 };
+		snprintf(valTxt, 16, " %14s", Add_Comma(pl_money[z]));
 		curLen = text_length(font, valTxt);
 		if (curLen > valLen)
 			valLen = curLen;
@@ -622,9 +622,9 @@
 
 		if (channels) {
 			env.voices = channels >  64 ?  32
-							: channels >  32 ?  16
-							: channels >  16 ?   8
-							: channels;
+			           : channels >  32 ?  16
+			           : channels >  16 ?   8
+			           : channels;
 
 			int32_t snd_installed = -1;
 
@@ -665,14 +665,13 @@
 			fprintf (stderr, "detect_digi_driver detected no sound device\n");
 	} // End of sound initialization
 
-	srand (time (0));
-
   	// Colour initialization, must be done here when allegro is initialized.
 	BLACK       = makecol (0x00, 0x00, 0x00);
 	BLUE        = makecol (0x00, 0x00, 0xff);
 	DARK_GREEN  = makecol (0x00, 0x50, 0x00);
 	DARK_GREY   = makecol (0x40, 0x40, 0x40);
 	DARK_RED    = makecol (0x80, 0x00, 0x00);
+	GOLD        = makecol (0xaf, 0xaf, 0x00);
 	GREY        = makecol (0x80, 0x80, 0x80);
 	GREEN       = makecol (0x00, 0xff, 0x00);
 	LIGHT_GREEN = makecol (0x80, 0xff, 0x80);
@@ -796,8 +795,8 @@
 		try {
 			player_new = new PLAYER();
 		} catch (std::exception &e) {
-			fprintf(stderr, "%s:%d : Failed to allocate memory for player\n",
-					__FILE__, __LINE__);
+			fprintf(stderr, "%s:%d : Failed to allocate memory for player (%s)\n",
+					__FILE__, __LINE__, e.what());
 			status = false;
 		}
 
@@ -1315,7 +1314,7 @@
 		// round by exiting or quitting
 		if ( (global.currentround == 0)
 		  && (global.get_command() == GLOBAL_COMMAND_PLAY) ) {
-			char        buffer[256] = { 0 };
+			char        buffer[512] = { 0 };
 			const char* winner      = do_winner();
 
 			if (winner)
@@ -1471,6 +1470,18 @@
 		return EXIT_FAILURE;
 	}
 
+	// Initialize random number generation
+	srand (time(nullptr));
+
+	// Set the game version global
+#ifdef VERSION
+	{
+		double this_version = 0.;
+		sscanf(VERSION, "%lf", &this_version);
+		game_version = static_cast<int32_t>(this_version * 10);
+	}
+#endif // VERSION
+
 	// try to find config dir
 	env.find_config_dir();
 
@@ -1489,7 +1500,7 @@
 
 	// Create the update checker thread:
 	update_data updateData("projects.sourceforge.net", "version.txt",
-	                       "atanks.sourceforge.net", VERSION);
+	                       "atanks.sourceforge.net");
 
 	std::thread updateThread(std::ref(updateData));
 	if (env.check_for_updates)
diff -Nru atanks-6.5~dfsg/src/atanks.rc atanks-6.6~dfsg/src/atanks.rc
--- atanks-6.5~dfsg/src/atanks.rc	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/atanks.rc	2016-11-02 14:57:52.000000000 +0000
@@ -2,10 +2,10 @@
 //
 #include "resource.h"
 /////////////////////////////////////////////////////////////////////////////
-// Deutsch (Deutschland) resources
+// Neutral (Default) resources
 
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
-LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
+LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
 #pragma code_page(1252)
 
 /////////////////////////////////////////////////////////////////////////////
@@ -16,16 +16,28 @@
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 A                       ICON                    "../atanks.ico"
+
 ALLEGRO_ICON            ICON                    "../atanks.ico"
 
+#endif    // Neutral (Default) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+/////////////////////////////////////////////////////////////////////////////
+// English (United States) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+
 /////////////////////////////////////////////////////////////////////////////
 //
 // Version
 //
 
 1 VERSIONINFO
- FILEVERSION 6,1,2,0
- PRODUCTVERSION 6,1,2,0
+ FILEVERSION 6,4,99,0
+ PRODUCTVERSION 6,4,99,0
  FILEFLAGSMASK 0x0L
 #ifdef _DEBUG
  FILEFLAGS 0x1L
@@ -41,11 +53,11 @@
         BLOCK "040904e4"
         BEGIN
             VALUE "FileDescription", "Atomic Tanks"
-            VALUE "FileVersion", "6.1.2.0"
+            VALUE "FileVersion", "6.4.99.0"
             VALUE "LegalCopyright", "See credits.txt and COPYING.txt"
             VALUE "OriginalFilename", "atanks.exe"
             VALUE "ProductName", "Atomic Tanks"
-            VALUE "ProductVersion", "6.1.2.0"
+            VALUE "ProductVersion", "6.4.99.0"
         END
     END
     BLOCK "VarFileInfo"
@@ -79,7 +91,7 @@
 
 #endif    // APSTUDIO_INVOKED
 
-#endif    // Deutsch (Deutschland) resources
+#endif    // English (United States) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff -Nru atanks-6.5~dfsg/src/client.cpp atanks-6.6~dfsg/src/client.cpp
--- atanks-6.5~dfsg/src/client.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/client.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -160,7 +160,7 @@
        sscanf(args[4], "%lf", &delta_y);
        sscanf(args[5], "%d", &my_type);
        missile = new MISSILE(nullptr, my_x, my_y, delta_x, delta_y, my_type,
-							MT_WEAPON, 1);
+							MT_WEAPON, 1, 0);
        if (! missile)
          printf("Attempted to create missile failed in client code.\n");
        return FALSE;
diff -Nru atanks-6.5~dfsg/src/debug.h atanks-6.6~dfsg/src/debug.h
--- atanks-6.5~dfsg/src/debug.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/debug.h	2016-11-27 00:14:58.000000000 +0000
@@ -26,7 +26,7 @@
 # define ATANKS_IS_LINUX
 #endif // Linux
 
-#if !defined(ATANKS_IS_WINDOWS) && !defined(ATANKS_IS_LINUX)
+#if !defined(ATANKS_IS_WINDOWS) && !defined(ATANKS_IS_LINUX) && !defined(ATANKS_IS_BSD)
 # error "Only Windows, Linux and BSD are supported at the moment"
 #endif // Windows versus Linux
 
diff -Nru atanks-6.5~dfsg/src/environment.cpp atanks-6.6~dfsg/src/environment.cpp
--- atanks-6.5~dfsg/src/environment.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/environment.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -766,7 +766,11 @@
 				play_music = val > 0 ? true : false;
 			} else if (!strcasecmp(field, "rounds") )
 				sscanf(value, "%u", &rounds);
-			else if (!strcasecmp(field, "scorehitunit"))
+			else if (!strcasecmp(field, "scoreboard")) {
+				int32_t val = 0;
+				sscanf(value, "%d", &val);
+				global.showScoreBoard = val > 0 ? true : false;
+			} else if (!strcasecmp(field, "scorehitunit"))
 				sscanf(value, "%d", &scoreHitUnit);
 			else if (!strcasecmp(field, "scoreroundwinbonus"))
 				sscanf(value, "%d", &scoreRoundWinBonus);
@@ -1477,6 +1481,7 @@
 	fprintf (file, "PLAYMUSIC=%d\n", play_music ? 1 : 0);
 	fprintf (file, "ROUNDS=%d\n", rounds);
 	fprintf (file, "SATELLITE=%d\n", satellite);
+	fprintf (file, "SCOREBOARD=%d\n", global.showScoreBoard ? 1 : 0);
 	fprintf (file, "SCOREHITUNIT=%d\n", scoreHitUnit);
 	fprintf (file, "SCOREROUNDWINBONUS=%d\n", scoreRoundWinBonus);
 	fprintf (file, "SCORESELFHIT=%d\n", scoreSelfHit);
diff -Nru atanks-6.5~dfsg/src/explosion.cpp atanks-6.6~dfsg/src/explosion.cpp
--- atanks-6.5~dfsg/src/explosion.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/explosion.cpp	2021-06-28 23:22:07.000000000 +0000
@@ -98,8 +98,14 @@
 	// Note: Napalm Jellies deal damage over time and not at once.
 	if ( (NAPALM_JELLY == weapType)
 	  || ( (weapType >= RIOT_BOMB) && (weapType <= CLUSTER_MIRV) ) ) {
-		apply_damage = false;
-		// And those wouldn't throw debris or clear terrain either
+
+		// Riot weapons must set who caused falling damage, but the
+		// others do not trigger any
+		if ( (NAPALM_JELLY == weapType) || (weapType >= DIRT_BALL) )
+			apply_damage = false;
+
+		// Neither of these would throw debris or clear terrain
+		// (Note: Riot weapons need a special trigger to clear terrain once.)
 		hasThrown  = true;
 		hasCleared = true;
 	} else if (env.debris_level > 0) {
@@ -380,11 +386,23 @@
 					  && (weapType >= DIRT_BALL)
 					  && (weapType <= SMALL_DIRT_SPREAD) ) {
 						BITMAP* tmp    = create_bitmap(rad * 2, rad * 2); // for mixing
-						int32_t   colour = player ? player->color : GREEN;
-
+						int32_t colour = player ? player->color : GREEN;
 						clear_to_color(tmp, PINK);
 
-						circlefill(tmp, rad, rad, rad - 1, colour);
+						if (global.skippingComputerPlay)
+							circlefill(tmp, rad, rad, rad - 1, colour);
+						else {
+							float fR   = static_cast<float>(getr(colour));
+							float fG   = static_cast<float>(getg(colour));
+							float fB   = static_cast<float>(getb(colour));
+							float fRad = static_cast<float>(rad);
+							for (float r = fRad - 1.f; r > .998f; r -= 1.f)
+								circlefill(tmp, rad, rad, static_cast<int32_t>(r), makecol(
+									static_cast<int32_t>(fR * (r / fRad) ),
+									static_cast<int32_t>(fG * (r / fRad) ),
+									static_cast<int32_t>(fB * (r / fRad) )
+								));
+						}
 
 						// copy terrain over explosion
 						masked_blit(global.terrain, tmp,
@@ -409,8 +427,17 @@
 
 						for (int32_t i = 1 + (curFrame % 2); i < rad; i += 2)
 							circle(global.canvas, x, y, i, i < (rad / 2) ? col_mid : col_back);
-						setUpdateArea (x - rad - 1, y - rad - 1,
-									(rad + 1) * 2, (rad + 1) * 2);
+						setUpdateArea(x - rad - 1, y - rad - 1,
+						              (rad + 1) * 2, (rad + 1) * 2);
+					} else if (THEFT_BOMB == weapType) {
+						int32_t col_front = GOLD;
+						int32_t col_back  = GetShadeColor(BLACK, false, col_front);
+
+						circlefill(global.canvas, x, y, rad,     col_front);
+						circle    (global.canvas, x, y, rad / 2, col_back);
+
+						setUpdateArea(x - rad - 1, y - rad - 1,
+						              (rad + 1) * 2, (rad + 1) * 2);
 					} else {
 						// This is something else. But what?
 						fprintf(stderr, "EXPLOSION::draw() Unknown weapon type %d\n",
@@ -490,10 +517,10 @@
 		dim_cur.w = x1;
 		dim_cur.h = y1;
 	} else {
-		dim_cur.x = std::min(std::min(std::min(x1, x2), x3), dim_cur.x);
-		dim_cur.y = std::min(std::min(std::min(y1, y2), y3), dim_cur.y);
-		dim_cur.w = std::max(std::max(std::max(x1, x2), x3), dim_cur.w);
-		dim_cur.h = std::max(std::max(std::max(y1, y2), y3), dim_cur.h);
+		dim_cur.x = std::min({x1, x2, x3, dim_cur.x});
+		dim_cur.y = std::min({y1, y2, y3, dim_cur.y});
+		dim_cur.w = std::max({x1, x2, x3, dim_cur.w});
+		dim_cur.h = std::max({y1, y2, y3, dim_cur.h});
 	}
 
 	if (recurseDepth < maxRecurse) {
@@ -575,11 +602,46 @@
 				if (dmg > 0.) {
 					if (PERCENT_BOMB == weapType)
 						lt->addDamage(player, dmg); // already set, no multiplier
-					else if (REDUCER == weapType) {
-						lt->player->damageMultiplier *= 0.75; // already checked
-					} else
+					else if (REDUCER == weapType)
+						// Note: dmg was set to a fake damage of 1.0
+						lt->player->damageMultiplier *= 0.667; // already checked
+					else if ( (RIOT_BOMB <= weapType)
+					       && (RIOT_BLAST >= weapType) )
+						lt->addDamage(player, 0.); // So falling damage gets credited.
+					else if ( (THEFT_BOMB == weapType)
+					         && (lt->player != player) ) {
+						// Note: dmg was set to a fake damage of 1.0
+						int32_t max_amount = ROUND(player->damageMultiplier * THEFT_AMOUNT);
+						int32_t amount     = lt->player->money <= max_amount
+						                   ? lt->player->money
+						                   : max_amount; // you have?
+
+						// We indicate the theft by a red string on top of the tank
+						static char the_money[17] = { 0x0 };
+						snprintf(the_money, 16, "-$%s", Add_Comma(amount) );
+
+						if (!global.skippingComputerPlay) {
+							// show how much the shooter gets
+							try {
+								new FLOATTEXT(the_money,
+								              lt->x, lt->y - 30,
+								              .0, -.5, RED,
+								              CENTRE,
+								              env.swayingText ? TS_HORIZONTAL : TS_NO_SWAY,
+								              200, false);
+								if (global.stage < STAGE_SCOREBOARD)
+									global.updateMenu = true;
+							} catch (...) {
+								perror("tank.cpp: Failed allocating memory for"
+								       "money text in explode().");
+							}
+						}
+
+						lt->player->money -= amount; // the actual theft.
+						player->money     += amount; // money goes to the shooter.
+					} else if (THEFT_BOMB != weapType)
 						lt->addDamage(player, dmg
-									* (player ? player->damageMultiplier : 1.) );
+						            * (player ? player->damageMultiplier : 1.) );
 				} // End of having damage to deal
 
 				lt->getNext(&lt);
@@ -764,7 +826,7 @@
 
         // find first earth pixel:
         if ( (ypos < y) && (maxY > ypos)
-		  && checkPixelsBetweenTwoPoints(&xpos, &ypos, xpos, maxY)) {
+		  && checkPixelsBetweenTwoPoints(&xpos, &ypos, xpos, maxY, 0.0, nullptr)) {
 
 			// Try to get a free debris pool item
 			sDebrisItem* deb_item = global.get_debris_item(deb_rad);
@@ -911,10 +973,18 @@
 	if ( (nullptr == tank) || (tank->destroy) )
 		return 0.;
 
-	double weap_rad  = weapon[type].radius;
-	double xrad      =    DRILLER       == type    ? weap_rad / 20. : weap_rad;
-	double yrad      = ( (SHAPED_CHARGE <= type)
-	                  && (CUTTER        >= type) ) ? weap_rad / 20. : weap_rad;
+	double weap_rad  = type < WEAPONS
+	                 ? weapon[type].radius
+	                 : naturals[type - WEAPONS].radius;
+	double xrad      = weap_rad;
+	double yrad      = weap_rad;
+
+	// Adapt x-/y-radius for the driller and the shaped weapons
+	if (DRILLER == type)
+		xrad /= 20;
+	if ( (SHAPED_CHARGE <= type) && (CUTTER >= type) )
+		yrad /= 20;
+
 	double in_rate_x = 0.;
 	double in_rate_y = 0.;
 	double dmg       = 0.;
@@ -923,30 +993,28 @@
 		if (PERCENT_BOMB == type)
 			dmg = ((tank->l + tank->sh) / 2) + 1;
 		else if ( (REDUCER == type)
-		       && (tank->player->damageMultiplier > 0.1) )
+			   && (tank->player->damageMultiplier > 0.1) )
+			dmg = 1.; // So result > 0 can be checked
+		else if (THEFT_BOMB == type)
+			dmg = 1.; // So result > 0 can be checked
+		else if ( (RIOT_BOMB <= type) && (RIOT_BLAST >= type) )
+			dmg = 1.; // So result > 0 can be checked
+		else if (THEFT_BOMB == type)
+			dmg = 1.; // So result > 0 can be checked
+		else if ( (RIOT_BOMB <= type) && (RIOT_BLAST >= type) )
 			dmg = 1.; // So result > 0 can be checked
 
 		// Shaped charges and drillers have a minimum distance under which they
 		// deal no damage:
-		else if ( ( ( (SHAPED_CHARGE > type) || (CUTTER < type) ) //     ( Not shaped
-		         || (std::abs(tank->x - hit_x) > yrad) )          //       or x distance okay )
-		       && ( (DRILLER != type)                             // and (not driller
-		         || (std::abs(tank->y - hit_y) > xrad) ) ) {      //       or y distance okay )
+		else if ( ( (SHAPED_CHARGE > type) || (CUTTER < type) ) //     ( Not shaped
+		       || (std::abs(tank->x - hit_x) > yrad) ) {        //       or x distance okay )
 			/* Note: The radii are reversed as the opposite radius is the
 			 *       minimum distance needed for the main blast radius.
-			 * Note: The above is built from the following formula:
-			 * Be a = Weapon is a shaped charge, wide boy or cutter,
-			 *    b = x distance is greater than the weapons x range minimum,
-			 *    c = Weapon is the driller,
-			 *    d = y distance is greater than the weapons y range minimum.
-			 * Then the following term must be true to be allowed to enter this block:
-			 * (~a v b) ^ (~c v d) which reads like:
-			 *       (Not a shaped weapon OR the x distance is in order)
-			 *   AND (Not the driller     OR the y distance is in order)
-			 * The above if block actually is exactly that from bottom to top.
 			 */
 
-			dmg = weapon[type].damage;
+			dmg = type < WEAPONS
+			    ? weapon[type].damage
+			    : naturals[type - WEAPONS].damage;
 
 			// Some weapons have minimum rates on axis ratings
 			if (DRILLER == type) {
@@ -967,10 +1035,19 @@
 			}
 
 			// The full in_rate must not be lower than 10% on any weapon.
-			double in_rate = in_rate_x * in_rate_y;
-			if (in_rate < 0.1)
-				in_rate = 0.1;
-			dmg *= in_rate;
+			// However, the driller has a minimum x distance to cover.
+			if ( (DRILLER != type)                      // (not driller
+			  || (std::abs(tank->y - hit_y) > xrad) ) { //  or y distance okay )
+				double in_rate = in_rate_x * in_rate_y;
+				if (in_rate < 0.1)
+					in_rate = 0.1;
+				dmg *= in_rate;
+			}
+			// If this is a driller and the distance is too low,
+			// a minimum damage of 1. is done so the cause of
+			// potential falling damage is at least noted.
+			else if (DRILLER == type)
+				dmg = 1.;
 		} // End of having damage to deal
 	} // End of tank in ellipse
 
diff -Nru atanks-6.5~dfsg/src/externs.h atanks-6.6~dfsg/src/externs.h
--- atanks-6.5~dfsg/src/externs.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/externs.h	2016-11-02 14:57:52.000000000 +0000
@@ -41,9 +41,9 @@
 
 
 // === Defined colours used everywhere ===
-extern int32_t BLACK, BLUE, DARK_GREEN, DARK_GREY, DARK_RED, GREY, GREEN,
-               LIGHT_GREEN, LIME_GREEN, ORANGE, PINK, PURPLE, RED, SILVER,
-               TURQUOISE, WHITE, YELLOW;
+extern int32_t BLACK, BLUE, DARK_GREEN, DARK_GREY, DARK_RED, GOLD, GREY,
+               GREEN, LIGHT_GREEN, LIME_GREEN, ORANGE, PINK, PURPLE, RED,
+               SILVER, TURQUOISE, WHITE, YELLOW;
 
 
 // === General values that are globally used ===
@@ -52,6 +52,7 @@
 extern int32_t     errorX, errorY;
 extern int32_t     k, K;
 extern int32_t     fi, lx, ly;
+extern int32_t     game_version;
 extern WEAPON      weapon[WEAPONS];    // from files.cpp
 extern WEAPON      naturals[NATURALS]; // from files.cpp
 extern ITEM        item[ITEMS];        // from files.cpp
diff -Nru atanks-6.5~dfsg/src/files.cpp atanks-6.6~dfsg/src/files.cpp
--- atanks-6.5~dfsg/src/files.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/files.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -47,6 +47,11 @@
 	if (!game_file)
 		return false;
 
+	// write file version information
+	fprintf(game_file, "VERSION\n");
+	fprintf(game_file, "FILE_VERSION=%d\n", game_version);
+	fprintf(game_file, "***\n");
+
 	// write global data
 	fprintf(game_file, "GLOBAL\n");
 	fprintf(game_file, "CURRENTROUND=%d\n", global.currentround + 1);
@@ -119,6 +124,7 @@
 	int32_t line_num                   = 0;
 	int32_t player_idx                 = -1;
 	bool    done                       = false;
+	int32_t file_version               = 0;
 
 	// Be sure that numbers are understood right:
 	const char* cur_lc_numeric = setlocale(LC_NUMERIC, "C");
@@ -148,7 +154,7 @@
 			}
 
 			// strip newline character
-			int32_t line_length = strlen(line);
+			size_t line_length = strlen(line);
 			while ( line[line_length - 1] == '\n') {
 				line[line_length - 1] = '\0';
 				line_length--;
@@ -159,13 +165,24 @@
 				stage = SGS_GLOBAL;
 			else if (!strcasecmp(line, "ENVIRONMENT") )
 				stage = SGS_ENVIRONMENT;
-			else if (!strcasecmp(line, "PLAYERS") )
+			else if (!strcasecmp(line, "PLAYERS") ) {
+				// Here the file version must be known, or it is not set.
+				// Inform the user if an upgrade is needed
+				if (game_version > file_version)
+					fprintf(stdout, "Game \"%s\" needs to be upgraded"
+					        " from version %2.1f to version %2.1f\n",
+					        env.game_name,
+					        static_cast<float>(file_version) / 10.0,
+					        static_cast<float>(game_version) / 10.0);
+
 				stage = SGS_PLAYERS;
+			} else if (!strcasecmp(line, "VERSION") )
+				stage = SGS_VERSION;
 			else {
 				// Not a new stage, keep loading.
 
 				// find equal sign
-				int32_t equal_position = 1;
+				size_t equal_position = 1;
 				while ( ( equal_position < line_length )
 					 && ( line[equal_position] != '='  ) )
 					equal_position++;
@@ -238,7 +255,7 @@
 
 						// Now let the player load itself
 						if (player_idx > -1)
-							env.allPlayers[player_idx]->load_game_data(game_file);
+							env.allPlayers[player_idx]->load_game_data(game_file, file_version);
 						else {
 							cerr << path_buf << ":" << line_num << " : Ignored line\n";
 							cerr << "The line \"" << line << "\"";
@@ -246,6 +263,16 @@
 						}
 
 						break;
+					case SGS_VERSION:
+						if (!strcasecmp(field, "FILE_VERSION") )
+							sscanf(value, "%d", &file_version);
+						else {
+							cerr << path_buf << ":" << line_num << " : Ignored line\n";
+							cerr << "The line \"" << line << "\"";
+							cerr << " is ignored, it does not belong to VERSION" << endl;
+						}
+
+						break;
 					case SGS_NONE:
 					default:
 						cerr << path_buf << ":" << line_num << " : Wrong line\n";
@@ -324,8 +351,7 @@
 	if (!access(dest_path, R_OK | W_OK))
 		return true;
 
-	char* my_home_folder        = getenv(HOME_DIR);
-	int   status                = 0;
+	char*  my_home_folder = getenv(HOME_DIR);
 
 	// figure out where home is
 	if (! my_home_folder)
@@ -335,12 +361,12 @@
 	// file not copied yet, create the required directory
 	snprintf(buffer, PATH_MAX, "%s/.atanks", my_home_folder);
 #ifdef ATANKS_IS_WINDOWS
-	status = mkdir(buffer);
+	int32_t mkdir_status = mkdir(buffer);
 #else
-	status = mkdir(buffer, 0700);
+	int32_t mkdir_status = mkdir(buffer, 0700);
 #endif // ATANKS_IS_WINDOWS
 
-	if (status == -1) {
+	if (mkdir_status == -1) {
 		printf( "Error occured. Unable to create sub directory.\n");
 		return false;
 	}
@@ -360,10 +386,10 @@
 	}
 
 	// we have open files, let's copy
-	status = fread(buffer, 1, PATH_MAX, source_file);
-	while (status) {
-		status = fwrite(buffer, 1, PATH_MAX, dest_file);
-		status = fread(buffer, 1, PATH_MAX, source_file);
+	size_t file_status = fread(buffer, 1, PATH_MAX, source_file);
+	while (file_status) {
+		file_status = fwrite(buffer, 1, PATH_MAX, dest_file);
+		file_status = fread(buffer, 1, PATH_MAX, source_file);
 	}
 
 	fclose(source_file);
diff -Nru atanks-6.5~dfsg/src/floattext.cpp atanks-6.6~dfsg/src/floattext.cpp
--- atanks-6.5~dfsg/src/floattext.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/floattext.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -3,9 +3,11 @@
 FLOATTEXT::FLOATTEXT (const char* text_, int32_t xpos, int32_t ypos,
                       double xv_, double yv_, int32_t color_,
                       alignType alignment, eTextSway sway_type,
-                      int32_t max_age) :
+                      int32_t max_age, bool is_fixed_) :
 	VIRTUAL_OBJECT(),
 	color(color_),
+	is_fixed(is_fixed_),
+	is_pushed(!is_fixed),
 	pos_x(xpos),
 	pos_y(ypos)
 {
@@ -25,8 +27,8 @@
 	// The font and thus its height is fixed:
 	dim_cur.h = env.fontHeight + (env.fontHeight % 2);
 
-	x         = xpos;
-	y         = ypos;
+	x         = pos_x;
+	y         = pos_y;
 	dim_cur.x = ROUND(pos_x);
 	dim_cur.y = ROUND(pos_y);
 	set_sway_type(sway_type);
@@ -66,7 +68,8 @@
 		right  = std::min(env.screenWidth, left + dim_old.w + 1);
 		bottom = std::min(env.screenHeight, top + dim_old.h + 1);
 
-		global.make_bgupdate(left, top, right - left, bottom - top);
+		if ( (right > left) && (bottom > top) )
+			global.make_bgupdate(left, top, right - left, bottom - top);
 	}
 
 	// Free allocated text
@@ -122,6 +125,36 @@
 }
 
 
+
+void FLOATTEXT::check_pos(bool is_new)
+{
+	if (is_fixed)
+		is_pushed = false; // Do nothing.
+	else {
+		FLOATTEXT* curr          = nullptr;
+		bool       curr_is_older = true; // We start with head, which is the oldest.
+		global.getHeadOfClass(CLASS_FLOATTEXT, &curr);
+
+
+		is_pushed = false;
+		while (curr) {
+			if (this == curr)
+				curr_is_older = false; // The following are newer texts
+			else if (!curr->is_fixed) {
+				// If the other text is older, this one is
+				// pushed.
+				if (curr_is_older || is_new)
+					this->push_down(curr->overlaps_by(this), true);
+				// otherwise the other is pushed.
+				else
+					curr->push_down(this->overlaps_by(curr), false);
+			} // End of having another text
+			curr->getNext(&curr);
+		}
+	} // End of not fixed text
+}
+
+
 /// Little Helper, move it somewhere else if it makes sense to be used elsewhere
 #define SAFE_MAKECOL(r_, g_, b_) makecol( \
 	r_ < 0 ? 0 : r_ > 255 ? 255 : r_, \
@@ -139,7 +172,12 @@
 	if (1 > dim_cur.w) {
 		dim_cur.w = text_length(font, text) + 3;
 		dim_cur.w += dim_cur.w % 2;
-	}
+		if (!is_fixed)
+			check_pos(true);
+	} else if (is_pushed)
+		// check, someone thought this to be in the way!
+		check_pos(false);
+
 
 	// Current position according to alignment:
 	int32_t left   = LEFT  == align ? dim_cur.x
@@ -211,6 +249,72 @@
 }
 
 
+/** @brief return the number of pixels this overlaps with @a other vertically.
+  * @param[in] other The floating text to compare this with.
+  * @return 0 if no overlapping found. <0 if @a other overlaps above,
+  * >0 if @a other overlaps below the centre of this text.
+  *
+  * Note: If either is fixed, the method always returns 0.
+**/
+int32_t FLOATTEXT::overlaps_by(const FLOATTEXT* other)
+{
+    if (other && (other != this)) {
+
+		// return at once if either is fixed.
+		if (this->is_fixed || other->is_fixed)
+			return 0; // Non of your business!
+
+		// Otherwise only check vertical
+		if ( ((other->dim_cur.x + other->dim_cur.w) > dim_cur.x)
+		  && ((dim_cur.x + dim_cur.w)               > other->dim_cur.x) ) {
+			int32_t this_y2  = dim_cur.y        + dim_cur.h;
+			int32_t other_y2 = other->dim_cur.y + other->dim_cur.h;
+
+			if ( (other_y2 > dim_cur.y)
+			  && (this_y2  > other->dim_cur.y) ) {
+				// If the other text is above this one, push it up by the
+				// overlapping amount, which is the distance from
+				// this y to their y + h.
+				// Otherwise, the other text is to be pushed down by an amount
+				// that is the distance from their y to this y + h
+				if ( (other->dim_cur.y < dim_cur.y) // Should be enough, but if
+				  || (other_y2         < this_y2) ) // not, favour pushing up
+					return dim_cur.y - other_y2;    // in any case.
+				else
+					return this_y2 - other->dim_cur.y;
+			}
+		} // End of x overlapping
+    } // End of having a different other
+
+    return 0;
+}
+
+
+/// @brief push down this text by ydiff pixels
+void FLOATTEXT::push_down(int32_t ydiff, bool is_new)
+{
+	if (ydiff && !is_fixed) {
+
+		// new(er) texts can be pushed by up to 3, older texts
+		// by only one pixel.
+		int32_t push_by = is_new
+		                ? (ydiff > 3 ? 3 : ydiff < -3 ? -3 : ydiff)
+		                : (ydiff > 1 ? 1 : ydiff < -1 ? -1 : ydiff);
+
+		pos_y = dim_cur.y = y = y + push_by;
+
+		// Whenever a text is pushed up, raise its speed by 1% / 3%.
+		// And when it is pushed down, lower its speed by 1% / 3%.
+		// Otherwise speedy texts keep bumping into the same
+		// over and over again.
+		yv *= 1.00 + (-0.01 * push_by);
+
+		is_pushed = true;
+	}
+
+}
+
+
 // Reset movement to begin neutrally if the text is swaying
 void FLOATTEXT::reset_sway()
 {
@@ -297,8 +401,8 @@
 	if (text && text_ && !strcmp(text, text_))
 		return;
 
-	int new_len = text_ ? strlen(text_)  : 0;
-	int old_len = text  ? strlen(text)   : 0;
+	size_t new_len = text_ ? strlen(text_)  : 0;
+	size_t old_len = text  ? strlen(text)   : 0;
 
 	// clean up old text
 	if (text && old_len)
diff -Nru atanks-6.5~dfsg/src/floattext.h atanks-6.6~dfsg/src/floattext.h
--- atanks-6.5~dfsg/src/floattext.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/floattext.h	2016-11-02 14:57:52.000000000 +0000
@@ -49,7 +49,7 @@
 	explicit FLOATTEXT (const char* text_, int32_t xpos, int32_t ypos,
 						double xv_, double yv_, int32_t color_,
 						alignType alignment, eTextSway sway_type,
-						int32_t max_age);
+						int32_t max_age, bool is_fixed_);
 	~FLOATTEXT ();
 
 
@@ -76,6 +76,9 @@
 	 * -----------------------
 	 */
 
+	void     check_pos    (bool is_new);
+	int32_t  overlaps_by  (const FLOATTEXT* other);
+	void     push_down    (int32_t ydiff, bool is_new);
 	void     reset_sway   ();
 	void     set_speed    (double xv_, double yv_);
 
@@ -87,6 +90,8 @@
 
 	int32_t   color     = SILVER; //!< Foreground colour
 	int32_t   halfColor = GREY;   //!< Shadow colour
+	bool      is_fixed  = false;  //!< Whether new texts can push this out of the way
+	bool      is_pushed = false;
 	double    pos_x     = 0.;
 	double    pos_y     = 0.;
 	eTextSway sway      = TS_NO_SWAY;
diff -Nru atanks-6.5~dfsg/src/gameloop.cpp atanks-6.6~dfsg/src/gameloop.cpp
--- atanks-6.5~dfsg/src/gameloop.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/gameloop.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -612,6 +612,12 @@
 			death_substitute = false;
 			next_tank        = nullptr;
 			need_update      = true;
+
+			// Activate shields and repair the tank.
+			if (curr_tank) {
+				curr_tank->reactivate_shield();
+				curr_tank->repair();
+			}
 		} else if (!curr_tank || !curr_tank->player || curr_tank->destroy) {
 			// We need a death substitute
 			if (next_tank && !next_tank->destroy)
@@ -628,6 +634,7 @@
 			fire              = false;
 			global.updateMenu = true;
 			global.set_curr_tank(curr_tank);
+
 			return true;
 		}
 	} // End of checking for tank advancement
@@ -945,8 +952,9 @@
 
 			try {
 				new MISSILE(nullptr, 1 + (rand () % (env.screenWidth - 2)),
-							MENUHEIGHT + (env.isBoxed ? 1 : 0), mxv, myv,
-							SML_METEOR + (rand () % env.meteors), MT_NATURAL, 1);
+				            MENUHEIGHT + (env.isBoxed ? 1 : 0), mxv, myv,
+				            SML_METEOR + (rand () % env.meteors), MT_NATURAL,
+				            1, 0);
 				global.naturals_activated++;
 				return;
 			} catch (...) { /* can't do anything here */ }
@@ -965,7 +973,7 @@
 				new MISSILE(nullptr, 1 + (rand () % (env.screenWidth - 2)),
 				            MENUHEIGHT + (env.isBoxed ? 1 : 0), mxv, myv,
 				            DIRT_BALL + ( rand() % env.falling_dirt_balls),
-				            MT_NATURAL, 1);
+				            MT_NATURAL, 1, 0);
 				global.naturals_activated++;
 			} catch (...) { /* can't do anything here */ }
 		}
@@ -1174,12 +1182,15 @@
 		// Show the weapon / item icon
 		draw_sprite(global.canvas, env.stock[ (tank->cw > 0) ? tank->cw : 1], 700, 1);
 
-		// Eventually print out money and Fuel
+		// Eventually print out money, fuel and power
 		textprintf_ex(global.canvas, font, 386, y1, BLACK, -1,
 		              "$%s", Add_Comma(tank->player->money));
 		textprintf_ex(global.canvas, font, 386, y2, BLACK, -1,
 		              "%s: %d", env.ingame->Get_Line(21),
 		              tank->player->ni[ITEM_FUEL]);
+		textprintf_ex(global.canvas, font, 386, y3, BLACK, -1,
+		              "%s: %.2f", "Power",
+		              tank->player->damageMultiplier);
 	} // End of displaying player info
 
 
@@ -1341,7 +1352,6 @@
 
 	if (curr_tank && !curr_tank->destroy) {
 		has_action.store(true);
-		curr_tank->reactivate_shield();
 		curr_tank->simActivateCurrentSelection();
 	}
 
@@ -1393,17 +1403,18 @@
 static inline void init_new_round()
 {
 	// First env,
-    env.newRound();
+	srand(time(NULL));
+	env.newRound();
 
-    // then the players in case the campaign mode rise kicks in
-    for (int32_t i = 0; i < env.numGamePlayers; ++i)
-        env.players[i]->newRound();
+	// then the players in case the campaign mode rise kicks in
+	for (int32_t i = 0; i < env.numGamePlayers; ++i)
+		env.players[i]->newRound();
 
 	// finally global, so campaign mode round is changed after the players.
 	global.newRound();
 
-    // clear floating text
-    FLOATTEXT* txt = nullptr;
+	// clear floating text
+	FLOATTEXT* txt = nullptr;
 	global.getHeadOfClass(CLASS_FLOATTEXT, &txt);
 	while (txt) {
 		txt->newRound();
@@ -1442,7 +1453,7 @@
 			human_players++;
 	}
 
-    // set wind
+	// set wind
 	if (env.windstrength)
 		global.wind = (rand() % env.windstrength) - (env.windstrength / 2);
 	else
@@ -1503,6 +1514,13 @@
 **/
 static inline void set_level_settings(LevelCreator* lcr)
 {
+#if defined(ATANKS_IS_WINDOWS)
+	// Here srand() is thread local according to MSDN.
+	// This affects cygwin/mingw builds, too.
+	// Thanks to billy Buerger for pointing this out!
+	srand(time(nullptr));
+#endif // Microsoft Windows Build
+
 	//  -------------------------
 	// ===  Choosing colours   ===
 	//=============================
@@ -1548,7 +1566,7 @@
 	//=============================
 	lcr->working_on(2);
 	if (lcr->can_work())
-		generate_land (lcr, rand (), 0, env.screenHeight);
+		generate_land (lcr, rand() % env.screenWidth, env.screenHeight);
 
 
 	//  -------------------------
diff -Nru atanks-6.5~dfsg/src/gfxData.cpp atanks-6.6~dfsg/src/gfxData.cpp
--- atanks-6.5~dfsg/src/gfxData.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/gfxData.cpp	2021-06-28 23:09:54.000000000 +0000
@@ -48,41 +48,44 @@
 		stuff_bar_gradient_strip = nullptr;
 		explosion_gradient_strip = nullptr;
 
-		if (sky_gradient_strips) {
+                // The following pointer checks are being removed because
+                // they are declared in the header and will always
+                // evaluate to true. -- Jesse
+		// if (sky_gradient_strips) {
 			for (int32_t i = 0; i < ALL_SKIES; ++i) {
 				if ( sky_gradient_strips[i] ) {
 					destroy_bitmap(sky_gradient_strips[i]);
 					sky_gradient_strips[i] = nullptr;
 				}
 			}
-		}
+		// }
 
-		if (land_gradient_strips) {
+		// if (land_gradient_strips) {
 			for (int32_t i = 0; i < ALL_LANDS; ++i) {
 				if ( land_gradient_strips[i] ) {
 					destroy_bitmap(land_gradient_strips[i]);
 					land_gradient_strips[i] = nullptr;
 				}
 			}
-		}
+		// }
 
-		if (explosions) {
+		// if (explosions) {
 			for (int32_t i = 0; i < EXPLOSIONFRAMES; ++i) {
 				if ( explosions[i] ) {
 					destroy_bitmap(explosions[i]);
 					explosions[i] = nullptr;
 				}
 			}
-		}
+		// }
 
-		if (flameFront) {
+		// if (flameFront) {
 			for (int32_t i = 0; i < EXPLOSIONFRAMES; ++i) {
 				if ( flameFront[i] ) {
 					destroy_bitmap(flameFront[i]);
 					flameFront[i] = nullptr;
 				}
 			}
-		}
+		// }
 
 		initDone = false;
 	}
diff -Nru atanks-6.5~dfsg/src/globaldata.cpp atanks-6.6~dfsg/src/globaldata.cpp
--- atanks-6.5~dfsg/src/globaldata.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/globaldata.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -546,7 +546,8 @@
 	while (!found && (wrapped < 2)) {
 		if (index >= MAXPLAYERS) {
 			index = 0;
-			*wrapped_around = true;
+			if (wrapped_around)
+				*wrapped_around = true;
 			wrapped++;
 		}
 
@@ -574,6 +575,23 @@
 }
 
 
+/// @brief randomly return one active tank
+TANK* GLOBALDATA::get_random_tank()
+{
+	int32_t idx      = rand() % MAXPLAYERS;
+	int32_t attempts = 2;
+	while ( (!order[idx] || order[idx]->destroy)
+	     && (idx < MAXPLAYERS) && attempts ) {
+		if (++idx >= MAXPLAYERS) {
+			idx = 0;
+			--attempts;
+		}
+	}
+
+	return order[idx];
+}
+
+
 void GLOBALDATA::initialise ()
 {
 	clear_objects();
@@ -663,14 +681,14 @@
 				return;
 
 			// strip newline character
-			int32_t line_length = strlen(line);
+			size_t line_length = strlen(line);
 			while ( line[line_length - 1] == '\n') {
 				line[line_length - 1] = '\0';
 				line_length--;
 			}
 
 			// find equal sign
-			int32_t equal_position = 1;
+			size_t equal_position = 1;
 			while ( ( equal_position < line_length )
 				 && ( line[equal_position] != '='  ) )
 				equal_position++;
diff -Nru atanks-6.5~dfsg/src/globaldata.h atanks-6.6~dfsg/src/globaldata.h
--- atanks-6.5~dfsg/src/globaldata.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/globaldata.h	2016-11-02 14:57:52.000000000 +0000
@@ -129,6 +129,7 @@
 	TANK*   get_curr_tank     ();
 	item_t* get_debris_item   (int32_t radius);
 	TANK*   get_next_tank     (bool* wrapped_around);
+	TANK*   get_random_tank   ();
 	void    initialise        ();
 	bool    isCloseBtnPressed ();
 	bool    isDirtInBox       (int32_t x1, int32_t y1, int32_t x2, int32_t y2);
diff -Nru atanks-6.5~dfsg/src/globals.h atanks-6.6~dfsg/src/globals.h
--- atanks-6.5~dfsg/src/globals.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/globals.h	2016-11-02 14:57:52.000000000 +0000
@@ -9,9 +9,9 @@
 ENVIRONMENT env;
 
 // === Defined colours used everywhere ===
-int32_t BLACK, BLUE, DARK_GREEN, DARK_GREY, DARK_RED, GREY, GREEN,
-        LIGHT_GREEN, LIME_GREEN, ORANGE, PINK, PURPLE, RED, SILVER,
-        TURQUOISE, WHITE, YELLOW;
+int32_t BLACK, BLUE, DARK_GREEN, DARK_GREY, DARK_RED, GOLD, GREY,
+        GREEN, LIGHT_GREEN, LIME_GREEN, ORANGE, PINK, PURPLE, RED,
+        SILVER, TURQUOISE, WHITE, YELLOW;
 
 // === General values that are globally used ===
 char        buf[100]; // buffer for general use
@@ -19,6 +19,7 @@
 int32_t     errorX, errorY;
 int32_t	    k, K; // k = key pressed, K = Key Code from k
 int32_t     fi, lx, ly;
+int32_t     game_version; // Used for update check and save file upgrades
 
 
 // === Gradients ===
diff -Nru atanks-6.5~dfsg/src/globaltypes.h atanks-6.6~dfsg/src/globaltypes.h
--- atanks-6.5~dfsg/src/globaltypes.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/globaltypes.h	2016-11-02 14:57:52.000000000 +0000
@@ -210,7 +210,8 @@
 	SGS_NONE = 0,
 	SGS_GLOBAL,
 	SGS_ENVIRONMENT,
-	SGS_PLAYERS
+	SGS_PLAYERS,
+	SGS_VERSION
 };
 
 
diff -Nru atanks-6.5~dfsg/src/land.cpp atanks-6.6~dfsg/src/land.cpp
--- atanks-6.5~dfsg/src/land.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/land.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -12,7 +12,7 @@
 
 
 // Define how the land will look.
-void generate_land (LevelCreator* lcr, int32_t xoffset, int32_t yoffset, int32_t heightx)
+void generate_land (LevelCreator* lcr, int32_t xoffset, int32_t heightx)
 {
 	double* depthStrip[2] = { nullptr, nullptr };
 	double  smoothness    = 100.;
@@ -84,7 +84,7 @@
 		// height.
 
 		if (land_type != LAND_NONE)
-			surface = (1. + perlin2DPoint(1.0, smoothness, xoffset + x, yoffset,
+			surface = (1. + perlin2DPoint(1.0, smoothness, xoffset + x, 0,
 			                              lambda, octaves) )
 			        / 2. * land_height;
 		global.surface[x].store(surface);
@@ -130,7 +130,7 @@
 			for (depth = 1; depth < env.screenHeight; depth++) {
 				depthStrip[1][depth] = (1. + perlin2DPoint (1.0, smoothness,
 				                                            xoffset + x,
-				                                            yoffset + depth,
+				                                            depth,
 				                                            lambda, octaves) )
 				                     / 2. * land_height
 				                     - (env.screenHeight - depth);
diff -Nru atanks-6.5~dfsg/src/land.h atanks-6.6~dfsg/src/land.h
--- atanks-6.5~dfsg/src/land.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/land.h	2016-11-02 14:57:52.000000000 +0000
@@ -8,135 +8,135 @@
 
 const gradient land_gradient1[] =
 {
-	{{ 20, 40, 20,0}, 0.0},
-	{{ 80,100, 80,0}, 0.5},
-	{{ 80,120,100,0}, 1.0},
+	{{ 20, 40, 20,0}, 0.0f},
+	{{ 80,100, 80,0}, 0.5f},
+	{{ 80,120,100,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient2[] =
 {
-	{{100,200,100,0}, 0.0},
-	{{ 80,100, 80,0}, 0.5},
-	{{ 80,120,100,0}, 1.0},
+	{{100,200,100,0}, 0.0f},
+	{{ 80,100, 80,0}, 0.5f},
+	{{ 80,120,100,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient3[] =
 {
-	{{200,100,100,0}, 0.0},
-	{{100, 70, 80,0}, 0.5},
-	{{120, 80,100,0}, 1.0},
+	{{200,100,100,0}, 0.0f},
+	{{100, 70, 80,0}, 0.5f},
+	{{120, 80,100,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient4[] =
 {
-	{{ 80, 50, 60,0}, 0.0},
-	{{100, 70, 80,0}, 0.25},
-	{{150,120, 80,0}, 0.75},
-	{{200,180,150,0}, 1.0},
+	{{ 80, 50, 60,0}, 0.0f},
+	{{100, 70, 80,0}, 0.25f},
+	{{150,120, 80,0}, 0.75f},
+	{{200,180,150,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient5[] =
 {
-	{{ 20, 20, 20,0}, 0.0},
-	{{100,100,100,0}, 0.7},
-	{{250,250,250,0}, 0.75},
-	{{250,250,250,0}, 1.0},
+	{{ 20, 20, 20,0}, 0.0f},
+	{{100,100,100,0}, 0.7f},
+	{{250,250,250,0}, 0.75f},
+	{{250,250,250,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient6[] =
 {
-	{{200,180, 70,0}, 0.0},
-	{{100, 90, 30,0}, 1.0},
+	{{200,180, 70,0}, 0.0f},
+	{{100, 90, 30,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient7[] =
 {
-	{{ 50,200,150,0}, 0.0},
-	{{130,120,180,0}, 1.0},
+	{{ 50,200,150,0}, 0.0f},
+	{{130,120,180,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient8[] =
 {
-	{{  0,  0,  0,0}, 0.0},
-	{{ 50, 40, 50,0}, 0.4},
-	{{100,  0,  0,0}, 0.8},
+	{{  0,  0,  0,0}, 0.0f},
+	{{ 50, 40, 50,0}, 0.4f},
+	{{100,  0,  0,0}, 0.8f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient9[] =
 {
-	{{100,100,100,0}, 0.0},
-	{{ 50, 50, 50,0}, 0.7},
-	{{255,255,255,0}, 1.0},
+	{{100,100,100,0}, 0.0f},
+	{{ 50, 50, 50,0}, 0.7f},
+	{{255,255,255,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient10[] =
 {
-	{{100, 50, 50,0}, 0.0},
-	{{ 50,  0,  0,0}, 0.25},
-	{{100, 10, 10,0}, 0.5},
-	{{100,  0,  0,0}, 0.95},
-	{{  0,  0,  0,0}, 1.0},
+	{{100, 50, 50,0}, 0.0f},
+	{{ 50,  0,  0,0}, 0.25f},
+	{{100, 10, 10,0}, 0.5f},
+	{{100,  0,  0,0}, 0.95f},
+	{{  0,  0,  0,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient11[] =
 {
-	{{ 50,100, 50,0}, 0.0},
-	{{  0, 50,  0,0}, 0.7},
-	{{  0,100,  0,0}, 0.95},
-	{{  0,  0,  0,0}, 1.0},
+	{{ 50,100, 50,0}, 0.0f},
+	{{  0, 50,  0,0}, 0.7f},
+	{{  0,100,  0,0}, 0.95f},
+	{{  0,  0,  0,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient12[] =
 {
-	{{ 90, 90, 90,0}, 0.0},
-	{{ 30, 30, 30,0}, 0.4},
-	{{ 60, 60, 60,0}, 0.95},
-	{{  0,  0,  0,0}, 1.0},
+	{{ 90, 90, 90,0}, 0.0f},
+	{{ 30, 30, 30,0}, 0.4f},
+	{{ 60, 60, 60,0}, 0.95f},
+	{{  0,  0,  0,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient13[] =
 {
-	{{ 90, 90, 90,0}, 0.0},
-	{{  0, 60,  0,0}, 0.95},
-	{{  0,  0,  0,0}, 1.0},
+	{{ 90, 90, 90,0}, 0.0f},
+	{{  0, 60,  0,0}, 0.95f},
+	{{  0,  0,  0,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient14[] =
 {
-	{{  0,175,  0,0}, 0.0},
-	{{  0, 50,  0,0}, 0.95},
-	{{  0,  0,  0,0}, 1.0},
+	{{  0,175,  0,0}, 0.0f},
+	{{  0, 50,  0,0}, 0.95f},
+	{{  0,  0,  0,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient15[] =
 {
-	{{100, 50, 50,0}, 0.0},
-	{{ 50,  0,  0,0}, 0.95},
-	{{  0,  0,  0,0}, 1.0},
+	{{100, 50, 50,0}, 0.0f},
+	{{ 50,  0,  0,0}, 0.95f},
+	{{  0,  0,  0,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient land_gradient16[] =
 {
-	{{200,  0,  0,0}, 0.0},
-	{{200,200,  0,0}, 0.25},
-	{{  0,200,  0,0}, 0.5},
-	{{  0,  0,200,0}, 0.75},
-	{{200,  0,200,0}, 1.0},
+	{{200,  0,  0,0}, 0.0f},
+	{{200,200,  0,0}, 0.25f},
+	{{  0,200,  0,0}, 0.5f},
+	{{  0,  0,200,0}, 0.75f},
+	{{200,  0,200,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
@@ -162,7 +162,7 @@
 
 class LevelCreator;
 
-void generate_land(LevelCreator* lcr, int32_t xoffest, int32_t yoffset, int32_t heightx);
+void generate_land(LevelCreator* lcr, int32_t yoffset, int32_t heightx);
 
 #endif
 
diff -Nru atanks-6.5~dfsg/src/main.h atanks-6.6~dfsg/src/main.h
--- atanks-6.5~dfsg/src/main.h	2016-11-02 14:35:47.000000000 +0000
+++ atanks-6.6~dfsg/src/main.h	2016-11-02 14:57:52.000000000 +0000
@@ -221,7 +221,7 @@
 
 #define MENUHEIGHT 40
 #define BOXED_TOP 41 // This is the highest non-border pixel in boxed mode
-#define	BALLISTICS 52
+#define	BALLISTICS 53
 #define	BEAMWEAPONS 3
 #define WEAPONS (BALLISTICS + BEAMWEAPONS)
 #define ITEMS 24
@@ -245,6 +245,10 @@
 #define MAX_ITEMS_IN_STOCK 999999
 #define MAX_MONEY_IN_WALLET 1000000000
 
+// to make the theft bomb base steal easier to change, here
+// is a useful define. Maybe, one day, we'll add it to the options?
+#define THEFT_AMOUNT 5000
+
 // Use these instead of the (most strict) defaults,
 // But only where timing by memory fences do not matter.
 #define ATOMIC_READ  std::memory_order_acquire
@@ -495,16 +499,17 @@
 	SMALL_DIRT_SPREAD  = 48,
 	CLUSTER_MIRV       = 49,
 	PERCENT_BOMB       = 50,
-	REDUCER            = 51, // Last ballistic
-	SML_LAZER          = 52,
-	MED_LAZER          = 53,
-	LRG_LAZER          = 54, // Last weapon (WEAPONS == 55)
-	SML_METEOR         = 55,
-	MED_METEOR         = 56,
-	LRG_METEOR         = 57,
-	SML_LIGHTNING      = 58,
-	MED_LIGHTNING      = 59,
-	LRG_LIGHTNING      = 60 // Last natural
+	REDUCER            = 51,
+	THEFT_BOMB         = 52, // Last ballistic (BALLISTICS == 53)
+	SML_LAZER          = 53,
+	MED_LAZER          = 54,
+	LRG_LAZER          = 55, // Last weapon (WEAPONS == 56)
+	SML_METEOR         = 56,
+	MED_METEOR         = 57,
+	LRG_METEOR         = 58,
+	SML_LIGHTNING      = 59,
+	MED_LIGHTNING      = 60,
+	LRG_LIGHTNING      = 61 // Last natural
 };
 
 
@@ -513,13 +518,13 @@
 #define ITEM_NO_SHIELD   -1
 enum itemType
 {
-	ITEM_TELEPORT             =  0, // 55 (weap_idx - WEAPONS)
-	ITEM_SWAPPER              =  1, // 56
-	ITEM_MASS_TELEPORT        =  2, // 57
-	ITEM_FAN                  =  3, // 58
-	ITEM_VENGEANCE            =  4, // 59
-	ITEM_DYING_WRATH          =  5, // 60
-	ITEM_FATAL_FURY           =  6, // 61
+	ITEM_TELEPORT             =  0, // 56 (weap_idx - WEAPONS)
+	ITEM_SWAPPER              =  1, // 57
+	ITEM_MASS_TELEPORT        =  2, // 58
+	ITEM_FAN                  =  3, // 59
+	ITEM_VENGEANCE            =  4, // 60
+	ITEM_DYING_WRATH          =  5, // 61
+	ITEM_FATAL_FURY           =  6, // 62
 	ITEM_LGT_SHIELD           =  7,
 	ITEM_MED_SHIELD           =  8,
 	ITEM_HVY_SHIELD           =  9,
@@ -534,9 +539,9 @@
 	ITEM_DIMPLEP              = 18,
 	ITEM_PARACHUTE            = 19,
 	ITEM_REPAIRKIT            = 20,
-	ITEM_FUEL                 = 21, // 76
-	ITEM_ROCKET               = 22, // 77
-	ITEM_SDI                  = 23 // Last item
+	ITEM_FUEL                 = 21, // 77
+	ITEM_ROCKET               = 22, // 78
+	ITEM_SDI                  = 23  // 79 (Last item)
 };
 
 #define SHIELD_COUNT		6
diff -Nru atanks-6.5~dfsg/src/missile.cpp atanks-6.6~dfsg/src/missile.cpp
--- atanks-6.5~dfsg/src/missile.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/missile.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -36,7 +36,8 @@
  */
 MISSILE::MISSILE (PLAYER* player_, double xpos, double ypos,
                   double xvel, double yvel, int32_t weapon_type,
-                  eMissileType missile_type, int32_t ai_level_) :
+                  eMissileType missile_type, int32_t ai_level_,
+                  int32_t delay_idx_) :
 	PHYSICAL_OBJECT(MT_WEAPON == missile_type),
 	ai_level(ai_level_),
 	missileType(missile_type)
@@ -131,12 +132,22 @@
 	  || (CLUSTER_MIRV == weapType) )
 		allowDirtyWrap = false;
 
-	// Add to the chain:
+	// If this is a mind shot with a delay characteristic, like
+	// the chain missile, set a delay range by its index.
+	// This causes PHYSICAL_OBJECT::applyPhysics() to not detonate
+	// the missile unless the set distance was travelled through
+	// dirt. This simulates the clearing of the path by previous
+	// missiles, so the AI can track those weapons better.
+	if (MT_MIND_SHOT == missile_type)
+		this->mindDelay = weap->radius * delay_idx_;
+
+	// Otherwise add it to the chain:
 	// Do not put mind shots in there or the object updaters
 	// will not only try to apply physics, but use delete on
 	// them when they get destroyed.
-	if (MT_MIND_SHOT != missileType)
+	else
 		global.addObject(this);
+
 }
 
 
@@ -204,6 +215,12 @@
 		// Standard physics can be applied
 		PHYSICAL_OBJECT::applyPhysics ();
 
+		// If a mind shot napalm jelly hit something, it is counted as
+		// destroyed immediately.
+		if (hitSomething
+		  && (MT_MIND_SHOT == missileType)
+		  && (NAPALM_JELLY == weapType) )
+			destroy = true;
 
 		// mirvs trigger above ground
 		if ( !hitSomething
@@ -242,44 +259,57 @@
 
 	// === 2) Handle rolling projectiles ===
 	else if (PT_ROLLING == physType) {
+
 		// check whether anything is hit
+		int32_t round_x = ROUND(x);
+		int32_t round_y = ROUND(y);
 		if ( (x < 2)
 		  || (x > (env.screenWidth  - 3) )
-		  || (y > (env.screenHeight - 3) ) ) {
-			int32_t round_x = ROUND(x);
-			int32_t round_y = ROUND(y);
-			if(PINK != getpixel(global.terrain, round_x, round_y))
+		  || (y > (env.screenHeight - 3) )
+		  || (PINK != getpixel(global.terrain, round_x, round_y)) )
 				hitSomething = true;
-		}
 
-		if (!hitSomething) {
-			// roll roller
-			float surfY = global.surface[ROUND(x)].load(ATOMIC_READ) - 1;
-
-			// Check whether terrain is going down
-			if ( (surfY > y) && (y < (env.screenHeight - 5)) ) {
-
-				// Do not fall more than five pixels if terrain gives way.
-				if ( surfY < (y + 5) )
-					y  = surfY;
+		else {
+			// To honour the size of the rollers, they have the following
+			// rules about the path they roll:
+			// - The small roller can climb four and fall six pixels.
+			// - The large roller can climb six and fall nine pixels.
+			// - The death roller can climb nine and fall twelve pixels.
+			int32_t maxClimb = SML_ROLLER == weapType ?  4 :
+			                   LRG_ROLLER == weapType ?  6 :
+			                   DTH_ROLLER == weapType ?  9 : 1;
+			int32_t maxFall  = SML_ROLLER == weapType ?  6 :
+			                   LRG_ROLLER == weapType ?  9 :
+			                   DTH_ROLLER == weapType ? 12 : 1;
+
+			// get next surface pixel
+			float surfY = global.surface[ROUND(x+xv)].load(ATOMIC_READ) - 1;
+
+			// Check whether the terrain is going down
+			if (surfY > y) {
+				// Do not fall more than 'maxFall' pixels if terrain gives way.
+				if ( surfY <= (y + maxFall) )
+					y  = surfY - 1;
 				else
-					y += 5;
-			} else {
-				// Normal movement:
-				x += xv > 0 ? 1 : xv < 0 ? -1 : 0;
+					y += maxFall;
+				// Do not fall through the floor:
+				if (y > (env.screenHeight - maxClimb))
+					y =  env.screenHeight - maxClimb;
+			}
 
-				if	(y >= MENUHEIGHT) {
-					// The small roller can climb two, the large three and
-					// the death roller four pixels. Everything else
-					// rolling is limited to one pixel.
-					int32_t maxHeight = y -
-								(SML_ROLLER == weapType ? 2 :
-								 LRG_ROLLER == weapType ? 3 :
-								 DTH_ROLLER == weapType ? 4 : 1);
-					if (surfY >= maxHeight)
-						y = surfY - 1;
-				}
-			} // End of normal movement
+			// Check whether the terrain is going up
+			else if (surfY < y) {
+				// If terrain is going up, it can be climbed,
+				// or the rollers path ends here
+				if ( surfY >= (y - maxClimb) )
+					y = surfY - 1;
+				else
+					// too steep!
+					hitSomething = true;
+			}
+
+			// Normal transversal movement:
+			x += xv > 0 ? 1 : xv < 0 ? -1 : 0;
 
 			// Adapt angle according to movement
 			if (xv > 0.0) angle = (angle +   3) % 256;
@@ -294,12 +324,39 @@
 	// === 3) Handle funky projectiles ===
 	else if (PT_FUNKY_FLOAT == physType)  {
 
-		// Funky Floats have a 0.5% chance to randomly reverse either direction:
-		if (0 == (rand() % 200)) {
-			if (rand() % 2)
+		// Funky Floats have a 0.75% chance to randomly change their direction
+		if (0 == (rand() % 150)) {
+
+			int32_t floatee_action = rand() % 4;
+
+			// Three possibilities:
+			// A) 25% chance to reverse x movement
+			// B) 25% chance to reverse y movement
+			// C) 50% chance to pick a random target to home into.
+			// If A is chosen and there is no x movement, or B is chosen and
+			// there is no y movement, option C is pulled.
+			if ( (1 == floatee_action) && (std::abs(xv) > 0.5))
 				xv *= -1.;
-			else
+			else if ( (3 == floatee_action) && (std::abs(yv) > 0.5))
 				yv *= -1.;
+			else {
+				TANK* floatee_tgt = global.get_random_tank();
+				if (floatee_tgt) {
+					WEAPON* launchWeap = FUNKY_BOMBLET == weapType
+					                   ? &weapon[FUNKY_BOMB]
+					                   : FUNKY_DEATHLET == weapType
+					                   ? &weapon[FUNKY_DEATH]
+					                   : nullptr;
+					double speed = ( launchWeap->launchSpeed
+					               + ROUND( (launchWeap ? launchWeap->speedVariation : 0.0)
+					                      * (launchWeap ? launchWeap->launchSpeed    : 0.0)
+					                      * Noise(rand() % 1000000) ) )
+					             * env.FPS_mod;
+					double fdiff = ABSDISTANCE2(floatee_tgt->x, floatee_tgt->y, x, y);
+					xv = (floatee_tgt->x - x) / fdiff * speed;
+					yv = (floatee_tgt->y - y) / fdiff * speed;
+				}
+			}
 		}
 
 		// Funky floats simply bounce on borders.
@@ -554,7 +611,6 @@
 	// and anything with submunition.
 	if ( (PT_DIGGING == physType)
 	  || (weapType == NAPALM_JELLY)
-	  || ( (weapType >= DIRT_BALL) && (weapType <= SMALL_DIRT_SPREAD) )
 	  || (weap->submunition > 0) )
 		return;
 
@@ -609,9 +665,10 @@
 			 * 2: but further away than the minimum distance and
 			 * 3: no dirt is between the gun top and the missile.
 			 */
-			if ( (sdi[idx].dist <= sdi[idx].range)                    // 1
-			  && (sdi[idx].dist >  lt->player->ni[ITEM_SDI])          // 2
-			  && !checkPixelsBetweenTwoPoints(&startX, &startY, x, y) /* 3 */ ) {
+			if ( (sdi[idx].dist <= sdi[idx].range)                // 1
+			  && (sdi[idx].dist >  lt->player->ni[ITEM_SDI])      // 2
+			  && !checkPixelsBetweenTwoPoints(&startX, &startY,
+			                                  x, y, 0.0, nullptr) /* 3 */ ) {
 				// This can be added!
 				if (pSDI) {
 					// Must be sorted in
@@ -637,7 +694,7 @@
 		if ( (rand() % 100) < (19 + pSDI->am) ) {
 			// Try to predict the coordinates where the missile will go down:
 			MISSILE mind_shot(player, x, y, xv, yv, weapType, MT_MIND_SHOT,
-			                  SDI_PREDICTOR);
+			                  SDI_PREDICTOR, 0);
 
 			// Adapt missile drag if the player has dimpled/slick projectiles
 			if (player->ni[ITEM_DIMPLEP])
@@ -670,7 +727,9 @@
 			}
 
 			// If the missile is destroyed, check whether the explosion would
-			// a) hit this tank and be) be nearer than the missile is now.
+			// a) hit this tank,
+			// b) be nearer than the missile is now and
+			// c) will not kill the tank if shot down.
 			// If so, shoot it down!
 			bool will_hit = false;
 			if (mind_shot.destroy) {
@@ -686,10 +745,18 @@
 				  && (std::abs(y_dist) <= y_rad) // tank in y range
 				  && ( ( std::abs(x - pSDI->x) > x_rad) // misses x radius now
 				    || ( std::abs(y - pSDI->y) > y_rad) // misses y radius now
-						// Is now farther away than when it goes off:
+				        // Is now farther away than when it goes off:
 				    || (   ABSDISTANCE2(x, y, pSDI->tank->x, pSDI->tank->y)
-				        >= ABSDISTANCE2(x, y, mind_shot.x, mind_shot.y) ) ) )
-					will_hit = true;
+				        >= ABSDISTANCE2(mind_shot.x, mind_shot.y,
+				                        pSDI->tank->x, pSDI->tank->y) ) ) ) {
+
+					// The point looks promising, but is it worth it?
+					double dmg = get_hit_damage(pSDI->tank,
+					                            static_cast<weaponType>(weapType),
+					                            x, y);
+					if (dmg < (pSDI->tank->sh + pSDI->tank->l))
+						will_hit = true;
+				}
 			}
 
 			if (will_hit) {
@@ -1097,6 +1164,9 @@
 									* Noise(randStart + 124786 + sc) );
 
 					// Launch new submunition missile
+					// Note on funky floats: They do *not* home in on random
+					// tanks when started, it is just a possibility in
+					// applyPhysics() *only*
 					try {
 						newmis = new MISSILE (player, x, startY,
 									env.slope[newMissAngle][0]
@@ -1107,7 +1177,7 @@
 									* launchSpeed
 									* env.FPS_mod
 									+ inheritedYV, weap->submunition,
-									missileType, ai_level);
+									missileType, ai_level, 0);
 						newmis->physType  = submunitionPhys;
 						newmis->countdown = newMissCount;
 						newmis->setUpdateArea(newmis->x - 20, newmis->y - 20, 40, 40);
@@ -1142,7 +1212,9 @@
 		else
 			trigger();
 	} else if ( (yv > 0.)
-	         && ( (weapType < RIOT_BOMB) || (weapType > SMALL_DIRT_SPREAD) ) )
+	         && ( (weapType < RIOT_BOMB)
+	           || (weapType > SMALL_DIRT_SPREAD) )
+	         && (weapType < BALLISTICS) )
 		// Otherwise it is time to check whether any tank SDI shoots it down
 		Check_SDI();
 }
diff -Nru atanks-6.5~dfsg/src/missile.h atanks-6.6~dfsg/src/missile.h
--- atanks-6.5~dfsg/src/missile.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/missile.h	2016-11-02 14:57:52.000000000 +0000
@@ -57,7 +57,7 @@
 	explicit MISSILE (PLAYER* player_, double xpos, double ypos,
 	                  double xvel, double yvel,
 	                  int32_t weapon_type, eMissileType missile_type,
-	                  int32_t ai_level_);
+	                  int32_t ai_level_, int32_t delay_idx_);
 	~MISSILE ();
 
 
diff -Nru atanks-6.5~dfsg/src/optionitembase.cpp atanks-6.6~dfsg/src/optionitembase.cpp
--- atanks-6.5~dfsg/src/optionitembase.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/optionitembase.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -507,7 +507,7 @@
 void OptionItemBase::activateText(char* target, int32_t k)
 {
 	if (target && (k > 0) ) {
-		int32_t oldTextLen = strlen(target);
+		int32_t oldTextLen = static_cast<int32_t>(strlen(target));
 		char    chr        = static_cast<char>(k & 0xff);
 		textLen = oldTextLen;
 
diff -Nru atanks-6.5~dfsg/src/optionitembase.h atanks-6.6~dfsg/src/optionitembase.h
--- atanks-6.5~dfsg/src/optionitembase.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/optionitembase.h	2021-06-28 22:40:01.000000000 +0000
@@ -37,7 +37,8 @@
 
 // Forward BUTTON if it isn't known, yet:
 #ifndef BUTTON_HEADER_
-class BUTTON;
+// class BUTTON;
+#include "button.h"
 #endif // BUTTON_HEADER_
 
 // Forward Menu if it isn't known, yet:
@@ -140,10 +141,10 @@
 		if (format) {
 			char txt_buf[256] = { 0x0 };
 			snprintf(txt_buf, 255, format, *target);
-			textLen = strlen(txt_buf);
+			textLen = static_cast<int32_t>(strlen(txt_buf));
 			this->displayText(txt_buf);
 		} else if (texts && texts[entryNum]) {
-			textLen = strlen(texts[entryNum]);
+			textLen = static_cast<int32_t>(strlen(texts[entryNum]));
 			this->displayText(texts[entryNum]);
 		}
 	}
diff -Nru atanks-6.5~dfsg/src/optionitem.h atanks-6.6~dfsg/src/optionitem.h
--- atanks-6.5~dfsg/src/optionitem.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/optionitem.h	2016-11-02 14:57:52.000000000 +0000
@@ -407,7 +407,7 @@
 	{
 		if ( (ET_VALUE == this->type) && this->format)
 			// Check format, because texts[] based options are rotated.
-			return (*target > static_cast<tgt_T>(minVal));
+			return (*target > static_cast<tgt_T>(minVal) ? true : false);
 		return true;
 	}
 
@@ -416,7 +416,7 @@
 	virtual bool canGoUp()
 	{
 		if ( (ET_VALUE == this->type) && this->format)
-			return (*target < static_cast<tgt_T>(maxVal));
+			return (*target < static_cast<tgt_T>(maxVal) ? true : false);
 		return true;
 	}
 
diff -Nru atanks-6.5~dfsg/src/optionscreens.cpp atanks-6.6~dfsg/src/optionscreens.cpp
--- atanks-6.5~dfsg/src/optionscreens.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/optionscreens.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -886,12 +886,12 @@
 	itemY += itemFullHeight;
 
 	// "Self-Damage Penalty"
-	mMoney.addValue(&env.scoreSelfHit, idx++, WHITE, 0, 10000, 1000, "%d",
+	mMoney.addValue(&env.scoreSelfHit, idx++, WHITE, 0, 5000, 25, "%d",
 	                menuMid - 50, itemY, itemWidth, itemHeight, itemPadding);
 	itemY += itemFullHeight;
 
 	// "Team-Damage Penalty"
-	mMoney.addValue(&env.scoreTeamHit, idx++, WHITE, 0, 10000, 1000, "%d",
+	mMoney.addValue(&env.scoreTeamHit, idx++, WHITE, 0, 5000, 10, "%d",
 	                menuMid - 50, itemY, itemWidth, itemHeight, itemPadding);
 	itemY += itemFullHeight;
 
diff -Nru atanks-6.5~dfsg/src/perlin.cpp atanks-6.6~dfsg/src/perlin.cpp
--- atanks-6.5~dfsg/src/perlin.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/perlin.cpp	2021-06-28 23:22:07.000000000 +0000
@@ -62,27 +62,17 @@
 values (sorry, it's the best I could explain it).  i is the distance,
 expressed as a percentage of the wave length, ie 0<=i<1 .
 *****************************************************************************/
-/*
 double interpolate (double x1, double x2, double i)
 {
-	double ft = i * M_PI;
-	double f = (1 - cos(ft)) * 0.5;
-
-	return (x1 * (1 - f) + (x2 * f));
-}
-*/
-
+  if (std::isnan(x1) || std::isnan(x2))
+    return 0.0;
 
-double interpolate (double x1, double x2, double i)
-{
   double ft = i * M_PI;
   double f = (1 - cos(ft)) * 0.5;
   double result = (x1 * (1 - f) + (x2 * f));
 
-  if (std::isnan(x1) || std::isnan(x2))
-    return 0.0;
   if (std::isnan(result))
-    return (x1 + x2) / 2.0; /* fall back to linear interpolation */
+    return (x1 * (1-i) + (x2 * i)); /* fall back to linear interpolation */
   return result;
 }
 
diff -Nru atanks-6.5~dfsg/src/physobj.cpp atanks-6.6~dfsg/src/physobj.cpp
--- atanks-6.5~dfsg/src/physobj.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/physobj.cpp	2021-06-28 23:22:07.000000000 +0000
@@ -59,7 +59,7 @@
 	double startX = x - xv;
 	double startY = y - yv;
 
-	if (checkPixelsBetweenTwoPoints(&startX, &startY, x, y)) {
+	if (checkPixelsBetweenTwoPoints(&startX, &startY, x, y, mindDelay, &mindPassed)) {
 		x = startX;
 		y = startY;
 		return true;
@@ -194,11 +194,12 @@
 		//       terminates the movement towards a wall. Only if the path
 		//       really is clear wall handling makes sense.
 		// =================================================================
-		if (checkPixelsBetweenTwoPoints(&currX, &currY, nextX, nextY)) {
+		if (checkPixelsBetweenTwoPoints(&currX, &currY, nextX, nextY, mindDelay, &mindPassed)) {
 			xv_cur = currX - nextX;
 			yv_cur = currY - nextY;
 			nextX  = currX;
 			nextY  = currY;
+
 			if (PT_DIRTBOUNCE == physType) {
 				double rxv, ryv;
 				getDirtBounceReact(nextX, nextY, xv, yv, rxv, ryv);
@@ -375,7 +376,9 @@
 }
 
 /* --- global function --- */
-bool checkPixelsBetweenTwoPoints (double *startX, double *startY, double endX, double endY)
+bool checkPixelsBetweenTwoPoints(double* startX,    double* startY,
+                                 double  endX,      double  endY,
+                                 double  can_delay, double* has_delayed)
 {
 	// return at once if there can't be any dirt in the box.
 	if (!global.isDirtInBox(*startX, *startY, endX, endY)) {
@@ -390,11 +393,12 @@
 	double length = FABSDISTANCE2(xDist, yDist, 0, 0);
 
 	// Shortcuts:
-	bool   hasTop = env.isBoxed;
-	double left   = 1;
-	double right  = env.screenWidth - 2;
-	double top    = MENUHEIGHT + (hasTop ? 1 : 0);
-	double bottom = env.screenHeight - 2;
+	bool   hasDelay = has_delayed && (can_delay > *has_delayed);
+	bool   hasTop   = env.isBoxed;
+	double left     = 1;
+	double right    = env.screenWidth - 2;
+	double top      = MENUHEIGHT + (hasTop ? 1 : 0);
+	double bottom   = env.screenHeight - 2;
 
 
 	// Drop out early if a neighbouring pixel is checked and it is a hit
@@ -404,19 +408,31 @@
 		  && (endY > top)
 		  && (endY < bottom) ) {
 
+			*startX = endX;
+			*startY = endY;
+
 			if (PINK != getpixel(global.terrain, endX, endY) ) {
-				*startX = endX;
-				*startY = endY;
 				result  = true;
+
+				// For mind shot delays the distance is only added
+				// to the travelled distance, but the result remains
+				// false if the distance is not used up.
+				if (hasDelay) {
+					*has_delayed += length;
+					if (can_delay > *has_delayed)
+						result = false;
+				}
 			}
 
 		} // End of having a valid position
+
 		return result;
 	} // End of early drop out
 
 	// Otherwise the path must be checked
-	double xInc = xDist / length;
-	double yInc = yDist / length;
+	double xInc  = xDist / length;
+	double yInc  = yDist / length;
+	double iDist = ABSDISTANCE2(0.0, 0.0, xInc, yInc); // [i]ncrease[Dist]ance
 
 	// sanity check
 	if (length > (env.screenWidth + env.screenHeight))
@@ -426,10 +442,10 @@
 
 	// As xInc/yInc are known now, left, right, top and bottom can
 	// be corrected if the line would not leave the screen.
-	left   = std::min(std::min(*startX,   left), *startX + (length * xInc));
-	top    = std::min(std::min(*startY,    top), *startY + (length * yInc));
-	right  = std::max(std::max(*startX,  right), *startX + (length * xInc));
-	bottom = std::max(std::max(*startY, bottom), *startY + (length * yInc));
+	left   = std::min({*startX, left,   *startX + (length * xInc)});
+	top    = std::min({*startY, top,    *startY + (length * yInc)});
+	right  = std::max({*startX, right,  *startX + (length * xInc)});
+	bottom = std::max({*startY, bottom, *startY + (length * yInc)});
 
 	// Note: Start with 1 and increase startX/Y first, as
 	//       the starting pixel can be assumed to be clean.
@@ -442,10 +458,20 @@
 		  && (*startY > top)
 		  && (*startY < bottom) ) {
 
-			if (PINK != getpixel (global.terrain, *startX, *startY) )
+			if (PINK != getpixel (global.terrain, *startX, *startY) ) {
 				result = true;
 				// Note: startX/startY now point to the hit pixel
 
+				// For mind shot delays we revert to false as long
+				// as the allowed distance through dirt is used up.
+				if (hasDelay) {
+					*has_delayed += iDist;
+					if (can_delay > *has_delayed)
+						result = false;
+				}
+
+			}
+
 		} // End of having a valid position
 	} // End of walking positions
 
diff -Nru atanks-6.5~dfsg/src/physobj.h atanks-6.6~dfsg/src/physobj.h
--- atanks-6.5~dfsg/src/physobj.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/physobj.h	2016-11-02 14:57:52.000000000 +0000
@@ -106,6 +106,8 @@
 	bool    lacerated    = false; //!< Set to true if the velocity check fails.
 	double  mass         = 0.;
 	double  maxVel       = 0.;    //!< maximum Velocity
+	double  mindDelay    = 0.;    //!< for mind shots to travel through dirt if delayed
+	double  mindPassed   = 0.;    //!< Counts the amount of dirt a delayed shot already passed through
 	bool    noimpact     = false;
 	int32_t spin         = 0;
 
@@ -113,8 +115,9 @@
 
 
 /// global helper methods:
-bool checkPixelsBetweenTwoPoints(double *startX, double *startY,
-								double endX, double endY);
+bool checkPixelsBetweenTwoPoints(double* startX,    double* startY,
+                                 double  endX,      double  endY,
+                                 double  can_delay, double* has_delayed);
 void getDirtBounceReact(int32_t x, int32_t y, double xv, double yv,
 						double &rxv, double &ryv);
 
diff -Nru atanks-6.5~dfsg/src/player.cpp atanks-6.6~dfsg/src/player.cpp
--- atanks-6.5~dfsg/src/player.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/player.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -49,7 +49,6 @@
 	memset(name,         0, sizeof(char)    * NAME_LEN);
 	memset(weapPref,     0, sizeof(int32_t) * THINGS);
 
-	nm[0] = 99; // need some small missiles. ;)
 	strncpy(name, "New Player", NAME_LEN);
 
 	// 25% of time set to perplay weapon preferences
@@ -527,6 +526,21 @@
 		}
 	} // End of handling firing stage
 
+	// If the AI wants to move their tank, do so:
+	else if (PS_MOVE_LEFT == plStage) {
+		if (tank->moveTank(DIR_LEFT)) {
+			aicore->hasMoved(DIR_LEFT);
+			return CONTROL_OTHER;
+		} else
+			aicore->hasMoved(0); // No movement possible
+	} else if (PS_MOVE_RIGHT == plStage) {
+		if (tank->moveTank(DIR_RIGHT)) {
+			aicore->hasMoved(DIR_RIGHT);
+			return CONTROL_OTHER;
+		} else
+			aicore->hasMoved(0); // No movement possible
+	}
+
 	return CONTROL_NONE;
 }
 
@@ -547,7 +561,8 @@
 	 * 4.: Armour/Amps
 	 * 5.: "Tools" to free themselves like Riot Blasts
 	 * 6.: Shields, if enough money is there
-	 * 7.: if all is set, look for dimpled/slick projectiles!
+	 * 7.: Fuel, everybody shall have at least 100 units.
+	 * 8.: if all is set, look for dimpled/slick projectiles!
 	 */
 
 
@@ -780,7 +795,15 @@
 	} // End of step 5
 
 
-    // Step 7: Slick / Dimpled Projectiles
+	// Step 7: Fuel
+	if ( (ni[ITEM_FUEL] < 100)
+	  && (money >= item[ITEM_FUEL].cost) ) {
+		DEBUG_LOG_FIN(name, "Pre-selecting Fuel", 0)
+		return (WEAPONS + ITEM_FUEL);
+	}
+
+
+    // Step 8: Slick / Dimpled Projectiles
     if ( (ni[ITEM_SLICKP] + ni[ITEM_DIMPLEP]) < 100 ) {
 
 		if ( (ni[ITEM_DIMPLEP] < 50)
@@ -1222,10 +1245,10 @@
 		damageMultiplier += std::pow(tmpDM, 0.6);
 
 	// All players need small missiles:
-	int32_t max_small_missiles = 500 + (rand() % 500); // max 999
-	nm[SML_MIS] += 50 + (rand() % 50);
-	if (nm[SML_MIS] > max_small_missiles)
-		nm[SML_MIS] = max_small_missiles;
+	if (nm[SML_MIS] < 100)
+		nm[SML_MIS] += 100 + (rand() % 100); // + [100;199]
+	if (nm[SML_MIS] < 250)
+		nm[SML_MIS] +=  50 + (rand() %  50); // + [ 50; 99]
 }
 
 
@@ -1389,6 +1412,11 @@
 					worth = 300. * ai_rate
 					      * -(defensive - 2.)
 					      * selfPreservation;
+				// Note: The theft bomb is a debuff weapon with extra benefits. ;-)
+				if (THEFT_BOMB == currItem)
+					worth = (150. + vengeful) * ai_rate
+					      * ( (selfPreservation + 2.) / 2.)
+					      * (std::abs(defensive) + 1.0);
 
 				// === 5. Shaped weapons are deadly but limited ===
 				//--------------------------------------------------
@@ -1485,7 +1513,7 @@
 					worth = baseProb / 15. * ai_rate;
 					break;
 				case ITEM_FUEL:
-					worth     = -5000; // Bots don't need fuel
+					worth = baseProb / 30. * ai_rate;
 					isWarhead = true;  // Yes, it's a lie. ;-)
 					break;
 				case ITEM_ROCKET:
@@ -1974,10 +2002,11 @@
 {
 	// Initialize basic values if this is not loaded
 	if (!loaded_game) {
-		nm[0] = MAX_ITEMS_IN_STOCK;
 		memset(nm, 0, sizeof(int32_t) * WEAPONS);
 		memset(ni, 0, sizeof(int32_t) * ITEMS);
 
+		ni[ITEM_FUEL] = 100; // Supply some initial fuel
+
 		kills  = 0;
 		killed = 0;
 		score  = 0;
@@ -2024,14 +2053,14 @@
 			}
 
 			// strip newline character
-			int32_t line_length = strlen(line);
+			size_t line_length = strlen(line);
 			while ( line[line_length - 1] == '\n') {
 				line[line_length - 1] = '\0';
 				line_length--;
 			}
 
 			// find equal sign
-			int32_t equal_position = 1;
+			size_t equal_position = 1;
 			while ( ( equal_position < line_length )
 				 && ( line[equal_position] != '='  ) )
 				equal_position++;
@@ -2122,7 +2151,20 @@
 }
 
 
-void PLAYER::load_game_data(FILE* file)
+/** @brief Load player data from @a file which has the @a file_version.
+  *
+  * Version additions that are not found in earlier versions:
+  * <ul>
+  * <li>Version 65 : THEFT_BOMB
+  * </ul>
+  *
+  * Version changes from earlier versions:
+  * <ul>
+  * <li>Version 65 : FUEL needs preferences
+  * </ul>
+  *
+**/
+void PLAYER::load_game_data(FILE* file, int32_t file_version)
 {
 	if (!file)
 		return;
@@ -2149,14 +2191,14 @@
 			}
 
 			// strip newline character
-			int32_t line_length = strlen(line);
+			size_t line_length = strlen(line);
 			while ( line[line_length - 1] == '\n') {
 				line[line_length - 1] = '\0';
 				line_length--;
 			}
 
 			// find equal sign
-			int32_t equal_position = 1;
+			size_t equal_position = 1;
 			while ( ( equal_position < line_length )
 				 && ( line[equal_position] != '='  ) )
 				equal_position++;
@@ -2220,8 +2262,47 @@
 				int32_t prf_val = -1;
 				sscanf(value, "%d %d", &prf_idx, &prf_val);
 				if ( (prf_idx > -1) && (prf_idx < THINGS) ) {
-					weapPref[prf_idx] = prf_val;
-					has_pref_loaded   = true; // to separate old versus new save games
+
+					/* === Version Checks for new weapons / items === */
+
+					if ( (file_version < 65) && (prf_idx >= THEFT_BOMB) ) {
+						if (THEFT_BOMB == prf_idx) {
+							// Generate a value
+							weapPref[THEFT_BOMB] = (150. + vengeful)
+							                     * (static_cast<double>(type) / 2. + .5)
+						                         * ( (selfPreservation + 2.) / 2.)
+						                         * (std::abs(defensive) + 1.0);
+							DEBUG_LOG_EMO(name, "New preference for %s : %5d",
+							              weapon[THEFT_BOMB].getName(),
+							              weapPref[THEFT_BOMB])
+						}
+						++prf_idx; // Skip new index value
+					} // End of version 65 THEFT_BOMB
+
+					/* === Version Checks for changed weapons / items === */
+
+					if ( (file_version < 65) ) {
+						if ( (ITEM_FUEL == (prf_idx - WEAPONS))
+						  && (prf_val < 1) ) {
+							// Generate a value
+							prf_val = static_cast<double>(MAX_WEAP_PROBABILITY)
+							        / 60.
+							        * ( static_cast<double>(type) / 2. + .5);
+
+							DEBUG_LOG_EMO(name, "Changed preference for %s : %5d",
+							              item[ITEM_FUEL].getName(),
+							              prf_val)
+						}
+					} // End of version 65 ITEM_FUEL
+
+					/* === Store data === */
+					// (If someone edited the save game, the index might
+					//  be too larger now, so check again to be safe!)
+					if (prf_idx < THINGS)
+						weapPref[prf_idx] = prf_val;
+
+					// separate very old from new save games
+					has_pref_loaded   = true;
 				}
 			}
 
@@ -2230,8 +2311,19 @@
 				int32_t weap_idx = -1;
 				int32_t weap_val = -1;
 				sscanf(value, "%d %d", &weap_idx, &weap_val);
-				if ( (weap_idx > -1) && (weap_idx < WEAPONS) )
-					nm[weap_idx] = weap_val;
+				if ( (weap_idx > -1) && (weap_idx < WEAPONS) ) {
+
+					/* === Version Checks for new weapons === */
+
+					if ( (file_version < 65) && (weap_idx >= THEFT_BOMB) )
+						++weap_idx; // Skip new index value
+
+					/* === Store data === */
+					// (If someone edited the save game, the index might
+					//  be too larger now, so check again to be safe!)
+					if (weap_idx < WEAPONS)
+						nm[weap_idx] = weap_val;
+				}
 			}
 
 			// Inventory of the items
@@ -2239,8 +2331,13 @@
 				int32_t item_idx = -1;
 				int32_t item_val = -1;
 				sscanf(value, "%d %d", &item_idx, &item_val);
-				if ( (item_idx > -1) && (item_idx < ITEMS) )
+				if ( (item_idx > -1) && (item_idx < ITEMS) ) {
+
+					/* === Version Checks for new weapons === */
+					// Currently there are no new items.
+
 					ni[item_idx] = item_val;
+				}
 			}
 
 			// Opponents Memory
@@ -2354,7 +2451,7 @@
 }
 
 
-// run this at the begining of each turn
+// run this at the beginning of each turn
 void PLAYER::newRound()
 {
 	// if the player is under computer control, give it back to the player
@@ -2437,8 +2534,8 @@
 				if (!global.skippingComputerPlay ) {
 					try {
 						new FLOATTEXT(selectRevengePhrase(),
-										tank->x, tank->y - 30, .0, -.4, color,
-										CENTRE, TS_NO_SWAY, 300);
+						              tank->x, tank->y - 30, .0, -.4, color,
+						              CENTRE, TS_NO_SWAY, 300, false);
 					} catch (...) {
 						perror ( "player.cpp: Failed to allocate memory for"
 								 " revenge text in noteDamageFrom().");
diff -Nru atanks-6.5~dfsg/src/player.h atanks-6.6~dfsg/src/player.h
--- atanks-6.5~dfsg/src/player.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/player.h	2016-11-02 14:57:52.000000000 +0000
@@ -99,7 +99,7 @@
 	int32_t     getWeapPref         (int32_t idx);
 	void	    initialise          (bool loaded_game);
 	bool        load_from_file      (FILE* file);
-	void        load_game_data      (FILE* file);
+	void        load_game_data      (FILE* file, int32_t file_version);
 	void        newGame             ();
 	void	    newRound            ();
 	void        noteDamageFrom      (PLAYER* opponent, int32_t damage, bool destroyed);
diff -Nru atanks-6.5~dfsg/src/player_types.h atanks-6.6~dfsg/src/player_types.h
--- atanks-6.5~dfsg/src/player_types.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/player_types.h	2016-11-02 14:57:52.000000000 +0000
@@ -16,6 +16,8 @@
 	PS_SELECT_WEAPON,  //!< AI is selecting a weapon or item
 	PS_CALCULATE,      //!< AI calculates its basic attack values
 	PS_AIM,            //!< AI aims the current selection to hit its target
+	PS_MOVE_LEFT,      //!< AI wants to move their tank to the left
+	PS_MOVE_RIGHT,     //!< AI wants to move their tank to the right
 	PS_FIRE,           //!< AI is ready to have the current weapon/item fired
 	PS_CLEANUP,        //!< AI is cleaning up
 	PS_STAGE_COUNT
diff -Nru atanks-6.5~dfsg/src/sky.cpp atanks-6.6~dfsg/src/sky.cpp
--- atanks-6.5~dfsg/src/sky.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/sky.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -371,8 +371,8 @@
 void generate_sky(LevelCreator* lcr, const gradient* grad, int32_t flags )
 {
 	double messiness  = (static_cast<double>(rand () % 100) / 1000.0 + 0.05);
-	const int xoffset = rand( );  // For perlin, random starting x
-	const int yoffset = rand( );  // For perlin, random starting y
+	const int xoffset = rand() % env.screenWidth;  // For perlin, random starting x
+	const int yoffset = rand() % env.screenHeight; // For perlin, random starting y
 
 	temp_sky = create_bitmap( env.sky->w, env.sky->h );
 	clear_to_color(temp_sky, BLACK);
diff -Nru atanks-6.5~dfsg/src/sky.h atanks-6.6~dfsg/src/sky.h
--- atanks-6.5~dfsg/src/sky.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/sky.h	2016-11-02 14:57:52.000000000 +0000
@@ -9,73 +9,73 @@
 // Sky gradients, first line is top of screen
 const gradient sky_gradient1[] =
 {
-	{{255,255,255,0}, 0.0},
-	{{100,100,100,0}, 0.1},
-	{{ 80,100,100,0}, 0.5},
+	{{255,255,255,0}, 0.0f},
+	{{100,100,100,0}, 0.1f},
+	{{ 80,100,100,0}, 0.5f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient sky_gradient2[] =
 {
-	{{  0,  0, 40,0}, 0.0},
-	{{ 40, 40,100,0}, 0.5},
-	{{ 80,80,100,0}, 0.75},
+	{{  0,  0, 40,0}, 0.0f},
+	{{ 40, 40,100,0}, 0.5f},
+	{{ 80,80,100,0}, 0.75f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient sky_gradient3[] =
 {
-	{{240,  0, 40,0}, 0.0},
-	{{140, 40,100,0}, 0.15},
-	{{ 80, 80,100,0}, 0.75},
+	{{240,  0, 40,0}, 0.0f},
+	{{140, 40,100,0}, 0.15f},
+	{{ 80, 80,100,0}, 0.75f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient sky_gradient4[] =
 {
-	{{ 40, 40, 40,0}, 0.0},
-	{{100, 40,100,0}, 0.2},
-	{{ 80, 80,100,0}, 0.75},
+	{{ 40, 40, 40,0}, 0.0f},
+	{{100, 40,100,0}, 0.2f},
+	{{ 80, 80,100,0}, 0.75f},
 	{{0,0,0,0}, -1}
 };
 
 const gradient sky_gradient5[] =
 {
-	{{  0, 90, 40,0}, 0.0},
-	{{  0,120,100,0}, 0.2},
-	{{ 40,200,100,0}, 0.75},
+	{{  0, 90, 40,0}, 0.0f},
+	{{  0,120,100,0}, 0.2f},
+	{{ 40,200,100,0}, 0.75f},
 	{{0,0,0,0}, -1}
 };
 
 // Sunset
 const gradient sky_gradient6[] =
 {
-	{{ 70,240,240,0}, 0.0},
-	{{ 70,200,200,0}, 0.3},
-	{{ 70,200,160,0}, 0.35},
-	{{255,200, 70,0}, 0.6},
-	{{255,255,128,0}, 1.0},
+	{{ 70,240,240,0}, 0.0f},
+	{{ 70,200,200,0}, 0.3f},
+	{{ 70,200,160,0}, 0.35f},
+	{{255,200, 70,0}, 0.6f},
+	{{255,255,128,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // Burning sky
 const gradient sky_gradient7[] =
 {
-	{{ 20, 20, 20,0}, 0.0},
-	{{255,200,  0,0}, 0.08},
-	{{255,255,  0,0}, 0.13},
-	{{ 20, 20, 20,0}, 0.16},
-	{{255,200,  0,0}, 0.5},
-	{{255,255,  0,0}, 1.0},
+	{{ 20, 20, 20,0}, 0.0f},
+	{{255,200,  0,0}, 0.08f},
+	{{255,255,  0,0}, 0.13f},
+	{{ 20, 20, 20,0}, 0.16f},
+	{{255,200,  0,0}, 0.5f},
+	{{255,255,  0,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // Burning landscape, black skies
 const gradient sky_gradient8[] =
 {
-	{{  0,  0,  0,0}, 0.0},
-	{{100,  0,  0,0}, 0.4},
-	{{255,255,255,0}, 0.8},
+	{{  0,  0,  0,0}, 0.0f},
+	{{100,  0,  0,0}, 0.4f},
+	{{255,255,255,0}, 0.8f},
 	{{0,0,0,0}, -1}
 };
 
@@ -83,73 +83,73 @@
 // dark blue to darker blue
 const gradient sky_gradient9[] =
 {
-	{{ 90, 90,255,0}, 0.0},
-	{{ 60, 60,200,0}, 0.3},
-	{{ 30, 30,150,0}, 1.0},
+	{{ 90, 90,255,0}, 0.0f},
+	{{ 60, 60,200,0}, 0.3f},
+	{{ 30, 30,150,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // dark blue to blue-grey
 const gradient sky_gradient10[] =
 {
-	{{110,110,255,0}, 0.0},
-	{{150,150,255,0}, 0.3},
-	{{200,200,255,0}, 1.0},
+	{{110,110,255,0}, 0.0f},
+	{{150,150,255,0}, 0.3f},
+	{{200,200,255,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // white to grey-blue to dark blue
 const gradient sky_gradient11[] =
 {
-	{{255,255,255,0}, 0.0},
-	{{200,200,255,0}, 0.3},
-	{{ 80, 80,180,0}, 1.0},
+	{{255,255,255,0}, 0.0f},
+	{{200,200,255,0}, 0.3f},
+	{{ 80, 80,180,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // simple purple: dark to light
 const gradient sky_gradient12[] =
 {
-	{{133, 33,133,0}, 0.0},
-	{{220,120,220,0}, 1.0},
+	{{133, 33,133,0}, 0.0f},
+	{{220,120,220,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // night sky: black to dark purple
 const gradient sky_gradient13[] =
 {
-	{{  0,  0,  0,0}, 0.0},
-	{{ 50,  0, 50,0}, 1.0},
+	{{  0,  0,  0,0}, 0.0f},
+	{{ 50,  0, 50,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // Sunset
 const gradient sky_gradient14[] =
 {
-	{{  0,  0,  0,0}, 0.0},
-	{{ 50,  0, 50,0}, 0.1},
-	{{ 90, 20,  0,0}, 0.3},
-	{{180, 50,  0,0}, 0.7},
-	{{255,150,150,0}, 0.9},
-	{{255,255,100,0}, 1.0},
+	{{  0,  0,  0,0}, 0.0f},
+	{{ 50,  0, 50,0}, 0.1f},
+	{{ 90, 20,  0,0}, 0.3f},
+	{{180, 50,  0,0}, 0.7f},
+	{{255,150,150,0}, 0.9f},
+	{{255,255,100,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // Burning sky
 const gradient sky_gradient15[] =
 {
-	{{185, 60, 60,0}, 0.0},
-	{{240,110,110,0}, 0.5},
-	{{255,110,110,0}, 1.0},
+	{{185, 60, 60,0}, 0.0f},
+	{{240,110,110,0}, 0.5f},
+	{{255,110,110,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
 // Burning landscape, black skies
 const gradient sky_gradient16[] =
 {
-	{{  0,  0,  0,0}, 0.0},
-	{{170, 50, 50,0}, 0.5},
-	{{220,110,110,0}, 1.0},
+	{{  0,  0,  0,0}, 0.0f},
+	{{170, 50, 50,0}, 0.5f},
+	{{220,110,110,0}, 1.0f},
 	{{0,0,0,0}, -1}
 };
 
diff -Nru atanks-6.5~dfsg/src/tank.cpp atanks-6.6~dfsg/src/tank.cpp
--- atanks-6.5~dfsg/src/tank.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/tank.cpp	2021-06-28 23:15:28.000000000 +0000
@@ -32,9 +32,9 @@
 
 TANK::TANK () :
 	PHYSICAL_OBJECT(false),
-	healthText(nullptr, -1, -1, 0., 0., WHITE,     CENTRE, TS_NO_SWAY, -1),
-	nameText(  nullptr, -1, -1, 0., 0., WHITE,     CENTRE, TS_NO_SWAY, -1),
-	shieldText(nullptr, -1, -1, 0., 0., TURQUOISE, CENTRE, TS_NO_SWAY, -1)
+	healthText(nullptr, -1, -1, 0., 0., WHITE,     CENTRE, TS_NO_SWAY, -1, true),
+	nameText(  nullptr, -1, -1, 0., 0., WHITE,     CENTRE, TS_NO_SWAY, -1, true),
+	shieldText(nullptr, -1, -1, 0., 0., TURQUOISE, CENTRE, TS_NO_SWAY, -1, true)
 {
 	// The shield phase delta depends on currently set FPS
 	shld_delta /= static_cast<double>(env.frames_per_second);
@@ -101,8 +101,9 @@
 		return;
 
 	// remove status from top bar at next redraw
-	if (global.tank_status)
-		global.tank_status[0] = 0;
+        // Removing this check as it is always true. -- Jesse
+	// if (global.tank_status)
+	global.tank_status[0] = 0;
 
 	// reduce time to fall, but reset if already done
 	if (--env.time_to_fall < 0)
@@ -141,7 +142,7 @@
 					MISSILE* newmis = new MISSILE(player,
 					                   x + (env.slope[ca][0] * turr_off_x),
 									   y + (env.slope[ca][1] * turr_off_x),
-									   mxv, myv, cw, MT_WEAPON, 1);
+									   mxv, myv, cw, MT_WEAPON, 1, 0);
 
 					// set up / check volley
 					if (weapon[cw].delay && (0 == fire_another_shot) )
@@ -439,7 +440,7 @@
 							.0, -.5, team_hit ? PURPLE : self_hit ? RED : GREEN,
 							CENTRE,
 							env.swayingText ? TS_HORIZONTAL : TS_NO_SWAY,
-							200);
+							200, false);
 					if (global.stage < STAGE_SCOREBOARD)
 						global.updateMenu = true;
 				} catch (...) {
@@ -460,8 +461,9 @@
 
 			try {
 				new FLOATTEXT(creditTo->selectGloatPhrase(),
-							creditTo->tank->x, creditTo->tank->y - 30,
-							.0, -.4, creditTo->color, CENTRE, TS_NO_SWAY, 200);
+				              creditTo->tank->x, creditTo->tank->y - 30,
+				              .0, -.4, creditTo->color, CENTRE, TS_NO_SWAY,
+				              200, false);
 			} catch (...) {
 				perror ( "tank.cpp: Failed to allocate memory for"
 						 " gloating text in applyDamage().");
@@ -472,8 +474,8 @@
 		if (self_hit && destroy && !global.skippingComputerPlay) {
 			try {
 				new FLOATTEXT(player->selectSuicidePhrase(),
-								x, y - 30, .0, -.4, player->color,
-								CENTRE, TS_NO_SWAY, 300);
+				              x, y - 30, .0, -.4, player->color,
+				              CENTRE, TS_NO_SWAY, 300, false);
 			} catch (...) {
 				perror ( "tank.cpp: Failed allocate memory for suicide"
 						 " text in applyDamage().");
@@ -500,6 +502,8 @@
 				t_dmg += sh_dmg - old_sh;
 				sh_dmg = old_sh;
 			}
+			if (t_dmg > l)
+				t_dmg = l;
 
 			sh = old_sh - sh_dmg;
 			l -= t_dmg;
@@ -525,7 +529,8 @@
 			snprintf (buf, 9, "%d", full_damage);
 			try {
 				new FLOATTEXT(buf, x, y - 30, .0, -.3, RED, CENTRE,
-						env.swayingText ? TS_HORIZONTAL : TS_NO_SWAY, 300);
+				              env.swayingText ? TS_HORIZONTAL : TS_NO_SWAY,
+				              300, false);
 			} catch (...) {
 				perror ( "tank.cpp: Failed to allocate memory for damage"
 						 " text in applyDamage().");
@@ -594,11 +599,9 @@
 
 		// Check whether a previous fall just ends:
 		if ( (yv > 0.) && ( (y >= bottom) || (PINK != pix_col) || on_tank ) ) {
-			if (isTeleported) {
-				addDamage(creditTo, yv * 10.);
+			addDamage(creditTo, yv * 10.);
+			if (isTeleported)
 				isTeleported = false;
-			} else
-				addDamage(nullptr, yv * 10.);
 
 			// 10 points of damage are 'free' when falling
 			// Note: This negates any damage when parachuting as well.
@@ -1355,8 +1358,9 @@
 **/
 bool TANK::moveTank(int32_t direction)
 {
-	// Return false now if there is no fuel or the tank is currently flying
-	if ( (player->ni[ITEM_FUEL] < 1 ) || (yv < 0.) || (yv > 0.) )
+	// return now if the tank is flying/falling or has no fuel
+	if ( (player->ni[ITEM_FUEL] < 1 ) // No fuel ?
+	  || (yv < 0.) || (yv > 0.) )     // flying / falling ?
 		return false;
 
 	// Safety: assert DIR_LEFT/RIGHT
@@ -1366,36 +1370,39 @@
 		return false;
 
 	// Check whether the target pixel is beyond the border or occupied
-	int32_t next_x = x + direction;
-	int32_t min_y  = y + tank_off_y - tank_sag - 4 ;
-
-	if ( (next_x < 1)
-	  || (next_x >= env.screenWidth)
+	int32_t nextX = ROUND(x + direction);
+	if ( (nextX < 1)
+	  || (nextX >= env.screenWidth)
 	  || (env.landType == LAND_NONE) )
 		return false;
 
-	if (PINK != getpixel(global.terrain, next_x, min_y))
-		return false;
+	// select the next pixel on the left/right that is not terrain
+	float   nextY  = global.surface[nextX].load(ATOMIC_READ) - 1;
 
-	// move tank
-	x += direction;
-	player->ni[ITEM_FUEL]--;
-
-	// Allow the tank to move up a bit if necessary
-	y = min_y + 5;
-	if (y > env.screenHeight - 1)
-		y = env.screenHeight - 1;
-
-	while ( ( y > min_y ) && (PINK != getpixel(global.terrain, x, y)))
-		--y;
-	// Now fix y back to normal coordinate
-	y -= tank_off_y - tank_sag;
-
-	// But secure y
-	if (y > (env.screenHeight - tank_off_y))
-		y = env.screenHeight - tank_off_y;
+	// If there is more terrain to climb, the pixel after the next must
+	// be taken into account, too
+	int32_t afterX = nextX + direction;
+	float   afterY = nextY;
+	if ( (afterX > 0) && (afterX < env.screenWidth) )
+		afterY  = global.surface[afterX].load(ATOMIC_READ) - 1;
+
+	// If the tank is not climbing too much, let it move:
+	if ( (nextY > (y - tank_sag)) && (afterY > (y - tank_off_y + tank_sag)) ) {
+		// move tank
+		x = nextX;
+		player->ni[ITEM_FUEL]--;
+
+		// climb and correct for the tank extension
+		y = nextY - tank_off_y + tank_sag;
+
+		// But secure y
+		if (y > (env.screenHeight - tank_off_y))
+			y = env.screenHeight - tank_off_y;
+		return true;
+	}
 
-	return true;
+	// No move:
+	return false;
 }
 
 
@@ -1503,6 +1510,36 @@
 }
 
 
+/// @brief do tank repairs
+void TANK::repair()
+{
+	if ( (repair_rate > 0) && (l < maxLife) ) {
+		int32_t old_life = l;
+
+		// Apply repair
+		l += repair_rate;
+		if (l > maxLife)
+			l = maxLife;
+
+		// update text
+		snprintf(buf, 9, "%d", l);
+		healthText.set_text(buf);
+
+		// add float text
+		if (!global.skippingComputerPlay) {
+			try {
+				snprintf(buf, 9, "+%d", l - old_life);
+				new FLOATTEXT(buf, x, y - 30, .0, -.8, GREEN, CENTRE,
+				              TS_NO_SWAY, 120, false);
+			} catch (...) {
+				perror("tank.cpp: Failed to allocate memory for healing"
+					   " text in repair().");
+			}
+		}
+	}
+}
+
+
 bool TANK::repulse (double xpos, double ypos, double* xa, double* ya,
                     ePhysType phys_type)
 {
@@ -1690,11 +1727,6 @@
 	// allow naturals to happen again
 	global.naturals_activated = 0;
 
-	// apply repairs
-	l += repair_rate;
-	if (l > maxLife)
-		l = maxLife;
-
 	snprintf (buf, 5, "%d", l);
 	healthText.set_text(buf);
 
diff -Nru atanks-6.5~dfsg/src/tank.h atanks-6.6~dfsg/src/tank.h
--- atanks-6.5~dfsg/src/tank.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/tank.h	2016-11-02 14:57:52.000000000 +0000
@@ -73,6 +73,7 @@
 	bool    moveTank(int32_t direction);
 	void    newRound (int32_t pos_x, int32_t pos_y);
 	void    reactivate_shield ();
+	void    repair();
 	bool    repulse (double xpos, double ypos, double* xa, double* ya,
 	                 ePhysType phys_type);
 	void    resetFlashDamage();
@@ -127,8 +128,8 @@
 	int32_t       para             = 0;
 	int32_t       repair_rate      = 0;
 	int32_t       repulsion        = 0;
-	int32_t shld_col_inner   = BLACK;
-	int32_t shld_col_outer   = BLACK;
+	int32_t       shld_col_inner   = BLACK;
+	int32_t       shld_col_outer   = BLACK;
 	double        shld_delta       = 360.; // divided by FPS in ctor
 	double        shld_phase       = 0.; // Neutral
 	int32_t       shld_rad_x       = 0; // Determined by the used bitmap
diff -Nru atanks-6.5~dfsg/src/text.cpp atanks-6.6~dfsg/src/text.cpp
--- atanks-6.5~dfsg/src/text.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/text.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -3,6 +3,7 @@
 #include <cstring>
 #include <cmath>
 #include <algorithm>
+#include <cassert>
 #include "text.h"
 #include "main.h"
 
@@ -271,24 +272,26 @@
 	char buffer[15] = { 0 };
 	snprintf(buffer, 14, "%d", number);
 
-	int32_t index       = strlen(buffer); // start from the end
+	int32_t index       = static_cast<int32_t>(strlen(buffer)); // start from the end
 	int32_t returnindex = index + (index / 3) - 1;
 	int32_t th_count    = 0;
 
 	if (0 == (index % 3) )
 		returnindex--;
 
-	while (--index >= 0) {
+	while ( (index-- > 0) && (returnindex >= 0) ) {
 		return_value[returnindex--] = buffer[index];
 		th_count++;
 
 		if ( (th_count == 3) && (returnindex > 0) ) {
 			th_count = 0;
-			return_value[returnindex] = ',';
-			returnindex--;
+			return_value[returnindex--] = ',';
 		}
 	}
 
+	assert((index < 1) && "ERROR: index is not smaller than 1!");
+	assert((returnindex < 1) && "ERROR: returnindex is not smaller than 1!");
+
 	return return_value;
 }
 
diff -Nru atanks-6.5~dfsg/src/update.cpp atanks-6.6~dfsg/src/update.cpp
--- atanks-6.5~dfsg/src/update.cpp	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/update.cpp	2016-11-02 14:57:52.000000000 +0000
@@ -21,11 +21,10 @@
 
 /// @brief update_data default ctor
 update_data::update_data(const char* server_, const char* remote_,
-	                     const char* host_,   const char* version_) :
+	                     const char* host_) :
 	server_name    (server_  ? strdup(server_)  : strdup("")),
 	host_name      (host_    ? strdup(host_)    : strdup("")),
-	remote_file    (remote_  ? strdup(remote_)  : strdup("")),
-	current_version(version_ ? strdup(version_) : strdup(""))
+	remote_file    (remote_  ? strdup(remote_)  : strdup(""))
 {
 	memset(update_string, 0, sizeof(char) * 1024);
 }
@@ -36,7 +35,6 @@
 	if (server_name)     free (server_name);
 	if (host_name)       free (host_name);
 	if (remote_file)     free (remote_file);
-	if (current_version) free (current_version);
 }
 
 
@@ -51,7 +49,6 @@
 		char buffer[1024];
 		char* found = nullptr;
 		int got_bytes;
-		double this_version, web_version;
 		int32_t towrite, written;
 
 
@@ -92,9 +89,13 @@
 		if (found) {
 			found += 9;
 			found[5] = '\0';
+
+			double web_version = 0.;
 			sscanf(found, "%lf", &web_version);
-			sscanf(current_version, "%lf", &this_version);
-			if (web_version > this_version)
+
+			int32_t ext_version = static_cast<int32_t>(web_version * 10);
+
+			if (ext_version > game_version)
 				snprintf(update_string, 1024, "A new version, %2.1lf, is ready for download.", web_version);
 		}
 
diff -Nru atanks-6.5~dfsg/src/update.h atanks-6.6~dfsg/src/update.h
--- atanks-6.5~dfsg/src/update.h	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/src/update.h	2016-11-02 14:57:52.000000000 +0000
@@ -12,10 +12,9 @@
 	char* host_name           = nullptr;
 	char* remote_file         = nullptr;
 	char  update_string[1024];
-	char* current_version     = nullptr;
 
 	explicit update_data(const char* server_, const char* remote_,
-	                     const char* host_,   const char* version_);
+	                     const char* host_);
 	~update_data();
 
 	void operator()();
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/52.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/52.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/53.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/53.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/54.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/54.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/55.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/55.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/56.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/56.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/57.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/57.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/58.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/58.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/59.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/59.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/60.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/60.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/61.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/61.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/62.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/62.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/63.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/63.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/64.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/64.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/65.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/65.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/66.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/66.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/67.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/67.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/68.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/68.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/69.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/69.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/70.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/70.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/71.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/71.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/72.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/72.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/73.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/73.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/74.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/74.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/75.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/75.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/76.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/76.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/77.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/77.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/78.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/78.bmp differ
Binary files /tmp/tmpciibfl51/X33JldaYHV/atanks-6.5~dfsg/stock/79.bmp and /tmp/tmpciibfl51/dW4dJBo2gn/atanks-6.6~dfsg/stock/79.bmp differ
diff -Nru atanks-6.5~dfsg/text/ingame.pt_BR.txt atanks-6.6~dfsg/text/ingame.pt_BR.txt
--- atanks-6.5~dfsg/text/ingame.pt_BR.txt	2016-01-09 13:24:46.000000000 +0000
+++ atanks-6.6~dfsg/text/ingame.pt_BR.txt	2016-11-02 14:57:53.000000000 +0000
@@ -81,3 +81,4 @@
 O servidor está cheio ou o jogo não começou.
 O servidor fechou a ligação.
 O jogo acabou.
+
diff -Nru atanks-6.5~dfsg/text/weapons_de.txt atanks-6.6~dfsg/text/weapons_de.txt
--- atanks-6.5~dfsg/text/weapons_de.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/text/weapons_de.txt	2016-11-02 14:57:53.000000000 +0000
@@ -6,7 +6,7 @@
 Kleine Wirkung, kleinflächige Explosion.
 
 Große Rakete
-Mittlerer Wirkung, mittelflächige Explosion.
+Mittlere Wirkung, mittelflächige Explosion.
 
 Kleine Atombombe
 Große Wirkung, großflächige Explosion.
@@ -15,7 +15,7 @@
 Sehr große Wirkung, riesige Explosion.
 
 Totenkopf
-Massive, tötliche Explosion.
+Massive, tödliche Explosion.
 
 Kleiner Streuer
 5 Kleine Raketen mit einem Schuss.
@@ -35,14 +35,14 @@
 Armageddon
 3 Totenköpfe mit einem Schuss.
 
-Kleine Raktenkette
-Feuert drei kleine Rakten nacheinander ab.
+Kleine Raketenkette
+Feuert drei kleine Raketen nacheinander ab.
 
 Raketenkette
-Feuert fünf kleine Rakten nacheinander ab.
+Feuert fünf kleine Raketen nacheinander ab.
 
 Jack Hammer
-Feuert acht kleine Rakten nacheinander ab.
+Feuert acht kleine Raketen nacheinander ab.
 
 Shaped Charge
 Hoch wirksame horizontale Explosion. Die gesamte Energie ist zu den Seiten fokusiert und erhöht den Schaden und verdampft die gesamte Umgebung im Bereich der Explosion.
@@ -153,7 +153,10 @@
 Zerstört die Hälfte der gegnerischen Panzerung.
 
 Reduzierer
-Vermindert die Kraft gegnerischer Waffen.
+Vermindert die Kraft der gegnerischen Waffen um ein Drittel.
+
+Diebstahlbombe
+Stiehlt dem Gegner 5k beim Einschlag.
 
 Kleiner Laser
 Ein 50kW Laserstrahl.
@@ -254,5 +257,5 @@
 Schießt den Panzer in die Luft.
 
 SDI Missile Defense System
-Bietet Schutz gegen ankommende Geschosse.
+Bietet etwas Schutz gegen ankommende Geschosse. Weiter Käufe erhöhen die Reichweite des SDI Systems. Es besteht eine Chance von 1% dass ein SDI Laser bei Gebrauch ausbrennt.
 
diff -Nru atanks-6.5~dfsg/text/weapons_ES.txt atanks-6.6~dfsg/text/weapons_ES.txt
--- atanks-6.5~dfsg/text/weapons_ES.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/text/weapons_ES.txt	2016-11-02 14:57:53.000000000 +0000
@@ -152,6 +152,9 @@
 Bomba Por Ciento
 Destruye la mitad de protecci�n de las armaduras
 
+Theft Bomb
+Steals 5k from opponent on impact.
+
 Reductor
 Baja el poder de explosion de los misiles enemigos.
 
diff -Nru atanks-6.5~dfsg/text/weapons_fr.txt atanks-6.6~dfsg/text/weapons_fr.txt
--- atanks-6.5~dfsg/text/weapons_fr.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/text/weapons_fr.txt	2016-11-02 14:57:53.000000000 +0000
@@ -155,6 +155,9 @@
 Reducer
 Lowers the explosive power of an enemy's missiles.
 
+Theft Bomb
+Steals 5k from opponent on impact.
+
 Small Laser
 A 50kW laser beam.
 
diff -Nru atanks-6.5~dfsg/text/weapons_it.txt atanks-6.6~dfsg/text/weapons_it.txt
--- atanks-6.5~dfsg/text/weapons_it.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/text/weapons_it.txt	2016-11-02 14:57:53.000000000 +0000
@@ -155,6 +155,9 @@
 Riduttore
 Abbassa la potenza esplosiva dei missili nemici.
 
+Theft Bomb
+Steals 5k from opponent on impact.
+
 Laser Piccolo
 Raggio Laser a 50kW.
 
diff -Nru atanks-6.5~dfsg/text/weapons_ru.txt atanks-6.6~dfsg/text/weapons_ru.txt
--- atanks-6.5~dfsg/text/weapons_ru.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/text/weapons_ru.txt	2016-11-02 14:57:53.000000000 +0000
@@ -155,6 +155,9 @@
 Reducer
 Lowers the explosive power of an enemy's missiles.
 
+Theft Bomb
+Steals 5k from opponent on impact.
+
 Малый лазер
 Луч мощностью 50КВт. Способен прожечь лист железа или грунт.
 
diff -Nru atanks-6.5~dfsg/text/weapons_sk.txt atanks-6.6~dfsg/text/weapons_sk.txt
--- atanks-6.5~dfsg/text/weapons_sk.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/text/weapons_sk.txt	2016-11-02 14:57:53.000000000 +0000
@@ -155,6 +155,9 @@
 Redukovač
 Znižuje explozívnu silu nepriateľských striel.
 
+Theft Bomb
+Steals 5k from opponent on impact.
+
 Malý laser
 50kW laserový lúč
 
diff -Nru atanks-6.5~dfsg/text/weapons.txt atanks-6.6~dfsg/text/weapons.txt
--- atanks-6.5~dfsg/text/weapons.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/text/weapons.txt	2016-11-02 14:57:53.000000000 +0000
@@ -1,3 +1,8 @@
+# Cost Amount Mass Drag Radius Sound Etime Damage Picpoint Spread Delay Noimpact
+# TechLevel Warhead NumSubmunitions Submunition ImpartVelocity Divergence
+# SpreadVariation LaunchSpeed SpeedVariation CountDown CountVariation
+#
+
 *WEAPONS*
 Small Missile
 Produces a low impact explosion
@@ -157,43 +162,43 @@
 
 Shock Wave
 Produce a large earthquake on impact
-10000 2 60 0.2 100 2 3 20 15 1 0 0 3 0 0 -1 0 0 0 0 0 -1 0
+8000 2 60 0.2 100 2 3 20 15 1 0 0 3 0 0 -1 0 0 0 0 0 -1 0
 
 Tectonic Shift
 Produce a huge earthquake on impact
-30000 1 100 0.2 150 3 4 30 16 1 0 0 5 0 0 -1 0 0 0 0 0 -1 0
+16000 1 100 0.2 150 3 4 30 16 1 0 0 5 0 0 -1 0 0 0 0 0 -1 0
 
 Riot Bomb
 Destroy a small volume of dirt without damaging anything else
-2000 5 15 0.2 25 0 2 0 23 1 0 0 1 0 0 -1 0 0 0 0 0 -1 0
+2000 5 15 0.2 50 0 2 0 23 1 0 0 1 0 0 -1 0 0 0 0 0 -1 0
 
 Heavy Riot Bomb
 Destroy a large volume of dirt without damaging anything else
-3000 2 30 0.2 100 1 2 0 24 1 0 0 3 0 0 -1 0 0 0 0 0 -1 0
+3000 2 30 0.2 125 1 2 0 24 1 0 0 3 0 0 -1 0 0 0 0 0 -1 0
 
 Riot Charge
 Cuts through a cone of dirt directly in front of the gun
-1000 5 15 0.2 50 0 2 0 11 1 0 1 1 0 0 -1 0 0 0 0 0 0 0
+1000 5 15 0.2 75 0 2 0 11 1 0 1 1 0 0 -1 0 0 0 0 0 0 0
 
 Riot Blast
 Cuts through a large cone of dirt directly in front of the gun
-2000 2 30 0.2 150 1 2 0 12 1 0 1 3 0 0 -1 0 0 0 0 0 0 0
+2000 2 30 0.2 200 1 2 0 12 1 0 1 3 0 0 -1 0 0 0 0 0 0 0
 
 Dirt Ball
 Produce a small sphere of material to bury your opponents
-3000 5 15 0.2 25 0 2 0 11 1 0 0 1 0 0 -1 0 0 0 0 0 -1 0
+2000 5 15 0.2 40 0 2 0 11 1 0 0 1 0 0 -1 0 0 0 0 0 -1 0
 
 Large Dirt Ball
 Produce a large sphere of material to bury your opponents
-7000 2 30 0.2 60 1 2 0 12 1 0 0 3 0 0 -1 0 0 0 0 0 -1 0
+4000 2 30 0.2 70 1 2 0 12 1 0 0 3 0 0 -1 0 0 0 0 0 -1 0
 
 Super Dirt Ball
 Produce a huge ball of material to bury your opponents
-10000 1 60 0.2 100 2 2 0 13 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
+7000 1 60 0.2 120 2 2 0 13 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
 
 Small Dirt Spread
 Drop little piles of dirt on your enemies
-4000 2 30 0.2 40 1 2 0 12 4 0 0 3 0 0 -1 0 0 0 0 0 -1 0
+4000 2 30 0.2 70 1 2 0 12 4 0 0 3 0 0 -1 0 0 0 0 0 -1 0
 
 Cluster MIRV
 Releases a cluster of small missiles on its way down
@@ -204,20 +209,24 @@
 12000 2 30 0.2 30 3 4 0 29 1 0 0 3 0 0 -1 0 0 0 0 0 -1 0
 
 Reducer
-Lowers the explosive power of an enemy's missiles.
+Lowers the explosive power of an enemy's missiles by one third.
 6000 3 25 0.3 30 3 4 0 30 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
 
+Theft Bomb
+Steals 5k from opponent on impact.
+3000 3 25 0.3 40 3 4 0 31 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
+
 Small Laser
 A 50kW laser beam.
-5000 5 1 0.0 2 5 5 30 13 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
+4000 5 1 0.0 2 5 5 30 13 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
 
 Medium Laser
 A 100kW laser beam
-10000 3 1 0.0 5 5 5 65 13 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
+8000 3 1 0.0 5 5 5 65 13 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
 
 Large Laser
 A powerful 200kW laser beam
-15000 2 1 0.0 9 5 5 150 13 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
+12000 2 1 0.0 9 5 5 150 13 1 0 0 4 0 0 -1 0 0 0 0 0 -1 0
 
 *NATURALS*
 Small Meteor
@@ -247,19 +256,19 @@
 *ITEMS*
 Teleport
 Teleports the tank to a random location
-5000 2 1 3 6
+2000 2 1 3 6
 
 Swapper
 Swap places with another tank
-10000 2 1 4 6
+40000 2 1 4 6
 
 Mass Teleport
 Teleports all tanks on the screen
-15000 2 1 4 6
+8000 2 1 4 6
 
 Fan
 Change the wind strength and direction
-2500 3 1 3 7
+500 3 1 3 7
 
 Vengeance
 A small self-destruct or auto-destruct device, if you've got to go, why not take someone with you?
@@ -267,11 +276,11 @@
 
 Dying Wrath
 A large self/auto-destruct device. Mutually Assured Destruction.
-25000 1 1 3 3 21 3
+20000 1 1 3 3 21 3
 
 Fatal Fury
 End it all in style
-50000 1 1 4 4 24 5
+30000 1 1 4 4 24 5
 
 Light Shield
 A small amount of protection from damage
@@ -331,13 +340,13 @@
 
 Fuel
 Allows the tank to move across level terran.
-1000 10 0 2 0 0 0
+200 10 0 2 0 0 0
 
 Rocket
 Launches the tank into the air.
-2000 2 1 4 0 0 0
+1000 2 1 4 0 0 0
 
 SDI Missile Defense
-Offers some protection against incoming missiles.
-10000 1 0 5 5 0
+Offers some protection against incoming missiles. Additional purchases increase the range of defense. There is a 1% chance on each use that an item will burn out.
+20000 1 0 5 5 0
 
diff -Nru atanks-6.5~dfsg/TODO atanks-6.6~dfsg/TODO
--- atanks-6.5~dfsg/TODO	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/TODO	2016-11-02 14:57:52.000000000 +0000
@@ -1,51 +1,20 @@
-There is now some small attempt at prioritisation in this file, 
-higher priority stuff should be at the top of the file, 
-lower priority at the bottom. It is currently only vaguely correct.
+There is now some small attempt at prioritisation in this file, higher priority
+stuff should be at the top of the file, lower priority at the bottom.
 
 	Bugs:
-	- Player options can become scrambled
-          if accessed too often.
-          -> Should be fixed with atanks-5.9_aiu1
-	- Wrap around ceiling should not destroy projectile.
-          -> Of course it should. Wrapping is only horizontal, not vertical.
-          -> Added a new option to enable that in atanks-6.0_aiu8
-	- Make sure network client doesn't get
-          unlimited shots.
-	- Atanks crashes when Windows players click the Network option
-          in the main Options menu.
-          -> Should be fixed with atanks-5.9_aiu1
-	- When cycling through tanks on Players screen,
-	  the old tank does not get erased.
-          -> Should be fixed with atanks-5.9_aiu1
-	- AI controlled tanks buy a limited number of defensive
-          upgrades during very long games. Plating, for example.
-
-In player.cpp the PLAYER::computerSelectItem selects a weapon or item for the bot to use.
-Values less than WEAPONS are weapons and values from WEAPONS to THINGS are items.
-After lots of black magic to select a weapon or item, finally in line 3567 the current_weapon containing a value from 0 to THINGS is passed to PLAYER::computerSelectTarget, which in line 3189 uses it as index into the array weapon which only has size WEAPONS, resulting in a segfault.
-Line 3561 also calls PLAYER::computerSelectTarget with a value from 0 to THINGS, so probably the same can happen there.
-I don't know how to fix this, since I don't know how PLAYER::computerSelectTarget should behave when an item is passed instead of a weapon, but probaly some of you know this and can fix.
-          -> This is fixed in atanks-6.1_aiu2
+	- Make sure network client doesn't get unlimited shots.
 
 	Features:
 	- Add scroll bar to buying screen.
-	- Add randomize button to buying screen to have
-	  items automatically purchased.
-   	- Field repair kit: Spend a turn to repair your tank 
-          rather than fire.           
-          Limited uses, heals more than Auto Repair Kit 
-	- Radar resistant missile: A missile designed to 
-          avoid the missile defence system by masking 
-          its heat signature 
+	- Add randomize button to buying screen to have items automatically
+	  purchased.
+	- Field repair kit: Spend a turn to repair your tank rather than fire.
+          Limited uses, heals more than Auto Repair Kit.
+	- Radar resistant missile: A missile designed to avoid the missile defence
+	      system by masking its heat signature.
           Yield: Large missile
-	- Better AI against tanks with SDI.
-          -> Added in atanks-6.1_aiu3
 	- Update client ground surface more often.
-	- When switching languages, player menu should display correct text.
-          -> Should be fixed with atanks-5.9_aiu1
 	- Client needs a buying screen.
-	- Make tank size variable.
-          -> It is in atanks-6.0_aiu? Don't remember which...
 	- Add rocks as semi-destructable items.
 
 
@@ -53,12 +22,12 @@
 
 	   Items from here to the bottom of the file
 	   are under consideration by the development
-	   team and may (or may not) be implemented.   
+	   team and may (or may not) be implemented.
 
 ===============================================
 
 
-        -- under ground mines
+	-- under ground mines
 
 	-- rocket like fireworks
 
@@ -66,7 +35,8 @@
 
 	-- Make main window scalable
            (Needs to wait until Allegro 5.x)
-           -> Allegro 5 is a no-opt. I gave up on it but will try SFML-2 soon.
+           -> Allegro 5 is a no-opt. And porting to SFML-2 or SDL2 would be
+              a major rewrite of the game. But maybe one day.
 
 	-- Harder ground
            -> What is that supposed to mean?
diff -Nru atanks-6.5~dfsg/vs12/atanks.vcxproj atanks-6.6~dfsg/vs12/atanks.vcxproj
--- atanks-6.5~dfsg/vs12/atanks.vcxproj	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/vs12/atanks.vcxproj	2016-11-02 14:57:53.000000000 +0000
@@ -95,7 +95,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level2</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;VERSION="6.2-aiu1";ATANKS_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;VERSION="6.5_rc1";ATANKS_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\allegro\include;$(SolutionDir)..\..\allegro\build_x86_d\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -106,7 +106,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)..</AdditionalLibraryDirectories>
-      <AdditionalDependencies>alleg44.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>alleg44_d.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -115,7 +115,7 @@
       </PrecompiledHeader>
       <WarningLevel>Level2</WarningLevel>
       <Optimization>Disabled</Optimization>
-      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;VERSION="6.2-aiu1";ATANKS_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;_DEBUG;_WINDOWS;VERSION="6.5_rc1";ATANKS_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\allegro\include;$(SolutionDir)..\..\allegro\build_x86_d\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
@@ -126,7 +126,7 @@
       <SubSystem>Windows</SubSystem>
       <GenerateDebugInformation>true</GenerateDebugInformation>
       <AdditionalLibraryDirectories>$(SolutionDir)..</AdditionalLibraryDirectories>
-      <AdditionalDependencies>alleg44_64-debug.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalDependencies>alleg44_64_d.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -137,7 +137,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;VERSION="6.2-aiu1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;VERSION="6.5_rc1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\allegro\include;$(SolutionDir)..\..\allegro\build_x86\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -164,7 +164,7 @@
       <Optimization>MaxSpeed</Optimization>
       <FunctionLevelLinking>true</FunctionLevelLinking>
       <IntrinsicFunctions>true</IntrinsicFunctions>
-      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;VERSION="6.2-aiu1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;VERSION="6.5_rc1";%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <SDLCheck>false</SDLCheck>
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\allegro\include;$(SolutionDir)..\..\allegro\build_x86\include;$(SolutionDir)..\src;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -282,4 +282,4 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff -Nru atanks-6.5~dfsg/vs12/README_allegro.txt atanks-6.6~dfsg/vs12/README_allegro.txt
--- atanks-6.5~dfsg/vs12/README_allegro.txt	2015-12-21 16:00:24.000000000 +0000
+++ atanks-6.6~dfsg/vs12/README_allegro.txt	2016-11-02 14:57:53.000000000 +0000
@@ -1,14 +1,14 @@
-To build atanks using Visual Studio 2013 you will need
+To build atanks using Visual Studio 2012 you will need
 to adapt the include path settings to where your allegro
 includes are.
-Further replace alleg44.dll and alleg44.lib with the
+Further replace alleg44.dll and alleg44_64.dll with the
 versions you want to use.
 
-Release 32bit uses alleg44.lib          and alleg44.dll
-Release 64bit uses alleg44_64.lib       and alleg44.dll
-Debug   32bit uses alleg44-debug.lib    and alleg44-debug.dll
-Debug   64bit uses alleg44_64-debug.lib and alleg44_64-debug.dll
+Release 32bit uses alleg44.lib      and alleg44.dll
+Release 64bit uses alleg44_64.lib   and alleg44_64.dll
+Debug   32bit uses alleg44_d.lib    and alleg44_d.dll
+Debug   64bit uses alleg44_64_d.lib and alleg44_64_d.dll
 
 As the windows build is originally not meant for debugging,
-only the 32bit release versions are included in git.
+only the release versions are included in git.
 You will need your own includes and libs!
diff -Nru atanks-6.5~dfsg/vs14/atanks.sln atanks-6.6~dfsg/vs14/atanks.sln
--- atanks-6.5~dfsg/vs14/atanks.sln	1970-01-01 00:00:00.000000000 +0000
+++ atanks-6.6~dfsg/vs14/atanks.sln	2016-11-02 14:57:53.000000000 +0000
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.24720.0
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "atanks", "atanks.vcxproj", "{853BC2FB-859F-4E97-892B-389CE4555C53}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{853BC2FB-859F-4E97-892B-389CE4555C53}.Debug|x64.ActiveCfg = Debug|x64
+		{853BC2FB-859F-4E97-892B-389CE4555C53}.Debug|x64.Build.0 = Debug|x64
+		{853BC2FB-859F-4E97-892B-389CE4555C53}.Debug|x86.ActiveCfg = Debug|Win32
+		{853BC2FB-859F-4E97-892B-389CE4555C53}.Debug|x86.Build.0 = Debug|Win32
+		{853BC2FB-859F-4E97-892B-389CE4555C53}.Release|x64.ActiveCfg = Release|x64
+		{853BC2FB-859F-4E97-892B-389CE4555C53}.Release|x64.Build.0 = Release|x64
+		{853BC2FB-859F-4E97-892B-389CE4555C53}.Release|x86.ActiveCfg = Release|Win32
+		{853BC2FB-859F-4E97-892B-389CE4555C53}.Release|x86.Build.0 = Release|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff -Nru atanks-6.5~dfsg/vs14/atanks.vcxproj atanks-6.6~dfsg/vs14/atanks.vcxproj
--- atanks-6.5~dfsg/vs14/atanks.vcxproj	1970-01-01 00:00:00.000000000 +0000
+++ atanks-6.6~dfsg/vs14/atanks.vcxproj	2016-11-02 14:57:53.000000000 +0000
@@ -0,0 +1,274 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Label="ProjectConfigurations">
+    <ProjectConfiguration Include="Debug|Win32">
+      <Configuration>Debug</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|Win32">
+      <Configuration>Release</Configuration>
+      <Platform>Win32</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Debug|x64">
+      <Configuration>Debug</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+    <ProjectConfiguration Include="Release|x64">
+      <Configuration>Release</Configuration>
+      <Platform>x64</Platform>
+    </ProjectConfiguration>
+  </ItemGroup>
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>{853BC2FB-859F-4E97-892B-389CE4555C53}</ProjectGuid>
+    <Keyword>Win32Proj</Keyword>
+    <RootNamespace>atanks</RootNamespace>
+    <WindowsTargetPlatformVersion>8.1</WindowsTargetPlatformVersion>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>true</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
+    <ConfigurationType>Application</ConfigurationType>
+    <UseDebugLibraries>false</UseDebugLibraries>
+    <PlatformToolset>v140</PlatformToolset>
+    <WholeProgramOptimization>true</WholeProgramOptimization>
+    <CharacterSet>MultiByte</CharacterSet>
+  </PropertyGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
+  <ImportGroup Label="ExtensionSettings">
+  </ImportGroup>
+  <ImportGroup Label="Shared">
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <ImportGroup Label="PropertySheets" Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
+  </ImportGroup>
+  <PropertyGroup Label="UserMacros" />
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <IntDir>.obj\$(Platform)_$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName)_d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <LinkIncremental>true</LinkIncremental>
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <IntDir>.obj\$(Platform)_$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName)_64_d</TargetName>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <IntDir>.obj\$(Platform)_$(Configuration)\</IntDir>
+  </PropertyGroup>
+  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <LinkIncremental>false</LinkIncremental>
+    <OutDir>$(SolutionDir)..\</OutDir>
+    <IntDir>.obj\$(Platform)_$(Configuration)\</IntDir>
+    <TargetName>$(ProjectName)_64</TargetName>
+  </PropertyGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>VERSION="6.5_rc1";DATA_DIR=".";ATANKS_DEBUG;WIN32;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\allegro\include;$(SolutionDir)..\..\allegro_build\all\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>alleg44_d.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
+    <ClCompile>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <WarningLevel>Level3</WarningLevel>
+      <Optimization>Disabled</Optimization>
+      <PreprocessorDefinitions>VERSION="6.5_rc1";DATA_DIR=".";ATANKS_DEBUG;_DEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\allegro\include;$(SolutionDir)..\..\allegro_build\all\include</AdditionalIncludeDirectories>
+      <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>alleg44_64_d.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>VERSION="6.5_rc1";DATA_DIR=".";WIN32;NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\allegro\include;$(SolutionDir)..\..\allegro_build\all\include</AdditionalIncludeDirectories>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>alleg44.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
+    <ClCompile>
+      <WarningLevel>Level3</WarningLevel>
+      <PrecompiledHeader>
+      </PrecompiledHeader>
+      <Optimization>MaxSpeed</Optimization>
+      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <IntrinsicFunctions>true</IntrinsicFunctions>
+      <PreprocessorDefinitions>VERSION="6.5_rc1";DATA_DIR=".";NDEBUG;_WINDOWS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <AdditionalIncludeDirectories>$(SolutionDir)..\..\allegro\include;$(SolutionDir)..\..\allegro_build\all\include</AdditionalIncludeDirectories>
+      <FavorSizeOrSpeed>Speed</FavorSizeOrSpeed>
+      <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
+    </ClCompile>
+    <Link>
+      <SubSystem>Windows</SubSystem>
+      <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <OptimizeReferences>true</OptimizeReferences>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>alleg44_64.lib;kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <AdditionalLibraryDirectories>$(SolutionDir)..\</AdditionalLibraryDirectories>
+    </Link>
+  </ItemDefinitionGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\aicore.h" />
+    <ClInclude Include="..\src\beam.h" />
+    <ClInclude Include="..\src\button.h" />
+    <ClInclude Include="..\src\client.h" />
+    <ClInclude Include="..\src\clock.h" />
+    <ClInclude Include="..\src\debris_pool.h" />
+    <ClInclude Include="..\src\debug.h" />
+    <ClInclude Include="..\src\decor.h" />
+    <ClInclude Include="..\src\environment.h" />
+    <ClInclude Include="..\src\explosion.h" />
+    <ClInclude Include="..\src\externs.h" />
+    <ClInclude Include="..\src\extern\dirent.h" />
+    <ClInclude Include="..\src\files.h" />
+    <ClInclude Include="..\src\floattext.h" />
+    <ClInclude Include="..\src\gameloop.h" />
+    <ClInclude Include="..\src\gfxData.h" />
+    <ClInclude Include="..\src\globaldata.h" />
+    <ClInclude Include="..\src\globals.h" />
+    <ClInclude Include="..\src\globaltypes.h" />
+    <ClInclude Include="..\src\land.h" />
+    <ClInclude Include="..\src\main.h" />
+    <ClInclude Include="..\src\menu.h" />
+    <ClInclude Include="..\src\missile.h" />
+    <ClInclude Include="..\src\network.h" />
+    <ClInclude Include="..\src\optioncontent.h" />
+    <ClInclude Include="..\src\optionitem.h" />
+    <ClInclude Include="..\src\optionitembase.h" />
+    <ClInclude Include="..\src\optionitemcolour.h" />
+    <ClInclude Include="..\src\optionitemmenu.h" />
+    <ClInclude Include="..\src\optionitemplayer.h" />
+    <ClInclude Include="..\src\optionscreens.h" />
+    <ClInclude Include="..\src\optiontypes.h" />
+    <ClInclude Include="..\src\physobj.h" />
+    <ClInclude Include="..\src\player.h" />
+    <ClInclude Include="..\src\player_types.h" />
+    <ClInclude Include="..\src\resource.h" />
+    <ClInclude Include="..\src\satellite.h" />
+    <ClInclude Include="..\src\shop.h" />
+    <ClInclude Include="..\src\sky.h" />
+    <ClInclude Include="..\src\sound.h" />
+    <ClInclude Include="..\src\tank.h" />
+    <ClInclude Include="..\src\teleport.h" />
+    <ClInclude Include="..\src\text.h" />
+    <ClInclude Include="..\src\update.h" />
+    <ClInclude Include="..\src\virtobj.h" />
+    <ClInclude Include="..\src\winclock.h" />
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\aicore.cpp" />
+    <ClCompile Include="..\src\atanks.cpp" />
+    <ClCompile Include="..\src\beam.cpp" />
+    <ClCompile Include="..\src\button.cpp" />
+    <ClCompile Include="..\src\client.cpp" />
+    <ClCompile Include="..\src\clock.cpp" />
+    <ClCompile Include="..\src\debris_pool.cpp" />
+    <ClCompile Include="..\src\debug.cpp" />
+    <ClCompile Include="..\src\decor.cpp" />
+    <ClCompile Include="..\src\environment.cpp" />
+    <ClCompile Include="..\src\explosion.cpp" />
+    <ClCompile Include="..\src\extern\dirent.c" />
+    <ClCompile Include="..\src\files.cpp" />
+    <ClCompile Include="..\src\floattext.cpp" />
+    <ClCompile Include="..\src\gameloop.cpp" />
+    <ClCompile Include="..\src\gfxData.cpp" />
+    <ClCompile Include="..\src\globaldata.cpp" />
+    <ClCompile Include="..\src\globaltypes.cpp" />
+    <ClCompile Include="..\src\land.cpp" />
+    <ClCompile Include="..\src\main.cpp" />
+    <ClCompile Include="..\src\menu.cpp" />
+    <ClCompile Include="..\src\missile.cpp" />
+    <ClCompile Include="..\src\network.cpp" />
+    <ClCompile Include="..\src\optionitembase.cpp" />
+    <ClCompile Include="..\src\optionitemcolour.cpp" />
+    <ClCompile Include="..\src\optionitemmenu.cpp" />
+    <ClCompile Include="..\src\optionitemplayer.cpp" />
+    <ClCompile Include="..\src\optionscreens.cpp" />
+    <ClCompile Include="..\src\optiontypes.cpp" />
+    <ClCompile Include="..\src\perlin.cpp" />
+    <ClCompile Include="..\src\physobj.cpp" />
+    <ClCompile Include="..\src\player.cpp" />
+    <ClCompile Include="..\src\player_types.cpp" />
+    <ClCompile Include="..\src\satellite.cpp" />
+    <ClCompile Include="..\src\shop.cpp" />
+    <ClCompile Include="..\src\sky.cpp" />
+    <ClCompile Include="..\src\sound.cpp" />
+    <ClCompile Include="..\src\tank.cpp" />
+    <ClCompile Include="..\src\teleport.cpp" />
+    <ClCompile Include="..\src\text.cpp" />
+    <ClCompile Include="..\src\update.cpp" />
+    <ClCompile Include="..\src\virtobj.cpp" />
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\src\atanks.rc" />
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\atanks.ico" />
+  </ItemGroup>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+  <ImportGroup Label="ExtensionTargets">
+  </ImportGroup>
+</Project>
diff -Nru atanks-6.5~dfsg/vs14/atanks.vcxproj.filters atanks-6.6~dfsg/vs14/atanks.vcxproj.filters
--- atanks-6.5~dfsg/vs14/atanks.vcxproj.filters	1970-01-01 00:00:00.000000000 +0000
+++ atanks-6.6~dfsg/vs14/atanks.vcxproj.filters	2016-11-02 14:57:53.000000000 +0000
@@ -0,0 +1,295 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup>
+    <Filter Include="Source Files">
+      <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier>
+      <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions>
+    </Filter>
+    <Filter Include="Header Files">
+      <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier>
+      <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions>
+    </Filter>
+    <Filter Include="Resource Files">
+      <UniqueIdentifier>{67DA6AB6-F800-4c08-8B7A-83BB121AAD01}</UniqueIdentifier>
+      <Extensions>rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms</Extensions>
+    </Filter>
+  </ItemGroup>
+  <ItemGroup>
+    <ClInclude Include="..\src\aicore.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\beam.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\button.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\client.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\clock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debris_pool.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\debug.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\decor.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\environment.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\explosion.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\externs.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\files.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\floattext.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\gameloop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\gfxData.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\globaldata.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\globals.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\globaltypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\land.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\main.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\menu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\missile.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\network.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\optioncontent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\optionitem.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\optionitembase.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\optionitemcolour.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\optionitemmenu.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\optionitemplayer.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\optionscreens.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\optiontypes.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\physobj.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\player.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\player_types.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\resource.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\satellite.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\shop.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sky.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\sound.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\tank.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\teleport.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\text.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\update.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\virtobj.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\winclock.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="..\src\extern\dirent.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+  </ItemGroup>
+  <ItemGroup>
+    <ClCompile Include="..\src\aicore.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\atanks.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\beam.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\button.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\client.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\clock.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debris_pool.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\debug.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\decor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\environment.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\explosion.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\files.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\floattext.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\gameloop.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\gfxData.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\globaldata.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\globaltypes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\land.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\main.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\menu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\missile.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\network.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\optionitembase.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\optionitemcolour.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\optionitemmenu.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\optionitemplayer.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\optionscreens.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\optiontypes.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\perlin.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\physobj.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\player.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\player_types.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\satellite.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\shop.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sky.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\sound.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\tank.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\teleport.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\text.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\update.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\virtobj.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="..\src\extern\dirent.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <ResourceCompile Include="..\src\atanks.rc">
+      <Filter>Resource Files</Filter>
+    </ResourceCompile>
+  </ItemGroup>
+  <ItemGroup>
+    <Image Include="..\atanks.ico">
+      <Filter>Resource Files</Filter>
+    </Image>
+  </ItemGroup>
+</Project>
\ No newline at end of file
diff -Nru atanks-6.5~dfsg/vs14/README_allegro.txt atanks-6.6~dfsg/vs14/README_allegro.txt
--- atanks-6.5~dfsg/vs14/README_allegro.txt	1970-01-01 00:00:00.000000000 +0000
+++ atanks-6.6~dfsg/vs14/README_allegro.txt	2016-11-02 14:57:53.000000000 +0000
@@ -0,0 +1,14 @@
+To build atanks using Visual Studio 2015 you will need
+to adapt the include path settings to where your allegro
+includes are.
+Further replace alleg44.dll and alleg44_64.dll with the
+versions you want to use.
+
+Release 32bit uses alleg44.lib      and alleg44.dll
+Release 64bit uses alleg44_64.lib   and alleg44_64.dll
+Debug   32bit uses alleg44_d.lib    and alleg44_d.dll
+Debug   64bit uses alleg44_64_d.lib and alleg44_64_d.dll
+
+As the windows build is originally not meant for debugging,
+only the release versions are included in git.
+You will need your own includes and libs!