7604 Commits
Author SHA1 Message Date
Flugente 36055d4e4f - new icon for ammo belt and ammo vest
- mercs can refuse to eat if they do not like the food (works only once)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5422 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-25 00:05:01 +00:00
Flugente 2cef09b50b fixed bugs when handling items that are both food and drug
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5419 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-24 22:26:13 +00:00
Flugente 155ee252f3 added external feeding values for most machineguns and their ammo
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1475 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-23 20:15:24 +00:00
Flugente 4949893c16 New feature: guns can now be fed externally
- added necessary face icons
- added description in ini
- as an example, the MG§ and the FN mag can now be fed externally with any 100-rnd 7.62 NATO mag. Internal feeding is possible from the LRAK vest
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307574/New_feature_Externally_fed_mac.html#Post307574

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1474 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-23 19:33:37 +00:00
Flugente fe460b0325 New feature: guns can now be fed externally
- a machinegun can be fed by another emc if he has an ammo blet in his hands
- a merc can also feed his gun with ammo belts in his inventory
- the necessary tags can be set in Items.xml in the <ItemFlag> -tag
- this feature can be turned on and off via the JA2_Options.iniReader
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307574/New_feature_Externally_fed_mac.html#Post307574
- this feature requires the newest GameDir files, as a new face icon was added

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5415 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-23 19:31:27 +00:00
Wanne c265a63b28 - Updated Merc Inventory Popup-Code (by The_Bob)
o externalized the hardcoded popup text code
o enable/disable the popup in the ingame option screen
-> To open the popup, left click on empty merc inventory slot while viewing sector inventory in mapscreen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5414 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-23 14:01:08 +00:00
Wanne 2ca650e0e4 - Added a minimal version of "Food.xml" for the "Data" folder, so the game can start
o Later, we should disable the food system in the start new game screen for the "Data" folder, like it was done for New Inventory. Then we can delete this minimal Food.xml file
- Added missing INI food properties for the "Data\Ja2_Options.INI" file

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1472 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-23 13:14:04 +00:00
Wanne 609047e333 - Updated VS 2005 and VS 2008 project files to include the missing referenced Food files
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5413 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-23 12:57:46 +00:00
Flugente 382fcbe14f Fix: buildfile entries were missing
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5412 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-21 17:31:26 +00:00
Flugente 57390e7da3 New feature: food system requires mercs to eat and drink in order to survive
- added food items
- added food items to various mechants, BR and as enemy item choice
- added cantina facility
- canteens can now be refilled in sectors by pressing 'Ctrl' + '.'. Map/SectorNames.xml determines wether this is possible, and wether the water will be poisonous
- added new icons related to the food system

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1471 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-21 16:47:16 +00:00
Flugente f6bf6bf4aa New feature: food system requires mercs to eat and drink in order to survive
- food and water levels are lowered every hour, eat food to survive
- not doing so leads to various penalties and ultimately death
- added food items for that purpose. Food can degrade over time. Rotten food poisons.
- Mercs automatically consume food if hungry/thirsty and food is in their inventories
- for more info, see http://www.bears-pit.com/board/ubbthreads.php/topics/307396/Re_Mercs_need_food_and_water_t.html#Post307396
- this feature requires new STI files from the GameDir trunk.

- added a bunch of filler variable to the soldier type, so hopefully savegame compatibility can be maintained easier in the future.

WARNING: This will break savegame compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5411 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-21 16:41:04 +00:00
Flugente b95d001812 - Bugfix: message said drugs were 'drunk' when they had to be 'taken'
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5405 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-18 19:32:49 +00:00
Wanne edae3a836c - Updated GameVersion to 5393
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-12 15:49:45 +00:00
Wanne 5a271cf6fb - Bugfix: Prevent game from CTD, on players end turn, when there are problems updating the light tiles for the corpses. This is an AI feature from "ddd" mod which was added in revision: 3789
Development source trunk: https://ja2svn.dyndns.org/source/ja2/branches/Wanne/JA2%201.13%20MP

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-12 15:09:29 +00:00
Flugente 5f680b499a - Code Improvement: it is now no longer necessary for the 'Full Sandbag' item to have a specific item number. The correct number will now be searched once per game.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-11 23:06:37 +00:00
Wanne 0d550743a7 - Updated Version Number: 5387
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5388 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-11 17:27:45 +00:00
Wanne 4ff07a0e4b - Translated missing German Texts (// TODO.Translate)
- BUGZILLA #597: Fixed spelling mistake in German Version and corrected some "bad" German translations in tool tips
 



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-11 08:28:41 +00:00
Wanne 837cb4dc43 - Replaced the old unused BOBBY_RAY_SELECTION property from ja2_sp.ini with the new ones (BOBBY_RAY_QUALITY and BOBBY_RAY_QUANTITY)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1468 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-10 13:49:06 +00:00
Wanne cc89500c72 - Bugfix: Bobby Ray Quality and Quantity was initialized with wrong values (not the ones from the Start new Game Screen)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-10 13:47:11 +00:00
Wanne 5c3115d743 Bugfixes (by Flugente)
- added a flag that drastically lowers the time needed for drug evaluations
- FIX: fixed a but that could lead to iron sights be used although they were forbidden
- FIX: scopes/sights are also selectable if they do not have a magnification factor (1.0 is used)
- FIX: sector cooldown to zero didn't work as intended

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5372 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-09 08:50:26 +00:00
Wanne 66a2a41f7d - Fixed compilation error in VS 2005 build: The 'hash_map' was not found in the namespace 'std', because it moved to namespace 'stdext'
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5371 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-09 08:26:44 +00:00
Wanne 8c4b952e6c - Convert video object cache to hashmap from linked list. This will protect better against video object leaks and probably still be faster than the linked list. (by tazpn)
o new #define: USE_HASHMAP_FOR_VOBJECTS

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5370 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-09 08:16:37 +00:00
Wanne d929b47aea - A fix for the general slow down issue due to scope icons (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5369 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-09 08:14:38 +00:00
Wanne c92729f93d - Protection for random crash issue I have seen due to accessing a negative index in an array. (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5368 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-09 08:13:05 +00:00
Wanne b1b98417ce - convert outofbounds check to inline macro. (This gets called a lot in render map. The Visual Studio profiler highlighted this one though probably not a real optimization.) (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-09 08:11:27 +00:00
Wanne 863d079252 - add a handledefaultevents to the map. Might solve random mouse issues. (by tazpn)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-09 08:09:36 +00:00
Wanne de6c84d4a9 - Made the "Rifle sling" feature optional, so we can decide if we like to build an executable with/without the feature
o See: builddefines.h: #define ENABLE_RIFLE_SLING
o Note: This feature is NOT the strategy performance killer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-06 13:43:34 +00:00
Wanne cecdc22d61 - Made the "Display - mines/bombs/tripwires" feature optional, so we can decide if we like to build an executable with/without the feature
o See: builddefines.h: #define ENABLE_DISPLAY_EXPLOSIVES
o Note: This feature is NOT the strategy performance killer

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-06 12:58:45 +00:00
Wanne a3dcb642ca - Fixed Date in version number
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-05 08:22:21 +00:00
Wanne 1eaa8947cf - Fixed random crashes in Vista and Windows7 (e.g: when starting the map editor, ...) when executable is compiled in VS 2010 (by Tais)
o Solution: Disable ASLR (address space layout randomization) compatibilty on the "ja2" project
o See: http://msdn.microsoft.com/en-us/library/bb384887.aspx

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5357 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-04 23:34:47 +00:00
Wanne f40e7fb118 - Made the "Zombie MOD" optional, so we can decide if we like to build an executable with/without the appearance of zombies
o See: builddefines.h: #define ENABLE_ZOMBIES (then you can turn on/off Zombies in the ingame option screen)
o Poison system is still in the code and not combined with the option "Zombie MOD"
o Gamers reported on the Bears Pit, that an executable compiled WITH the Zombies mod enabled makes the game unplayable slow in tactical screen after a few minutes in turn based/realtime



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5356 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-07-04 10:30:13 +00:00
MaddMugsy f1c1fd448a Swapped zombie hit sounds.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1466 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-07-03 18:44:08 +00:00
Wanne e8027d6663 - Made the "Highspeed timer game loop (FF-MOD by tazpn)" optional, so we can decide if we like to build an executable with/without the highspeed timer
o See: builddefines.h: #define USE_HIGHSPEED_GAMELOOP_TIMER
o Gamers reported on the Bears Pit, that an executable compiled WITH the highspeed timer enabled makes the game unplayable slow in mapscreen mode when doing certain actions (repair, ...). That is the reason, why I made the compilation of the highspeed timer optional. Currently it is disabled.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-25 15:06:04 +00:00
Wanne f4d47f38e2 - Updated Version: 5353
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-19 10:58:04 +00:00
Wanne 31ec66539b - Bugfix: Map Editor
o The "Save map in vanilla ..." was checked wrong after loading the map, when the map was not saved in "vanilla format"

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-19 10:49:05 +00:00
Wanne eaacef7221 Externalized some hardcoded grid numbers to "Mod_options.ini" (by DepressivesBrot)
- There is a new "Mod_options.ini" file located in the "Data" MOD folder
- Only modders should make changes to the file.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1464 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-19 07:54:10 +00:00
Wanne c0448be2e6 Externalized some hardcoded grid numbers to "Mod_options.ini" (by DepressivesBrot)
- There is a new "Mod_options.ini" file located in the "Data" MOD folder
- Only modders should make changes to the file.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5352 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-19 07:54:08 +00:00
Wanne bcec78472f Bugfixes: Bombs (by Flugente)
- bombs armed in the inventory now have a small indicator that describes their settings
- fix: it is no longer possible to remove the detonators of an armed bomb. Trying so will detonate it.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-18 22:28:18 +00:00
Wanne 476391e600 - Updated version number: 5346
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-18 22:27:34 +00:00
Wanne 0a8c395c3e ja2_options.ini update (by Flugente)
- added a new option under [Tactical Fortification Settings] in the ini that governs wether any fortification options can be used while enemies are in the sector

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1462 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-16 22:58:52 +00:00
Wanne 88155e52d0 Bugfixes (by Flugente)
- fixed a bug that prevented zombies from rising in turnbased mode
- fixed a bug that prevented weapons on the floor from cooling down in turnbased mode
- fixed a bug that caused gun traps with buckshot ammo to deduct to much ammo
- fixed a bug that could crash the game when firing a lot of gun traps at the same time

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5346 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-16 22:57:53 +00:00
Wanne 9404de5640 Enabled the HIGHSPEED_TIMER in the Ja2.ini, which is used for the feature "Fast Enemy AI Turns" in the ingame options
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1460 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-13 07:53:42 +00:00
Wanne 99d9567f35 Bugfixes (by Flugente)
- fixed a bug that caused wrong cursors to be dispalyed in NCTH
- fixed an oversight that caused the scope mode toggle not to be working
- corrected fortification cursor issues


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-13 07:48:02 +00:00
Wanne 0749e468a4 - Updated version number to 5343
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5344 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-12 16:20:54 +00:00
Wanne 010ff3d5ef Bugfix: Static fortifications (by Flugente)
- Changed Item type for shovel to "Misc-Item" (it cannot be used as a weapon anymore)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1458 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-12 16:08:13 +00:00
Wanne a6f24ac9ce Fortification feature fixes (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1457 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-12 07:46:03 +00:00
Wanne ac220f981c Fortification feature fixes (by Flugente)
- fixed a bug that prohibited building a structure in turnbased mode
- fixed a bug that caused a wrong AP cost for fortification actions
- fixed itemflag
- fixed cursor animations for fortifications


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5343 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-12 07:45:30 +00:00
Wanne a2f598799c - Added missing ini properties to the Data/APBPConstants.ini and Data/Ja2_Options.INI file
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1456 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-06-11 08:48:38 +00:00
Wanne 4dbd8e504f - Added new items (1540 - 1542) for the new "static fortifications" feature (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5342 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-11 08:44:05 +00:00
Wanne f728cdfe72 Forget to mention a few more bugfixes that are included in the previous commit (revision: 5340) (by Flugente)
- new code: added a new flagmask variable to items. This one is separately from the attachments index, and can be used to determine item properties without adding up to 32 BOOLEAN varaibles
- fixed a bug that caused underbarrel weapon modes not to appear on guns with only one firing mode.
- zombie damage resistance and zombie can now be set separately via the JA2Options.ini
- fixed a bug that caused corpses not to disappear on time (graphic-only glitch)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5341 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-11 08:36:00 +00:00