7621 Commits
Author SHA1 Message Date
Flugente 5335553158 - Fix: prisoner interrogation was stopped even though it shouldn't
- Fix: prison location was displayed wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5721 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-09 16:14:24 +00:00
Wanne bd4f8c670e - Added an ini option (ALL_NAMED_NPCS_DECIDE_ACTION) which enables proper realtime decision making for any named NPC (i.e. NPCs tied to a profile). As a result such NPCs are not required to be in CIV_TEAM anymore. (by Realist)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1574 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-08 22:05:52 +00:00
Wanne c3ac6a5d1f - Added an ini option (ALL_NAMED_NPCS_DECIDE_ACTION) which enables proper realtime decision making for any named NPC (i.e. NPCs tied to a profile). As a result such NPCs are not required to be in CIV_TEAM anymore. (by Realist)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-08 22:05:20 +00:00
Flugente 843c2ba9f2 - Diving bottle is now worn in the combat pack position instead of vest position
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1573 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-08 18:55:44 +00:00
Flugente 87e0d82cdd - Diving bottle is now worn in the combat pack position instead of vest position
- Fix: the first food item created via item transformation was spawned rotten if the base item was no food item

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-08 18:54:30 +00:00
Flugente 7e6ec3659e New Feature: scuba gear allows to dive, thereby staying invisible to the enemy as long as you are in deep water. If you are spotted however, the enemy remembers that, and can still see you in deep water.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-08 00:34:52 +00:00
Flugente c32aa8947c New Feature: scuba gear allows to dive, thereby staying invisible to the enemy as long as you are in deep water. If you where spotted however, the enemy remembers that, and can see still you in deep water
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1572 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-08 00:33:27 +00:00
Flugente 0ecc6f224c - taking prisoners is disabled in the palace and the royal bunker
- improved surrender strength formula

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-07 16:17:33 +00:00
Flugente 91bdc131be when talking to an enemy, the player can offer them the option to surrender, thus capturing all enemies and ending the battle
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5714 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-06 00:47:59 +00:00
Flugente c68b5e482f - added more messages
- remaining interrogation points are taken over to the next hour

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5713 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-05 01:29:08 +00:00
Flugente 3bb14a870b - Prisoner system can now be correctly turned off.
- improved handcuffing checks

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-04 00:57:19 +00:00
Flugente 0316223f32 - allowed to check militia in Tixa
- added pepper spray to a few mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1570 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-03 23:29:11 +00:00
Flugente de94eb605b - added stun gun and pepper spray (only placeholder images for now).
- Fix: Kobra had wrong nasAttachmentClass

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1569 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-03 23:08:48 +00:00
Flugente 6ff06a530e - New Item: Stun gun (#1626) needs batteries and does no damage but knocks out an enemy. Uses new item flag TASER (/1048576)
- New Item: Pepper Spray (#1627) blinds anyone for a few turns if hit in the face, ammo is (#1628), uses ammoflag AMMO_BLIND (2)
- Fix: possible division by zero in ammotype description

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-03 23:07:00 +00:00
Wanne 15b096d41c - Added a few // TODO.Translate comments
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-03 19:43:57 +00:00
Flugente cb9c217bb1 - New Feature: The rosine system now allows to capture enemy soldeirs via using handcuffs on them. They can e transferred to a prison the player controls, and be interrogated there.
- GameDir revision 1568 is required for this feature.
- Savegame compatibility is maintained.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-03 00:50:48 +00:00
Flugente 288b0ed284 New Feature: The prisoner system allows to capture enemy soldiers by using handcuffs on them. They can be transferred to a prison the player controls, and be interrogated there.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1568 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-12-03 00:30:42 +00:00
Wanne cb5367f580 - Added new folder structure for the UB language spec. GameDir files
o UB mod and UB addons can now be started from the INI Editor instead of a separate mod manager tool

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5708 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-01 20:36:48 +00:00
Wanne 34b1b0154a - Deleted old folder structure
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-01 18:42:34 +00:00
Wanne e458b8ed6d - Deleted old folder structure
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5706 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-01 18:40:06 +00:00
Wanne e5361967ec - Deleted old folder structure
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-12-01 18:37:25 +00:00
Wanne 69ae3e97dc - Updated Russian texts for Russian.EncyclopediaQuests.xml (by LLIkaOIO)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5704 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-30 19:24:26 +00:00
Wanne fb54e2ee3c - Updated translation text in Encyclopedia/EncyclopediaQuests.xml (by LLIkaOIO)
o Info: Currently Encyclopedia is disabled in the source, cause of memory leaks

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1567 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-30 19:23:57 +00:00
Wanne 33f3fefc3b - Bugfix: Fixed assertion error when dismissing a vehicle (by Realist)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-29 14:44:16 +00:00
Sandro d60507a020 - Changed jumping hotkey from >Shift+Mouse Button< to >Ctrl+Shift+Mouse Button<
- "Flexing" idle animation made rare, unless the merc has Show Off personality.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5702 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-26 19:01:25 +00:00
Wanne d3d47da188 - Fixed previous attachment fix (by Realist)
o If you removed grenade launcher incl. grenade from attachments, a "ghost" items slot was crated
o If this fix causes any weird behaviors with attachments, it can be reverted...

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5699 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-25 21:47:42 +00:00
Wanne cf36441564 - Fixed blitting of town grid markers for adjacent towns (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-23 19:45:13 +00:00
Wanne 12f32b14e3 - Updated 1.13 Hotkeys (by goc_man )
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1565 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-23 19:42:51 +00:00
Wanne e0d028bed2 - Fixed CTD that could happen when removing attachments (by Realist)
o The CTD always happened in Old Attachment System (OAS)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5697 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-22 23:16:03 +00:00
inshy 666a4c2335 Update French.FacilityTypes.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-21 06:59:45 +00:00
Flugente bb9baf1af6 improved strategic offensives
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5694 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-20 22:48:38 +00:00
Flugente 023873b787 - with option ONLY_REPAIR_GUNS_AND_ARMOUR to TRUE, only guns and armour can be repaired when using the advanced repair system
- Fix: crash when repairing without a repair kit

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5693 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-19 00:39:23 +00:00
Flugente fb55ad7ff4 with option ONLY_REPAIR_GUNS_AND_ARMOUR to TRUE, only guns and armour can be repaired when using the advanced repair system
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1564 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-19 00:37:32 +00:00
Flugente 0112384652 Fix: under the advanced repair system, items other than guns and armour weren't repairable
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5692 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-17 14:20:44 +00:00
Wanne fe0e197270 Fixes (by Buggler)
- Fixed incorrect/missing Map Entry Points
- Corrected previous mistake in MovementCosts.xml sector F5 access to east & west 

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1563 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-17 14:08:47 +00:00
Flugente 3a6e4260a5 Fix: settings had wrong location
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5689 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-16 21:34:02 +00:00
Flugente 23e93663fd - New feature: massive counterattacks in all major cities
- Fix: Check for water drums was wrong

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5688 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-16 21:16:31 +00:00
Flugente e9e4eeb228 New feature: Counterattacks in all major cities
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1562 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-16 21:13:12 +00:00
MaddMugsy f0464d49f9 -Added Random Item Class to Lookup/ItemClass.xml
-Added Lookup/AmmoFlag.xml
-Updated description of MAP_ITEM_CHANCE_OVERRIDE in Ja2_Options.INI

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1561 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-16 09:02:24 +00:00
Flugente f6ae18533f - Optimized a few code bits
- Enemy ranks has now size 20 instead of 500
- Fix: losing your disguise makes you lose your disguise again

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5687 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-15 00:03:39 +00:00
Flugente b5b4aaffcd Ini option MAP_ITEM_CHANCE_OVERRIDE somehow got lost.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1560 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-14 01:26:00 +00:00
Flugente 51342b0669 - Fix: fully repairing a gun did not always clean it
- Fix: need to sleep modifiers from food were applied wrong
- Fix: under certain circumstances, player mercs won an AI interrupt, leading a deadlock or - potentially - AI-controlled player mercs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5686 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-14 01:23:13 +00:00
Flugente 1a7e900df5 - Fix: security check for underflows when adding reinforcements
- Fix: added defined heights for kid's heads and torsos to correctly apply headshots
- Fix: While filling canteens, poisoned water from sectors is only consumed if no water drum is found

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5684 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-12 20:10:28 +00:00
MaddMugsy 6b4ee264d7 New Zombie laugh sound
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1559 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-11 07:04:32 +00:00
Flugente 3d745c57f4 options for AI window-jumping and jumping through closed windows
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1558 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-11 05:40:34 +00:00
Flugente 004728d2e4 - AI controlled soldiers can now jump through windows
- new ini option allows to jump through closed windows, smashing them while doing so

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5682 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-11 05:31:41 +00:00
MaddMugsy e98c1ce83c -Added check in CONSIDERED_NEUTRAL macro for SOLDIER_COVERT_CIV and SOLDIER_COVERT_SOLDIER flags. This should prevent enemies from targeting a disguised merc with sniper and spread fire.
-Added screen messages when disguise changes to indicate civilian or soldier disguise
-Enabled mercs disguised as soldiers to carry >2 guns, if the additional guns are covert or hidden


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5679 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-09 08:10:23 +00:00
MaddMugsy 09af018716 Xml Editor Version .100
-Added AmmoFlags lookup table and reference in AmmoTypes.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1557 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-09 08:02:24 +00:00
Wanne f0e542509b Movement Costs fix (by Buggler)
- Fix for Alma Northeast Border TravelRating



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1555 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-08 08:36:57 +00:00
Flugente 5844c7265c if disguised mercs with the covert trait retreat from battle, it is assumed they were on a reconnaissance mission, thus they do not suffer a morale penalty for retreating
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5678 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-06 23:28:13 +00:00