7604 Commits
Author SHA1 Message Date
silversurfer aff4f09278 New item property modifier for armor:
CAMO_LBE_OVER_ARMOR_MODIFIER sets the amount of camouflage from armor vests that is used when we wear LBE over them. Default is 0.2. That's basically the arms sticking out of the LBE.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1854 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-02 10:48:32 +00:00
Wanne ff820a5c45 - Added new items for Radio Operator feature
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-01 13:31:33 +00:00
Wanne 24be2cbd6a Reworked JA1/DG mercs (by anv)
- Animated new Smoke faces
- Revised Postie, Reuban, Leon and Bud's dialogues (replaced 11khz battle sounds with better quality equivalents, replaced some quotes with better fitting, unlocked 045s, etc.)
- Leon now immediately hates all of his progeny, including both drunk and sober Larry
- Replaced some default nationalities/sexism/racism values for DG mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1853 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-11-01 13:21:51 +00:00
Wanne 7440dd5745 Enhancements (by Buggler)
- Allows all mercs cover display view by using hotkey '='; multi-selected mercs view only possible in realtime mode

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6551 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-11-01 13:00:44 +00:00
silversurfer abbf792a76 - added missing flags to ItemFlag.xml
- added missing explosion type 10 to ExplosionType.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1852 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-31 20:56:05 +00:00
Wanne 1588a04ff3 - Deleted unused files from old encyclopedia
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1851 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-31 12:13:43 +00:00
Wanne e7bd32dad9 Reworked Encyclopedia (by Moa)
- Access Encyclopedia from laptop screen
- Encyclopedia can be enabled/disabled in the ja2_options.ini: ENCYCLOPEDIA
- more infos:  http://www.bears-pit.com/board/ubbthreads.php/topics/327315/Re_Ingame_Encyclopaedia.html#Post327315


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-31 11:42:05 +00:00
Wanne 1cca337fa0 Reworked Encyclopedia (by Moa)
- Updated INI options, INIEditor xml files
- Updated other game dir files

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1849 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-31 09:22:42 +00:00
Wanne 5872d264f7 Additional Mobile Militia improvements from Rev: 6544 (by Moa)
- popup for training mobiles allowed training when above maximum

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6548 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-31 09:04:11 +00:00
Flugente f17829fac9 New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills.
Also includes mechansim for easy implementation of new skills.

For more info see http://www.bears-pit.com/board/ubbthreads.php/topics/327348.html#Post327348

Requires GameDir >= r1848.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 23:05:37 +00:00
Flugente 210658e382 New feature: radio operator trait allows calling in artillery, requesting reinforcements, scanning for enemies and a few other skills
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1848 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-30 22:20:39 +00:00
Flugente bef4e7b52b Fix: DropDown tooltip text was copied
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6545 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 19:50:00 +00:00
Wanne 397e764983 Mobile Miltia improvements (by Moa)
- ja2_options.ini: MOBILE_MILITIA_MAX_ACTIVE_MODE, MOBILE_MILITIA_MAX_ACTIVE_MODIFIER
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/325103/2.html

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1847 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-30 19:49:09 +00:00
Wanne 923327ca14 Mobile Miltia improvements (by Moa)
- ja2_options.ini: MOBILE_MILITIA_MAX_ACTIVE_MODE, MOBILE_MILITIA_MAX_ACTIVE_MODIFIER
- see: http://www.bears-pit.com/board/ubbthreads.php/topics/325103/2.html


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6544 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 19:48:45 +00:00
Wanne cf06aed52a Bugfix: AP deduct is different then shown (by Moa)
- no more jump with backpack (keys 'j' and 'J'). This is more consistent. Sometimes the soldier got stuck in the fence as some functions did not allow jumping and others did.
- Pickup items from ground will now cost AP.
- Backpack, Scubba fins and swimming background AP modificattion is now shown in path and is considered when calculating new path. No pathing through fences when wearing backpack. More likely to create path through water when wearing scubba fins.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6543 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 19:36:15 +00:00
Flugente cb53f7bb91 Fix: text outside of laptop boundary on first use of IMP Prejudice webpage
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 18:55:20 +00:00
silversurfer 27faf8d763 Bugfix: Enemy/Militia Profiles will not overwrite tanks anymore
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 11:25:54 +00:00
silversurfer 5582f09537 Bugfix for crash with attachment popups and hidden attachments
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-30 10:22:45 +00:00
Flugente 5e65fe45c1 Gun sling picture (from IOV by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1846 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-29 21:34:14 +00:00
Wanne 08e6bc4aca More buddies/foes (by anv)
- Currently MercProfiles.xml contains 5 records for buddies and 5 for foes + 1 per "learn to", but in code only 2 first + "learn to" are handled. I changed it so all possible buddies and foes can be used, and it's possible to add their specific like/dislike quotes to quote .edts.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-28 20:02:19 +00:00
silversurfer 7e3d4e9a01 - removed ability to store the large Belts, C-Mags and Drums in small pockets in Old Inventory System
- updated description for LAW


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1845 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-27 16:54:31 +00:00
silversurfer decc986649 Bugfix for JaggZilla Bug #625
There was a check missing if the item we look at is really an ammo item. Other item classes can have class indexes too...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-27 15:33:30 +00:00
silversurfer 954b2bffc0 Bugfix for JaggZilla Bug #637
When a throwing knife hits a window structure it won't duplicate anymore.
Throwing knifes that land on a roof will be created there instead of ground level.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-27 14:01:12 +00:00
silversurfer 6e98818e16 New modifiers for enemy item quality in Ja2_Options.ini:
ADMIN_EQUIPMENT_QUALITY_MODIFIER = 0
REGULAR_EQUIPMENT_QUALITY_MODIFIER = 0
ELITE_EQUIPMENT_QUALITY_MODIFIER = 0

These modifiers work just like the existing ones for militia.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6535 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-27 09:04:57 +00:00
silversurfer 33224f66d8 New modifiers for enemy item quality:
ADMIN_EQUIPMENT_QUALITY_MODIFIER = 0
REGULAR_EQUIPMENT_QUALITY_MODIFIER = 0
ELITE_EQUIPMENT_QUALITY_MODIFIER = 0

These modifiers work just like the existing ones for militia.


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1844 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-27 09:04:04 +00:00
Flugente 476d6478d6 Overheating:
- OVERHEATING_DISPLAY_JAMPERCENTAGE controls wether the temperature bar shows temperature/jam threshold(true) or temperature/damage threshold (false)
- OVERHEATING_TEMPERATURE_GLOBAL_MODIFIER is obsolete and this removed, as the same effect can be achieved by OVERHEATING_TEMPERATURE_PISTOL_gunclass in Item_Settings.ini


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1843 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-25 19:25:03 +00:00
Flugente b23be615b9 - Tank have superior surrender strength, making it much harder to get the enemy to surrender when he has tanks
Overheating:
- OVERHEATING_DISPLAY_JAMPERCENTAGE controls wether the temperature bar shows temperature/jam threshold(true) or temperature/damage threshold (false)
- OVERHEATING_TEMPERATURE_GLOBAL_MODIFIER is obsolete and this removed, as the same effect can be achieved by OVERHEATING_TEMPERATURE_PISTOL_gunclass



git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6531 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-25 19:23:55 +00:00
Kriplo f008316275 Brief: //dnl ch74
- Couple map editor fixes.
Details:
- Map loading not properly set Vanilla global variable switch.
- Loading AIMNAS maps of version 28 cause CTD due to incorrect StackedObjectData loading sizeof.
- Only in editor mode and if NAS setting is on inseparable and default attachments will be always add, but default attachments will not, so older maps should be converted from mapeditor to new version.
- Fix CTD if try to place items from tab selection which contains no items.
- There was missing part from ch4 for mouse wheel support in mapeditor.
- There was conflict between keyboard and mouse events creating problems when try to select taskbar options by mouse.
- Fix annoying message of using improper attachment during item place if item consist of default or inseparable attachments.
- Remove hints to display if loading map from editor.
- Fix CTD if have previously selected merc and loading another (smaller) map.
- Saving map as Vanilla will check if attachment is valid for 1.12, that means you will lost some stuff from NIV if save in Vanilla mode, so you should always save map in newest format if want play map in 1.13.
- Add correct weight recalculation when saving in Vanilla format using old OBJECTTYPE.
- Remove entry points check during map save as Scheinworld reported problem with basement levels and similar maps which doesn't need entry points.
- Fix displaying wrong map version in summary window because MapInfo is incorrectly saved in all previous mapeditors.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-25 18:48:37 +00:00
Flugente c5e72c4265 Fix: pows received wrong poison values. Those values were inconsistent and caused odd displays.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6528 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-24 19:52:15 +00:00
Wanne affb682c29 MOLLE Fixes
- MOLLE Typos
- Wrong Bray Descs.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6527 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-24 18:22:16 +00:00
Wanne d9a709b1fe MOLLE Fixes (by Off_Topic)
- MOLLE Typos
- Wrong Bray Descs.
- Throwing Knife Pocket now holds 3 Shuriken.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1842 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-24 18:03:58 +00:00
Flugente 30980e91fb Fix: background speed_run bonus was used in the wrong way
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-23 17:21:20 +00:00
Wanne f1f2985dc0 Fixes (by Moa)
- Hitting CTRL + V in Debug Build now writes all the data into file SGPVideoDump.txt (This can show instances of not removed objects ...)
- Fixed guiMAPINV was not disposed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6525 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-23 06:50:02 +00:00
Wanne 9f5c54bcca - MOLLE Updates: Added and updated language specific Items.xml and Pockets.xml (from GameDir Rev. 1840)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6524 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-23 06:33:46 +00:00
Flugente 337f796bfb added missing ini options
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1841 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-22 19:40:11 +00:00
Flugente 68add1a794 - moved IMP prejudice page to personality, which it fits better than skills
- DropDown: Create() calls Destroy()

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6523 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-22 19:39:22 +00:00
Wanne ff26555370 Fixed compilation errors in all NON-ENGLISH versions
- The problem were the new NATIONALITY enum values which conflicted with the language build defines
- I added a "_NAT" postfix to the nationality enum values (e.g: CHINESE_NAT)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-22 17:13:38 +00:00
Wanne 3095bffa8a MOLLE Fixes (by Off_Topic)
- Fixed: PriceMod Missing for some Premium Kits
- Added: New Pocket & Silhouette Double Frag
- Added: New Pocket Single Flashbang
- Balanced Price/Coolness of MOLLE from 1-8
- Change TK Leg Rig Pocket General->Tiny
- Added Missing BRAY Text for Bomb Pouch
- Better Image for 7RD Bandolier

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1840 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-22 17:10:46 +00:00
Flugente 35c3f94e9c added descriptions of values for racism/sexism/nationality etc.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1839 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-21 22:22:00 +00:00
Flugente dcceff99c5 - Reworked DropDown class. It is now much easier to use, the user has to implement only one function. See Documentation in DropDown.h.
- Added Helptexts to DropDown that will show when hovering over the main region of the DropDown.
- Added 2 more nations.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6521 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-21 21:57:54 +00:00
Flugente 596b08ca70 - renamed AC_SUPPRESSOR to AC_MUZZLE
- mercs with average refinement get a morale penalty if they care extremely about refinement and the other merc is a slob or snob
- added code for soldier-specific interrupt modifier
- added belgian and portoguese nationalities
- Fix: race, sexism etc. xml data didn't correctly overwrite PROF.DAT data

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6519 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-21 17:57:39 +00:00
Wanne 1ccf175a25 Externalized victory sector and gridno (by Buggler)
- VICTORY_SECTOR_X
- VICTORY_SECTOR_Y
- VICTORY_POSITION


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1838 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-21 12:25:17 +00:00
Wanne 8007db56dc Fixed (by Buggler)
- Externalized victory sector and gridno
- Fixed initial game loading screen not using file specified in SectorLoadscreens.xml when starting other than A9 sector
- Fixed no time delay for interrogation meanwhile scene
- Added space to 'moveitem' string 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-21 12:24:45 +00:00
silversurfer 3346fddf09 - New behaviour for gas grenades:
Gas grenades now don't cause direct damage on hit anymore. They will cause damage on start of turn or if you move inside a gas cloud. Of course gas mask still helps (except for creature gas and fire).
Every tile moved inside a gas cloud deals a percentage of the normal damage (default 10%). This is set in Item_Settings.ini (DAMAGE_HEALTH_MOVE_EXPLOSIVE_MODIFIER, DAMAGE_BREATH_MOVE_EXPLOSIVE_MODIFIER).
Tiles can now have multiple gas effects on them. Unfortunately this is not visualized (yet).
Smoke doesn't make a character immune to other gas types anymore.
The 25% chance of taking damage while moving through a gas cloud has been removed. Damage is now applied 100% of the time.

- New modifiers for explosive damage in Item_Settings.ini (DAMAGE_HEALTH_EXPLOSIVE_MODIFIER, DAMAGE_BREATH_EXPLOSIVE_MODIFIER). These could fully replace EXPLOSIVES_DAMAGE_MODIFIER in Ja2_Options.ini but I left that general modifier untouched for now.

- Some compiler warning fixes.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-21 07:13:15 +00:00
silversurfer 86c7a22f9a Added some modifiers for explosive damage:
DAMAGE_HEALTH_EXPLOSIVE_MODIFIER - general health damage modifier
DAMAGE_BREATH_EXPLOSIVE_MODIFIER - general breath damage modifier

DAMAGE_HEALTH_MOVE_EXPLOSIVE_MODIFIER - modifier for health damage while moving through gas cloud
DAMAGE_BREATH_MOVE_EXPLOSIVE_MODIFIER - modifier for breath damage while moving through gas cloud


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1837 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-21 07:12:41 +00:00
silversurfer 236d7a8f7b Molle updates (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1836 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-21 06:26:41 +00:00
Flugente a71f8745ab Fix: usBackGround is now UINT16 (was UINT8) to accommodate more than 255 backgrounds.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 20:45:05 +00:00
Flugente ac0e14beca set possible number of backgrounds to 500, as some modders might need that many
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 18:52:11 +00:00
Flugente df2ffc590b Fix: colouring selected entry wrote over lower boundary
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6511 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 16:52:53 +00:00
Flugente b9ac50aaac New (originally very old) feature: merc relations are influenced by appearance/refinement/racism/nationality/sexism. See http://www.bears-pit.com/board/ubbthreads.php/topics/326828.html#Post326828 for more info.
Also includes classes for creation of dropdown menua, see Laptop/DropDown.h.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6510 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 16:33:43 +00:00