1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
- 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
Download Patch File Download Diff File Expand all files Collapse all files
Utils/Text.h
+4 -1
View File
@@ -1032,11 +1032,14 @@ enum
MERC_FILES_ALREADY_HIRED, //5
MERC_FILES_SALARY,
MERC_FILES_PER_DAY,
MERC_FILES_GEAR,
MERC_FILES_TOTAL,
MERC_FILES_MERC_IS_DEAD,
MERC_FILES_HIRE_TO_MANY_PEOPLE_WARNING,
MERC_FILES_BUY_GEAR,
MERC_FILES_MERC_UNAVAILABLE,
MERC_FILES_MERC_OUTSTANDING,
MERC_FILES_BIO, //JMich_MMG: Adding two new texts for the small button, assuming we manage to add a silhouette with the gear, add it after this.
MERC_FILES_INVENTORY,
TEXT_NUM_MERC_FILES,