From 8ffc4016900fca233d26496ec0fdc57d03d9f8bf Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 16 Dec 2006 23:36:59 +0000
Subject: [PATCH] - bugfix: Gabby did not show up in Sci-Fi mode. Now Gabby is
 randomly located in sector H11 or I4

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo                      | Bin 197632 -> 197632 bytes
 Tactical/Interface Items.cpp |   2 +-
 Tactical/Soldier Profile.h   |   4 ++--
 Utils/_EnglishText.cpp       |   2 +-
 Utils/_ItalianText.cpp       |   2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index 08184f806f9708362a0e5c423675e48a5922bb55..596c8bd27c1f35d14263898976c5a7ff5c5041ae 100644
GIT binary patch
delta 2349
zcmb_cYfPJE6n@Xw0)>6OKq=d}NV$&=CN!AMOISe+xG^canCWCN24jOFO$UpehSj-b
zB#Q~#H#ylKGclQofPiIoW-;kBoeo9DqPU^kz(oHUe+>T&1<(7nuwpB7iEr~>zV|%m
zIq$jjxVl7FmpEios=F`re$$-xB`6qU7PnKmRS7X}pQ=-#W*WLmrnx{vs#ax2a!ejb
zN5xLTa>0FH)IfBkz*r2;Bq>&-k9LyEahehQOR{L3N__%j(wmY&&zM3*>dkB)Gt>SB
zzn?j0$YHFH+o_~`J8Nfcw30-mWfy%OVm5Y|&U2DZyJr1d936KOa=$FvPbV7}a)Rer
z1ED#AgI~EDw6)|y3Y|IEq6^Y&oK=huTr6F->#b5*e4+G*zDiVw2;;}4XU`W(?FOr;
z{D;szYY>H$2=afP$P|H{^YXYv@$b|7GSH@gv%~g0_&D*k0_b%+x1_v|clse6E=g&=
za>;RhlhpZ_Mw&K0=5Dw;tq?guZ1AhwN2}yF%#L0cwIt953Ei__i$z%fGMF#M!ME^<
z09J^dB*0yoKhV5Mlb(?jG3`GbL(2eoJzgbv1-x+x(s678(xq;n3Qr6IQN=)}CsPHP
zO4TaT;E&<i_q2=flN#RfR3}31Ni49!mY!nJdDguTd!w+sLpX!Q6+&W63+eFD!mzGc
zNI>H%xRYB>scL17%*dW+ugZDaKuNUA$?o&x8Q-(;iUhu%elQuhk9JnY>ZxWL<%~0y
zjhp+S1bd?)9v5zch~9oEMbiN6J;sQ+oq(-u&yrd`D`p*3KZ}wYqRghb_`Nccmwpr5
zMw|{ZZ>6=39gr)sQLaf-uskmWu!ohi5>`sTml!u3H1J9m7|{F{n4T;l+E$_~BQw03
zxiKE1Bl5}%`az(6p?czj@5MOtF8p4!sBT<F5H8C1z^{A{aJmV4@XvGb%Ete$J|9r$
zdz)<g5tQem{kHj@fhAgKL9-DyJp#l3Y+fq#ZColKmFLt5908mefmCCLz<8JAqw8sh
z_WUyrE%!W%HxU}!(e)YJN_|M&aQZuF#Ib7-Wz1ZeuTtj2p|hYvTbH1NgJ{17yYd-Z
z%_bBVA%_3|vR3A>F6T%<=Vf>ixBU!>hHx%yK(7z_@cw&X#!qj+?wo*?oRzJ-AX~|J
zi04$T2T`{m)EU>UOt({}OIxJ-*YZdEWvId0DL9clra0}7M@lF)E=)lyb`8Miczh7-
z=o$nUPJILkJegA3<4<@jm%s~>E7!6<f&ouy1J7r0m<^${p1U7Xm&WlCYLZ($pw=gZ
zVz}u^T<eCTrlpLn4uu6*(Nl0HsS@6hntZuf+XofYM>YCVYA^NlbF%H!IXb8Z9Olm3
zaE+G?hn8X>?e?#PZ2WDMGXAz3wEDH7ma+DG_!aAlsTa$YA>$Im;1;eD?#EF$;P*8t
z3?y}4m_+q0a6HIHawyD0uxikU$&-hIWd+<k0nxad0vhS}3uWGt+rhl4VR*-HLnUDC
xFsO~jP;qdG1JNm{py<e6*9=2)d}tJlmZ!pmW`Hsr`T#U1cT9q3$D}Zj|2LO}SZ)9S

delta 1858
zcmd5-ZETZO6u!^fw_CTpZP#|ig4^6i@q@$x6AdaKWgwelkwMr(5SWY&oeZ|Hf%1_#
zFo7io1Kh9^B_>5k^v9Hi(!CHcZn%oN2uli!d>0%)OpNhkCI%vS?%Sb@2LJfS+uX17
zo_p?d&UwylTf5QLZge&1&QSiDB@6RU!zP4ii)_;8>##>+j#ir!E*9M#X>y?>n4)wx
z3c1;6)pmp<w+t834nl}d?gi50@}=2X!Oh*Fb~5DJq}#>_A-74tPl&jKzq~3|iXxul
zN`CzvKTmOWPdUq*M2l$Tkwr4!9he?Bcv;E9deI=7mDtO}V%A(`30Lu|L5Y=t=R_^*
zDFf@3C{pXLW*2gJ?c}b!P%g+}Z-tRDBKT9-;;S&!CTo-?Jn~oH0@>%AA~$56k#n3=
zWQ)JT@civ;WY}+Lo;!S4b(<!H&i&4wl}|)Mfs;5g?)Awy71>mlvxS3qOy<W*_9dY2
zdkWcd{lGNY`nyXe@^T}!pC@dF&bC$b6ch_=%U28JXJs??_V*dtEYBSEEi&A1Or`Bh
z;f)sI45(d4Ublt{7z)QAYhL0mCkGBuo{lj6*a{aV>ftqebo6Mny$56H;~r$mt9`}P
z#|x@SN6-v95Y!zi@b^%dEe0+-vD;iY4%Is;QG+sSJb@xc8dHe5srgAduoqW4W+Kx}
ze;+GSJNof7HGTpoCJ>^?jo!A|L5XAV5IXUgKY21aR*N}Ifak>=n$?Nfv^@<|>Fzf$
zDBOu+It9$6-#Ss+@dgaJdyP(+Jvc(coeYFM%A$9B5TrxB2+BKs1<IEn=*EZGLFp$@
z=c^GLEdJCoKkCG4UazCXEv=e9io;Ez^KjaI?(lRUt?0*_bl_V|qGdObK^akGnfqgy
z3p)EH((s7o1&Szq7N-?3hxyh~Yy|C2!$exW6ona!n2+oDnntmf@-E;-I#q~=J;e;5
zfq!*O&Sp_4UZIeQN@|S3N#76f;Ecknl|eQ=Q;w~4eFFUS(o}dU1)Q>LQP^cT7J#5_
zy%=xfQZw)Nq8HS46eYCZL>irp-?Oq5GWRlDQI$pER1V9h-6K&NyVwdtoyZfj8D+g#
z%V<?;HPY1~)Y1Ge*vWj$Np11{&G^@|Bg)A-uCv#yYHJX+lo-Nt%Ow<8Cd@52Pzj8;
zHaQ_ity=rDR;b--o2ob_G%<}r-MByl%QaWQR<TuV5p%_4yMWTERVv~E@wIIa(iI~E
zmOWZ?6Bjd7Vn^ai1LyE^`lEWYW@(MJw3tKpEITkd=;i$*;lil9>AN9RS)9Ow)^TkN
zWZN(0<T-&Aw0R=N(WP@(MAt4N#Su-S$xbQ;{!;vRwjpN(em^e$M_O=NOZg$mva2jM
z(NCpJ8unlry=Nj752<^y`7tU>hM?;M<SF=7H0vf(ES>*7X_84+e+NyR=6cagnK4w;
zr1Nkj3o@9De$_v?$|d8KKhF!$uH$%{3J-EAS*bgG1!HN+ZOy|k^b7YXH;(H(Sreab
f&KQClOy=G}<eJR4QqbWzQg$96gn4{WD|!46sQ6kT

diff --git a/Tactical/Interface Items.cpp b/Tactical/Interface Items.cpp
index d6b5bc32..1a494a5c 100644
--- a/Tactical/Interface Items.cpp	
+++ b/Tactical/Interface Items.cpp	
@@ -7640,7 +7640,7 @@ void GetHelpTextForItem( INT16 * pzStr, OBJECTTYPE *pObject, SOLDIERTYPE *pSoldi
 					break;
 				}
 
-				swprintf( (wchar_t *)pStr, L"%s [%d %%]\n%s %d%% (%d/%d)\n%s %d%%\n%s %1.1f %s", 				
+				swprintf( (wchar_t *)pStr, L"%s [%d%%]\n%s %d%% (%d/%d)\n%s %d%%\n%s %1.1f %s", 				
 					ItemNames[ usItem ],		//Item long name
 					sValue,						//Item condition
 					pInvPanelTitleStrings[ 4 ],	//Protection string
diff --git a/Tactical/Soldier Profile.h b/Tactical/Soldier Profile.h
index b77b52be..3a378803 100644
--- a/Tactical/Soldier Profile.h	
+++ b/Tactical/Soldier Profile.h	
@@ -53,7 +53,7 @@ enum NPCIDs
 	PERKO,
 	QUEEN,
 	AUNTIE,
-	GABBY, //ENRICO,
+	ENRICO, //GABBY, //ENRICO,
 	CARMEN,
 	JOE,
 	STEVE,
@@ -83,7 +83,7 @@ enum NPCIDs
 	FATIMA,	// 101
 	WARDEN,
 	GORDON,
-	ENRICO, //GABBY,
+	GABBY, //ENRICO, //GABBY,
 	ERNEST,
 	FRED,
 	MADAME,
diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp
index 4ad01985..23ad16a7 100644
--- a/Utils/_EnglishText.cpp
+++ b/Utils/_EnglishText.cpp
@@ -3712,7 +3712,7 @@ STR16 pMessageStrings[] =
 	L"No room to pass %s to %s.", //pass "item" to "merc".  Same instructions as above.
 
 	//A list of attachments appear after the items.  Ex:  Kevlar vest ( Ceramic Plate 'Attached )'
-	L" Attached]",
+	L" attached]",
 
 	//Cheat modes
 	L"Cheat level ONE reached",
diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp
index 4aa3907f..340cb2b2 100644
--- a/Utils/_ItalianText.cpp
+++ b/Utils/_ItalianText.cpp
@@ -3687,7 +3687,7 @@ STR16 pMessageStrings[] =
 	L"Nessun spazio per passare %s a %s.", //pass "item" to "merc".  Same instructions as above.
 
 	//A list of attachments appear after the items.  Ex:  Kevlar vest (Ceramic Plate 'Attached)'
-	L" Compreso )",
+	L" compreso )",
 
 	//Cheat modes
 	L"Raggiunto il livello Cheat UNO",