Commit Graph
7637 Commits
Author SHA1 Message Date
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
silversurfer 78b4e784b6 New trait bonus for Ranger
Oops. Forgot to copy two files.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6430 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-22 18:31:43 +00:00
silversurfer 810df5bce0 New trait bonus for Ranger
FIRING_SPEED_BONUS_SHOTGUNS will reduce the APs needed to fire shotguns. Default is 10 (percent).


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6429 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-22 18:25:57 +00:00
silversurfer 669c6b3bbf New trait bonus for Ranger
FIRING_SPEED_BONUS_SHOTGUNS will reduce the APs needed to fire shotguns. Default is 10 (percent).


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1784 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-22 18:21:31 +00:00
silversurfer f3a36ee7c6 New feature for UDB
It is now possible to see secondary attributes on the general tab for weapons. Just click on the tab a second time.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6428 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-21 16:03:47 +00:00
inshy 6f2c3bc833 French translation by hrvvillers
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6427 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-21 06:42:24 +00:00
silversurfer 9094283046 Bugfix for advanced repair system
The pSoldier that was passed to the ability check was the owner of the item and not the person that does the repairs.
So no Technician trait on the owner -> no repair...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6426 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 19:10:56 +00:00
silversurfer 7685f54e3b - fixed attachment class of trigger group
- fixed coolness of 4x scope
- fixed coolness of 7x scope

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1783 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 15:03:05 +00:00
silversurfer 58f6e2d188 ATTENTION! This requires at least GameDir 1782!
More secondary attributes are now shown on general page of UDB. The following item tags were added:

<Damageable>0
<Metal>1
<Sinks>1
<TwoHanded>1
<BlockIronSight>1

The new icons were added to ItemInfoSecondaryIcons.sti.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6425 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 14:46:06 +00:00
Wanne f10071e255 - Added new loadscreen hints (by Uriens)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1781 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 08:36:52 +00:00
Wanne 0c2c5945e2 - Externalized Kingpin money sector and Hospital sector (by Buggler)
[San Mona]
;Kingpin's private stash. He will come looking for you if stolen
KINGPIN_MONEY_SECTOR_X = 5
KINGPIN_MONEY_SECTOR_Y = 4
KINGPIN_MONEY_SECTOR_Z = 1

[Cambria]
;The Hospital sector
HOSPITAL_SECTOR_X = 8
HOSPITAL_SECTOR_Y = 6
HOSPITAL_SECTOR_Z = 0



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1780 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 08:20:39 +00:00
Wanne 8221472bc2 - Externalized Kingpin money sector and Hospital sector (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6423 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-20 08:19:56 +00:00
Wanne e4d62464dd - Addded missing gear kit name 5 ("Premium") for merc Lucky (by Off_Topic)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1779 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-20 08:11:49 +00:00
silversurfer 1e06d2a725 Bugfix for merc availability on M.E.R.C
When loading a savegame mercs that became available automatically where not enabled because they couldn't meet a condition anymore. This condition will not be checked anymore because it is not needed for functionality.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6421 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-19 16:57:53 +00:00
Wanne c0f0cb3959 - Reworked GearKits for Merc and adjusted a few merc profiles (by Off_Topic)
These KITS are Limited to Merc Lvl and prices, it would be tempting to give them "the perfect loadout" but it would take away from the fun and balance of the game.

*List of Kits

Ammo: Extra ammo at the expense of an other item.
Gun Choice: an alternative weapon.
Combat: Mercs drop their Med/Tool Kits in favour of extra firepower.
Fast Rope: Only seen in upper tier Mercs. The idea was to create a basic kit for when you know you are landing in an enemy occupied sector. (Could be change to "Hot LZ")
CQC: Close Combat
HTH: Hand to Hand
LBE: If you feel like splashing the cash for some extra carry capacity.
Paramedic: A kit for Doctors on the front line, dropping their MEdkit for a FirstAid Kit and a Smoke Grenades.
Auto/Heavy WPNs: Skill specific kits.
Sapper: Desroying/Constructing stuff.
Breach: Using explosives or ballistics to open doors.
Covert: Silent weapons/ammo.
Night OPs: Flares etc... 

There are more KITS but they should be self explanatory. It's a lot of info to edit, so if there are any mistakes/oversights let me know and i'll change them. Same goes for any suggestions.

I tweaked these Mercs in order for OST/NST to match and to improve one or two.

Dyno & Smoke: Electronics added to OST to match Demo.
Mouse: Stealthy/Stealthy added to OST Melee removed from NST
Moses: Given Devolve evolution.
Hector:Knifing expert in OST.
Needle: Knifing OST.
Screw: HTH (OST) HTH/Tech (NST)
Elroy: Strealth/Lockpicking.
Carp: Removed Deputy and gave him Teacjng in OST/NST. He's pretty useless at the moment, at least this way he can be a Militia Trainer.
Doc: He had Teaching/Deputy in NST. Changed it to Doctor in NST and no skill in OST.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1778 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-19 11:54:53 +00:00
silversurfer 113e54b4b1 Fix for new repair ease display
- tooltip takes into account if MERCS_CAN_DO_ADVANCED_REPAIRS = TRUE/FALSE
- added forgotten tooltip for OCTH
- formatting changes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6420 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 20:03:18 +00:00
silversurfer 6d431cd2e8 ATTENTION! This needs at least GameDir 1777!
Fix and Enhancement for Repair Ease display in UDB

- Repair Ease is now displayed for all items and not only for weapons because other items use the <bRepairEase> tag too
- fixed tooltip display for explosives, half the values didn't show tooltips

There are new icons for repair ease display (ID 34 and 35 in ItemInfoWeaponIcons.sti). The old icon was changed to green color (ID 10).

The colors are used to show if the item is repairable and by whom:

- green for items that can be repaired by anyone
- yellow for items that need a technician or NPC to repair them beyond repair threshold
- red for items that have <Repairable> tag set to 0 in items.xml


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6417 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2013-09-18 18:14:30 +00:00
silversurfer 7942f1e551 New icons for repair ease
There are now 3 icons for the wrench:

- green for items that can be repaired by anyone
- yellow for items that need a technician of NPC to repair them beyond repair threshold
- red for items that have <Repairable> tag set to 0 in items.xml


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1777 4f8fa57e-7814-0410-bad4-adc449f26b7c
2013-09-18 18:06:53 +00:00