From 67663339a33372b1bf5908e007da24f887d5e0a3 Mon Sep 17 00:00:00 2001 From: Wanne Date: Wed, 20 Sep 2006 09:23:48 +0000 Subject: [PATCH] - bugfix: Enemies do not wear NVGs at night - add: Missing option screen text for "Random I.M.P personality" git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@541 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- GameSettings.cpp | 2 +- GameVersion.cpp | 4 ++-- JA2.suo | Bin 197632 -> 197632 bytes Tactical/Inventory Choosing.cpp | 33 +++++++++++++++++++++++++++++++- Utils/_DutchText.cpp | 1 + Utils/_FrenchText.cpp | 1 + Utils/_GermanText.cpp | 1 + Utils/_ItalianText.cpp | 3 ++- Utils/_PolishText.cpp | 1 + Utils/_RussianText.cpp | 1 + 10 files changed, 42 insertions(+), 5 deletions(-) diff --git a/GameSettings.cpp b/GameSettings.cpp index 147a0ff04..f8692eb3d 100644 --- a/GameSettings.cpp +++ b/GameSettings.cpp @@ -536,7 +536,7 @@ void LoadGameExternalOptions() gGameExternalOptions.fVehicleInventory = iniReader.ReadBoolean("JA2 Gameplay Settings", "VEHICLE_INVENTORY", TRUE); // ShadoWarrior: Tooltip changes (start) - gGameExternalOptions.ubSoldierTooltipDetailLevel = iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 2); + gGameExternalOptions.ubSoldierTooltipDetailLevel = iniReader.ReadInteger("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DETAIL_LEVEL", 1); gGameExternalOptions.fEnableDynamicSoldierTooltips = iniReader.ReadBoolean("JA2 Tactical Settings", "DYNAMIC_SOLDIER_TOOLTIPS", TRUE); gGameExternalOptions.fEnableSoldierTooltipLocation = iniReader.ReadBoolean("JA2 Tactical Settings", "SOLDIER_TOOLTIP_DISPLAY_LOCATION", TRUE); diff --git a/GameVersion.cpp b/GameVersion.cpp index a5902e92e..46053e3e8 100644 --- a/GameVersion.cpp +++ b/GameVersion.cpp @@ -23,12 +23,12 @@ INT16 zVersionLabel[256] = { L"Beta v. 0.98" }; #else //RELEASE BUILD VERSION - INT16 zVersionLabel[256] = { L"Release v1.13.538" }; + INT16 zVersionLabel[256] = { L"Release v1.13.541" }; #endif -INT8 czVersionNumber[16] = { "Build 06.09.19" }; +INT8 czVersionNumber[16] = { "Build 06.09.20" }; INT16 zTrackingNumber[16] = { L"Z" }; diff --git a/JA2.suo b/JA2.suo index 745808afa804f50b8ccc177b2a1b87ee92bb668f..f7ded1e2e8100c48fd556ae0b9110f9a585b4c58 100644 GIT binary patch delta 1801 zcmeHH?@yCg6u!^fmQr~816rU=VGUu@p_^TF36UB*z`+PgXBb&Bi8x@v=@hj~l$qK2 zWnBUr>5ZIemRLzfOe7I`KNJ&9Ok^Z#vMu|t4`V_0Wm#sNnPI>DvF_Xsid~oe1v|-k zd+xc~L_%WND+9?Wne> z`Ypy${Ug|Hnh+lL9kR$#X0h>xizBxTIgXm&DHTG#Crjj4j@qZ@RGBs|Kfpo`@KcC6 zogc68a*x=@DmWosPVd^eVh%eP*^}Pt;b@=QR0Xz*UPh||hg8bwb?#z?6&%~ymBh3{ zxmX<53zsr0*@!!=tCc4k>ki8qcR)rwQF!Dpp6#;H{+x`Ig!Q6-RxlPzbj`q;6pU0k z9AlfbF@Nz?@Q6b@VKD|+wxv@ut4?%mzF`2`AnhZ$)u=4^O5~yqKPs zzVyT>UN(8kUo+*u3VE+~ryQ8C{tslizebMz95gQ1njz2L+e~-H@eM7Q;iKE9af~iV z*xVJGP&2M9R)58o2wt%zjgQd+x;qRT{V)Q1-cmZ%rP8-XINcUsN%!nR7^+z5GVqJ; z3~=4a72t-~u?;lY4c%Rp%SsOt_@1I~Xxy5gG(UYXf==2psmPj8Sh_5Z2TNGhNwT#; z4s2@UF9Gm8wKt-T_Fvar?&hVd?GufBpAPWt+DnN#boqoR6V0YL3REMib2TLIeu5%U zVgy^XW)oe!29M|OkAIvt21k)fpM9 zav>zgF>P;8|9|XZ{rkmXI$MP@dS(basA2+c`h7TauEY)an(my&;Qt-Xo#ot)E=?(& z8RFXz%||8OZp5okXBx65w;@^Gr|<->(+lSi8+GyBS97}3&8(OEorz$-GehLbeyJeC ZSVIRJSjPDwe69p}-bV+L=+IIZ{sKXE8@K=f delta 1313 zcmZ`(|8G-O6hEKW*R|c=x~+X1rGwexjI~*Gz$8u<=(-JXW3I`NXja1JhSE4?qt!4} zsQh5|1BvKOxfp&a(<~%H0=yq;^p|S7{(y;2jfn~Vus?yAI)e=Axn(m$@xGk*&bRwH z=bm%!OV1kVS>sx-=GsI=_siw7DF(I2?A0u7wx+ce)P@SnH*OVSV@*13oz(mFop$Dx z|LZhJN9Z_>Q;gro=ru~vBx{mvi$2AMMZ`U$dz)DJKs1V<++j1RQ1;UpO;L)YPqCB~!8%`8(qQ%_R;qMVGD(Gb zfIY`6%5mlHw7ia*R3MNf9CNHxX`{a-FtsnO8v(75sze0MSDch7}Ab0JOK_8XSbHR;y0D(htb z!Leul0?{(lpG+%EcbM)o-Bn-CXN}4%lSbmwHybVAm7))E5nR|S3WX++xK;StLG&f{ z(DPz?u~VG7=N3zW7HguoWHZ#E8deijEfJ}kLzT=+Hy4dMHq@^(TBYxd4soUs&E%oW zfkSA|bfCyhJfXtL^fWy3(;>8oa|=~ax*p>m!2Ivrn+QRhzb2`F1 zm6w{2wdsxVbfoAgYu2wg^;0)(W7KzOt1SP59vO9@DfEO!s^n_T?o2qdT?wa>9cp-Z z`SC7o=WX3Gt0N$N4us^W&NXYRLWlgMp2dg@CvsUQF58?nyhHUt)jyXq5HVyRthMEq zLfC}d%0}oO`Kk$19)1>vyto~{%oI4DxE|hpBbUYvi;oC+VEvZv@NRiK zf##fb9Rb*Tsh#>{q#1b`eG+*`<=*jS3odj@EreZiR|~#Ouu*nBJy0`59wrMlOAfN!gY`jjS2wWBhy--^;WUPWht?<@q`| zs_7taOfbL^nYZwYJbf0m*dj5E7F@|i;^;(8lrdA42ye;I1ssz= gArmyItemChoices[ typeIndex ].ubChoices ) { if ( !getMatchingCoolness ) @@ -3000,8 +3002,37 @@ UINT16 PickARandomItem(UINT8 typeIndex, UINT8 maxCoolness, BOOLEAN getMatchingCo } usItem = gArmyItemChoices[ typeIndex ].bItemNo[ uiChoice ]; + // WANNE + if (usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem)) + { + // On day + if (DayTime() == TRUE) + { + // Only pick items, that have not a negative day vision bonus range + // So we only pick normal items and day items (sun googles, ...) + if (Item[usItem].dayvisionrangebonus >= 0 ) + { + pickItem = TRUE; + } + } + // At night + else + { + // Only pick items, that have not a negative night vision bonus range + // So we only pick normal items and night items (NVG, ...) + if (Item[usItem].nightvisionrangebonus >= 0 ) + { + pickItem = TRUE; + } + } + } + + //Madd: quickfix: don't use NVGs during the day, and no sungoggles at night either - if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && (( DayTime() && Item[usItem].nightvisionrangebonus == 0 ) || ( NightTime() && Item[usItem].dayvisionrangebonus == 0 ))) + //if ( usItem >= 0 && Item[usItem].ubCoolness <= maxCoolness && ItemIsLegal(usItem) && (( DayTime() && Item[usItem].nightvisionrangebonus == 0 ) || ( NightTime() && Item[usItem].dayvisionrangebonus == 0 ))) + + // WANNE + if (pickItem == TRUE) { // pick a default item in case we don't find anything with a matching coolness, but pick the coolest item we can find if ( defaultItem == 0 || Item[usItem].ubCoolness > Item[defaultItem].ubCoolness ) diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index ce7aea716..f0e47fd14 100644 --- a/Utils/_DutchText.cpp +++ b/Utils/_DutchText.cpp @@ -3460,6 +3460,7 @@ STR16 zOptionsToggleText[] = L"Show Weapon Ranges in Tiles", L"Tracer effect for single shot", L"Rain noises", + L"Random I.M.P personality", }; //This is the help text associated with the above toggles. diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 7f9f757ae..3b4249632 100644 --- a/Utils/_FrenchText.cpp +++ b/Utils/_FrenchText.cpp @@ -3449,6 +3449,7 @@ STR16 zOptionsToggleText[] = L"Show Weapon Ranges in Tiles", L"Tracer effect for single shot", L"Rain noises", + L"Random I.M.P personality", }; //This is the help text associated with the above toggles. diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index d12f96b24..00b84fc16 100644 --- a/Utils/_GermanText.cpp +++ b/Utils/_GermanText.cpp @@ -3269,6 +3269,7 @@ STR16 zOptionsToggleText[] = L"Tracereffekte für Einzelschüsse", L"Regengeräusche", L"Krähen erlauben", + L"Zufällige B.S.E Personalität", }; //This is the help text associated with the above toggles. diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 436916c0a..5070bee8c 100644 --- a/Utils/_ItalianText.cpp +++ b/Utils/_ItalianText.cpp @@ -3442,6 +3442,7 @@ STR16 zOptionsToggleText[] = L"Show Weapon Ranges in Tiles", L"Tracer effect for single shot", L"Rain noises", + L"Random I.M.P personality", }; //This is the help text associated with the above toggles. @@ -3517,7 +3518,7 @@ STR16 zOptionsScreenHelpText[] = L"When ON, weapon ranges will be shown in tiles.", L"When ON, tracer effect will be shown for single shots.", L"When ON, you will hear rain noises when it is raining.", - + L"When ON, I.M.P characters will get random personality and attitude.", }; diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index af43e8f92..e827a4030 100644 --- a/Utils/_PolishText.cpp +++ b/Utils/_PolishText.cpp @@ -3442,6 +3442,7 @@ STR16 zOptionsToggleText[] = L"Show Weapon Ranges in Tiles", L"Tracer effect for single shot", L"Rain noises", + L"Random I.M.P personality", }; //This is the help text associated with the above toggles. diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 96406328a..70f8ba4ad 100644 --- a/Utils/_RussianText.cpp +++ b/Utils/_RussianText.cpp @@ -3453,6 +3453,7 @@ STR16 zOptionsToggleText[] = L"Tracer effect for single shot", L"Rain noises", L"Allow crows", + L"Random I.M.P personality", }; //This is the help text associated with the above toggles.