Commit Graph
1351 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 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 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 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 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
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 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 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 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 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 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
Wanne 80509d2b61 New Feature: static fortifications can now be built by mercs (by Flugente)
- if the terrain allows it, an empty sandbag (item 1540) can be filled to a full sandbag (item 1541). You need to have a shovel (item 1015) in your second hand. You will notice the new hammer cursor
- by using a full sandbag, you can build a sandbag barrier
- by using a concertina stack, you can build a concertina wire barrier
- this only works if the current map has sandbags/concertina wire in its tileset
- with a shovel in your hand, you can remove a sandbag barrier
- changed the size of shovel so it can actually be put in inventories. It was also necessary to remove its ability to be used as a melee weapon.
- for further info, see this thread: http://www.bears-pit.com/board/ubbthreads.php/topics/305822.html#Post305822


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5340 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-11 08:32:07 +00:00
Wanne 56df9f8f69 - Bugfix: Fixed a bug that caused underbarrel weapon modes not to appear on guns with only one firing mode. (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5339 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-11 08:12:48 +00:00
MaddMugsy 2c342000c4 1. Fixed victory music playing prematurely when zombies were present
2. Zombies should now moan randomly (same as enemy taunts)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5337 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-08 20:14:43 +00:00
Wanne 253631f061 - Updated Game Version: Revision: 5334
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-08 20:13:33 +00:00
MaddMugsy e84edc47d1 1. Added zombie battle sounds
2. Made creepy music play when zombies rise

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5335 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-08 19:56:14 +00:00
MaddMugsy abed2ed6c5 Bugfix (from Flugente): fixed an issue that could cause an overflow during a merc's training
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5334 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-07 18:18:59 +00:00
MaddMugsy 3651ef29e7 Guns attaching to tripwire feature has been moved from an xml-enabled feature to a hardcoded feature. This is because there are so many guns in the game (esp. in various mods) that the required xml changes are huge. Not to mention things like this -- http://i50.tinypic.com/zjxoat.jpg ATTACHING_DETONATOR skill check is used and the usual gun attachment sound is played instead of the detonator beep.
Additionally, this resolves the issue with being able to attach lasers, etc to tripwire.  Instead, guns retain their attachments, as would be expected.

Transformations on attached guns have also been disabled.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5332 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-06 18:20:03 +00:00
Wanne f200ac8d3d New Feature: Traps made out of guns and a piece of tripwire (by Flugente)
- guns can now be attached to tripwire and then be used as tripwire-activatd traps
o Attach any firearm (any gun, no RPGs, Mortars or GLs) to a piece of tripwire. You will need the newest xmls for that.
o You can plant the tripwire as you usually do.
o Once activated, the gun that is attached to the wire will fire once. It will fire in the direction that you planted the bomb, just like claymore mines do (the direction that the merc planting the wire was looking).
o The bullet fired has the range and damage it would have if fired from the gun. 
o The gun correctly heats, jams, degrades and whatever else guns do when fired. If the gun is jammed, not pumped (pumpguns) or does not have ammo, it will not fire.
o After firing, the gun lies on the floor, just where the trp was planted.
o This can be applied to any tripwire. You can ave multiple of these traps. Just put them into your normal trap setup however you like.
o At the moment, only single shots are possible, even for guns that do not have a single shot mode (MG3 etc.)
o Although I did not experience any problems with attachments, it might be a good idea to take any attachments off a gun if you attach it to tripwire.
o When the gun is attached, it is possible to attach gun attachments (lasers, scopes etc.) to the explosive. Do not attach any attachments to the explosive. They will be lost if the wire is activated.
o see: http://www.bears-pit.com/board/ubbthreads.php/topics/305634.html#Post305634
-> To support this feature, some (already existing) xml-tags have been added to the weapons in Data-1.13\TableData\Items.xml (<nasAttachmentClass>, <AttachmentPoint>, <AttachToPointAPCost>, <Attachment>)



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5331 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-06 08:27:12 +00:00
Wanne a4cfec6ec7 - Bugfix: Fixed a bug that could cause sector items to be identified as bombs altough they weren't (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-05 07:55:36 +00:00
Wanne de09d4e80f New Feature: Bombs can now be armed from the inventory. This requires an attached detonator or remote detonator. (by Flugente)
- they can then be thrown, dropped or whatever else you can think of.
- to arm/disarm a bomb, enter the Enhanced description box and click on the item's picture.
- timed bombs will blow up once the time is up, wether they are in the sector or in your inventory. Remote bombs can be also detonated in your inventory.
- see this thread for more info: http://www.bears-pit.com/board/ubbthreads.php/topics/305534.html#Post305534

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5327 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-03 16:53:03 +00:00
Wanne 4750b07f16 Zombie Update (by Flugente)
- new variables for additional strength, dexterity, agility, wisdom and experience level due to drugs, traits etc.
- new flagmask for soldiers (so no new variables have to be added in the future)
- fix: stat-altering drugs work again and can now have a higher magnitude
- drug-altered stats now show up purple
- fix: option screen help texts were missing

WARING! This will break savegame compatibility

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5325 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-02 15:50:54 +00:00
MaddMugsy defef00330 Bugfix: P_Items were only allowed up to 10 in the ini file - now corrected to 20.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5324 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-06-01 17:47:51 +00:00
MaddMugsy 9f9e42a004 1. Feature - Spooky creature music now plays when zombies are present
2. Bugfix - CheckForFullStruct in Soldier Control.cpp was referencing NUMBEROFTILES instead of new global variable


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5323 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-05-31 19:55:48 +00:00