diff -r de9144250c37 -r 71c47122fbc0 QTfrontend/weapons.h
--- a/QTfrontend/weapons.h	Sat Apr 08 18:36:12 2017 +0200
+++ b/QTfrontend/weapons.h	Sat Apr 08 21:43:48 2017 +0200
@@ -16,10 +16,10 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#define AMMOLINE_EMPTY_QT       "000000900000000000000000000000000000000000000000000000000"
-#define AMMOLINE_EMPTY_PROB     "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_EMPTY_DELAY    "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_EMPTY_CRATE    "131111031211111112311411111111111111121111111111111111111"
+#define AMMOLINE_EMPTY_QT       "0000009000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_EMPTY_PROB     "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_EMPTY_DELAY    "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_EMPTY_CRATE    "1311110312111111123114111111111111111211111111111111111111"
 
 /*
  AmmoType lookup table (use monospace font / cursor movements)
@@ -81,63 +81,60 @@
  amKnife-------------------------------------------------------------------------------|
  amRubber-------------------------------------------------------------------------------|
  amAirMine-------------------------------------------------------------------------------|
+ amDuck-----------------------------------------------------------------------------------|
 */
-#define AMMOLINE_DEFAULT_QT     "939192942219912103223511100120000000021110010101111100010"
-#define AMMOLINE_DEFAULT_PROB   "040504054160065554655446477657666666615551010111541111111"
-#define AMMOLINE_DEFAULT_DELAY  "000000000000020550000004000700400000000022000000060002000"
-#define AMMOLINE_DEFAULT_CRATE  "131111031211111112311411111111111111121111111111111111111"
+#define AMMOLINE_DEFAULT_QT     "9391929422199121032235111001200000000211100101011111000102"
+#define AMMOLINE_DEFAULT_PROB   "0405040541600655546554464776576666666155510101115411111114"
+#define AMMOLINE_DEFAULT_DELAY  "0000000000000205500000040007004000000000220000000600020000"
+#define AMMOLINE_DEFAULT_CRATE  "1311110312111111123114111111111111111211111111111111111111"
 
-#define AMMOLINE_CRAZY_QT       "999999999999999999299999999999999929999999999999999299919"
-#define AMMOLINE_CRAZY_PROB     "111111011111111111111111111111111111111111111111111111111"
-#define AMMOLINE_CRAZY_DELAY    "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_CRAZY_CRATE    "131111031211111112311411111111111111121111111111111111111"
+#define AMMOLINE_CRAZY_QT       "9999999999999999992999999999999999299999999999999992999199"
+#define AMMOLINE_CRAZY_PROB     "1111110111111111111111111111111111111111111111111111111111"
+#define AMMOLINE_CRAZY_DELAY    "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_CRAZY_CRATE    "1311110312111111123114111111111111111211111111111111111111"
 
-#define AMMOLINE_PROMODE_QT     "909000900000000000000900000000000000000000000000000000000"
-#define AMMOLINE_PROMODE_PROB   "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_PROMODE_DELAY  "000000000000020550000004000700400000000020000000000002000"
-#define AMMOLINE_PROMODE_CRATE  "111111011111111111111111111111111111111111111111111111111"
+#define AMMOLINE_PROMODE_QT     "9090009000000000000009000000000000000000000000000000000000"
+#define AMMOLINE_PROMODE_PROB   "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_PROMODE_DELAY  "0000000000000205500000040007004000000000200000000000020000"
+#define AMMOLINE_PROMODE_CRATE  "1111110111111111111111111111111111111111111111111111111111"
 
-#define AMMOLINE_SHOPPA_QT      "000000990000000000000000000000000000000000000000000000000"
-#define AMMOLINE_SHOPPA_PROB    "444441004424440221011212122242200000000200040001001100101"
-#define AMMOLINE_SHOPPA_DELAY   "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_SHOPPA_CRATE   "111111011111111111111111111111111111111111111111111111111"
+#define AMMOLINE_SHOPPA_QT      "0000009900000000000000000000000000000000000000000000000000"
+#define AMMOLINE_SHOPPA_PROB    "4444410044244402210112121222422000000002000400010011001011"
+#define AMMOLINE_SHOPPA_DELAY   "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_SHOPPA_CRATE   "1111110111111111111111111111111111111111111111111111111111"
 
-#define AMMOLINE_CLEAN_QT       "101000900001000001100000000000000000000000000000100000000"
-#define AMMOLINE_CLEAN_PROB     "040504054160065554655446477657666666615551010111541112111"
-#define AMMOLINE_CLEAN_DELAY    "000000000000000000000000000000000000000000000000000002000"
-#define AMMOLINE_CLEAN_CRATE    "131111031211111112311411111111111111121111111111111111111"
+#define AMMOLINE_CLEAN_QT       "1010009000010000011000000000000000000000000000001000000000"
+#define AMMOLINE_CLEAN_PROB     "0405040541600655546554464776576666666155510101115411121114"
+#define AMMOLINE_CLEAN_DELAY    "0000000000000000000000000000000000000000000000000000020000"
+#define AMMOLINE_CLEAN_CRATE    "1311110312111111123114111111111111111211111111111111111111"
 
-#define AMMOLINE_MINES_QT       "000000990009000000030000000000000000000000000000000000000"
-#define AMMOLINE_MINES_PROB     "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_MINES_DELAY    "000000000000020550000004000700400000000020000000060002000"
-#define AMMOLINE_MINES_CRATE    "111111011111111111111111111111111111111111111111111111111"
+#define AMMOLINE_MINES_QT       "0000009900090000000300000000000000000000000000000000000000"
+#define AMMOLINE_MINES_PROB     "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_MINES_DELAY    "0000000000000205500000040007004000000000200000000600020000"
+#define AMMOLINE_MINES_CRATE    "1111110111111111111111111111111111111111111111111111111111"
 
-#define AMMOLINE_PORTALS_QT     "900000900200000000210000000000000011000009000000000000000"
-#define AMMOLINE_PORTALS_PROB   "040504054160065554655446477657666666615551010111541112111"
-#define AMMOLINE_PORTALS_DELAY  "000000000000020550000004000700400000000020000000060002000"
-#define AMMOLINE_PORTALS_CRATE  "131111031211111112311411111111111111121111111111111111111"
+#define AMMOLINE_PORTALS_QT     "9000009002000000002100000000000000110000090000000000000000"
+#define AMMOLINE_PORTALS_PROB   "0405040541600655546554464776576666666155510101115411121112"
+#define AMMOLINE_PORTALS_DELAY  "0000000000000205500000040007004000000000200000000600020000"
+#define AMMOLINE_PORTALS_CRATE  "1311110312111111123114111111111111111211111111111111111111"
 
-#define AMMOLINE_ONEEVERY_QT    "111111911111111111111111111111111111111111111111111111111"
-#define AMMOLINE_ONEEVERY_PROB  "111111011111111111111111111111111111111111111111111111111"
-#define AMMOLINE_ONEEVERY_DELAY "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_ONEEVERY_CRATE "111111011111111111111111111111111111111111111111111111111"
+#define AMMOLINE_ONEEVERY_QT    "1111119111111111111111111111111111111111111111111111111111"
+#define AMMOLINE_ONEEVERY_PROB  "1111110111111111111111111111111111111111111111111111111111"
+#define AMMOLINE_ONEEVERY_DELAY "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_ONEEVERY_CRATE "1111110111111111111111111111111111111111111111111111111111"
 
-#define AMMOLINE_HIGHLANDER_QT    "111111911111111111110191111111111001011111011110110011010"
-#define AMMOLINE_HIGHLANDER_PROB  "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_HIGHLANDER_DELAY "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_HIGHLANDER_CRATE "000000000000000000000000000000000000000000000000000000000"
-
-#define AMMOLINE_CONSTRUCTION_QT    "110001900000001001000000000000000000000000000000000000000"
-#define AMMOLINE_CONSTRUCTION_PROB  "111111011111111111111111111111111111111111111111111111110"
-#define AMMOLINE_CONSTRUCTION_DELAY "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_CONSTRUCTION_CRATE "111111011111111111111111111111111111111111111111111111111"
+#define AMMOLINE_HIGHLANDER_QT    "1111119111111111111101911111111110010111110111101100110101"
+#define AMMOLINE_HIGHLANDER_PROB  "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_HIGHLANDER_DELAY "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_HIGHLANDER_CRATE "0000000000000000000000000000000000000000000000000000000000"
 
-#define AMMOLINE_SHOPPAPRO_QT      "000000990000000000000000000000000000000000000000000000000"
-#define AMMOLINE_SHOPPAPRO_PROB    "444440004404440000000000000040000000000000000000000000000"
-#define AMMOLINE_SHOPPAPRO_DELAY   "000000000000000000000000000000000000000000000000000000000"
-#define AMMOLINE_SHOPPAPRO_CRATE   "111111011111111111111111111111111111111111111111111112111"
+#define AMMOLINE_CONSTRUCTION_QT    "1100019000000010010000000000000000000000000000000000000000"
+#define AMMOLINE_CONSTRUCTION_PROB  "1111110111111111111111111111111111111111111111111111111100"
+#define AMMOLINE_CONSTRUCTION_DELAY "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_CONSTRUCTION_CRATE "1111110111111111111111111111111111111111111111111111111111"
 
+#define AMMOLINE_SHOPPAPRO_QT      "0000009900000000000000000000000000000000000000000000000000"
+#define AMMOLINE_SHOPPAPRO_PROB    "4444400044044400000000000000400000000000000000000000000000"
+#define AMMOLINE_SHOPPAPRO_DELAY   "0000000000000000000000000000000000000000000000000000000000"
+#define AMMOLINE_SHOPPAPRO_CRATE   "1111110111111111111111111111111111111111111111111111121111"
 
-//When adding new weapons also insert one element in cDefaultAmmos list (hwconsts.cpp.in)
-
-