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
2512 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente f421eb4529 Fix: If the Hicks spot a spy at night, they don't enter combat as often. 
The Hicks will still enter combat, as this is hardcoded - the fix merely causes them to do this only once instead of every turn.. Their behaviour of becoming hostile at night is hardcoded, inconsistent with other code behaviour, but should stay in. This poses no threat to a properly disguised spy and is merely a small annoyance.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7785 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-16 20:29:27 +00:00
silversurfer 2afa02c913 Requires GameDir >= 2227 because of new icons! 
EDB now displays available volume and pocket volume for MOLLE items.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7784 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-16 09:56:29 +00:00
silversurfer 76689ab99d Enhancement: It is now possible to display attachments and contents of LBE at the same time when game option "Show LBE Content" is active. 
http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=340063&#msg_340063

Fixes for MOLLE display and handling:
- MOLLE didn't display attached pockets and their contents when the item was in sector inventory
- MOLLE pockets could be detached although there were still items inside the pocket. This led to items in invalid pockets (MOLLE on soldier) or items vanishing completely (MOLLE in sector inventory). Now it is not possible anymore to detach filled MOLLE pockets. You will have to empty them first.
- MOLLE in a stack displayed the wrong contents as long as their index was not 0.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7783 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-15 12:50:30 +00:00
Flugente 877f205b92 Fix: When defusing a gun trap, the attached gun vanished 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7782 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-13 22:55:19 +00:00
Flugente b92524da77 Deleted unused code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7781 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-13 18:31:13 +00:00
silversurfer 181f6eba63 Fix (by Sevenfm): 
- calculation error in sight adjustment for stealth at light level
- calculation error in sight adjustment for movement at light level

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7780 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-11 19:38:47 +00:00
Flugente b3a362978c Fix: On some maps, fragments from explosives travel at the wrong height, thus dealing no damage. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7778 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-10 22:14:28 +00:00
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 6e824810ab - Fix: profile id was used instead of profile's face id 
- Fix: squad names were not used correctly

- Change: spotter minimum preparation time lowered to 2 turns (was 3)
- Change: spotter ct bonus has been doubled
- Cahnge: spotter cth bonus now works for rifles and sniper rifles


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7774 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-09 18:19:34 +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 62f0461f96 - disease infection chances (percentage) is now read as float, valid numbers between 0.01 an 100.0 
- lowered infection chances for swamp/tropical sectors and contact with humans/corpses
- infections on gunshot wounds only happen on severe wounds (damage taken > 20)
- lifeloss by bloodloss no longer leads to traumatic infections

Requires GameDir >= r2219 due to changed xml entries.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7770 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-06 21:42:32 +00:00
Flugente 66d4bc8a33 Added disease resistance and lowered food and drink consumption to survival trait. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7768 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-05 22:43:15 +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
silversurfer 8ae8c147f9 Fix (by Sevenfm): NCTH aperture was offset by 1 to the bottom right 
EDB enhancement: rechamber display now includes effects from traits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7765 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-02 17:15:29 +00:00
silversurfer 215550e8fc Fix: Machinegunner trait did only count once for LMG attack AP reduction 
More updates to EDB:
- fixed gun range calculation
- trait modified values now shown for attack AP and reload AP

Cleaned up attack AP trait modifiers and moved them to a new function.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7764 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-01 16:25:58 +00:00
Flugente 0875a76687 If the player has no prison and thus has to let his prisoners go, some might volunteer. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7763 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-03-01 00:42:20 +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
silversurfer 4b70b1e400 Fix: mouse position was not restored after a message box was closed 
Modified the Ranger trait to make it more useful after loosing all survival bonuses:
- aim click bonus for shotguns is now again 1 (hunter) or 2 (ranger)
- new aim click bonus for rifles that is half the shotgun bonus. With the default value of "1" this means 0 for hunter and 1 for ranger. This does NOT stack with the sniper bonus! It's one or the other depending on which is higher.
- new speed bonus to reloading single shells into shotguns
- new range bonus for shotguns of 10% (hunter) or 20% (ranger)

EDB now displays the trait modified values for:
- Gun Range
- Draw Cost


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7761 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-28 17:08:37 +00:00
Flugente f6f19d01cd Fix: captured enemy officers still provided boni 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7760 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-28 15:32:51 +00:00
Flugente b7612ab64e Fix: Auto weapons (expert) could not be selected during IMP creation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7759 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-28 14:13:31 +00:00
Wanne deba6d7ac0 Merged from revision: 7757 
Multiplayer Bugfix: Reverted the "endless interrupt bugfix" for the pure client, because it was not working correctly, and the server could not press ALT + E to give the turn back to the client, if stuck.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7758 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-02-28 12:54:15 +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
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
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 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
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
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 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
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