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
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
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
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
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
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
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
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
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
silversurfer
3bdf06c62d
several fixes (by Ocular)
...
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336357/[PATCH]_Minor_bug_fixes#Post336357
- wrong calculation for gear AP bonus
- wrong display for max health damage
- wrong use of TRAIN_MILITIA_MODIFIER modifier
- wrong calculation for breath regeneration with unused AP
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7536 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-10-01 10:51:16 +00:00
silversurfer
cd786cf213
Fix: Key data wasn't set correctly when the swap merc faces feature was used so the game couldn't load the savegame anymore.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-29 00:24:19 +00:00
Flugente
fc861e0ba1
- Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER)
...
- Fix: during dialogue, mercs did not agree often enough
- Fix: if no mercs were in any squad, Melody website did not show relations
- Dialogue has been reordered, this should make adding new ones slightly easier
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-27 20:19:49 +00:00
Flugente
58d9cf0925
Fix: In Release built with VS2008 the game crashes when parsing xmls.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-24 23:29:07 +00:00
Flugente
7558c84bc2
New Feature: IMP gear selection allows choosing what items an IMP starts with instead of relying upon randomness.
...
Requires GameDir >= r2152, as required images were added.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-23 22:46:10 +00:00
Wanne
6de39a6ff2
Merged from revision: 7525
...
- Fixed bug with game selecting helicopter loading screen when reloading game (by anv)
- Fixed autoplace stacks logic from sector inventory on r7380 commit (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-17 18:46:09 +00:00
Flugente
12cf5396e9
Merged revision(s) 7523 from branches/ja2_source_official_2014:
...
Fix: enemy radio operators called in artillery even though it could not fire
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7524 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-16 23:09:56 +00:00
Flugente
484f8572ca
Merged revision(s) 7521 from branches/ja2_source_official_2014:
...
Fix: Kingpin's assassins do not attack
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-15 21:37:58 +00:00
Flugente
48819f860a
Fix: Equipping militia with guns and ammo could lead to creation of ammo items with 0 bullets.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-14 21:23:16 +00:00
Flugente
5a0d93da94
Feature improvement:
...
- If MILITIA_USE_SECTOR_EQUIPMENT is TRUE and you assign a merc to the 'MOVE ITEM' assignment, you can select wether gear that the militia can use should be ignored.
- To prevent confusion, 'MOVE ITEM' has been renamed 'GETITEM'.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7517 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-14 14:02:16 +00:00
Flugente
f46083515d
Externalised amount of debt to MERC at which Speck complains.
...
Note: this does NOT affect wether MERC goes bankrupt, as this is independent of the amount of debt.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-13 15:08:30 +00:00
Flugente
a642ab500d
Covert Ops trait improvements:
...
- performing suspicious activities renders a spy easily identifiable for a short time (realtime) or until he ha spend enough AP (turnbased). This should make exploiting disguises harder.
- if a spy is closer than COVERT_ELITES_UNCOVER_RADIUS to an elite or officer, they can uncover the spy, depending on uniform worn an experience levels.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-13 13:12:46 +00:00
Wanne
260f09356c
Merged from revision: 7512
...
- Translated skills menu entries for French version (by hrvg)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7513 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-12 16:21:36 +00:00
Flugente
029da88b51
Added missing translations.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7510 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-11 22:39:54 +00:00
Flugente
81644fef04
If walking with an aimed gun, do not return to standing animation but to aiming animation.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7509 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-11 22:23:10 +00:00
Flugente
e3a94de7a3
Merged revision(s) 7507 from branches/ja2_source_official_2014:
...
Fix: under certain circumstances, picking up LBE that could be worn, while slots this LBE would use were already in use, corrupted objects.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7508 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-11 20:14:43 +00:00
Flugente
68dbf0da05
Merged revision(s) 7505 from branches/ja2_source_official_2014:
...
Increased maximum number of random items to 2000 (from 1000). These extra random items should NOT be placed in maps. They are intended to be used in other random items, in case a modder creates random items from other random items.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7506 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-10 20:03:11 +00:00
silversurfer
a2be5b06c2
added new option to CTHConstants.ini:
...
IRON_SIGHTS_MAX_APERTURE_MODIFIER = 3.0
This modifies how fast the aperture grows for iron sights when IRON_SIGHTS_MAX_APERTURE_USE_GRADIENT = TRUE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7504 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-10 12:16:45 +00:00
Wanne
84089c3c0c
Merged from revision: 7500
...
- Fixed wrong camo type worn off message (by Buggler)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7501 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-08 19:32:17 +00:00
Flugente
760a1b16f1
Feature improvement:
...
- via StructureConstruct.xml and StructureDeconstruct.xml, one can now define which structures can be removed and created via items and the fortifications feature.
For more information, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335557#Post335557
does not break savegame compatibility. Requires GameDir >= r2140.
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7491 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-07 00:11:16 +00:00
Flugente
3f4973b54c
Fix: disease magnitude should be 0 if feature is off
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7487 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-04 20:00:35 +00:00
Flugente
5ad522e4a7
- Fix: disease notification should not be visible to the player
...
- Fix: disease infection happened even though disease feaure was off
- Disease Improvement: infection chance by corpse is now affected by age of corpse
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-04 19:55:56 +00:00
Wanne
d3100e3c4e
Merged from revision: 7484
...
Fixes (by Buggler)
- Commented code due to weird results when swapping filled LBE items that has pockets of the same size
- Fixed militia remains in loaded sector on using Unassign All button and then not assigning any militia to the loaded sector
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7485 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-03 16:29:19 +00:00
Flugente
f07dbef356
Feature improvement (PMC):
...
- when PMC militias arrive, loyalty in player towns can be lowered
- PMC militia arrival time is slightly randomized around the ETA
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7483 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-02 22:12:08 +00:00
Flugente
650deb67a5
Fix: light sources did not decay in turnbased mode
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7482 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-02 20:11:16 +00:00
Wanne
3f4f8004ec
Merged from revision: 7478
...
- Updated _RussianText.cpp (by Valiant)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7481 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-02 19:49:28 +00:00
Flugente
2cb2e89a33
Fix: error when building UB exe
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-01 21:53:15 +00:00
Flugente
15083befa2
Feature improvement: Battle reports in campaign history get a proper Operation name
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7474 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-01 20:20:13 +00:00
Wanne
64ed0c22b7
Merged from revision: 7472
...
- Updated _Ja25RussianText.cpp (by Sevenfm)
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7473 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-09-01 19:38:05 +00:00
Flugente
ee27f27895
removed obsolete code
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7464 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-31 20:42:20 +00:00
Flugente
fce1904d12
Fix: When starting a game, the entire map is grey.
...
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7463 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-31 16:14:04 +00:00
Wanne
684e1d6148
Externalized Difficulty Settings
...
- Removed #ifdef DIFFICULTY_SETTING. Now the new difficulty settings code is always active (by Jazz)
- Removed unused INI reading settings
These parameters were moved to the file DifficultySettings.xml.
** Ja2_Options.INI **
ENEMY_AP_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_KILLS_PER_PROGRESS_POINT_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
INITIAL_GARRISON_PERCENTAGES_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
MIN_ENEMY_GROUP_SIZE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
UNLIMITED_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEENS_INITIAL_POOL_OF_TROOPS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_STARTING_ALERT_LEVEL_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
ENEMY_ALERT_DECAY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
NUM_AWARE_BATTLES_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
BASE_DELAY_IN_MINUTES_BETWEEN_EVALUATIONS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
EVALUATION_DELAY_VARIANCE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_HOURS_AFTER_SECTOR_LIBERATION_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
GRACE_PERIOD_IN_DAYS_AFTER_PATROL_DESTROYED_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AGGRESSIVE_QUEEN_AI_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
PERCENT_EXTRA_ELITES_EXPERIENCED , _EXPERT, _INSANE
MAX_MERC_DEATHS_EASY , _EXPERIENCED, _EXPERT, _INSANE
** Creatures_Settings.INI **
CREATURE_SPREAD_TIME_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BASE_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_REPRODUCTION_BONUS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_INIT_BONUS_SPREAD_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_POPULATION_MODIFIER_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
CREATURE_TOWN_AGGRESSIVENESS_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
QUEEN_POOL_INCREMENT_PER_DIFFICULTY_LEVEL
** CTHConstants.ini **
BASE_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
AIM_DIFFICULTY_NOVICE , _EXPERIENCED, _EXPERT, _INSANE
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7461 3b4a5df2-a311-0410-b5c6-a8a6f20db521
2014-08-31 13:39:23 +00:00