7623 Commits
Author SHA1 Message Date
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
Flugente 0357178420 - 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.
- fixed some default values

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1835 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-19 16:18:57 +00:00
Wanne 73be285e09 Fixes (by Moa)
-SGP debugging now works again (corrected some typos and one missing include).
-Memmory debugging works again (wrong types corrected)
-Laptop screen heigth macro and all references is now usable. (was 'C: y + A' 'D: B - C' which translates to 'D: B - y + A' instead of 'D: B - y - A')
-Laptop screens do not need to rerender as often then before as the laptop screen width/heigth macros works now and invalidating screen will do the trick -> almost no render calls neccessary.
-MercProfile.ubMiscFlag was used instead of .ubMiscFlag2 -> enter sector action schedule for soldiers which dont need to be insertered is now canceled as intended

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6509 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 12:47:53 +00:00
Wanne 49798d67b4 - Added new items and pockets for MOLLE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 12:31:00 +00:00
Wanne 79bf420306 Molle Improvments / Fixes (by Off_Topic)
- Mini Grenade Size 14->13
- Mini Grenade Pocket 14x2->13x2
- New Pocket (Small Knife) for Nylon Knife Sheath Can't hold KCB or Rambo. 
o KCB & Rambo size 24->28
o Regular Knife Pocket Volume 13->15
- Carabiner
o New Item Class Armour/Face/LBE/Misc.
o Can now hold items 16 (Handcuffs) & 18 (Compact Binoculars)
There are still a few items that will go there that shouldn't (Syringes for example) but with the new item class restriction it's a lot less stuff.
- New ITEM: Carabiner
oCan be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard.
- New Silhouette: Sniper Rifle
- New Pocket type: Sniper Rifle (Can now only hold one item sized 8 & 9, large sniper rifles and one item sized 5,6, or 7)
- Replaced this in Sniper Drag Bag
- General Drop Pouch can now hold more than small pouch (no restriction) and can hold bigger items. Volume increased from 2 to 8.
- New ITEM: Carabiner
o Can be attached to MOLLE vests to add more Rings. -5 Stealth penalty to stop you going overboard.
- Ammo Pockets now more flexible, they still only take Ammo. Other pockets tweaked.
- Mercstarting Gear: Wolf K2 Removed Leg Rig/Ice K3 Removed Combat Pack.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1834 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-19 12:18:37 +00:00
Wanne 8e17fb3fd2 - Added missing changes from revision: 6503 (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6507 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-19 12:13:09 +00:00
silversurfer d4d4578487 Bugfix for AttachmentSlots.xml:
- Molle leg rigs lower row small slots had the wrong attachment class

Bugfix for NAS layout class assignments for Molle:
- layout class is a bit mask so I had to reassign (leg rig = 4, vest = 8, combat pack = 16, backpack = 32)
- new file Lookup\NasLayoutClass.xml for reference


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1833 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-18 13:33:25 +00:00
Wanne 484b353b1c - Fixed compilation error
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6506 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-18 07:03:41 +00:00
Wanne 09fe9a59f8 - Removed special characters from xml texts (® and ™) cause they could lead to problems
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1832 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-18 07:01:24 +00:00
Wanne 6c0d00b013 - Added missing <szBRName> for item #1643
- Removed special characters (® and ™) from description texts, because of display problems in the game

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6505 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-18 07:00:43 +00:00
Wanne ebcf2dfd77 Externalizations (by Buggler)
- Externalized airport sectors
- Leave equipment in Drassen used airport sector instead of bobbyr shipping location, allowing possibility of separate airport and bobbyr location 
- Used actual sector names instead of Omerta and Drassen hardcoded text in leave equipment message prompt

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1831 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-17 14:50:11 +00:00
Wanne e58ce236b5 Externalizations (by Buggler)
- Externalized airport sectors
- Leave equipment in Drassen used airport sector instead of bobbyr shipping location, allowing possibility of separate airport and bobbyr location 
- Used actual sector names instead of Omerta and Drassen hardcoded text in leave equipment message prompt

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-17 14:49:52 +00:00
silversurfer 0ae123c448 added missing silhouette for small shotgun to Silhouette.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1830 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-16 19:04:05 +00:00
silversurfer 6a31463608 - new NAS Layout Classes for Molle System (Thigh Rigs = 3 and Vests = 4)
- fixed attachment slot layout for Molle items
- fixed wrong slots for Molle items
- fixed wrong BR dropoff grid in GameDir 1828


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1829 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-16 18:46:04 +00:00
Wanne 7ccdd5f7ab - Missing changes for revision 6500 (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-16 10:53:15 +00:00
Wanne dd7a893b1b Externalizations (by Buggler)
- Externalized BR shipping destination
- Externalized Drassen item dropoff grid no

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1828 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-15 19:53:05 +00:00
Wanne 772e99924a Improvements (by Buggler)
- Externalized BR shipping destination
- Externalized Drassen item dropoff grid no
- Used profile name instead of hardcoded value on message prompt for marrying Daryl, sparing Krott and finding queen's POW sector
- Hid names on message prompt when attempt to talk to out of LOS hidden NPC

Mapeditor (by Buggler)
- Show index no within usItemClass on item selection screen for another easy reference
- Lighten quantity and selected tiles color in tile selection screen 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6500 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-15 19:51:53 +00:00
Wanne 9128ee0e4b - Chinese translations (by zwwooooo)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6498 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-15 19:38:50 +00:00
silversurfer 698228eefb Russian Molle pistol holster had wrong pocket
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1827 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-15 18:02:25 +00:00
silversurfer 8fbc9fc9d9 added new silhouette 46 for shotgun holster
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1826 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-15 17:59:40 +00:00
silversurfer d917725477 - fixed <ubClassIndex> in Items.xml. This was broken in rev 1818 with the addition of the Molle system
- added some missing tags in MercStartingGear.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1825 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-15 11:15:04 +00:00
silversurfer 50013990f8 - Talon Launcher was missing NAS attachment class
- moved OA-93 and CMMG 7.3 to pistol category

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1824 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-14 15:31:46 +00:00
silversurfer d2363d32db New silenced sound definitions for rifle type weapons
The old sound IDs used a sound that fits pistols but not rifles, ARs and sniper rifles

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1823 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-14 12:26:05 +00:00
Wanne bcc9d88efd Externalized (by Buggler)
- AWOL scientist location
- Brothel sector
- Call Kingpin over for boxing match
- fact Tony in building
- meet Carmen for reward
- moved John & Mary unescort sector from Mod_Settings.ini to LUA

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1822 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-14 11:57:51 +00:00
Wanne 7f489a1b53 Externalized (by Buggler)
- AWOL scientist location
- Brothel sector
- Call Kingpin over for boxing match
- fact Tony in building
- meet Carmen for reward
- moved John & Mary unescort sector from Mod_Settings.ini to LUA

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6495 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-14 11:57:08 +00:00
Wanne eabb415ee1 - Added rifle silencer burst sounds (by silversurfer)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1821 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-14 11:54:08 +00:00
silversurfer dcf1df3c72 Bugfix for BR mail order screen
- items with long names displayed only ... when index >= 20

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6494 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-14 10:54:31 +00:00
Flugente bd8ede4f06 visionrange calculation was performed twice when once was enough
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6493 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 20:07:37 +00:00
Flugente ab501386d5 Fix: negative poison values
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6492 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 19:51:29 +00:00
silversurfer 3d3bc9fb9c - fixed some tags that went missing with the new Molle system
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1820 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 19:46:22 +00:00
Wanne 3860bc12e2 - Added new ja2.ini file for Chinese version, which has USE_WINFONTS = 1
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 19:04:48 +00:00
Wanne 3baf968324 New ja2_ini value: USE_WINFONTS
o Set USE_WINFONTS = 1, if you play the Chinese version of the game, otherwise set to 0 (default)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1819 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 19:03:38 +00:00