widelands-dev team mailing list archive

[TiborB <tiborb95@xxxxxxxxx>]

TiborB has proposed merging lp:~widelands-dev/widelands/ai_new_wai_files_08042018 into lp:widelands.

Commit message:
New WAI files for AI, with a tiny update in C++ code of AI.

Requested reviews:
  Widelands Developers (widelands-dev)

For more details, see:
https://code.launchpad.net/~widelands-dev/widelands/ai_new_wai_files_08042018/+merge/342840

New WAI files for AI (after some latest changes to the C++ code), with a tiny update in C++ code of AI that seemed convenient to me.
-- 
Your team Widelands Developers is requested to review the proposed merge of lp:~widelands-dev/widelands/ai_new_wai_files_08042018 into lp:widelands.

=== modified file 'data/ai/ai_input_1.wai'
--- data/ai/ai_input_1.wai	2018-03-29 21:16:32 +0000
+++ data/ai/ai_input_1.wai	2018-04-08 19:29:15 +0000
@@ -2,294 +2,294 @@
 # See wiki for more info: https://wl.widelands.org/wiki/Ai%20Training/
 
 [magic_numbers]
-0="-92"
-1="27"
+0="-85"
+1="66"
 2="45"
 3="12"
-4="94"
+4="7"
 5="61"
-6="-69"
+6="-51"
 7="-95"
-8="-25"
-9="37"
-10="-70"
-11="-100"
-12="70"
+8="-47"
+9="81"
+10="-21"
+11="-62"
+12="82"
 13="19"
 14="3"
 15="-78"
-16="76"
+16="0"
 17="-60"
-18="-35"
-19="27"
-20="39"
-21="4"
+18="78"
+19="-40"
+20="1"
+21="-85"
 22="13"
-23="80"
-24="0"
-25="100"
-26="40"
-27="-26"
-28="86"
-29="45"
+23="15"
+24="60"
+25="71"
+26="99"
+27="32"
+28="79"
+29="56"
 30="-42"
-31="-77"
-32="-81"
+31="-55"
+32="48"
 33="24"
-34="-46"
+34="35"
 35="92"
-36="-29"
+36="27"
 37="-63"
-38="-15"
+38="-48"
 39="0"
 40="-55"
-41="0"
-42="80"
-43="-36"
+41="89"
+42="55"
+43="0"
 44="-46"
-45="65"
+45="52"
 46="47"
 47="3"
 48="74"
-49="43"
-50="-14"
+49="79"
+50="-69"
 51="100"
-52="-11"
-53="-88"
+52="-45"
+53="81"
 54="25"
-55="-76"
-56="-46"
+55="8"
+56="85"
 57="-61"
 58="13"
-59="-63"
-60="-33"
-61="-41"
-62="19"
+59="-56"
+60="-17"
+61="35"
+62="0"
 63="-34"
 64="95"
 65="-24"
-66="-54"
+66="-20"
 67="94"
 68="-11"
 69="-85"
-70="75"
-71="64"
+70="-6"
+71="58"
 72="55"
 73="0"
-74="-83"
-75="-4"
-76="-73"
+74="-100"
+75="-8"
+76="-86"
 77="-34"
 78="61"
 79="92"
 80="99"
 81="-98"
-82="94"
-83="-66"
-84="74"
+82="82"
+83="0"
+84="81"
 85="-76"
-86="47"
+86="46"
 87="-2"
 88="80"
 89="0"
-90="-86"
-91="53"
-92="72"
+90="-78"
+91="-99"
+92="64"
 93="90"
-94="-41"
-95="97"
-96="-52"
+94="33"
+95="68"
+96="-72"
 97="34"
 98="60"
 99="-65"
 100="38"
-101="62"
-102="-28"
+101="76"
+102="-1"
 103="-70"
-104="64"
+104="-41"
 105="75"
-106="-35"
-107="-42"
+106="-97"
+107="-41"
 108="0"
-109="-13"
-110="17"
+109="-32"
+110="41"
 111="-39"
 112="0"
-113="-5"
+113="-30"
 114="-45"
-115="-64"
+115="59"
 116="43"
-117="0"
+117="-57"
 118="52"
 119="75"
 120="85"
-121="-30"
+121="-55"
 122="-5"
 123="48"
-124="67"
+124="83"
 125="36"
-126="-6"
-127="59"
-128="21"
-129="79"
-130="-33"
+126="38"
+127="-1"
+128="54"
+129="69"
+130="-9"
 131="-32"
 132="-31"
-133="-82"
-134="63"
-135="-24"
-136="75"
-137="12"
-138="-90"
+133="-71"
+134="32"
+135="55"
+136="88"
+137="47"
+138="90"
 139="0"
-140="89"
-141="19"
-142="11"
+140="74"
+141="-56"
+142="-74"
 143="-82"
-144="-38"
-145="-63"
-146="-16"
+144="4"
+145="-80"
+146="-37"
 147="-25"
 148="0"
 149="8"
-150="-65"
-151="95"
-152="58"
-153="41"
+150="43"
+151="77"
+152="19"
+153="-82"
 154="56"
 155="-45"
-156="38"
+156="0"
 157="23"
 158="10"
-159="-44"
-160="-74"
+159="-2"
+160="-72"
 161="56"
 162="19"
-163="-80"
-164="-33"
+163="-87"
+164="37"
 165="77"
-166="-73"
-167="84"
-168="0"
-169="-51"
+166="-49"
+167="37"
+168="55"
+169="-33"
 170="44"
-171="-46"
-172="-59"
+171="-82"
+172="-74"
 173="27"
-174="-14"
-175="-55"
-176="89"
-177="20"
-178="-97"
+174="-52"
+175="59"
+176="-91"
+177="-82"
+178="-62"
 179="-55"
-180="71"
+180="-47"
 181="-75"
-182="-33"
-183="39"
-184="33"
+182="-62"
+183="-100"
+184="61"
 185="26"
 186="20"
 187="-28"
-188="-54"
-189="0"
-190="21"
-191="-79"
-192="22"
+188="17"
+189="34"
+190="-6"
+191="46"
+192="3"
 193="-29"
-194="4"
-195="9"
+194="-94"
+195="100"
 196="44"
-197="-83"
-198="-57"
+197="-93"
+198="38"
 199="-98"
 
 [neuron_values]
-0="-31"
+0="-86"
 1="-85"
 2="74"
 3="47"
-4="0"
+4="32"
 5="-88"
 6="94"
-7="62"
-8="50"
+7="60"
+8="-79"
 9="-12"
 10="21"
 11="-50"
 12="-89"
-13="66"
+13="-66"
 14="-10"
-15="32"
+15="-17"
 16="-11"
 17="-45"
 18="-96"
-19="0"
+19="23"
 20="-60"
 21="-29"
 22="51"
 23="-90"
-24="-62"
-25="0"
+24="49"
+25="73"
 26="62"
 27="0"
 28="79"
 29="47"
-30="-87"
+30="39"
 31="54"
 32="-59"
-33="5"
+33="-2"
 34="15"
 35="-90"
 36="66"
 37="-15"
 38="-22"
-39="-74"
-40="-76"
-41="54"
-42="-87"
-43="-42"
+39="-43"
+40="-51"
+41="91"
+42="-74"
+43="-98"
 44="45"
-45="98"
+45="69"
 46="4"
 47="-76"
-48="43"
-49="-42"
-50="87"
+48="-59"
+49="-2"
+50="-5"
 51="-36"
 52="71"
 53="-77"
-54="-23"
+54="-37"
 55="-6"
 56="-64"
 57="71"
 58="19"
-59="75"
+59="6"
 60="-72"
 61="77"
 62="62"
-63="-7"
-64="-42"
-65="-38"
+63="-49"
+64="-51"
+65="0"
 66="15"
 67="4"
-68="0"
-69="-42"
-70="-33"
-71="-48"
+68="27"
+69="96"
+70="3"
+71="51"
 72="-41"
 73="6"
 74="41"
-75="80"
+75="1"
 76="-80"
-77="0"
-78="-29"
-79="-86"
+77="90"
+78="73"
+79="-98"
 
 [neuron_functions]
 0="2"
 1="2"
 2="1"
-3="2"
+3="0"
 4="0"
 5="0"
 6="1"
@@ -314,7 +314,7 @@
 25="1"
 26="0"
 27="0"
-28="0"
+28="2"
 29="2"
 30="2"
 31="2"
@@ -351,9 +351,9 @@
 62="1"
 63="0"
 64="2"
-65="2"
+65="1"
 66="1"
-67="0"
+67="2"
 68="0"
 69="2"
 70="0"
@@ -368,63 +368,63 @@
 79="1"
 
 [fneurons]
-0="205380910"
-1="3479365532"
-2="607488298"
-3="3218403551"
-4="3818448681"
-5="3541339980"
-6="1397981601"
-7="559351757"
-8="3759635735"
-9="2082704400"
-10="3140043542"
-11="1288981407"
-12="2159320732"
-13="2118354277"
-14="3926640156"
-15="1081374918"
-16="2400659058"
-17="2218669008"
-18="3658929663"
-19="2005178445"
-20="2715896950"
-21="4225781642"
-22="165472656"
-23="623828237"
-24="2207882925"
-25="114625808"
-26="953014587"
-27="1895468623"
-28="4045157079"
-29="3275091527"
-30="3609093764"
-31="1809248862"
-32="1075351732"
-33="789010024"
-34="2876031859"
-35="3294583502"
-36="904853336"
-37="49717517"
-38="2632536562"
-39="756141353"
-40="1023085145"
-41="4215871682"
-42="3984959902"
-43="1156574206"
-44="664944294"
-45="3876231190"
-46="3482436319"
-47="2672512911"
-48="717757885"
-49="2814057136"
-50="3833871268"
-51="2288736012"
-52="2316364408"
-53="865428795"
-54="591880990"
-55="769914537"
-56="282683634"
-57="3029824104"
-58="3069586161"
-59="2452851719"
+0="238927151"
+1="2641908669"
+2="2085942233"
+3="2303750263"
+4="3810059177"
+5="303826923"
+6="1363335632"
+7="3776811087"
+8="2685730067"
+9="3451964496"
+10="841499542"
+11="3445573729"
+12="1217714902"
+13="3997435843"
+14="1601160669"
+15="1395116102"
+16="2669618851"
+17="624825312"
+18="3739081087"
+19="1984727161"
+20="668032135"
+21="3714293736"
+22="769255827"
+23="629561615"
+24="3340570221"
+25="911331268"
+26="3100499003"
+27="1423509535"
+28="3105633111"
+29="1539125097"
+30="4198922112"
+31="2685891684"
+32="561564133"
+33="790060648"
+34="700880766"
+35="3313063558"
+36="480236913"
+37="519565580"
+38="2619986428"
+39="1225247807"
+40="1154832853"
+41="3947436162"
+42="2159406482"
+43="946055930"
+44="629292198"
+45="2919938070"
+46="1602867612"
+47="2533713823"
+48="721558279"
+49="165485082"
+50="2216063393"
+51="2314891628"
+52="3813717566"
+53="2983674987"
+54="1649369628"
+55="2090764669"
+56="1078686297"
+57="2127919152"
+58="2799053553"
+59="3861407363"

=== modified file 'data/ai/ai_input_2.wai'
--- data/ai/ai_input_2.wai	2018-03-29 21:16:32 +0000
+++ data/ai/ai_input_2.wai	2018-04-08 19:29:15 +0000
@@ -2,294 +2,294 @@
 # See wiki for more info: https://wl.widelands.org/wiki/Ai%20Training/
 
 [magic_numbers]
-0="-92"
-1="27"
+0="-85"
+1="66"
 2="45"
 3="12"
-4="94"
+4="7"
 5="61"
-6="-69"
+6="23"
 7="-95"
-8="-25"
-9="37"
+8="-47"
+9="81"
 10="-70"
-11="-100"
-12="70"
+11="-6"
+12="82"
 13="19"
 14="3"
-15="-78"
-16="76"
+15="-37"
+16="0"
 17="-60"
-18="-35"
-19="27"
-20="39"
-21="4"
+18="78"
+19="92"
+20="1"
+21="-85"
 22="13"
-23="80"
-24="0"
-25="100"
-26="40"
-27="-26"
-28="86"
-29="45"
+23="15"
+24="60"
+25="71"
+26="99"
+27="32"
+28="79"
+29="56"
 30="-42"
-31="-77"
-32="-81"
+31="-55"
+32="-11"
 33="24"
-34="-46"
+34="35"
 35="92"
-36="-29"
+36="27"
 37="-63"
-38="-15"
+38="-48"
 39="0"
 40="-55"
-41="0"
-42="49"
-43="-36"
+41="89"
+42="62"
+43="0"
 44="-46"
-45="65"
+45="52"
 46="47"
 47="3"
 48="74"
-49="43"
-50="-14"
+49="79"
+50="-69"
 51="100"
-52="-11"
-53="-88"
+52="-45"
+53="-54"
 54="25"
-55="-76"
-56="-46"
+55="8"
+56="40"
 57="-61"
-58="13"
-59="-63"
-60="-33"
-61="-41"
-62="19"
+58="-31"
+59="-56"
+60="-17"
+61="35"
+62="-100"
 63="-34"
 64="95"
 65="-24"
-66="-54"
+66="-20"
 67="94"
 68="-11"
 69="-85"
-70="75"
-71="64"
-72="-17"
+70="-6"
+71="58"
+72="55"
 73="0"
-74="-83"
-75="-4"
-76="-73"
+74="-100"
+75="-8"
+76="-86"
 77="-34"
 78="61"
 79="92"
 80="99"
 81="-98"
-82="94"
-83="-66"
-84="74"
+82="82"
+83="0"
+84="81"
 85="-76"
-86="47"
+86="46"
 87="-2"
 88="80"
 89="0"
-90="-86"
-91="53"
-92="72"
+90="-78"
+91="-99"
+92="64"
 93="90"
-94="-41"
-95="97"
-96="-52"
+94="33"
+95="68"
+96="-72"
 97="34"
 98="60"
 99="-65"
 100="38"
-101="62"
-102="-28"
+101="76"
+102="-1"
 103="-70"
-104="64"
+104="-41"
 105="75"
-106="-35"
-107="-42"
+106="-97"
+107="-50"
 108="0"
-109="-13"
-110="17"
+109="-32"
+110="41"
 111="-39"
-112="0"
-113="-5"
+112="-21"
+113="-30"
 114="-45"
-115="-64"
+115="59"
 116="43"
-117="0"
+117="-57"
 118="52"
 119="75"
 120="85"
-121="-30"
+121="-55"
 122="-5"
 123="48"
-124="67"
+124="83"
 125="36"
-126="-6"
-127="59"
-128="21"
-129="79"
-130="-33"
+126="38"
+127="-1"
+128="54"
+129="69"
+130="-9"
 131="-32"
 132="-31"
-133="-82"
-134="63"
-135="-24"
-136="75"
-137="12"
-138="-90"
+133="-71"
+134="32"
+135="55"
+136="88"
+137="47"
+138="90"
 139="0"
-140="89"
-141="19"
-142="11"
+140="74"
+141="-56"
+142="-74"
 143="-82"
-144="-38"
-145="-63"
-146="-16"
+144="4"
+145="-80"
+146="-37"
 147="-25"
 148="0"
 149="8"
-150="-65"
-151="95"
-152="58"
-153="41"
+150="43"
+151="77"
+152="19"
+153="-82"
 154="56"
 155="-45"
-156="38"
+156="0"
 157="23"
 158="10"
-159="-44"
-160="-74"
-161="56"
+159="-2"
+160="-72"
+161="13"
 162="19"
-163="-80"
-164="-33"
+163="-87"
+164="84"
 165="77"
-166="-73"
-167="84"
-168="0"
-169="-51"
+166="-49"
+167="37"
+168="55"
+169="-33"
 170="44"
-171="-46"
-172="-59"
+171="-82"
+172="-74"
 173="27"
-174="-14"
-175="-55"
-176="89"
-177="20"
-178="-97"
+174="-52"
+175="59"
+176="-91"
+177="-82"
+178="-62"
 179="-55"
-180="71"
+180="-47"
 181="-75"
-182="-33"
-183="39"
-184="33"
+182="-62"
+183="-67"
+184="61"
 185="26"
 186="20"
 187="-28"
-188="-54"
-189="0"
-190="21"
-191="-79"
-192="22"
+188="17"
+189="34"
+190="-6"
+191="46"
+192="15"
 193="-29"
-194="4"
-195="9"
+194="-94"
+195="100"
 196="44"
-197="-83"
-198="-57"
-199="35"
+197="-93"
+198="38"
+199="-98"
 
 [neuron_values]
-0="-20"
+0="-86"
 1="-85"
 2="74"
 3="47"
-4="0"
+4="32"
 5="-88"
 6="94"
-7="62"
-8="50"
+7="60"
+8="-92"
 9="-12"
 10="21"
 11="-50"
 12="-89"
 13="66"
 14="-10"
-15="32"
+15="-84"
 16="-11"
 17="-45"
 18="-96"
-19="0"
+19="23"
 20="-60"
 21="-29"
 22="51"
 23="-90"
-24="-62"
-25="0"
+24="49"
+25="73"
 26="62"
 27="0"
 28="79"
-29="47"
-30="-87"
+29="65"
+30="39"
 31="54"
 32="-59"
-33="5"
+33="-2"
 34="15"
 35="-90"
 36="66"
 37="-15"
 38="-22"
-39="-74"
-40="-76"
-41="54"
-42="-87"
-43="-42"
+39="-43"
+40="-51"
+41="-49"
+42="-74"
+43="-98"
 44="45"
-45="98"
+45="69"
 46="4"
 47="-76"
-48="43"
-49="-42"
-50="87"
+48="-59"
+49="-50"
+50="-5"
 51="-36"
 52="71"
-53="-77"
-54="-23"
+53="-61"
+54="-37"
 55="-6"
 56="-64"
 57="71"
 58="19"
-59="75"
+59="6"
 60="-72"
 61="77"
 62="62"
-63="-7"
-64="-42"
-65="-38"
+63="-49"
+64="-80"
+65="0"
 66="15"
 67="4"
-68="0"
-69="-42"
-70="-33"
-71="-48"
+68="27"
+69="96"
+70="3"
+71="51"
 72="-41"
 73="6"
 74="41"
-75="80"
+75="1"
 76="-80"
-77="0"
-78="-29"
-79="-86"
+77="90"
+78="73"
+79="-98"
 
 [neuron_functions]
 0="2"
 1="2"
 2="1"
-3="2"
+3="0"
 4="0"
 5="0"
 6="1"
@@ -314,7 +314,7 @@
 25="1"
 26="0"
 27="0"
-28="0"
+28="2"
 29="2"
 30="2"
 31="2"
@@ -328,7 +328,7 @@
 39="2"
 40="2"
 41="0"
-42="2"
+42="1"
 43="1"
 44="2"
 45="1"
@@ -351,9 +351,9 @@
 62="1"
 63="0"
 64="2"
-65="2"
+65="1"
 66="1"
-67="0"
+67="2"
 68="0"
 69="2"
 70="0"
@@ -368,63 +368,63 @@
 79="1"
 
 [fneurons]
-0="205380910"
-1="3479365532"
-2="607488298"
-3="3218403551"
-4="3818448681"
-5="3541339980"
-6="1397981601"
-7="559351757"
-8="3759635735"
-9="4229106832"
-10="3140043542"
-11="1288981407"
-12="2159320732"
-13="2118354277"
-14="3926640156"
-15="1081374918"
-16="2400659058"
-17="71185360"
-18="3658929663"
-19="2005178445"
-20="2715896950"
-21="4225781642"
-22="165472656"
-23="623828237"
-24="2207882925"
-25="114625808"
-26="953014587"
-27="1895468623"
-28="4045157079"
-29="3275091527"
-30="4112412432"
-31="1809248862"
-32="1075351732"
-33="789010024"
-34="2876031859"
-35="3294583502"
-36="904853336"
-37="49717517"
-38="2632536562"
-39="756141353"
-40="1023085145"
-41="2068388034"
-42="3984959902"
-43="1156574206"
-44="664944294"
-45="3876231190"
-46="3482436319"
-47="2672512911"
-48="717757885"
-49="2814057136"
-50="3833871268"
-51="2288736012"
-52="2316364408"
-53="865432891"
-54="591880990"
-55="769914537"
-56="282683634"
-57="3029824104"
-58="3065916147"
-59="2452851719"
+0="238927151"
+1="2641908669"
+2="2085942233"
+3="2370992181"
+4="3810059177"
+5="303826923"
+6="1363335632"
+7="3776811087"
+8="2685730067"
+9="3451964496"
+10="841499542"
+11="3445573729"
+12="1217714902"
+13="3963881411"
+14="1601160669"
+15="1395116102"
+16="2669618851"
+17="1698567136"
+18="3739081087"
+19="1984727165"
+20="668032135"
+21="3714293736"
+22="769255827"
+23="629561615"
+24="2207858349"
+25="911331268"
+26="3100499003"
+27="1423509535"
+28="3105633111"
+29="1543319401"
+30="4198987648"
+31="2685891684"
+32="41601525"
+33="790060648"
+34="700880766"
+35="3313063558"
+36="606076273"
+37="519565580"
+38="2619986428"
+39="1225247806"
+40="1154873809"
+41="3947468930"
+42="2159406482"
+43="1559227134"
+44="629292198"
+45="2919938070"
+46="1602867612"
+47="2671799183"
+48="721558407"
+49="165485082"
+50="2216063393"
+51="167424852"
+52="3813717566"
+53="2983674987"
+54="1650418204"
+55="2090764669"
+56="1078686297"
+57="2127919152"
+58="2797480632"
+59="3876102786"

=== modified file 'data/ai/ai_input_3.wai'
--- data/ai/ai_input_3.wai	2018-03-29 21:16:32 +0000
+++ data/ai/ai_input_3.wai	2018-04-08 19:29:15 +0000
@@ -2,299 +2,299 @@
 # See wiki for more info: https://wl.widelands.org/wiki/Ai%20Training/
 
 [magic_numbers]
-0="-92"
-1="27"
+0="-85"
+1="66"
 2="45"
 3="12"
-4="94"
+4="7"
 5="61"
-6="-69"
+6="-51"
 7="-95"
-8="0"
-9="37"
-10="-70"
-11="-100"
-12="96"
+8="-47"
+9="81"
+10="-21"
+11="-62"
+12="82"
 13="19"
 14="3"
 15="-78"
-16="76"
+16="0"
 17="-60"
-18="-35"
-19="27"
-20="39"
-21="4"
-22="-42"
-23="80"
-24="0"
-25="0"
-26="40"
-27="-26"
-28="86"
-29="45"
+18="78"
+19="-40"
+20="1"
+21="-85"
+22="13"
+23="15"
+24="60"
+25="71"
+26="99"
+27="32"
+28="79"
+29="56"
 30="-42"
-31="-77"
-32="-81"
-33="29"
-34="-46"
+31="-55"
+32="48"
+33="24"
+34="35"
 35="92"
-36="-29"
-37="-20"
-38="-15"
+36="27"
+37="-63"
+38="-48"
 39="0"
 40="-55"
-41="84"
-42="49"
-43="-36"
+41="89"
+42="76"
+43="0"
 44="-46"
-45="65"
+45="52"
 46="47"
 47="3"
 48="74"
-49="43"
-50="-14"
+49="79"
+50="-69"
 51="100"
-52="-11"
-53="-88"
+52="-45"
+53="81"
 54="25"
-55="-76"
-56="-46"
+55="8"
+56="85"
 57="-61"
 58="13"
-59="-63"
-60="-29"
-61="-41"
-62="61"
+59="-56"
+60="-17"
+61="35"
+62="0"
 63="-34"
 64="95"
 65="-24"
-66="-54"
+66="-20"
 67="94"
 68="-11"
 69="-85"
-70="75"
-71="64"
+70="0"
+71="58"
 72="55"
 73="0"
-74="-83"
-75="-4"
-76="-73"
+74="-100"
+75="-8"
+76="-86"
 77="-34"
 78="61"
 79="92"
 80="99"
 81="-98"
-82="94"
-83="-66"
-84="74"
+82="82"
+83="0"
+84="81"
 85="-76"
-86="47"
+86="46"
 87="-2"
 88="80"
 89="0"
-90="-86"
-91="53"
-92="72"
-93="90"
-94="-41"
-95="97"
-96="-52"
+90="-78"
+91="-99"
+92="64"
+93="-16"
+94="33"
+95="68"
+96="-72"
 97="34"
-98="-70"
+98="60"
 99="-65"
-100="72"
-101="62"
-102="60"
+100="38"
+101="76"
+102="-1"
 103="-70"
-104="64"
+104="-41"
 105="75"
-106="-35"
-107="-42"
+106="-97"
+107="-41"
 108="0"
-109="-13"
-110="17"
+109="-32"
+110="41"
 111="-39"
 112="0"
-113="-27"
+113="-30"
 114="-45"
-115="-64"
+115="59"
 116="43"
-117="0"
+117="-57"
 118="52"
 119="75"
 120="85"
-121="-30"
+121="-55"
 122="-5"
 123="48"
-124="59"
+124="83"
 125="36"
-126="-6"
-127="59"
-128="80"
-129="79"
-130="-33"
+126="38"
+127="-1"
+128="54"
+129="69"
+130="-9"
 131="-32"
 132="-31"
-133="-82"
-134="63"
-135="-24"
-136="75"
-137="12"
-138="-90"
+133="-71"
+134="32"
+135="55"
+136="88"
+137="47"
+138="90"
 139="0"
-140="89"
-141="19"
-142="11"
+140="74"
+141="-56"
+142="-74"
 143="-82"
-144="-38"
-145="-63"
-146="-16"
+144="4"
+145="-80"
+146="-37"
 147="-25"
 148="0"
 149="8"
-150="-65"
-151="95"
-152="58"
-153="41"
+150="43"
+151="77"
+152="19"
+153="-82"
 154="56"
 155="-45"
-156="38"
+156="0"
 157="23"
 158="10"
-159="-44"
-160="-74"
+159="-2"
+160="-72"
 161="56"
 162="19"
-163="-80"
-164="-33"
+163="-87"
+164="37"
 165="77"
-166="-73"
-167="84"
-168="0"
-169="-51"
+166="-49"
+167="37"
+168="55"
+169="-33"
 170="44"
-171="-46"
-172="-59"
+171="-82"
+172="-74"
 173="27"
-174="-14"
-175="-55"
-176="89"
-177="20"
-178="-97"
+174="-52"
+175="59"
+176="-91"
+177="-82"
+178="-62"
 179="-55"
-180="71"
-181="-84"
-182="-33"
-183="-44"
-184="33"
+180="-47"
+181="-75"
+182="-62"
+183="-67"
+184="61"
 185="26"
 186="20"
 187="-28"
-188="-54"
-189="0"
-190="21"
-191="-79"
-192="22"
+188="17"
+189="34"
+190="-6"
+191="46"
+192="3"
 193="-29"
-194="4"
-195="9"
+194="-94"
+195="100"
 196="44"
-197="-83"
-198="-57"
-199="35"
+197="-93"
+198="38"
+199="-98"
 
 [neuron_values]
-0="-20"
+0="-86"
 1="-85"
 2="74"
 3="47"
-4="0"
+4="32"
 5="-88"
 6="94"
-7="62"
-8="50"
+7="60"
+8="-79"
 9="-12"
 10="21"
 11="-50"
 12="-89"
 13="66"
 14="-10"
-15="32"
+15="-17"
 16="-11"
 17="-45"
 18="-96"
-19="0"
+19="23"
 20="-60"
 21="-29"
 22="51"
 23="-90"
-24="-34"
-25="0"
+24="49"
+25="73"
 26="62"
 27="0"
 28="79"
 29="47"
-30="-87"
+30="39"
 31="54"
 32="-59"
-33="5"
+33="-2"
 34="15"
 35="-90"
 36="66"
 37="-15"
 38="-22"
-39="-74"
-40="-76"
-41="54"
-42="-87"
-43="-42"
+39="-43"
+40="-51"
+41="91"
+42="-74"
+43="-98"
 44="45"
-45="98"
+45="69"
 46="4"
 47="-76"
-48="43"
-49="-42"
-50="87"
+48="-59"
+49="-2"
+50="-5"
 51="-36"
 52="71"
-53="-30"
-54="-23"
+53="-77"
+54="-37"
 55="-6"
 56="-64"
-57="81"
+57="71"
 58="19"
-59="75"
+59="6"
 60="-72"
 61="77"
 62="62"
-63="-7"
-64="-42"
-65="-38"
+63="-49"
+64="-80"
+65="0"
 66="15"
 67="4"
-68="0"
-69="-42"
-70="-33"
-71="-48"
+68="27"
+69="96"
+70="3"
+71="51"
 72="-41"
 73="6"
-74="94"
-75="80"
+74="41"
+75="1"
 76="-80"
-77="0"
-78="-29"
-79="-86"
+77="90"
+78="73"
+79="-98"
 
 [neuron_functions]
-0="0"
+0="2"
 1="2"
 2="1"
-3="2"
+3="0"
 4="0"
 5="0"
 6="1"
 7="0"
-8="1"
+8="0"
 9="0"
 10="2"
 11="0"
@@ -314,7 +314,7 @@
 25="1"
 26="0"
 27="0"
-28="0"
+28="2"
 29="2"
 30="2"
 31="2"
@@ -348,12 +348,12 @@
 59="1"
 60="0"
 61="0"
-62="1"
+62="0"
 63="0"
 64="2"
-65="2"
+65="1"
 66="1"
-67="0"
+67="2"
 68="0"
 69="2"
 70="0"
@@ -368,63 +368,63 @@
 79="1"
 
 [fneurons]
-0="2355944718"
-1="3479365532"
-2="607488298"
-3="3218403551"
-4="3818448681"
-5="1548861293"
-6="1397981601"
-7="559351749"
-8="3759635735"
-9="2082720784"
-10="3140043542"
-11="1288981407"
-12="283424412"
-13="1984005990"
-14="3926640156"
-15="1081375430"
-16="2400659058"
-17="2222863312"
-18="3658929663"
-19="2005178445"
-20="2715896950"
-21="4225781642"
-22="165472656"
-23="623828229"
-24="2207882925"
-25="115152165"
-26="953015611"
-27="1895468623"
-28="4045157079"
-29="3275091527"
-30="3609093764"
-31="1809248862"
-32="1079546036"
-33="789010024"
-34="2876031859"
-35="3294583502"
-36="904853336"
-37="49717513"
-38="2632536562"
-39="756141097"
-40="1023085145"
-41="4215871682"
-42="3299125701"
-43="1156574204"
-44="664944294"
-45="3876231190"
-46="3482436319"
-47="2672512911"
-48="2865241533"
-49="3082563729"
-50="3298104214"
-51="2288736012"
-52="2316364408"
-53="865428793"
-54="667165470"
-55="769914537"
-56="821383411"
-57="618099273"
-58="3065916147"
-59="2452851719"
+0="238927151"
+1="2641908669"
+2="2085942233"
+3="2303750263"
+4="3810059177"
+5="303826923"
+6="1363319248"
+7="3776811087"
+8="2685730067"
+9="3451964496"
+10="841499542"
+11="3445573729"
+12="1217714902"
+13="3997435843"
+14="1601160669"
+15="1395116102"
+16="2669618851"
+17="624825312"
+18="3739076991"
+19="1984727161"
+20="668032135"
+21="3714293736"
+22="769255827"
+23="629561615"
+24="2207858349"
+25="911331268"
+26="3100499003"
+27="1423509535"
+28="3105633111"
+29="1539125097"
+30="4207310720"
+31="2685891684"
+32="561564133"
+33="790060648"
+34="700880766"
+35="3313063558"
+36="480236913"
+37="519565580"
+38="2619986428"
+39="1225247807"
+40="1154873809"
+41="3947436162"
+42="2159406482"
+43="946055930"
+44="629292198"
+45="2919938070"
+46="529126812"
+47="2533713823"
+48="721558279"
+49="165485082"
+50="2216063393"
+51="2314891628"
+52="3813717566"
+53="2983674987"
+54="1649369628"
+55="2090764669"
+56="1078686297"
+57="2127919152"
+58="2799053553"
+59="3861407363"

=== modified file 'data/ai/ai_input_4.wai'
--- data/ai/ai_input_4.wai	2018-03-29 21:16:32 +0000
+++ data/ai/ai_input_4.wai	2018-04-08 19:29:15 +0000
@@ -2,294 +2,294 @@
 # See wiki for more info: https://wl.widelands.org/wiki/Ai%20Training/
 
 [magic_numbers]
-0="-92"
-1="27"
+0="-85"
+1="66"
 2="45"
 3="12"
-4="94"
+4="7"
 5="61"
-6="-69"
+6="23"
 7="-95"
-8="-17"
-9="37"
+8="-47"
+9="81"
 10="-70"
-11="-100"
-12="70"
+11="-6"
+12="82"
 13="19"
 14="3"
 15="-78"
-16="76"
+16="0"
 17="-60"
-18="-35"
-19="27"
-20="39"
-21="4"
+18="78"
+19="-40"
+20="1"
+21="-85"
 22="13"
-23="80"
-24="0"
-25="100"
-26="40"
-27="-26"
-28="86"
-29="45"
+23="15"
+24="60"
+25="71"
+26="99"
+27="32"
+28="79"
+29="56"
 30="-42"
-31="-77"
-32="-81"
+31="-55"
+32="-11"
 33="24"
-34="-46"
+34="35"
 35="92"
-36="-29"
+36="27"
 37="-63"
-38="-15"
+38="-48"
 39="0"
 40="-55"
-41="0"
-42="79"
-43="-36"
+41="89"
+42="68"
+43="0"
 44="-46"
-45="65"
+45="52"
 46="47"
 47="3"
 48="74"
-49="43"
-50="-14"
+49="79"
+50="-69"
 51="100"
-52="-11"
-53="-88"
+52="0"
+53="-54"
 54="25"
-55="-76"
-56="-46"
+55="8"
+56="40"
 57="-61"
-58="13"
-59="-63"
-60="-33"
-61="-41"
-62="19"
+58="0"
+59="-56"
+60="-17"
+61="35"
+62="-100"
 63="-34"
 64="95"
 65="-24"
-66="-54"
+66="-20"
 67="94"
 68="-11"
 69="-85"
-70="75"
-71="64"
+70="-6"
+71="58"
 72="55"
 73="0"
-74="-83"
-75="-4"
-76="-73"
+74="-100"
+75="-12"
+76="-86"
 77="-34"
 78="61"
 79="92"
 80="99"
 81="-98"
-82="94"
-83="-66"
-84="74"
+82="82"
+83="0"
+84="81"
 85="-76"
-86="47"
+86="46"
 87="-2"
 88="80"
 89="0"
-90="-86"
-91="53"
-92="72"
+90="-78"
+91="-99"
+92="64"
 93="90"
-94="-41"
-95="97"
-96="-52"
+94="33"
+95="68"
+96="-72"
 97="34"
 98="60"
 99="-65"
 100="38"
-101="62"
-102="-28"
+101="76"
+102="-1"
 103="-70"
-104="64"
+104="-41"
 105="75"
-106="-35"
-107="-42"
+106="-97"
+107="-50"
 108="0"
-109="-13"
-110="17"
+109="-32"
+110="41"
 111="-39"
 112="0"
-113="-5"
+113="-30"
 114="-45"
-115="-64"
+115="59"
 116="43"
-117="0"
+117="-57"
 118="52"
 119="75"
 120="85"
-121="-30"
+121="-55"
 122="-5"
 123="48"
-124="67"
+124="83"
 125="36"
-126="-6"
-127="59"
-128="21"
-129="79"
-130="-33"
+126="38"
+127="-1"
+128="54"
+129="69"
+130="-9"
 131="-32"
 132="-31"
-133="-82"
-134="63"
-135="-24"
-136="75"
-137="12"
-138="-90"
+133="-71"
+134="32"
+135="55"
+136="88"
+137="47"
+138="90"
 139="0"
-140="89"
-141="19"
-142="11"
+140="74"
+141="-56"
+142="-74"
 143="-82"
-144="-38"
-145="-63"
-146="-16"
+144="4"
+145="-80"
+146="-37"
 147="-25"
 148="0"
-149="38"
-150="-65"
-151="95"
-152="58"
-153="41"
+149="8"
+150="43"
+151="77"
+152="19"
+153="-82"
 154="56"
 155="-45"
-156="38"
+156="0"
 157="23"
 158="10"
-159="-44"
-160="-74"
+159="-2"
+160="-72"
 161="56"
 162="19"
-163="-80"
-164="-33"
+163="-87"
+164="37"
 165="77"
-166="-73"
-167="84"
-168="0"
-169="-51"
+166="-49"
+167="37"
+168="55"
+169="35"
 170="44"
-171="-46"
-172="-59"
+171="-82"
+172="-74"
 173="27"
-174="-14"
-175="-55"
-176="89"
-177="20"
-178="-97"
+174="-52"
+175="59"
+176="-91"
+177="-82"
+178="-62"
 179="-55"
-180="71"
+180="-47"
 181="-75"
-182="-33"
-183="39"
-184="33"
+182="-62"
+183="-67"
+184="61"
 185="26"
 186="20"
 187="-28"
-188="-54"
-189="0"
-190="21"
-191="-79"
-192="22"
+188="17"
+189="34"
+190="-6"
+191="46"
+192="3"
 193="-29"
-194="4"
-195="9"
+194="-94"
+195="100"
 196="44"
-197="-83"
-198="-57"
-199="35"
+197="-93"
+198="38"
+199="-98"
 
 [neuron_values]
-0="-20"
+0="-86"
 1="-85"
 2="74"
 3="47"
-4="0"
+4="32"
 5="-88"
 6="94"
-7="62"
-8="50"
+7="60"
+8="-92"
 9="-12"
 10="21"
 11="-50"
 12="-89"
 13="66"
 14="-10"
-15="32"
+15="-84"
 16="-11"
 17="-45"
 18="-96"
-19="0"
+19="23"
 20="-60"
 21="-29"
 22="51"
 23="-90"
-24="-62"
-25="0"
+24="49"
+25="73"
 26="62"
 27="0"
 28="79"
-29="47"
-30="-87"
+29="65"
+30="39"
 31="54"
 32="-59"
-33="5"
+33="-2"
 34="15"
 35="-90"
 36="66"
 37="-15"
 38="-22"
-39="-74"
-40="-76"
-41="54"
-42="-87"
-43="-42"
+39="-43"
+40="-51"
+41="91"
+42="-74"
+43="-98"
 44="45"
-45="98"
+45="69"
 46="4"
 47="-76"
-48="43"
-49="-42"
-50="87"
+48="-59"
+49="-50"
+50="-5"
 51="-36"
 52="71"
 53="-77"
-54="-23"
+54="-37"
 55="-6"
-56="-71"
+56="-64"
 57="71"
 58="19"
-59="75"
+59="6"
 60="-72"
 61="77"
-62="62"
-63="-7"
-64="-42"
-65="-38"
+62="-16"
+63="-49"
+64="-80"
+65="0"
 66="15"
 67="4"
-68="0"
-69="-42"
-70="-33"
-71="-48"
+68="27"
+69="96"
+70="3"
+71="51"
 72="-41"
 73="6"
-74="41"
-75="80"
+74="3"
+75="1"
 76="-80"
-77="0"
-78="-29"
-79="-86"
+77="90"
+78="73"
+79="-98"
 
 [neuron_functions]
 0="2"
 1="2"
 2="1"
-3="2"
+3="0"
 4="0"
 5="0"
 6="1"
@@ -314,7 +314,7 @@
 25="1"
 26="0"
 27="0"
-28="0"
+28="2"
 29="2"
 30="2"
 31="2"
@@ -351,9 +351,9 @@
 62="1"
 63="0"
 64="2"
-65="2"
+65="1"
 66="1"
-67="0"
+67="2"
 68="0"
 69="2"
 70="0"
@@ -368,63 +368,63 @@
 79="1"
 
 [fneurons]
-0="205380910"
-1="3479365532"
-2="607488298"
-3="3218403551"
-4="3818448681"
-5="3541339980"
-6="1397981473"
-7="559351757"
-8="3759635735"
-9="2082704400"
-10="3140043542"
-11="1288981407"
-12="2159320732"
-13="2118354277"
-14="3926640156"
-15="1081374918"
-16="2400659058"
-17="2218669008"
-18="3658929663"
-19="2005178445"
-20="2715896950"
-21="4225781642"
-22="165472656"
-23="623828237"
-24="2207882925"
-25="114625808"
-26="953014587"
-27="1895468623"
-28="4045157079"
-29="3275091527"
-30="3609093764"
-31="1809248862"
-32="1075351732"
-33="789010024"
-34="2876031859"
-35="3294583502"
-36="904853336"
-37="49717517"
-38="2632536562"
-39="756141353"
-40="1023085145"
-41="4215871682"
-42="3984959902"
-43="1156578302"
-44="664944294"
-45="3876231190"
-46="3482436319"
-47="2672512911"
-48="717757885"
-49="2814057136"
-50="3833871268"
-51="2288736012"
-52="2316331640"
-53="865428795"
-54="591880990"
-55="769914537"
-56="282683634"
-57="3029824104"
-58="3065916147"
-59="2452851719"
+0="238927151"
+1="2641908669"
+2="2085942233"
+3="2370992181"
+4="3810059177"
+5="303826923"
+6="1363335632"
+7="3776811087"
+8="2685730067"
+9="3451964496"
+10="841499542"
+11="3445573729"
+12="1217714902"
+13="3997435843"
+14="1601160669"
+15="1395116102"
+16="2669618851"
+17="624825312"
+18="3739081087"
+19="1984727165"
+20="668032135"
+21="3714293736"
+22="769255827"
+23="629561615"
+24="2207858349"
+25="911331268"
+26="3100499003"
+27="1423509535"
+28="3105633111"
+29="1543319401"
+30="4198922112"
+31="2685891684"
+32="561564133"
+33="790060648"
+34="700880766"
+35="3313063558"
+36="480236913"
+37="519565580"
+38="2619986428"
+39="1225247806"
+40="1154873809"
+41="3930691714"
+42="2159406482"
+43="1559227134"
+44="629292198"
+45="2919938070"
+46="1602867612"
+47="2533713823"
+48="721558407"
+49="165485082"
+50="2216063393"
+51="2314892140"
+52="3813717566"
+53="2983674987"
+54="1650418204"
+55="2090764669"
+56="1078686297"
+57="2127919152"
+58="2799053553"
+59="3843990192"

=== modified file 'src/ai/defaultai_warfare.cc'
--- src/ai/defaultai_warfare.cc	2018-04-07 16:59:00 +0000
+++ src/ai/defaultai_warfare.cc	2018-04-08 19:29:15 +0000
@@ -430,7 +430,8 @@
 					}
 				}
 			}
-			site->second.score += management_data.get_military_number_at(138) / 4;
+			site->second.score += (management_data.get_military_number_at(138) +
+				management_data.get_military_number_at(159))/ 8;
 
 			if (site->second.score > 0) {
 				assert(is_visible);