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,512 Commits 9 Branches 6 Tags
f421eb452950bdf51a1cfd7decd202f2ee5ee38e
Commit Graph
614 Commits
Author SHA1 Message Date
Flugente 8751402f5c Fix: militia cannot be ordered to move in strategic 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7777 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-10 20:13:59 +00:00
Flugente e0d15266ea Fix: mercs on repair assignment continued repairing after running out of repair points, causing extra repairs on items with repair ease > 0 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7776 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-09 21:01:24 +00:00
Flugente 68869f77b2 If ALLOW_BANDAGING_DURING_TRAVEL is set to TRUE, travelling mercs will bandage themselves if they bleed. This behaviour is off by default. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7772 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-07 15:53:25 +00:00
Flugente 5b5f24401c If not enough militia can be trained due to a lack of volunteers, excess trainign goes into militia promotions instead. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7767 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-05 22:04:53 +00:00
silversurfer f3553cf888 Fix: Mercs that have the <druguse> tag in their background spawned a bottle of alcohol anywhere in there inventory at full hour when function HourlyLarryUpdate() was run. The bottle would spawn in invalid slots as well for example the backpack slot. Now the game will only spawn a 25% condition bottle which is consumed right away which solves the inventory problem. This is more or less a hackfix. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7766 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-04 10:54:28 +00:00
Flugente 9d8e5a4c3a - New prisoner class: Civilians can be interrogated. Does not work for profile-based charcters. 
- Capturing civilians is possible if their faction has <fCanBeCaptured> set to 1.

Requires GameDir >= r2215.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7762 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-28 22:35:30 +00:00
Flugente 8bfb14e90a New Trait: SURVIVAL (new minor trait) gets the non-weapon parts of the ranger trait. 
Requires GameDir >= r2213.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7756 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-27 23:23:03 +00:00
Flugente 3f615cc68b Depending on whch direction the helicopter came from, a different aniamtion will play when performing a heli insertion. 
Requires GameDir >= r2212.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7755 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-26 20:16:13 +00:00
silversurfer 34803db3cd fix: - alternative heli fuel system read the wrong parameters from Helicopter_Settings.INI 
- when alternative heli fuel system was turned off the heli wouldn't refuel at all despite being at a refuel site

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7754 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-26 17:14:52 +00:00
Flugente c7c085b04f New Feature: Militia Volunteer Pool limits the number of militia we can train. Turned off by default. 
GameDir >= r2210 is recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7746 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-22 18:52:41 +00:00
Flugente 045d171bb6 - Fix: counterattack groups did not spawn from sectors that had no enemy troops, even if there were other forces present, thereby unnecessarily prolonging their movement time 
- Fix: higher difficulty level indizes made tank apearances in counterattacks more likely

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7744 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-21 14:55:28 +00:00
Flugente d4432d95c3 - If ALLOW_MILITIA_STRATEGIC_COMMAND is TRUE and militia can be commanded, oen can order them to retreat from autoresolve 
- Final sector in a militia group's path is shown while plotting in the strategic map.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7743 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-20 23:27:22 +00:00
Flugente bfe520debf When clicking on a sector to start militia pathing, and the sector does not have static militia but militia groups, select the last militia group instead of creating a new empty one. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7742 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-18 21:04:47 +00:00
silversurfer 38cb0f8ffc fix: on map screen number of enemy troops in a sector was displayed incorrectly if there was one player unit besides the sector and another unit was diagonal to it and ALLOW_DETECTION_IN_DIAGONAL_SECTORS was FALSE. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7740 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-15 13:36:58 +00:00
silversurfer 7d932ffe75 fix: The first three boxing fights could never be completed if no boxers were available (direct result of a change in r7263) because Darren's quote requires at least one boxer. 
If the player killed all boxers during these fights the check would fail. A new externalized parameter "KINGPIN_RING_TILE" for Kingpins location at the ring was implemented. This is used to check if Kingpin is watching these first three fights. If so it will override the BoxersAvailable check.

fix: AI could be gathering around an empty player vehicle. Disturbance check should from now on ignore that.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7737 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-14 17:27:03 +00:00
Flugente f5ba30c57f Militia groups can coordinate their arrival with other player and militia groups. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7733 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-12 21:45:55 +00:00
Flugente 24dae202f8 If airspace isn't controlled by neither side (due to damage to SAM site, lack of qualiified is currently not checked), airspace is coloured blue. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7732 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-12 20:57:27 +00:00
Flugente 39b45c89d8 No nighttime movement penalty for militia groups if they move inside a town. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7731 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-12 19:23:50 +00:00
Flugente 5826dd63a6 Female admins and troops can appear in autoresolve. 
Requires GameDir >= r2206.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7730 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-12 18:53:23 +00:00
Flugente 6336f2bbb7 Altered tank position in autoresolve. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7729 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-11 22:38:17 +00:00
Flugente 07e09f17fe Enemy tanks can now fight in autoresolve. If mercs/militia is attacking a tank and has heavy weapons, they will use these against the tank. 
Requires GameDir >= r2205.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7728 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-11 21:44:15 +00:00
Flugente c9bcf90966 Expanded feature: Militia Strategic Movement is turned on with ALLOW_MILITIA_STRATEGIC_COMMAND set to TRUE and allows plotting paths for the militia just like for merc squads. 
GameDir >= r2204 is recommended.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7727 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-08 22:11:16 +00:00
silversurfer e4ef716d91 Bugfix: When using a vehicle to move to an enemy sector mercs will force exit the vehicle. In this case the team panel sort order was random depending on which merc was last selected. This problem occurred because the sort function for the squad was not called for this scenario. It is now called whenever a merc is added to a squad. 
Because of this the call for the sort function was removed from function SetAssignmentForList(). We do not need to call it twice.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7724 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-01 22:14:33 +00:00
Flugente 4ba64556bf Fix: no morale/loyalty penalty if a killed civilian was a member of a group 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7721 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-22 21:13:30 +00:00
Flugente bb95be057b Replaced reinforcement functions to allow non-enemy movement groups to reinforce battles 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7712 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-06 21:11:36 +00:00
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