M.E.R.C Optional Gear (by Buggler)

- Added MERC optional gear purchase
- Adopted Tais' gear cost format as previously gear cost uses MercProfiles.xml 'optional gear cost' value if hire without pressing any 'gear kit' button
- Added condition to settle bills first before hiring same merc from MERC
- Added MERC starting gear hotkey
- Fix for AIM starting gear hotkey when using old inventory
- Removed unused variable in fresh_header.h

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2013-01-11 20:24:36 +00:00
parent b08422ec1b
commit f914a1da77
13 changed files with 55 additions and 17 deletions
+6 -2
View File
@@ -4201,11 +4201,15 @@ STR16 MercInfo[] =
L"Home",
L"Hired",
L"Salary:",
L"Per Day",
L"per Day",
L"Optional Gear:",
L"Total:",
L"Deceased",
L"Looks like you're trying to hire too many mercs. Your limit is 18.",
L"Unavailable",
L"Buy Equipment?",
L"Unavailable",
L"Unsettled Bills",
L"Bio",
L"Inv",
};