From c7177a7e56c7d5aba358362397d98e471065694c Mon Sep 17 00:00:00 2001
From: tapioca <tapioca2k@gmail.com>
Date: Sun, 11 Apr 2021 17:51:59 -0400
Subject: [PATCH] add some more chaos point info

---
 .vs/slnx.sqlite              | Bin 1564672 -> 1564672 bytes
 JC2MapViewer/Window1.xaml.cs |   2 +-
 JC2Save/ChaosPointInfo.cs    |   8 +++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
index e226382e7cc58a2473435e7a65d366bae598bd29..87c3e45ce2e34dfccb757d75e3da81c057c6c6cd 100644
GIT binary patch
delta 1530
zcmZ{jd2AF_9LM)vGuvsq1qxG+RyhPyz%D(Ykwc){dykfuK!V2Y%1-HOcW1BOEiIH%
zI_n=G(H|xzN;yhV{wSqP0I_JK|Co6G;SmWENd%)wgZ&4iiEnu|k*Jw`@|pL2^X9$z
zy*GU~ynQ#kN0%V|ShfS{V-1_^Xz2J`_Fd@i_;2<XI#}Vg!6lc*caFY?=);Qdv&ZSX
zmp-P`&Sf_9eI2C?pu2-pGsv8p!4DQKY>b9{&5=;h+ZJw&2g7-LW8tX&GP`SjZX>%g
zpZxD`YW?QV!fEIAa<gnXiR3K$pQrd+KHExCUP3y2dy?d_uEnGn!&rs7pn<ii#E!jD
ztud;_n(DMjix!J(eiq9j`PkbSXx8dGco5v}i|=jHqAa?AJcGUdKrAeRoq-@vBMV8P
zNSl2f^;$gMtOd1DJjTN2fnjnUp*~o9nw(QvO(x03jwYWTtJMRccvYxTXKwT7)1)CC
zwVTe1<V%cN;E4$WsKdNGK>`HznoF;cc7%?YZ(b!2)}u4<>NF{oyJ<gtLwU`dnkG6y
zLD(=uT&NTJXUGcFZH~;4CQ6lY-Z68Jo`TB{$&^32beHb)m$by=ddTZ&4(xq}?Vm@U
z#?3sf_qA&NM+@pnCpoy<QIMC6m@BQ?Qv9!BMLb>h_^?7A*~}k)Cv^3Wc8MUonY9VE
z3bhEug<?Wcp@>jeNEZqT1*PvS@WFg~&@@-lNyaPFwub&hdWS^!5urh$!$Jc>hlKit
z4hkI*>J#b}+Aq{2)GgE{)F~5;*%)0t>)b~+Z`tXp;za|=ld?zGgH@r&3VR5$_tE9{
zgUKD=9SHgLwtR20jQnu5rjaFoXDt5DM#v2Aqb%P(l-#Ri`OEnUtcuN!8%$1BrzOk&
z*i`*+@&wI72h1xcsC(^VR`Y0mcbI3^?peFcr8jBb3d}ra?LGQDLWkkQ`!v&>yidzi
zwDfhx9FlBLUK1W>O4RnEWfUT#bQRcTR+(%Tn_V*dQBo`x%N`5L-IS67&&n*<%I;X_
z@oWX0+(@$rCv1!(ab%8_lfqFrshl)UI>*Mz;LPF7<;>$`a^`aum=iYDl`mnJWh;t-
zyiMIwf^*RWbPdI<0qYhkktgJ!yiEF98kQ<0$}X~M`UgEjL)1=wA*V<kKYy3-j*Rh)
z#*8f67q%hW#`Ld_&t3N`DKl!IKxXCG@Ia@`ib#>+2A_?s$A$~u*+_Fz??|cqTbQLG
zfuXxp_2C49+oh@#CoHhGOsz$|(38}D__R!|#61e+V75idnX}pGR-gg1O|;19Qs8aO
z3h7RxQ-KR-XgzTn9WY(4x=}kkSE261Z3<jHOFeYE(W*e&2;D|^8!Zadj?i7Sz=$hw
zeuU=J3L~b#?Gai|s*ETc^QcY~fm<H60*4j2evVetVnbITb(C%(xkd;s)TnFtU+=p~
zo{~1NOf494!eo`Y&YY@L(;4w6QlO?p)o{WJmrGPPPRPI<YB^3w;C85`B*7F257R2?
dlR4E1s=(whtzaMVdjj@Swfb<adbT#}=wG#uz$X9z

delta 1481
zcmZ{keQc9O9LIal{qE`ZuyuvO!<&<3uXO9ycI{TS?hVS`yQQ+XIF+ujjuqFnTZ?lh
zMuh0_2{8-<hlzj4HW)8zz&S1uWN2iGAwflBkU)@NB9Isf%s(_SdgW#!iT?4)=k9yY
z^W5F<F3--3zMU6+`&Of_v8UXq>vXrvf~wwm&(eYJOh2+bKSGM={v-FN+m3&LV9loe
zH>cs`CtpD3H&;%v^I??u2D&pkH;>rdy!3G83Tyx1mhIs_yKgws8w*7Ww?-pF;qBxO
z``UmzQrG<VFeF_2)1G;C`y*D9fd|u8{?AkVD_>RN#4RYB{%{x<65A^5l<378by+tl
zP_aew4F!6K0@1!rfx#VtXe`h}Ov|xN^7RJ$1Fa)G2zB~nTl)e-WbHCsAo+TN(TE7z
zf+3#fuE2JY_WMU#1F=|tAQTvgMM(~OeH@=asDzp)@i7%TQn5*L_xZz7Z#Xy*YZ&Ma
zLmRt4iMx|gA#3^=UzJckeR>8{WMOA!a1f(nmVOq$j8G+e_Z)s$jBe1q53pT74ZGo>
z@+F&lfWsJN(vo@XK~}nZ9%rH=HZ_m?0FoNfB%Qwt6ZFjQc#e+V2WLTi{hqMDXTy$I
zEIi<I_XoGWNE}OWuGG)dR{u+Zp7^SWJsGD-?8iSa<ULa;V<eT60wJ?dzEGZ!NocK5
zu27CpwosN(rhHvTFD!*!jAg?t;rkrUhoA9lRbseOs6wb*$R$)JR4TMi$SG7JR4n8W
zvI`Xn*@UcmEJ@@v<Sp3r*zBeSa-3<d__=q5!=Z+OCn{8yf$JnXwn0s^l6CPz><kX{
zgokaucrE#TF(={G|70ZZ-<>QL+6KgCsft%VUf)`NsT!gS?^VR-+Z2e`{)zcY>ET1L
z968z9L(ptq1s#tUc^ldn+_vCWmVOBeGbLze-n;M|Lgn<cdyvXz??H`<vJMd9mJJ6C
zoAtvpEriK5bR6=iMNjInV^2H1uwHerkM!h}tT^_xDLQ0wB_`5W*Q+Kyxt*{ieNQWW
zzYNkwXAFcRbM%}9P9jI)EaD__k~s!W3dhJ<%vr)o<t*haV>1TTW0RA=)wv`O)mN((
zWhvjMoJfhJWEid+-ZpGBq$HH;f74IsUGgvT!Q^Xlr@WM0Ca(|^+<*}<<6C$iZsbQd
zEqSIFTdyGK(W(?`J`8^HlhLD9(ux+fS<))#-WIi1ua)!d<hN7fF36zXaabjPXZC0=
zg+|7qLB4Ek)XEe(I}Ua7=e%92(4-08K5OjO)+zMa33x%C;<;0y=i~X9u|+FUXyPO^
zQLkGCsaT<1yd!U3S*tk|dU6unq|#We+3Bxtb%Ru-&~AyipiQ$X^ur_2ikmbG{cEGz
zj0$OUjk--LQ0Td%&;si<GoO13s-aWMSEzRiI&jfjO?0+FwX(T-HJK#nbULDQXf`^y
zQFTC(mZ#7YQ(%KS&7{y<Q&0;H+FFI0jzK-H(Q;{|POX!26#D5gXauL0t<Xisp#+<>
bELvT!=JTJ0{}Rr^<=Kng^r}a_%lG{a123f9

diff --git a/JC2MapViewer/Window1.xaml.cs b/JC2MapViewer/Window1.xaml.cs
index ad38aed..e421033 100644
--- a/JC2MapViewer/Window1.xaml.cs
+++ b/JC2MapViewer/Window1.xaml.cs
@@ -245,7 +245,7 @@ private void loadMarkers( List<string> categories, List<Marker> list, List<strin
 									int chaos = 0;
 									if (ChaosPointInfo.points.ContainsKey(i.Key)) chaos = ChaosPointInfo.points[i.Key];
 									totalchaos += chaos;
-									tmp.Add( string.Format( " {0}x  {1} ({2}cp)", i.Value, i.Key, chaos > 0 ? i.Value * chaos : 0 ) );
+									tmp.Add( string.Format( " {0}x  {1} {2}", i.Value, i.Key, chaos > 0 ? "(" + i.Value * chaos + "cp)" : "" ) );
 								}
 								description = "Missing: " + totalchaos + "cp\r\n" + string.Join( "\r\n", tmp.ToArray() );
 							}
diff --git a/JC2Save/ChaosPointInfo.cs b/JC2Save/ChaosPointInfo.cs
index 390e029..9a54220 100644
--- a/JC2Save/ChaosPointInfo.cs
+++ b/JC2Save/ChaosPointInfo.cs
@@ -15,7 +15,7 @@ static ChaosPointInfo()
             // Fuel storage/transport/production
             points.Add("Fuel Depot", 150);
             points.Add("Fuel Silo", 500);
-            points.Add("Bio Fuel Shaft", 250);
+            points.Add("Fuel Shaft", 250);
             points.Add("Gas Holder", 500);
             points.Add("Gas Pump", 100);
             points.Add("Gas Tank", 10);
@@ -25,11 +25,11 @@ static ChaosPointInfo()
 
             // Communication equipment
             points.Add("Radar", 250);
-            points.Add("Communications Mast", 1000);
+            points.Add("Radio Mast", 1000);
             points.Add("Broadcast Tower", 250);
             points.Add("Satellite Dish", 250);
             points.Add("Mobile Radar", 500);
-            points.Add("Communications Outpost", 1500);
+            points.Add("Communication Station", 1500);
 
             // Electric power
             points.Add("Wind Turbine", 500);
@@ -44,6 +44,8 @@ static ChaosPointInfo()
             points.Add("Factory Chimney", 500);
             points.Add("Water Tower", 250);
             points.Add("Crane", 500);
+            points.Add("Colonel", 1000);
+            points.Add("SAM Site", 500);
 
         }
     }