1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-29 13:52:17 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,604 Commits 9 Branches 6 Tags
master
Commit Graph
7604 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 5e7c6490a3 New Trait: SURVIVAL (new minor trait) gets the non-weapon parts of the ranger trait. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2213 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-02-27 23:06:41 +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
Flugente 541151a0bf Added new heli animations (insertion from different directions) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2212 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-02-26 20:13:19 +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 e52485d0ef Added interrogation boni to 'priest' backgrounds. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2211 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-02-23 21:06:59 +00:00
silversurfer b2d35f6333 Message boxes can now have the mouse over a default button. 
First places this is used are the tactical sector menu (CTRL + .) where "Refill Canteens" is the default and the trap disarm menu where "Disarm" is the default.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7753 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-23 19:33:15 +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 3dd5e71aa5 New Feature: Militia Volunteer Pool limits the number of militia we can train. Turned off by default. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2210 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-02-22 18:51:32 +00:00
silversurfer caf482614a Pre-placed bombs (action items with an explosive) can now be blown up by explosives. This allows clearing mine fields with grenades for example. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7745 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-21 16:33:44 +00:00
Flugente a1ce83d8cc Added missing property values 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2209 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-02-21 16:29:57 +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 1d1616707d fix: Mercs were always complaining that they can't hit a target with buckshot. Problem was that only one pellet was considered for the fake shot. Now all are calculated and the best result is returned. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7741 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-16 19:23:09 +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 33cb09366c enhancement: in NCTH the EDB now shows the effective mag factor for a gun in the final column. This should make it easier to decide who will profit most from a scope on the gun. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7739 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-15 09:26:09 +00:00
silversurfer 31cb148d53 fix: after boxing the characters would retain their boxing flags including the AI control of player characters. This caused player characters to do random stuff. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7738 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-14 18:33:03 +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
silversurfer c828b8ce9f new externalized parameter "KINGPIN_RING_TILE" for Kingpins location at the ring. This is used to check if Kingpin is watching the first three fights. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2207 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-02-14 17:19:19 +00:00
Flugente 89b9a69b9b Fix: Militia does not equip multi-shot launchers if there are less than 3 shots in the sector. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7735 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-13 20:47:54 +00:00
Flugente b3b3fe0580 If firing a one-shot rocket launcher creates a discarded RPG, drop it to the ground, as the object is useless anyway. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7734 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-13 20:25:04 +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
Flugente 28d28add01 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. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2204 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-02-08 22:10:07 +00:00
Wanne c94ac421ae Merged from revision: 7725 
- Fixed typos in English AIM Bios and source texts (thx to ATigersClaw)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7726 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-04 19:25:06 +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
silversurfer c1e0793c8f This GameDir revision requires at least exe 7722 or you may end up with no weapon at start! 
- new option for automatic IMP item distribution:
uiIndex 52 "Sidearm" in IMPItemChoices.xml is used to give the IMP a standard sidearm based on random selection. All items were removed from marksmanship based distribution. Special weaponry now comes from traits (e.g. SMGs for auto weapons, shotgun for ranger).

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2201 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-01-31 14:40:46 +00:00
silversurfer 46b34e55d1 - new option for automatic IMP item distribution: 
uiIndex 52 "Sidearm" in IMPItemChoices.xml is used to give the IMP a standard sidearm based on random selection. It is encouraged to remove marksmanship based gun choices and instead add special weaponry for traits.

- The following changes are supposed to remove useless items from vendors and other lists:
Function ItemIsLegal now filters out food items if the food system is off. The same applies to cleaning kits if the dirt system is off.


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7722 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-31 14:36:36 +00:00
silversurfer 19809481b6 added missing FOOD_SYSTEM parameter to 1.13 Ja2_sp.ini 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2200 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-01-23 15:21:47 +00:00
Flugente 29a132a2dd Added xml explanations 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2199 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2015-01-22 21:17:45 +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 4c46054977 If a person kills someone on the same side, they curse instead of laugh. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7720 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-18 02:50:53 +00:00
Flugente 33316bcac8 A gun only counts as mounted if it is raised. This does not alter shooting mechanics and removes unnecessary code changes. As a sideeffect, mercs will complain less often about other mercs using them as weapon racks. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7719 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-17 22:21:34 +00:00
Flugente 3f7bbdc423 Radio Operators can now use their skills while using Old Inventory. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7718 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-17 21:02:22 +00:00
Wanne fd1ecb2edf Merged from revision: 7716 
- Improved message prompt when launching game in fullscreen mode on unsupported screen resolutions instead of just those that's set to larger than primary desktop resolution (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7717 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-07 20:05:23 +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
Flugente 57f6e41d47 Merged revision(s) 7694 from branches/Flugente/BaseTable: 
IMP gear images can be shown without background if required


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7706 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:58:28 +00:00
Flugente 0ecfe1109c Merged revision(s) 7701 from branches/ja2_source_official_2014: 
Merged revision(s) 7692 from branches/Flugente/BaseTable:
Merged AssignMinorTraitHelpText(...) and  AssignSkillTraitHelpText(...) into AssignPersonnelSkillTraitHelpText(...)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7705 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:53:26 +00:00
Flugente 209ba22b49 Merged revision(s) 7700 from branches/ja2_source_official_2014: 
Merged revision(s) 7690 from branches/Flugente/BaseTable:
Improved required stats for IMP creation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7704 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:40:39 +00:00
Flugente 8cfdddddc4 Merged revision(s) 7699 from branches/ja2_source_official_2014: 
Merged revision(s) 7688 from branches/Flugente/BaseTable:
- moved hair & skin enums to header
- moved hair colour choosing function to header


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7703 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-01-05 00:39:35 +00:00