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,763 Commits 9 Branches 6 Tags
671b4527ac9638f772725baf4a5a0898bd51d61d
Commit Graph
2763 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
silversurfer 671b4527ac Fixes (by Sevenfm): 
- Armor search routine had incorrect calculations
- Tiles adjacent to buildings could be assigned to a building

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-27 07:52:32 +00:00
Flugente d8c79675e7 Fix: armour comparison compares helmet with vest/legs and is unsafe 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-26 19:05:58 +00:00
Flugente c20232a740 Fix: when starting a new campaign, NULL the StrategicMap flagmask 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-26 12:27:49 +00:00
Flugente 88d60c8df1 Fix: corpses on a roof cannot be interacted with 
Note that once a rooftop corpse has been decapitated, it cannot be accessed again, due to as of yet unclear structure handling.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8236 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-26 11:17:04 +00:00
Flugente 2defb8259b Fix: after firing an underbarrel GL, it was possible to reload via leftclick for a short time, leading to reload of main gun with a grenade 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8235 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-25 19:39:10 +00:00
Flugente 4e498b1a5d Fix: ASD update function not periodicaly called. This bug only exists in campaigns started before r8015. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8233 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-24 19:19:48 +00:00
Wanne c676a48cd5 Fix: Added explicit BOOLEAN check for pSoldier->bVisible (by sevenfm) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8230 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-23 05:24:45 +00:00
Flugente db00927287 - Fix: same militia profile is used several times in autoresolve 
- Fix: sometimes no battle repoer is written for autoresolve
- Fix: no militia profile found in autoresolve due to bad sector

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-22 23:04:05 +00:00
Flugente 74bebdd454 - colour TestTable scrollbar 
- militia website sector filter uses longer names
- prisoner surrender dialogue explains how many prisoners were captured, and allows selecting prison via dropdown selection
- explain soldier relation boundaries on Melody website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8228 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-20 22:39:29 +00:00
Flugente c0d25c3cb7 Fix: mobile militia (ALLOW_MOBILE_MILITIA = TRUE) could get 'lost' if moving 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8227 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-20 19:07:04 +00:00
silversurfer 196a1eb84d AI and tactics improvements (by Sevenfm): 
New options:
 AI_YELLOW_FLANKING - yellow flanking is disabled by default
 IMPROVED_TACTICAL_UI - use name color to show soldier's status (disguised, drunk)

Removed obsolete options:
 SHOW_COVER_INDICATOR
 SHOW_ENEMY_RANK_ICON
 SHOW_ENEMY_AWARENESS

Fixes and improvements:
 - collapsed enemies should not taunt
 - if soldier is unconscious, he can't see anything or anybody
 - ClosestReachableDisturbance - performance improvement
 - allow InternalGoAsFarAsPossibleTowards to jump over fences

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8226 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-20 18:25:33 +00:00
Flugente e86b24821c sped up reload function 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8225 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-19 21:58:07 +00:00
Flugente 310fa7d57c Fix: incorrect check (by sevenfm) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8224 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-18 19:13:38 +00:00
Flugente 5a84b7b748 Fix: on various actions in the strategic screen (open inventory, dynamic dialogue) the message list is turned on and off 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8223 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-18 18:13:45 +00:00
Flugente 1565a9f67c 'Improve Gear'-function now also merges magazines and fills up ammo stacks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-17 21:37:42 +00:00
Flugente b9575fcbee If Skyrider can't fly due to being out of fuel, warn the player 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 20:54:01 +00:00
Flugente 41a9c7104d Fix: crash in release exe due to bad initialisation 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8218 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 16:25:32 +00:00
Flugente 5df191a263 New disability: Hemophiliac causes mercs to bleed a lot faster, even for tiny wounds 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8217 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 15:17:11 +00:00
Flugente 645b42bc8b Fix: UB compilation error 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 12:37:24 +00:00
Flugente 381acc74a4 If we manually disguise a merc, immediately test the disguise 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-16 10:31:47 +00:00
Flugente 6460e9d325 Fix: unable to save after loading an older savegame 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8213 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-15 22:53:19 +00:00
Flugente 7bb401b1fb New feature: We can now create non-profile-based merchants via lua.scripts. 
Requires GameDir >= r2320.

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23061&goto=345526&#msg_345526

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-15 17:11:29 +00:00
Flugente d594ba0e67 If a merc intentionally removes the diguise property via the [Ctrl] + [.] menu, the disguise property will not be reapplied until new clothes are applied, even if COVERT_STRIPIFUNCOVERED is set to FALSE in Skills_Settings.ini. This allows dressing up mercs in other colours without them being subject to covert mechanics. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8211 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-13 17:25:02 +00:00
Flugente 284910e2d5 Changes to covert operations feature (by sevenfm): If the new skill setting COVERT_STRIPIFUNCOVERED is FALSE, 
- we can only disguise successfully if we haven't been seen recently (last 3 turns)
- disabled automatic clothes stripping when uncovered
- redisguise automatically if spy haven't been seen by enemy recently and wears correct clothes

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8210 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-12 22:27:54 +00:00
silversurfer e43d1b3fb3 Fix: The Brass Knuckles tag didn't count as bare hand attacks anymore since revision 6465. I changed that back because Martial Arts trait includes brass knuckle items. Single attack AP display of such items in EDB was fixed as well. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-08 15:19:39 +00:00
Flugente 1a56d4a473 Fix: jumping over a merc allowed moving through walls 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8206 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-07 19:54:56 +00:00
Flugente 999fcea058 Added more operation names 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8205 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-06 18:42:22 +00:00
Flugente dc78077b0f Fix: unneccessary individual militia created during savegame loading due to bad sector 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8203 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-06 15:09:17 +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
silversurfer 67927ed723 Fix: After restarting the game and loading a savegame the reinforcement option was always TRUE because it didn't take DifficultySettings.xml into account. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8191 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-04 11:23:03 +00:00
Wanne c969dce2b3 Bugfix: Button Image (WM_AUTOFIRE) was not unloaded (by Subotai) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-03 19:28:54 +00:00
Flugente 6adf9ad901 - Fix: coloured glitches in dropdown area 
- Improved mouse drag in dropdown scrollbar

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-02 20:11:42 +00:00
Flugente dba2386bc3 Changed variables to UINT16, in case a dropdown has a lot of entries 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-05-01 19:04:50 +00:00
Flugente bd59b2fcba - Fix: UB cannot be compiled 
- Fixed a few compiler warnings

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-24 19:59:25 +00:00
Flugente 38814f5ee3 Fix: counter is not increased, potentially resulting in endless loop 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8169 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-23 14:42:58 +00:00
Flugente f0b9bb4304 Fix: if an enemy jeep is destroyed, sector jeep count is not properly updated 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8168 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-23 14:36:38 +00:00
Flugente 1b8a368108 Fix: UB cannot be compiled 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8167 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-22 20:03:32 +00:00
Flugente 92314bfbfb Fix: if a jeep is fought in autoresolve, it's entry remains in the vehicle list 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8166 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-22 19:46:41 +00:00
silversurfer 14ccc1193b Fix: The invisible troops fix from r8131 caused defending troops to be handled as reinforcements and appear at the map border instead of the pre-defined positions across the map. This was caused by unpausing the game before the troops had been placed. This revision fixes that and hopefully doesn't break anything else. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8162 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-18 21:21:53 +00:00
Flugente 26db62bd19 Fix: when merc starting gear is distributed into inventory, it is possible that too many items are spawned if an item stack is ahared over several slots 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8154 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-12 21:36:07 +00:00
Flugente d913cf5ad8 Fix: crash in autoresolve 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8149 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-10 15:39:41 +00:00
Flugente 7124df2354 - Fix: Get Item assignement: if no valid gridno is found, let the game find one upon loading the sector instead of risking a wrong gridno assignment 
- Fix: When dropping an item in strategic inventory, height values are not set 
- Fix: When looking for a valid gridno to drop items t via strategic inventory, WORLD_ITEM_REACHABLE is not reliable, as updated map topology trumps this. Instead rely upon finding a valid gridno once the sector is entered.
- Fix: when searching for a new item dropoff gridno, search for new height too
- Fix: if items are spawned mid-air, the player cannot retrieve them

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8136 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-09 16:11:43 +00:00
Flugente d0dc6c3230 - Tweaked tunnel vision penalty calculation 
- If both body items and weapon have tunnel vision penalties, use their maximum, not their sum

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8134 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-03 16:53:17 +00:00
Flugente 6089e9a3b8 Fix: CTD when tring to check for panic triggers if no enemy is present 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8133 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-03 14:41:52 +00:00
Flugente 01ffd3eaf2 New feature: spawn extra civilians via Lua, see also http://thepit.ja-galaxy-forum.com/index.php?t=tree&th=22998&goto=344843&#msg_344843 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8132 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-04-03 14:40:17 +00:00
silversurfer fcad428a12 Fix: When MIN_DELAY_ENEMY_REINFORCEMENTS was set in Ja2_Options.ini incoming enemy troops were not placed on the map because their reinforcement timer was not met yet. Also the game was paused so the timer could never run at all. 
The game is now unpaused whenever we enter the tactical screen. Also if there are no enemies on the map yet the minimum reinforcement delay is ignored.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8131 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-29 14:08:26 +00:00
Flugente 186093923c Fix: reinforcements do not arrive when no other enemies are present and reinforcements are ordered to be delayed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8130 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-28 21:31:21 +00:00
Flugente 328d484b20 Fix: missing buildfile entries 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8129 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-27 16:30:38 +00:00
Flugente a4cfe642ef Fix: missing files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8128 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-27 16:23:29 +00:00
Flugente 7bf2943849 If a tank just took a heavy hit, but cannot see an enemy to fire upon, it can detonate a smoke grenade on itself to hide. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8127 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-26 23:16:41 +00:00