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
1326 Commits
Author SHA1 Message Date
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 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
Wanne de99bcdb4f Merged from revision: 7672 
Increased MAXATTACHMENTS size from 30000 to 40000 which is needed for the amount of attachments in AIMNAS mod (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7673 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-12-05 19:13:54 +00:00
silversurfer d9badabaf6 EDB now displays morale modifier for food. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7661 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-20 12:17:13 +00:00
Flugente 4f00ce2ffd Merged revision(s) 7659 from branches/ja2_source_official_2014: 
Fix: memory corruption in CalcChanceToGetThrough() causes game crash


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7660 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-18 20:53:39 +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
Flugente ee27a3864c Fix: removed unnecessary display cover updates (by Ocular) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7651 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-11 19:33:26 +00:00
Flugente b5ed7df390 DISEASE_CONTAMINATES_ITEMS controls wether contaminated food/blades/throwing knifes can infect people. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7649 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-05 22:01:14 +00:00
Flugente 94ded57962 New Feature: tracking allows rangers to track past movements. 
Fro more info, see http://www.ja-galaxy-forum.com/ubbthreads.php/topics/337545#Post337545

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7646 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-04 20:03:18 +00:00
silversurfer 60bffb1352 Fix: Removed invalid item property "counterforcefrequencymodifier" and all code parts associated with it. It was not used anymore by the game but fragments of it were still displayed in EDB which lead to confusion. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7644 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-03 13:23:05 +00:00
silversurfer 001f716d2f Fix: Swap Merc Portaits caused problems when trying to swap position with a dead merc. This is now denied. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7640 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-02 15:16:57 +00:00
Flugente 7a61eec3e0 Merged revision(s) 7634 from branches/ja2_source_official_2014: 
Fix: NPCs could be handcuffed. This is useless as long as there are no routines that handle their removal and interrogation.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7635 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-02 03:11:19 +00:00
silversurfer 7bd14ec3fc Fix: LBE layouts were broken since r7600 and always displayed all slots instead of those defined in LoadBearingEquipment.xml. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7631 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-01 18:38:31 +00:00
Flugente 65056d793c Fix: should any robot still have the covert property from a savegame prior to r7628, simply remove it. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7629 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-01 17:09:08 +00:00
Flugente 30ae48c8d7 Fix: robot could get the 'covert' property when added to the team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7628 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-01 17:01:00 +00:00
silversurfer 62cb6f44fa Fix: Spreadpatterns did never work since their externalization. Now they should work. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7624 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-11-01 13:31:51 +00:00
Flugente 8857e0772b - if a a roof collapses, any structures built on it (fans, sandbags) are destroyed 
- if a a roof collapses, any corpses on it are moved to the floor

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7623 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-31 22:13:32 +00:00
silversurfer faf345ac18 Fix (by Sevenfm): Corrected mixed suppression parameters MAX_CTH_PENALTY_FOR_TARGET_SHOCK and MAX_CTH_PENALTY_FROM_SHOCK and also fixed suppression calculation. 
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/337412/Re:_Code_Snippets#Post337412


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7621 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-31 15:36:02 +00:00
silversurfer 08af7cca36 Fix: Inventory popups for LBE slots didn't work properly. LBE slots are supposed to return a pocket type of -1 because they are no pockets. Instead they returned 2 (Knife pocket). 
Fix: Inventory slots didn't show possible item amount anymore since r7600.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7619 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-30 16:11:24 +00:00
silversurfer c47ad1214e Fix: type of explosive was not processed correctly which always lead to pExplosive->ubType of 1 (stun). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7617 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-26 21:21:09 +00:00
Flugente eb15473d37 Deconstructing the walls of a house will eventually cause it's roof to collapse. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-26 00:20:29 +00:00
Flugente 2e9c6965b0 - New Feature: roof tiles can be destroyed. Requires GameDir >= r2174. 
- Fix: Owner ID of player-requested artillery shells was wrong.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7614 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-25 23:46:45 +00:00
Flugente 9eb023abf2 - Fix: crash if fragments from a non-player-planted mine destroyed a lock. 
- Take direction of explosions into account if possible.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7613 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-25 21:21:14 +00:00
silversurfer 5b7f243ed9 Change to # of aim clicks bonus for Ranger trait: 
The hunter now only gets POSSIBLE_AIM_CLICK_ADDED_SHOTGUNS / 2 (rounded down) as bonus which is a compromise that was necessary after the revamp of shotguns by Strohmann in GameDir 2173.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7612 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-25 14:03:07 +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
silversurfer 5dbcf2a1e8 Fix: Militia tank fix could lead to graphical glitch with following crash. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7597 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-19 17:57:18 +00:00
silversurfer f05cdc3286 Fix: Improved the fix for militia manning tanks in revision 7557. Tank slots are not made invalid anymore. Instead the placement body type will be converted to a normal militia body and moved to a free slot next to the tank. There is a new function "FindNearestPassableSpot" for finding an accessible tile next to a starting grid. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7588 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-18 15:26:03 +00:00
Wanne e000abcc57 Merged from revision: 7586 
Multiplayer Bugfix:
- Improved (fixed) interrupt endless clock when enemy interrupts (CO-OP game) (tested by Woquit)
- Override turn (ALT + E): Now it is possible again for the server to give the turn back to itself
- Updated MP Version Number to 3.1

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7587 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-18 14:08:28 +00:00
silversurfer 03e6f0bb0b Fixes (by Ocular): Grenade Launchers didn't cost any Ready AP. 
Underbarrel launchers shouldn't be able to change Ready AP of primary weapon because of AP micromanagement exploits.
http://www.ja-galaxy-forum.com/ubbthreads.php/topics/336777/[PATCH]_Fix_ready_AP_cost_and_#Post336777


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7584 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-18 11:20:56 +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 1102106b78 Fix: ID on artillery shells was not set correctly. This caused all damage of an artillery strike to be attributed to the first merc. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7570 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-14 22:15:44 +00:00
Flugente 396fe4d106 Fix: if sneaking undetected near an enemy, saving and reloading increased agility. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-14 20:05:49 +00:00
Wanne 00999d673a Merged from revision: 7565 
Multiplayer Bugfix: Fixed endless clock on enemy interrupt on the server, by reverting the non working interrupt fix which was introduced in revision 5623
- INFO: The endless clock on the client still occurs on certain enemy interrupts, but this can be fixed by pressing ALT + E on the server and giving the turn back to the client.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7566 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-14 18:22:18 +00:00
Flugente 20e3b6cf94 Fix: player could not order artillery from militia (by Ocular) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7564 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-13 20:23:51 +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
silversurfer 1a2c93ddbc Fix: Militia was able to man tanks (even destroyed ones). This is not intended. Also the player could take these tanks as personal vehicles. Not good... 
Now militia shouldn't spawn as tank anymore.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7557 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-10-13 17:43:13 +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 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
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
silversurfer cd786cf213 Fix: Key data wasn't set correctly when the swap merc faces feature was used so the game couldn't load the savegame anymore. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7534 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-29 00:24:19 +00:00
Flugente fc861e0ba1 - Added 3 new opinion events (OPINIONEVENT_BRUTAL_GOOD, OPINIONEVENT_BRUTAL_BAD and OPINIONEVENT_TEACHER) 
- Fix: during dialogue, mercs did not agree often enough
- Fix: if no mercs were in any squad, Melody website did not show relations
- Dialogue has been reordered, this should make adding new ones slightly easier

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7533 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-27 20:19:49 +00:00
Flugente 58d9cf0925 Fix: In Release built with VS2008 the game crashes when parsing xmls. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7530 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-24 23:29:07 +00:00
Flugente 7558c84bc2 New Feature: IMP gear selection allows choosing what items an IMP starts with instead of relying upon randomness. 
Requires GameDir >= r2152, as required images were added.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-23 22:46:10 +00:00
Wanne 6de39a6ff2 Merged from revision: 7525 
- Fixed bug with game selecting helicopter loading screen when reloading game (by anv)
- Fixed autoplace stacks logic from sector inventory on r7380 commit (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7526 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-17 18:46:09 +00:00
Flugente 12cf5396e9 Merged revision(s) 7523 from branches/ja2_source_official_2014: 
Fix: enemy radio operators called in artillery even though it could not fire

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7524 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-16 23:09:56 +00:00
Flugente 484f8572ca Merged revision(s) 7521 from branches/ja2_source_official_2014: 
Fix: Kingpin's assassins do not attack

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7522 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-15 21:37:58 +00:00
Flugente 48819f860a Fix: Equipping militia with guns and ammo could lead to creation of ammo items with 0 bullets. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7518 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2014-09-14 21:23: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