7604 Commits
Author SHA1 Message Date
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
Wanne 378c0f1df2 Bugfix: Movement costs (by Buggler)
- Fixes include C1-D1 & I2-I3 as GroundBarrier; corrected Alma & its borders TravelRating
- Align traveling costs to be more inline w strategic & actual maps

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1554 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-06 18:26:56 +00:00
MaddMugsy 9462aec26d -Added missing entries to Lookup/ItemFlags.xml and Lookup/Attachments.xml
-Added 0/None record to Clothes.xml (for editor)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1552 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-06 07:50:30 +00:00
Flugente f970116840 Fix: disguising as a soldier did not always work because of string comparisons
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5671 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-06 00:55:33 +00:00
Flugente 8ace761e7f - new ini option ZOMBIE_ONLY_HEADSHOTS_PERMANENTLY_KILL: if a zombie is killed via headshot/melee combat, he can't rise again
- new ini option FOOD_MAX_POISONING: determines the maximum amount of food poisoning eating a singel food item can give
- fixed a bug that caused tooltips to display the wrong traits
- fixed a few zombie-related bugs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-05 22:38:52 +00:00
Flugente 622dd4ef69 - new ini option ZOMBIE_ONLY_HEADSHOTS_PERMANENTLY_KILL: if a zombie is killed via headshot/melee combat, he can't rise again
- new ini option FOOD_MAX_POISONING: determines the maximum amount of food poisoning eating a singel food item can give

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1551 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-05 22:32:22 +00:00
Wanne 4c232c38c7 Added features (by Buggler)
- 'Ctrl+Tab' for next tab in Enhanced Description Box at Strategic & Tactical Screen ('Tab' also possible in Strategic Screen as previously not in used)
- 'M' for Multiplayer in Main Menu Screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5668 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-05 09:12:14 +00:00
Wanne 29f8b5e7cd - Updated Data-1.13\TableData\*.Items.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@5667 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-05 09:10:23 +00:00
Flugente cc33522cdc The assassins now come in random clothes and are covert initially, making it harder for the player to detect them. Ini option: ASSASSINS_DISGUISED = TRUE/FALSE
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1550 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-11-05 02:05:11 +00:00
Flugente b9615ff597 Fix: Jim was missing in several assassin-related checks
The assassins now come in random clothes and are covert initially, making it harder for the player to detect them. Ini option: ASSASSINS_DISGUISED = TRUE/FALSE

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5666 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-05 02:03:10 +00:00
Wanne 3124310a74 Bugfixes (by Buggler)
- Close old description box to open the new one if nothing in hand while right-clicking on an item in sector stack
- Ctrl + Right-Click to call info description directly for e first item in stack
- Revert partially to have an empty mouse region to close item stack easily when stack is full (r5632)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5657 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-11-01 15:08:04 +00:00
Flugente ab8aec333b - new item flag NO_METAL_DETECTION (131072) makes mines and bombs undetectable via metal detector. Also works on action item bombs and mines. Sparing usage is advised.
- new item flag JUMP_GRENADE (262144) increases the explosion heigth of explosives, can be used to simulate bouncing grenades or jumping mines.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1549 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-10-29 23:10:39 +00:00
Flugente 04278c7ad9 - new item flag NO_METAL_DETECTION (131072) makes mines an bombs undetectable via metal detector. Also works on action item bombs and mines. Sparing usage is advised.
- new item flag JUMP_GRENADE (262144) increases the explosion heigth of explosives, can be used to simulate bouncing grenades or jumping mines.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5656 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-29 23:08:44 +00:00
Flugente 14561917ec Fix: bombs action items on newer map versions did not get the correct settings
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5651 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-28 19:23:15 +00:00
Flugente 43adda0e5b Fix: game should no longer complain about randomitems being invalid arms dealer items
Reminder: Do NOT put random items into any merchant xml or BR, weirdness can occur here!

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5648 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-27 20:20:18 +00:00
Flugente a3bddbe742 Fix: map-editor specific copies of tripwire and claymore no longer appear at BR
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1548 4f8fa57e-7814-0410-bad4-adc449f26b7c
2012-10-26 20:35:27 +00:00
Wanne b1596f0c63 - Removed the "USE_HIGHSPEED_GAMELOOP_TIMER" define. Now highspeed timer and new way of dequeuing events are always enabled when building an executable
o This makes the code more easy to maintain
o Highspeed timer seems to run fine (after months of tests)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5643 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-25 19:00:12 +00:00
Flugente 888c76e65c zombies no longer kick in melee
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5641 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2012-10-23 21:29:56 +00:00