1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,457 Commits 9 Branches 6 Tags
474df6ffb5907310029bf554602d050ce4803813
Commit Graph
589 Commits
Author SHA1 Message Date
Flugente 474df6ffb5 - removed UINT8 NumFreeMilitiaSlots() 
- militia groups can reinforce battles in neighbouring sectors

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7711 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 19:54:29 +00:00
Flugente 097c33815d Altered group movement draw function 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7710 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 19:42:28 +00:00
Flugente 34a8b22f54 Removed unused code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7709 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 17:09:09 +00:00
Flugente cc572651c0 Replaced 
UINT8 CountAllMilitiaInSector(INT16 sMapX, INT16 sMapY);
with
UINT8 NumNonPlayerTeamMembersInSector( INT16 sSectorX, INT16 sSectorY, UINT8 ubTeam );

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7708 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 01:22:07 +00:00
Flugente c8eda14e2b Work has begun to enable strategic movement for other teams than just player and enemy. 
- I've changed the GROUP struct - instead of BOOLEAN fPlayer we now have UINT8 usGroupTeam.
- To further simplify the code, I've replaced 
UINT8 NumEnemiesInSector( INT16 sSectorX, INT16 sSectorY ); 
with 
UINT8 NumNonPlayerTeamMembersInSector( INT16 sSectorX, INT16 sSectorY, UINT8 ubTeam );

In the next days, more strategic functions will be simplified, merged and replaced.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7707 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 00:50:25 +00:00
Wanne 0ef41fffd7 Merged from revision: 7668 
- Externalized hardcoded TownInfo text which shows the number of Total # of prisoners/capacity, to language text files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7669 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-01 20:57:11 +00:00
Flugente 3a015ed1e6 Fix: dynamic opinions: mercs will only complain about the killing of civilains if they aren't hostile at the moment of their death 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7652 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-12 21:08:08 +00:00
silversurfer d4b6b6f4a7 Fix: During Autoresolve a group that was in the sector could be assigned again as reinforcement which practically cloned the soldiers. Groups that are in the battle sector already now will not be considered as reinforcement anymore. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7636 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-02 13:41:18 +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
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 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
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 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 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
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 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
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
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 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
Flugente e00897b91b New Feature: a private military company allows hiring of advanced militia. For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/335279#Post335279 
Does not break savegame compatibility.

Requires GameDir revision >= r2130.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7457 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-30 17:34:25 +00:00
Wanne 344797f6af New Feature: Added up to 15 game difficulty settings (by Jazz) 
- Externalized the difficulty setings to "TableData\DifficultySettings.xml" file
- Some INI Settings (ja2_options.ini, CTHConstants.ini and Creature_Settings.ini) moved from INI file to this xml file
- see #define DIFFICULTY_SETTING

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7447 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 10:30:40 +00:00
Flugente 17fab7ba83 Fix: mercs move medical equipment into their hands on non-medical assignments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7442 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 01:25:02 +00:00
Flugente 3bc2ea294c Fix: the disease button was not always set back correctly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7441 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-28 01:16:59 +00:00
Wanne 27c9a9ce6b Merged from revision: 7401 
Fixes (by Buggler)
- Fixed enemies retreating to inaccessible sectors
- Fixed hardcoded interrogation sector values

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-20 04:39:30 +00:00
Flugente ce3369f72e Slightly improved loading times. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-17 18:55:00 +00:00
Wanne 9b8169cd58 Merged from revision: 7391 
- Show helicopter icon in team view mode and restored helicopter passengers indicator (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7392 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-12 17:03:45 +00:00
Flugente 36e9d15edc New feature: Diseaes affect your mercenaries. They can be contracted in varíous ways and have varying effects. 
For more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/334918#Post334918

Requires GameDir >= r2099.

Does not break savegame compatibility.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-10 13:45:11 +00:00
Wanne 09244c2369 Merged from revision: 7382 
- Fixed eliminated patrol groups not being replenished (by anv)
- Fixed en route patrol reinforcements not obeying grace period settings (by Buggler) 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7383 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-09 11:07:21 +00:00
Wanne b4af6cec69 Merged from revision: 7380 
Fixes (by Buggler)
- Fixed lost items when autoplace stacks from sector inventory to vehicle inventory
- Changed autoplace items priority to stacking first; previous order: specialized pockets > stacking > other pockets
- Improved autoplace stacks logic from sector inventory
- Fixed OIV vehicle inventory figure sti not loaded

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-08-09 11:06:08 +00:00
Wanne 05fdcb5d2e Merged from revision: 7363 
- Map Editor now properly handles all available items without empty placeholders in between (by anv)
- Added item compare popup help text (by Buggler)
- Enemy icons will not be shown as 10x icons in 640x480 due to visibility issues (the rest remains as it is) (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7364 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-26 13:07:32 +00:00
Wanne d7d1cce626 Merged from revision: 7350 
Fixes (by Buggler)
- Fixed mouse region for item stack popup in strategic screen for non-standard resolutions
- Disabled Ctrl+Click for dropping item to sector inventory in combat
- Disabled Sector Inventory Stack Popup in combat
- Removed unused Ja2Options.ini: MIN_RANGE_FOR_FULL_COWERING_TARGET_PENALTY and STAMINA_HIT (by Buggler & Sevenfm)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-21 18:07:47 +00:00
Wanne f086611d21 Merged from revision: 7344 
Fixes (by Buggler)
- Centered strategic screen in non-standard resolutions
- Fixed message log disappearing when clicking map border buttons
- Minor fix for increased MAX_BUILDINGS limit 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7345 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-19 13:48:27 +00:00
Wanne 696e9ccdff Merged from revision: 7335 
Updates (by Buggler)
- Mercs, militia & enemies are now shown with 10x icons on strategic screen
- Changed militia icon order display in strategic map; elite first 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7336 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-14 19:38:20 +00:00
Wanne 0a16af6fe2 Merged from revision: 7329 
- Fixed Movement box and Militia Popup box x-coordinates in non-standard resolutions (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7330 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-12 10:10:13 +00:00
Flugente 0efc3b7241 - When ordering a merc to interrogate, one can now select what type of prisoners should be interrogated primarily. Thus one no longer has to empty the prison just to get to the one remaining officer. 
- Generals are now a separate prisoner type. They cannot join militia, but yield an impressive ransom.
- various prisoner fixes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7327 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-10 21:19:26 +00:00
Flugente 3389f3fb24 Fix: overflow in EliminateAllEnemies(...) (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7322 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-08 23:12:26 +00:00
Flugente 2f1dcdaa47 Added icons for enemy tanks in strategic map. 
Requires GameDir >= r2062.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7314 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-07-07 21:59:47 +00:00
Flugente 3a9cb5ecc3 New Feature: dynamic dialogue is played when dynamic opinions are active. Mercs can comment on each others actions, and this can influence their opinions further. IMP character answers can even be chosen by the player. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7297 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-27 22:12:29 +00:00
Wanne 4f0ee82ccb Merged from revision: 7290 
- Fixed inaccessible or lost items for moving items from mercs to sector inventory when a different tactical map is loaded (by Buggler & anv)
- Revert fix on queen reinforcement pool being replenished on depletion when playing with limited enemy troops setting (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7291 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-25 17:53:15 +00:00
Wanne ff34f538d9 Merged from revision: 7287 
Fixes (by Buggler)
- Disabled calling reinforcements from patrol groups when queen wakes up as they will not be replenished (thanks anv)
- Fixed queen reinforcement pool being replenished on depletion when playing with limited enemy troops setting
- Alternative hotkey ~ (tilde) to toggle merc inventory in strategic screen like in tactical screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7288 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-23 17:46:10 +00:00