* Trying to walk past him, he will now stop the player, move to the correct tile, trigger the mine explosives and turn hostile
* Threatening him will close the dialogue, he moves to the correct tile, triggers explosives and turns hostile
* Shooting him makes him turn hostile. Does not trigger explosives. Game keeps freezing if he gets interrupted while on his way to the tile where bombs are set off so this functions as a workaround.
Due to additional dialogue flag having the value 8, and UB not having a specific flag for mercs standing up after heli crash, the FindSoldierByProfileID would always find Steroid if he was on the team, and then display the crunched laptop popup text.
Adding a new flag that is checked before we go into that branch in HandleDialogue fixes the issue.
* Use the new columns added to Text instead
* Changed most functions to allow choosing a column
* Removed unneeded SecondColumn specific functions to lessen code duplication
* Lots of formatting changes to Popupbox.cpp, indentation was messed up in majority of the functions
* Add compilationFlags to {exe}
sgp.cpp is not recognizing JA2EDITOR preprocessor definition otherwise and therefore does not read EDITOR_SCREEN_RESOLUTION when starting map editor
* Add debugFlags too
LOBOT:
- Added graphics for the Officer's Coat
- Added a separate palette for tan-colored firearms (the SCAR and XM8 families and the Milkor)
- Added a separate palette for the Guardian Vest
Items:
- The Officer's Coat can now also be attached to most vest armors
LOBOT:
- Fixed and renamed several filters in Filters.xml and the related LogicalBodyType .xml files
- Leather jackets now display longsleeved graphics
Items:
- Added a new Army Cap hat, uses the existing ballcap LOBOT graphics
LOBOT:
- Added cowboy hat graphics
- Added a palette swap for the SVDS
- Fixed female SWAT Helmet palette
- Ghillie cover, jacket and leggings now display ghillie suit graphics when attached to armor items
Other:
- Added a new Cowboy Hat item, available from BR's later in the game and in Tex's starting gear kits
LOBOT:
- Added a new blunt melee weapon strike animation, currently used by the Retractable Baton, Shovel and Pipe Wrench
- Touched up some .sti files
- Changed SWAT Vest, Leggings and Helmet color to a more subdued one
LOBOT:
- Fixed SPAS 12 and basic shotgun ground shadows and water animation palettes
- Added palettes and filters for desert and urban camouflage jackets and pants, originally made by shadics
- Added palettes and filters for green and blue berets, originally made by shadics
Items:
- Changed Field Uniform into Woodland BDU jacket, can be worn in the vest slot and also attached to most body armors, +15% woodland camo, +5% desert camo, reduced armor values, can't take ceramic/titanium plates anymore
- Added Desert (+15 desert camo, +5 woodland camo) and Urban (+15 urban camo) BDU jackets, otherwise identical to above
- Added Woodland (+10 woodland camo, +3 desert camo), Desert (+10 desert camo, +3 woodland camo) and Urban (+10 urban camo) BDU pants, can be worn in the legs slot and also attached to most leg armors
- Added Green and Blue Berets, originally made by shadics
- Gave the Underarmor Camo Shirt +5% stealth bonus
- Folding Stock (folded) and Retractable Stock (retracted) now have their own distinct inventory images
- Touched up Fire Extinguisher inventory images