7604 Commits
Author SHA1 Message Date
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
Wanne c3eb3a5434 Turned WINFONTS macro into the ja2.ini property (USE_WINFONTS) (by scodec)
- Set USE_WINFONTS = 1, if you play Chinese version of 1.13, otherwise 0 (Default)
- This is the first step in a process making only ONE executable file for ALL the different languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6488 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 19:02:27 +00:00
Wanne bec0aa92b7 - Added Molle items
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 18:10:52 +00:00
silversurfer 90dabd20ad Bugfix for JaggZilla bug #515
When we fly to a sector with enemies and assign at least one of our passengers in the heli to a squad the game will remove everyone from the heli and start combat. This prevents the exploits that existed before where we could assign our men to anything in hostile sectors.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 18:10:51 +00:00
Wanne 96f83d1387 Added Molle system to 1.13 (by Off_Topic)
- Several new MOLLE vests added along with three MOLLE leg RIGS and numerous MOLLE Pouches. (Most Images: IOV, Attachment slots based on Strohmanns, thanks to Depri/Parkan for help.)
- Only DG Mercs MOSES, BOb, Mitch Snake & BUD have been given MOLLE items in their starting gear for demonstration purposes.. MOLLE only available through BRAYs.
- MOLLE vest differ from regular vests in that an AR mag pocket/pouch etc... will only hold AR mags. I did this to make regular vests a viable option versus MOLLE vests, don't worry, you can customise the best MOLLE vests with up to 9 pockets and leg rigs with 5 pouches.
- There is also a new "Carabiner" pocket, this is for "hooking" on items with straps E.G. Helmets, Gasmasks, LBE etc... there are a few things that will still go there that shouldn't, but it's a minor thing. There is also a Carabiner that will only hold face items.
- In order for this to be implemented, i had to standardise LBE leg rigs, in most cases a size change from 21->22. I also had to change:
- Medkit:26->27, Toolkit26->27 but this won't change anything in game storage wise. TV, Golfclubs, & Chalice were also changed by one size.
- The first few vests you encounter will have limited MOLLE attachment points. 
- E.G. 3.11 Leg Rig has limited volume and can only take small MOLLE pouches. Later, you can purchase Larger Rigs/vests with greater volume and can hold both small/large pouches.
- Several new pockets/silhouettes added.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1818 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 17:57:21 +00:00
silversurfer 9602a67946 Bugfix for JaggZilla bug #566
- max coolness was calculated wrong and was below min coolness. This couldn't work well...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 14:31:43 +00:00
silversurfer 1f6a7be646 - bugfix for scrolling items on BR mail order screen
- bugfix for display errors on empty lines on BR mail order screen
- externalized noise threshold for silenced shots to Ja2_Options.ini (MAX_PERCENT_NOISE_SILENCED_SOUND)
- updated version numbers

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6484 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-13 12:30:25 +00:00
silversurfer 36a6ac83c9 - externalized noise threshold for silenced shots to Ja2_Options.ini (MAX_PERCENT_NOISE_SILENCED_SOUND)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1817 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-13 11:35:30 +00:00
Wanne 04a2fda24b - Reworked Smoke face (by anv)
- Recolored Beth's clothes (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1816 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-12 20:51:48 +00:00
silversurfer c5873e956d - changed MAX_PERCENT_NOISE_VOLUME_FOR_SILENCED_SOUND from 35 to 50 so that all shots with silencers use the silenced sound instead of the normal weapons sound
- New item tag <SleepModifier>:
This is a percentage bonus to breath regain while resting.
It could be applied to sleeping bags for example.
Reasonable values are from 0 (no bonus) to 100 (twice the regeneration).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-12 15:02:10 +00:00
silversurfer f83c5c7933 Fixed wrong recovery bonus values for facilities. They were upside down. Sleeping was worse than idling.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1815 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-12 14:44:40 +00:00
silversurfer 7731b96e85 New item tag <SleepModifier>
This is a percentage bonus to breath regain while resting.
It could be applied to sleeping bags for example.
Reasonable values are from 0 (no bonus) to 100 (twice the regeneration).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1814 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-12 13:57:04 +00:00
Wanne f72e4424eb Externalizations (by Buggler)
- Queen Palace & Interrogate meanwhile stuff
- Initial POW stuff in Alma
- Sectors for triggering Meduna outskirts meanwhile scene
- Add Iggy to location when game progress condition met
- Add Rat to location after creature meanwhile scene

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6479 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-11 06:55:31 +00:00
Wanne ef2f023c35 Externalizations (by Buggler)
- Queen Palace & Interrogate meanwhile stuff
- Initial POW stuff in Alma
- Sectors for triggering Meduna outskirts meanwhile scene
- Add Iggy to location when game progress condition met
- Add Rat to location after creature meanwhile scene

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1813 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-11 06:54:58 +00:00
Wanne a8bda0af8e Externalizations (by Buggler)
- 'Kingpin wants his money' history log hardcoded location to his actual location
- John & Mary sector to disappear on quest completion
- Dynamo prison sector for Matt's quest
- Joey primary & alternate location to be found
- Spike sector relocation when assassins are sent
- Weapon cache locations

- Resort Mod_Settings.ini according to town order in cities.xml for easy referencing 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1812 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-09 19:45:52 +00:00
Wanne 3ab6da635f Externalizations (by Buggler)
- 'Kingpin wants his money' history log hardcoded location to his actual location
- John & Mary sector to disappear on quest completion
- Dynamo prison sector for Matt's quest
- Joey primary & alternate location to be found
- Spike sector relocation when assassins are sent
- Weapon cache locations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6477 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-09 19:44:15 +00:00
silversurfer e59e951e31 Bugfix for JaggZilla Bug #635
- NPCs that turn neutral cannot end a battle for an entire sector anymore if there is other enemies around.
- Enemies that bled to death won't stop the code anymore to grant us victory.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-09 19:32:19 +00:00
Wanne 7cbdb6064d - Fixed typo in Items.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1809 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-08 20:26:50 +00:00
silversurfer fa56d63ce4 Bugfix for JaggZilla Bug #623
The crash was caused by Mike or Iggy because they are created from an Elite but don't have ubSoldierClass set to SOLDIER_CLASS_ELITE. Therefore ubNumElites and num remained at 1 when the for loop was done.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6475 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-08 17:55:45 +00:00
Wanne c14e76622a - Fixed Tixa & Orta location not shown on NPC quote trigger (by Buggler)
- Fixed Merc Formation text positioning and other minor text tweaks in option screen (by Buggler)

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