7604 Commits
Author SHA1 Message Date
silversurfer 480321fd2f fixed wrong xml tags
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1808 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 19:18:33 +00:00
silversurfer ae6a97dbe6 added missing .45 drum magazines to Tony's inventory
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1807 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 19:12:22 +00:00
silversurfer 48ceea04ee Fix for JaggZilla Bug #591
Mercs that were set to student with a trainer that was not good enough could practice without breath loss. They will still practice with this fix but they will lose breath as normal.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-06 14:53:43 +00:00
silversurfer 9eedf3d45d new modifiers for item properties:
- APs to reload
- APs to reload manually
- max distance for messy death
- gun handling
- best laser range

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6472 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-06 12:50:36 +00:00
silversurfer 67613cd472 fixed Dr. Q's 4th trait. Somehow he lost his paramedic skills
new modifiers for item properties:
- APs to reload
- APs to reload manually
- max distance for messy death
- gun handling
- best laser range


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1806 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 12:21:54 +00:00
Wanne 9efd1f8a5e - Added language specific item texts and pockets (both in English) from GameDir revision 1805
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6471 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-06 07:04:32 +00:00
Wanne 1ba8990eef New Pocket Types and Silhouettes (by Off_Topic)
Large Pistol Holster
Shotgun Shells
Throwing Knife
General Misc
Small Explosive
Short Rifle Mag x2
Revolver Holster (Sideways)
Combat Pack Gun Sling
Combat Pack Small
Explosives
Sniper Mag

New LBE added:

Leg Throwing Knife Rig
SMG Mag Leg Rig
Pistol Mag Rig
Bomb Rig
Equipment Rig
Large Pistol Holster
12 G Shotgun Shell Holster
Small Shotgun Holster

Mercstarting gear:

Wolf (Shotgun Rig)
Blood/Hitman: Throwing Knife Leg Rig
Buns: Pistol Mag Rig
Ice: Smg Mag Rig
Red: Bomb Pouch
Bull: equipment pouch
grizzly: Large Pistol Holster.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1805 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-06 06:41:28 +00:00
silversurfer c16971b9f2 New weapon type modifiers for:
- damage
- single shot AP
- burst AP
- auto fire AP

Fixed some parts where the raw item property was used instead of the Get... function that should be used.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6470 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-05 15:15:50 +00:00
silversurfer f6df15ea20 New weapon type modifiers for:
- damage
- single shot AP
- burst AP
- auto fire AP


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1804 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-05 15:02:59 +00:00
silversurfer 2b19bd1959 - new Item_Settings.ini modifiers for weapon class specific range
- renamed weapon overheating modifiers to get a common naming scheme
- added weapon overheating modifiers for launchers
- renamed TURNING_FROM_PRONE_FOR_PUNCH_OR_STUB to TURNING_FROM_PRONE_FOR_PUNCH_OR_STAB for search reasons


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6469 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-04 18:55:50 +00:00
silversurfer 17d343524c - added weapon overheating modifiers for launchers
- added range modifiers for guns and launchers

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1803 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-04 18:47:41 +00:00
Wanne d913209450 Translated merc bios and some quote files to Polish (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6467 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-04 18:09:26 +00:00
Kriplo d83f23ce2b Brief: //dnl ch73
- Fixing bad APs deduction when using blade or blunt weapons and punching in general from different stances when need turn to your target.
Details:
- Fix wrong APs deduction and animation change when go to attack with knife or punch from prone.
- Fix no APs cost for martial artist when perform turning.
- When target was prone there was several problems in defining turnover and stance cost as range to them could vary depending of obstacles between, and as punch or stub in general use same logic put all stubbing and punching under one function MinAPsToPunch which should solve current problems with APs calculations.
- Still there are no turning cost when going to stub or punch from moving, but this problem is not related with MinAPsToAttack but with UIPlotPath which don't add turning cost, hope someone in the future will add this feature which never exist.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6465 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-03 20:22:35 +00:00
Flugente 79fc89036d Fix: missing merge lookup
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1802 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-02 21:42:01 +00:00
silversurfer d99d74a9f4 added missing items from Tony's inventory
- 1078 "Beretta Cx4 Storm"
- 927 "9x18mm Mag 12 AP"
- 928 "9x18mm Mag 20 AP"

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1801 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-02 14:48:28 +00:00
silversurfer 0668d04e1f Bugfix for JaggZilla bug #543
During an interrupt it is not possible anymore to drop the backpack with Shift+B if you are not among the interrupters.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-02 13:45:19 +00:00
silversurfer cc51c13529 New modifiers for Item Properties
The new Item_Settings.ini is there to host modifiers for item properties in the different XML files. For now it is only used for the Weapon Overheating feature to adjust parameters based on gun class.
It uses the new struct gItemSettings which is populated in function void LoadItemSettings() on game start.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-02 12:40:08 +00:00
silversurfer 69c26866af New Ini for item property modifiers
The new Item_Settings.ini is there to host modifiers for item properties in the different XML files. For now it is only used for the Weapon Overheating feature to adjust parameters based on gun class.
The ini can hold any modifiers, for example modifiers for range, armor rating, damage, weight, AP to load/fire etc. Of course somebody has to add that to the game code first. ;)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1800 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-10-02 12:30:21 +00:00
silversurfer bc7b3e2d62 Bugfix for superheated weapons in loaded sector inventory after saving the game (by Moa)
In revision 6434 a bug was introduced where all weapons in a loaded sector would be set to 45000 temperature after the game was saved. This is a temporary fix.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6459 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-01 17:31:18 +00:00
Wanne 529fe10b9d - Updated missing loadscreen hints for foreign languages
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6458 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-01 07:32:16 +00:00
Wanne 1a6f275157 - Updated Polish translation (by Faalagorn)
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/326033.html#Post326033


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-10-01 07:19:28 +00:00
Wanne b3da78a4b6 - Fixed Tixa explored sector name (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1799 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-30 17:49:04 +00:00
Wanne 7b1124a596 Reduces render calls when mouse over compatible item in stash and soldier inventory (highlighting) (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6456 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 19:46:59 +00:00
Flugente 982f9db514 added rifle sling attachment to AI attachment choices
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1798 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 17:42:46 +00:00
Flugente b85ae40af9 Forgot to merge tripwire rolls.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1797 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 17:35:21 +00:00
Flugente 3c01b5364e - new item: when planting tripwire roll (Item# 1640), a tripwire item is created, thereby making planting multiple wires much easier. Teipwires can be merged to create a roll
- new item tag: <buddyitem> connects items to other items. Connection specifics depend on items involved

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6455 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 17:06:37 +00:00
Flugente 14333998a1 - stacks of binders can be merged
- new item: when planting tripwire roll (Item# 1640), a tripwrie item is created, thereby making planting multiple wires much easier

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1796 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 17:03:58 +00:00
silversurfer 2169fbd6a9 New trait modifier for Ranger
POSSIBLE_AIM_CLICK_ADDED_SHOTGUNS was added to adjust the number of aim clicks for shotguns. The default is 1.

Also fixed the broken aim click modifiers for Gunslinger and Sniper.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6454 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 16:03:35 +00:00
silversurfer c0e61959d6 New trait modifier for Ranger
POSSIBLE_AIM_CLICK_ADDED_SHOTGUNS was added to adjust the number of aim clicks for shotguns. The default is 1.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1795 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 16:01:38 +00:00
Wanne 795f23682a - Added "Eskimo" (aka "Mr. Removed") - big face + camo, basing on animated ones (by anv)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1794 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 13:06:04 +00:00
Wanne f8427e2ffd Fixed faces (by anv)
o Beth, Sam, Smoke, Postie, Bud, Needle, Stella, It, Ears
o Added missing camo faces

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1793 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-29 13:03:12 +00:00
inshy d9ff4b81cd French translation by hrvvillers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6453 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 10:49:17 +00:00
inshy 5341186c4b French translation by hrvvillers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6452 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 10:28:54 +00:00
silversurfer 5fc1ab95a1 Fixed Carmen's terrorist counter
When terrorists had fixed placements in MercProfiles.xml they were not taken into account for the terrorist counter. Now all terrorists count no matter if fixed placement or random placement.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6451 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-29 09:28:05 +00:00
Kriplo f65719e801 Brief: //dnl ch72
- Fixing bad APs deduction when using hand grenades, mortars, rocket launchers, grenade launchers and attached grenade launchers from different stances and need turn to your target.
Details:
- Add APs cost for stance change and turnover for mortar and rocket launchers.
- Rocket launchers cannot be fire from prone any more as there are no animation for that stance.
- Attached grenade launchers now take raise gun cost for launcher instead for gun.
- No more problems with APs for grenades from different stances and turnover, add proper costs for crouch too as someone add animation for that.
- Fix wrong APs deduction for grenade launcher from prone and turnover in general.
- Fix incorrect values for APs cost under throwing/launching cursor.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-27 22:03:42 +00:00
Wanne ebef9b6df3 Bugfix: Repair assignment sub-menu goes out of rendering range (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6446 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-27 06:41:49 +00:00
silversurfer 09ea0d8ec2 Changed code for sex in brothel to use the externalized grid numbers.
This change only helps if you use the fixed LUA script in GameDir 1792.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6445 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-26 18:23:29 +00:00
silversurfer f81665cbba Fixed LUA script for sex in brothel
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1792 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-26 18:20:24 +00:00
silversurfer 211e406bb9 Rifle Sling now uses external attachment slot which is more logical and doesn't block internal slot anymore.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1791 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-26 16:32:46 +00:00
Wanne df4d555a34 Merc Starting Gear adjustments (by Off_Topic)
- Sidney - Kit 4: Added mini grenade and mag to Kit 4
- Hector - Kit 3: He had a SIG PRO .40, it should be a HK P7M8
- Vinny -  Kit 4: He should have a TT 3 Day Pack.
- Blood -  Kit 2: He had .40 SMG mag, should be .40 pistol mag.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1790 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-26 06:35:24 +00:00
silversurfer 393790f817 Bugfix for game clock mouse region in map screen (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6441 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-25 06:47:17 +00:00
silversurfer a389081a9a Bugfix for crash with empty sector inventory (by Moa)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6440 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-24 20:34:43 +00:00
silversurfer 08f5b05c82 When checking if a gun barrel extender should be damaged and fall off the game will not use item ID GUN_BARREL_EXTENDER anymore because that was tied to item 310.
Instead the game will now use the attachment class AC_EXTENDER. 
With this we can have more extenders that can be damaged and fall off and also other extenders that are not damaged by shooting.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6438 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-24 15:13:56 +00:00
Kriplo d02f1acab2 - add settings for enemy and militia reinforcements delay, and this option from now is turn off and by default.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1789 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 21:52:06 +00:00
Flugente b74d319e6c Fix: wrong ini value location
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1788 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 20:33:45 +00:00
Flugente 14facdc6a8 Missing ini values caused reinforcements to be delayed. Added default values simulating absence of this feature.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1787 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 20:04:39 +00:00
Flugente deb0a65f46 Carried weight percentage can now change on uneven strength points.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6436 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-23 19:29:13 +00:00
Wanne 5df38d5042 Improve loading speed of stash (by Moa)
- improved processing of sector stash (opening/closing)
- improved loading speed of save games
- improved processing of items droped by militia (most noteable after autoresolve)
- and some other code related changes
see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/325332/FIX_improve_loading_speed_of_s.html#Post325332

Notes:
removed some functions, still in code so but renamed to *_OLD() because they are from Sirtech and should be kept as I have read in "§18) If possible, we don't just delete the old code, but comment it out (or #ifdef it out) for reference. We delete it only if it's really necessary."

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6434 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-23 06:59:29 +00:00
Wanne 9fa0723716 - Deleted unused file A9_0_ExtraItems_Expert.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1786 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 06:53:51 +00:00
Wanne 31aca9562b - Restored missing Covert Ops-Traits for Mouse and Elroy (by Flugente)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1785 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-23 06:42:37 +00:00