7604 Commits
Author SHA1 Message Date
Flugente bd9b600be8 Fix: Sounds.xml changes were missing.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2175 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-26 11:26:52 +00:00
Flugente eb15473d37 Deconstructing the walls of a house will eventually cause it's roof to collapse.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-26 00:20:29 +00:00
Flugente 2e9c6965b0 - New Feature: roof tiles can be destroyed. Requires GameDir >= r2174.
- Fix: Owner ID of player-requested artillery shells was wrong.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7614 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-25 23:46:45 +00:00
Flugente 8d11eda385 New Feature: roof tiles can be destroyed.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2174 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-25 23:45:09 +00:00
Flugente 9eb023abf2 - Fix: crash if fragments from a non-player-planted mine destroyed a lock.
- Take direction of explosions into account if possible.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7613 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-25 21:21:14 +00:00
silversurfer 5b7f243ed9 Change to # of aim clicks bonus for Ranger trait:
The hunter now only gets POSSIBLE_AIM_CLICK_ADDED_SHOTGUNS / 2 (rounded down) as bonus which is a compromise that was necessary after the revamp of shotguns by Strohmann in GameDir 2173.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7612 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-25 14:03:07 +00:00
silversurfer 904691298c Updates to aim levels of shotguns and AIM_DRAW_COST (by Strohmann)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2173 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-25 14:01:55 +00:00
Wanne af1f5c5e17 Merged from revision: 7605
Multiplayer: Added additional info text for using the chat by pressing 'y' in the Multiplayer Start screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7606 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-24 06:59:07 +00:00
Wanne 852f5bd5bb Merged from revision: 7603
- Fixed _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7604 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-21 18:46:12 +00:00
Flugente 178142ad3d Merged revision(s) 7601 from branches/ja2_source_official_2014:
Fix: savegames in slots > 119 get a wrong number.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7602 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-20 18:08:41 +00:00
Flugente 499ff2db06 If the itemlist is huge and one uses New Inventory System, New Attachment System and a lot of MOLLE items, there is a noticable slowdown if inventory is open in tactical. I cleaned up code to ease that somewhat, but the problem will likely persist.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7600 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-19 21:53:05 +00:00
silversurfer 5dbcf2a1e8 Fix: Militia tank fix could lead to graphical glitch with following crash.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-19 17:57:18 +00:00
silversurfer 74845ec5b9 Fix: Having lower (and invalid) team size values in Ja2_Options.ini than in the savegame could lead to crashes. I put back the check and warning message for this case. Having higher numbers in the ini is ok.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7590 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-18 19:54:50 +00:00
silversurfer f05cdc3286 Fix: Improved the fix for militia manning tanks in revision 7557. Tank slots are not made invalid anymore. Instead the placement body type will be converted to a normal militia body and moved to a free slot next to the tank. There is a new function "FindNearestPassableSpot" for finding an accessible tile next to a starting grid.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-18 15:26:03 +00:00
Wanne e000abcc57 Merged from revision: 7586
Multiplayer Bugfix:
- Improved (fixed) interrupt endless clock when enemy interrupts (CO-OP game) (tested by Woquit)
- Override turn (ALT + E): Now it is possible again for the server to give the turn back to itself
- Updated MP Version Number to 3.1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-18 14:08:28 +00:00
silversurfer 03e6f0bb0b Fixes (by Ocular): Grenade Launchers didn't cost any Ready AP.
Underbarrel launchers shouldn't be able to change Ready AP of primary weapon because of AP micromanagement exploits.
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336777/[PATCH]_Fix_ready_AP_cost_and_#Post336777


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7584 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-18 11:20:56 +00:00
Wanne 53a1c28632 Merged from revision: 7581
- Hotkey corrections in *.LoadScreenHints.xml (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7582 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-17 17:33:15 +00:00
Wanne 56cc070c62 Merged from revision: 2169
Externalized (by Buggler):
- Kingpin's faction sector and roaming gridno around tony shop if they become hostile
- Queen's alternate grid no if basement sector is cleared
- Hotkey corrections in LoadScreenHints.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2170 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-17 16:26:36 +00:00
Wanne f9cad94471 Merged from revision: 7579
Externalized (by Buggler):
- Kingpin's faction sector and roaming gridno around tony shop if they become hostile
- Queen's alternate grid no if basement sector is cleared
- Doreen's kids sector that is being freed
- Single sector towns does not give global loyalty bonus instead of previously hardcoded Tixa and Orta sector
- Enemy investigation town sectors if current loaded sector is player-controlled
- Associated town sectors to mine when mine runs out

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7580 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-17 16:25:58 +00:00
Flugente a87e977769 Unused IMP gear slots are no longer displayed in red.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7577 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-15 21:09:27 +00:00
Flugente 68e3909d05 removed wirecutter concertina deconstruction, as it can be confused with the regular wirecutting (both work on the same tileset)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2168 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-15 21:08:24 +00:00
Flugente c91702819b Merged revision(s) 7575 from branches/ja2_source_official_2014:
Fix: when a strategic group attempts to move diagonally, it can decide to do an illegal move.

Note: The real error is that a diagonal move is ordered in the first place - this should not happen. This fix merely tries to stop subsequent illegal moves.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7576 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-15 20:49:10 +00:00
Wanne ee63f86aed Merged from revision: 7573
- Deleted wrong texts in _FrenchText.cpp (by hrvg)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7574 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-15 19:20:34 +00:00
Flugente 1102106b78 Fix: ID on artillery shells was not set correctly. This caused all damage of an artillery strike to be attributed to the first merc.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7570 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-14 22:15:44 +00:00
Flugente 61f6322ab5 - Fix: Mauser M-03 gets the SF-42 scope.
- Altered IMPItemChoices.xml: more reasonable weapon choices, items teasing food and other new features.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2167 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-14 21:11:50 +00:00
Flugente 396fe4d106 Fix: if sneaking undetected near an enemy, saving and reloading increased agility.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-14 20:05:49 +00:00
Wanne cb19fa0850 Merged from revision: 7567
- Updated French xml files (by hrvg)
- Added missing "Jeep" to *.Vehicles.xml (index = 199)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@7568 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-14 18:41:46 +00:00
Wanne 00999d673a Merged from revision: 7565
Multiplayer Bugfix: Fixed endless clock on enemy interrupt on the server, by reverting the non working interrupt fix which was introduced in revision 5623
- INFO: The endless clock on the client still occurs on certain enemy interrupts, but this can be fixed by pressing ALT + E on the server and giving the turn back to the client.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-14 18:22:18 +00:00
Flugente 20e3b6cf94 Fix: player could not order artillery from militia (by Ocular)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-13 20:23:51 +00:00
Flugente e6b6395f47 Fix: Under certain conditions, an overflow in healing can cause doctors to heal tremendous amounts. HealPatient() was redesigned along the way.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7563 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-13 20:18:35 +00:00
Wanne 982ad644a8 Merged from revision: 7561
- Fixed hardcoded sam site sectors for gubEnemyEncounterCode (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7562 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-13 19:25:40 +00:00
Wanne d6fc14b738 Merged from revision: 7559
- Fixed SectorNames.xml tags not properly read in non-ENG versions (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7560 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-13 19:23:44 +00:00
silversurfer 1a2c93ddbc Fix: Militia was able to man tanks (even destroyed ones). This is not intended. Also the player could take these tanks as personal vehicles. Not good...
Now militia shouldn't spawn as tank anymore.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7557 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-13 17:43:13 +00:00
silversurfer 75b628df57 Fix: Adding mercs to a vehicle when the player already has the maximum number of vehicles caused the game to crash on the next move order.
Trying to add more mercs to a vehicle than there was seats caused an error message with a 'null' name for the vehicle.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7554 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-12 13:06:31 +00:00
silversurfer 5f80ad78d7 Fix (by Ocular): Reusing the pInventoryPoolList vector lead to incorrect flags on items that were placed in slots that previously had an action item in them. This fix resets the flags for these slots to 0 when the list is updated.
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336486/[PATCH]_Fix_invalid_slots_in_m#Post336486


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7552 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-12 11:35:53 +00:00
Wanne 2da88b9e15 ExShell (New Version: 0.02(018.14282)) (by StaticZ)
- Fixed: FPS limit ignored after minimize\restore application 
- Fixed: SuperEagle filter crashed application. 
- Fixed: Related paths for $StartPEPath: don't work. 
- Change startup initialization for more safety 
- Change using instruction sets: MMX, SSE, SSE2, AVX 
- Added: EPX upscale filter 
- Added: info about selected filters and game mode in OSD 
- Added: saving screenshots by PrntScr hotkey (Ctrl+PrntScr to save original image) 
- Added: separating FPS limit for focused and unfocused application window 
- Added: sending customise keyboard keys scancode at lose and get focus. 
- Added: minor checks and validations

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2166 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-11 16:38:33 +00:00
silversurfer 64f85b6c9b Fix (by Ocular):
Removing attached grenade launchers makes their grenades vanish under NAS. This fix removes the grenades first and then the launcher.
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336539/[PATCH]_Fix_missing_UGL_grenad#Post336539


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7550 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-11 09:10:34 +00:00
Wanne 06367419c0 Merged from revision: 7548
Bugfix: Place inventory on same bLevel as merc when dropping items through map screen inventory (by Ocular)
- see: http://www.ja-galaxy-forum.com/ubbthreads.php/ubb/showflat/Number/336500/gonew/1/[PATCH]_Place_inventory_on_sam#UNREAD

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7549 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-09 11:34:54 +00:00
Wanne 6dc0ed1bee Merged from revision: 2163
- Added support for new resolution: 960x540 (see ja2.ini)
- Custom Resolution (25) can now set to any user specific resolution (X, Y) value, but must be at least 640x480 resolution
- Added new INI Editor (Version: 2.9) which supports the new 960x540 resolution

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2164 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-04 15:56:53 +00:00
Wanne 6c2273f4eb - Added support for new resolution: 960x540
- Custom Resolution (25) can now set to any user specific resolution (X, Y) value, but must be at least 640x480 resolution

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-04 15:55:21 +00:00
silversurfer 19cf8d6518 Fix: From testing volatility was left at 0 for land mines. Changed back to 2.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2162 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-04 07:56:59 +00:00
silversurfer 2d3fc62bb6 Changed fragmentation explosives to emit fragments like they should. All values are experimental.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2161 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 10:51:35 +00:00
Wanne 22ed620084 Essence XWnd Shell - Tool (Version: (2014.09.28) ver 0.01 rev 011 build 14271) (by StaticZ)
- This tool can upscale and use different graphic filters to display JA2 1.13 with better graphics
- For more infos see "Tools\ExShell\read_me.txt"
- Additional infos and screenshot results (for different filters) on the Bears Pit:
  http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336350/1
- INFO: Using upscaling and filters improves the graphics, but on the other side slows down the game!!

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2160 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 10:29:19 +00:00
silversurfer 9930b4d557 Fix: The game used an internal range multiplier for fragments giving them insane range. I changed that from 10 to 1. Fragment range defined in Explosives.xml already includes a x10 multiplier.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7542 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-03 10:04:19 +00:00
Wanne 19f1b82c84 Driveable Vehicles Tanks Update (by Ocular)
- New ja2_options.ini entry: TANK_MINIMUM_PROGRESS
- This defines the progress (0-100), when the enemy can use tanks for attacks and patrols
- For Data-1.13, the progress value is set to 30.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2159 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 09:51:35 +00:00
Wanne a2b40cd51b Driveable Vehicles Tanks Update (by Ocular)
- New ja2_options.ini entry: TANK_MINIMUM_PROGRESS
- This defines the progress (0-100), when the enemy can use tanks for attacks and patrols

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7541 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-03 09:47:15 +00:00
silversurfer 004cb3d482 Fix (by Ocular and Strohmann):
wrong aim levels and handling for Sphinx pistol
wrong Need for sleep values for Lance Fisher and Turtle

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2158 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-03 07:44:48 +00:00
silversurfer 3704d9b8e4 cleanup of old code after move of difficulty settings to new file DifficultySettings.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7540 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-02 19:03:20 +00:00
silversurfer 3574c42c65 cleanup of old data after move of difficulty settings to new DifficultySettings.xml
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2156 4f8fa57e-7814-0410-bad4-adc449f26b7c
2014-10-02 19:02:14 +00:00
silversurfer 384d0a36a4 Fix: Finishing different types of militia training in the same sector could lead to only one notification and also paying for only that one while both did continue.
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336348/Re:_BUGZILLA_report_all_bugs_h#Post336348


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7538 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-01 14:54:51 +00:00