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,975 Commits 9 Branches 6 Tags
e55b480996d2b653c8cd811eaad7546224bb3056
Commit Graph
87 Commits
Author SHA1 Message Date
Flugente e55b480996 New feature: Getting and using intel allows for more spy-related roleplay. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23643&goto=352475&#msg_352475

Requires GameDir >= r2401.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-18 23:17:34 +00:00
TheBob 3c4da04532 Cleaned up attachment removal code 
Fixed rare issue with squads and movement groups not being defined at game start.
Fixed wrong type declarations in header files

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8407 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-06-12 17:09:25 +00:00
Flugente 258e9c24a0 New feature: SAM site cover can now overlap, and SAM sites can be hacked to lower their radius. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23211&goto=347188&#msg_347188 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8309 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-10-05 22:22:50 +00:00
silversurfer ab554b937c Fix: 
- price and militia resource points display in sector inventory was incorrect and didn't take Shift key into account
- display of militia resource below the map didn't work if MILITIA_VOLUNTEER_POOL was FALSE

Enhancements:
- militia resource points display below map now better organized
- militia resource points display below map now available when in sector inventory and pressing ALT key
- conversion of items to militia resource points now available with ALT + RMB, ALT + Shift + RMB and ALT + Shift + Y + RMB just like quick sell feature works


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8275 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-17 13:44:58 +00:00
Flugente 6acbd72c89 Slightly altered militia resource display 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8274 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-16 22:13:53 +00:00
Flugente 7a34e9a154 New feature: militia resources requires the player to convert items to resources to be able to train and promote militia 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8271 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-15 19:33:44 +00:00
Flugente 951da7812d New feature: mines require workers for maximum income, these can be trained like militia. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8267 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-04 22:31:37 +00:00
Flugente 503523a9fa New feature: localized weather adds more weather types, different weather can happen in different sectors at the same time. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23094&#msg_345949

Requires GameDir >= r2325

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8253 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-06-18 20:57:03 +00:00
Flugente 9f52c940a8 New feature: individual militia creates small militia profiles that track a militia's history and allow it to be recreated, thereby maintaining the illusion of persistent militia. 
Requires GameDir >= r2316.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=23044&goto=345324&#msg_345324

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-06 14:51:24 +00:00
Flugente 9e97538d89 New feature: enemy combat jeeps fill the role between infantry and tanks. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=344628&#msg_344628 
This is savegame compatible. GameDir >= r2305 required.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8114 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-20 18:45:51 +00:00
Flugente e206c21daa Unified strategic map display code for airspace, militia restrictions and disease 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-09 22:48:16 +00:00
Flugente 3af6748b03 - Fix: compiler warning 
- If possible, use the intended macrso to determine sector coordinates

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8018 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-10 18:06:55 +00:00
Flugente 7664342746 - New Feature: Arulco special division controls other features to fight the player. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343706&#msg_343706 
- New Feature: Enemy helicopters allow the AI to rapidly deploy troops aross the map. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=tree&goto=343707&#msg_343707. GameDir <= r2279 is required.
- Fix: income of mine 0 was not correctly calculated

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-09 19:45:30 +00:00
Flugente 8a84db40d4 Fix: enemy tanks spawned by cheats are not added to the sector count 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7980 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-18 19:26:41 +00:00
Flugente 32a8b75748 - Fix: wrong final destination displayed for travelling militia 
- Fix: when ordering militia movement, data of another group's path can be erased
- Fix: a militia groups's path isn't always destroyed if the group is deleted
- Fix: unsafe pointer handling can result in a gamecrash when loading strategic AI data from a savegame
- Fix: traveltime calculations do not correctly handle waypoints, resulting in possible crashes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7876 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-24 14:09:48 +00:00
Flugente a5754a5428 made unclaimed airspace a bit brigher in the map, as it was hard to see anything 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7831 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-04-22 19:13:28 +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
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 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 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 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 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 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 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 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 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 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 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
silversurfer 0e15435069 Bugfix: Mercs would act independently after taking part in a boxing match (broken in rev 7178). I reactivated the old fix with an additional check for boxing state so loading a savegame during a boxing match will not break the boxing match. 
Bugfix: When a squad had the scouting trait,  CAN_DETECT_ENEMY_PRESENSE_IN_SECTORS_AROUND = TRUE and CAN_DETERMINE_ENEMY_NUMBERS_IN_SECTORS_AROUND = FALSE the map always showed enemy teams next to the player squad because of the false positives feature. I disabled this feature completely until a believable mechanism is implemented for a chance based false positive reporting.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-16 10:20:18 +00:00
Flugente 6448b332ec Merged revision(s) 7251 from branches/ja2_source_official_2014: 
code cleanup & removed some warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7252 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-06-01 21:50:14 +00:00
Flugente 3a7f7b263b Fix: wrong function calls 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-05-02 18:17:49 +00:00
Flugente 6edf7dd079 - New Feature: Enemy Generals are unique enemies whose location randomized and unknwon to the player. As long as they are alive, the enemy gets signifiant strategic boni. The player must learn of their location and take take them out, preferrably without alerting them prior. 
- Covert Ops: Bleeding is deemed suspicious only if COVERT_DETECTEDIFBLEEDING is set to TRUE.
- renamed special prisoners to officers. 
- lowered the priority of enemy troops becoming medics
- prisoners in player-controlled prisons now use the prioner-colour scheme used by Shank and Dynamo


Requires GameDir >= r2028.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-05-01 13:28:33 +00:00
Wanne 3341992db4 Merged from revision: 7120 
- Disabled militia assignment popup window when battle occurs for hostile sectors adjacent to associated town to prevent radio operator exploits (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7121 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-03-28 19:50:24 +00:00
Flugente 95b1c783eb Merged revision(s) 7014 from branches/ja2_source_official_2014: 
- Fix: snitches report mercenaries and vehicles complain about pay even if they receive none
- Fix: if NO_ENEMY_DETECTION_WITHOUT_RECON is FALSE, every sector is reported to contain enemies

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7015 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-03-03 20:23:13 +00:00
Flugente cee17f5651 New Feature: strategic militia command allows ordering militia around in the map if someoen performs the STRATEGIC_MILITIA_MOVEMENT facility assignment. 
requires GameDir >= r1946

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6943 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-18 21:26:46 +00:00
Wanne 11037729f0 Merged from revision: 6905 
Improved Snitch Trait (by anv)
- The snitch actions can be selected in the strategy view "Assignment" menu
o Spreading Propaganda: Accessible in town sectors
o Gathering Rumours: Accessible in town sectors
o Undercover Prison Snitch: Accessible from Facilities menu (Prison)
o Preventing Misbehaviour: New Snitch Menu
o Passive Reputation Increase
see: http://www.bears-pit.com/board/ubbthreads.php/topics/329412/1.html

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6906 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-02-12 17:22:40 +00:00
Wanne 5bf82b9d82 Heli Refuel Updates (by Buggler) 
- heli refuel site marking in airspace mode
- fixed missing remaining fuel & distance to fuel site text in other languages

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6715 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-27 09:37:32 +00:00
Wanne 0ae8ce2408 Code Cleanup (by Buggler) 
- Unused vanilla code cleanup on zoomed strategic map & raising/lowering level

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6700 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-22 02:58:17 +00:00
Flugente faba9ea713 Helicopter features (by anv): 
- Waldo can now repair the helicopter for money
- alternative fuel system
- damage to helicopter can damage passengers

Appropriate Data in GameDir r1897.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6695 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-12-19 22:01:44 +00:00
Wanne 79a62c1750 Fixes (by Buggler) 
- Fixed CTD when displaying militia assignment box that has regions beyond sector P16
- Corrected variable for heli tile gridno calculation 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-18 08:26:42 +00:00
Wanne 010e967948 New Feature: Different Mineral Types for Mines (by Jazz & Buggler) 
- Instead of only having Gold and Silver for Mines, we can now add more mineral types (-> TableData\Map\Minerals.xml)
- The initialization of the mineral types of the mines is done in LUA (Scripts\initmines.lua)

- Example: https://ja2svn.dyndns.org/source/ja2/trunk/Documents/1.13%20Modding/Modding%20Examples/New%20Minerals-Mines%20Example.zip
o In this example we have a new mineral type (Oil) and the Cambria Mine (H8) becomes a Refinery


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6584 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-11-12 09:58:18 +00:00
Wanne b268d330ed - externalized samsite coordinates concerning strategic AI action and Skyrider dialogue (by Buggler) 
- minor ENG language tweaks to traits popup help text (by Buggler)
- translated a few missing German Texts in _Ja25GermanText.cpp

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6410 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-09-17 14:44:55 +00:00
Wanne f0c824e0dd - Fixed shading of other towns in militia assignment window (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-09-05 12:37:34 +00:00
Wanne 89194ff11b - Expanded militia training to 6x6 square (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6355 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-09-04 10:28:12 +00:00
Flugente d9e526bcc8 Added 'Ctrl' hotkey to add/remove 5 militia when assigning militia (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6347 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-09-02 18:03:04 +00:00
Wanne b107a916e1 - Disabled Tab hotkey for description tab switching in strategic screen so as not to interfere with militia equipment assignment (use Ctrl+Tab like in tactical screen) (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5873 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-02-26 14:00:48 +00:00