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
4,291 Commits 9 Branches 6 Tags
7d9cd87da8dcd96ceed1fdffc299ed4b39f048c7
Commit Graph
4291 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
silversurfer 5d6de52be9 Fix: NPCs could get covert flags in old trait system which prevented them from ever losing it making them undetectable. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8405 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-06-12 11:15:29 +00:00
TheBob b60a94afc5 Added: Ctrl+Shift+E now fill LBE items in sector with other items and places them in vehicles first. 
Added: Right-Click on remove attachments button on sector inventory screen will not empty LBE items in sector
Changed: SLAY_STAYS_FOREVER disables Slay's hourly chance to leave when unattended
Added: SLAY_HOURLY_CHANCE_TO_LEAVE setting to Ja2_Options.ini
Fixed: a bunch of array index out of bounds bugs
Fixed: a bunch of typos in if contitions
Fixed: BuildListFile() function loading items from index 1 instead 0
Added translation: Polish text for some map inventory screen items
Added translation: English texts for new functionality for other language files
Cleaned up some old TODOs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8404 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-05-19 13:40:34 +00:00
inshy dc350d724d Update for Russian against latest included features (by IY) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8403 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-19 08:53:34 +00:00
Flugente baf68cd7e6 Fix: performance of GetItem check 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8402 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-15 20:48:04 +00:00
silversurfer 0c521e2623 Fixes (by The_Bob): 
- Fixed never ending interrupt bug (cats/bugs got interrupt when out of breath)
- Added condition to interrupt code for minimal breath left to get interrupts
- Tweaked timer control code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8401 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-14 19:03:55 +00:00
silversurfer d7f91064f0 Fixes (by The_Bob): 
- Fixed index out of bounds in get items assignment check
- Fixed attachment popup not allowing more than one of the same attachment
- Improved timer control sanity check code
- Added timer adjustment for variable CPU frequency
- Added shortcut: ctrl+left-click on attachment to remove and drop it in sector inventory

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8400 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-14 08:34:20 +00:00
silversurfer fef0722178 Fixes (by The_Bob): 
- Fixed random freeze on win8/10
- Fixed crash on mercs entering sector
- Fixed crash when using cover display (del/end)
- Fixed attachment popup showing incompatible attachments (crash/freeze/confusion on clicking the option)
- Fixed attachment popup positioning
- Fixed LBE contents corruption/deletion
- Fixed access violation (out of array bounds) in interrupt code
- Fixed a bunch of random old stuff
- Got the project to build on VS2015
- Improved popup class handling of grayed out options
- Improved performance of get item assignment check (added by Flugente)
- Added Ctrl+Space bind for testing/fixing broken LBE contents


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8399 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-12 08:09:12 +00:00
silversurfer 5d02ca8894 fix: UB build error from change in 8396 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8398 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-02 16:07:23 +00:00
silversurfer 3a4821286a fix: game info display showed incorrect levels for BR 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8397 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-04-02 07:38:09 +00:00
silversurfer dbec9c6ca0 - Added external parameter CounterAttackGroupSize to DifficultySettings.xml for counter attack strength. This replaces the old hard coded value. Requires GameDir >= 2363! 
- Changed counter attack elite soldier distribution to replace regulars just like the rest of the code handles elites.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8396 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-03-14 17:21:40 +00:00
Flugente a6b8b559f0 Fix: If troops spawn at the very northern edge of a sector, we often barely see them, and cannot target their head or torso. To stop that from happening, do not spawn there. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8395 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-03-11 19:03:10 +00:00
Flugente c2b3d1a5a0 Speed up inventory rendering by avoiding unnecessary function calls 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8394 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-03-11 15:35:39 +00:00
Flugente 125fda3905 minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8393 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-03-11 13:19:20 +00:00
Flugente dc5db5c06a - If a shopkeeper is a non-NPC dealer, show their body in the shopkeeper interface 
- Fix: unwanted items in shopkeeper screen not always crossed out correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8392 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-03-06 19:11:20 +00:00
Flugente 1aa8eaa948 Fix: When reading in Skills_Settings.ini, NUMBER_OF_MAJOR_TRAITS_ALLOWED_FOR_IMP is now limited by min(NUMBER_OF_MAJOR_TRAITS_ALLOWED, MAX_NUMBER_OF_TRAITS_FOR_IMP - 1). 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8391 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-03-04 13:30:37 +00:00
Flugente 8a00c33946 Added AP modifiers for forest and plain sectors. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8390 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-02-26 19:25:11 +00:00
Flugente f65f97a27a New feature: the trade menu is now resolution dependent, as a result more items can be traded at the same time. Trader budget is now also displayed. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8389 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-02-26 16:08:03 +00:00
Flugente ec7f15f1d7 Fix: merchants stack identical items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8388 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-02-04 14:43:28 +00:00
Flugente a8ba28d90a Cleaned up AIM gearkit code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8387 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-02-04 14:14:55 +00:00
Flugente 79ee1522f9 If 'GetItem' assignment isn't possible due to no valid items in target sector, indicate this to the player. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8386 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-02-01 19:05:58 +00:00
Flugente 48254ea5a5 Fix: deadlock on ammo creation popup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8385 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-31 21:05:01 +00:00
Flugente a6b641d701 Fix: crash when loading a savegame repeatedly due to initialisation flag not being reset 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8384 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-30 20:06:45 +00:00
Flugente cd628ec4f2 Fix: animated explosion warnings were drawn over turn bar 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8383 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-29 14:38:12 +00:00
Flugente 44577ee164 - Fix: delayed explosions not possible in roofs 
- Fix: delayed explosions warnings not correctly drawn depending on height level
- improved delayed explosion warning calculations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8382 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-29 14:00:18 +00:00
Flugente bdc46603d8 - Fix: animated explosion warnings were drawn over inventory 
- Fix: animated explosion warnings were only drawn if explosive item was on screen

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8381 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-29 12:54:09 +00:00
Flugente 70473557cd - Fix: ASD did not take mercs on assignment into account 
- Fix: crash when entering combat without any mercs in sector on duty

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8380 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-28 20:00:52 +00:00
Flugente f41457250a Accelerated roof collapse code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8379 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-28 12:58:16 +00:00
Flugente d2a4d53a0a AmmoTypes.xml: tag <canGoThrough> replaced with <usPiercePersonChanceModifier> (unsigned integer). If value is > 0, a bullet can pierce a person after hitting. Higher values increase the chance to do so. Vehicles can now be pierced as well. 
Requires GameDir >= r2360.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8378 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-27 22:35:31 +00:00
Flugente fd09d16b4d Added new records: total healing (combined healing, stat repair and diesease cure) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8377 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-27 20:37:28 +00:00
Flugente 5f2da3707c Added new records: diseases caught, interrogations, total damage taken, total damage dealt 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8376 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-26 20:46:26 +00:00
Flugente e643c1ea57 - Hospital healing now uses the same function as normal healing 
- If surgery would not heal anything, don't do it
- removed unnecessary defines

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8375 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-23 23:05:30 +00:00
Wanne 91faf8a182 Fixed compilation error in VS2005 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8374 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-23 19:28:19 +00:00
Flugente 43fa9090c1 Fix: crash when displaying LBE with corrupted content. 
This des not fix whatever corrupts the LBE, it merely stops the game from crashing.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8373 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-22 20:37:13 +00:00
Flugente 4690b89ffc Added new laptop merc data subpage to display more stats that weren't displayed before, like dialogue approach points and whether merc is a 'good guy' 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8372 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-22 20:12:29 +00:00
silversurfer 4f8498e5ef slightly modified the damage formula from r8370 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8371 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-22 14:09:26 +00:00
silversurfer a6b2568e24 - new jam damage thresholds for guns - when a gun jams it can only take damage if its status is below the threshold 
- modified damage calculation for jam damage
- modified cleaning point calculation for mercs
- natural dirt level of sectors now halved if the shooter is inside a building

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8370 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-22 13:33:44 +00:00
Flugente 9a46c2a9fc - The number of possible IMP voices is no lnger limited 
- If no IMP voices could be read, IMP creation is not allowed

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8368 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-17 20:32:31 +00:00
Flugente ec52ab30e5 When trading, mark items that the trader won't buy. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8367 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-15 23:48:34 +00:00
Flugente 87809f222f Gun selection at shopkeepers is pre-sorted by weapon type (by DepressivesBrot) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8366 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-14 22:41:48 +00:00
Flugente 7163e98b6e Mercs won't attack teammates or neutrals (profile-based) if their opinion of them is > 20. For good guys, that value is -20. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8365 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-14 22:22:30 +00:00
Flugente efd9ab4723 New feature: Voicesets are now independent fom profile slots. Voiceset is set in MercProfiles.xml with <usVoiceIndex>. IMP voices are defined in IMPVoices.xml. 
This feature is savegame compatible.

Requires GameDir >= r2357

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8364 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-14 20:20:11 +00:00
Flugente e2c05ce1c6 minor code cleanup 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8363 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-13 20:19:44 +00:00
Flugente 3419fd1c5d dded new character trait "Coward" (charrcter trait #13) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8362 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-12 23:24:41 +00:00
Flugente 556ce68586 Fix: jeeps were not properly counted 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8361 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-12 00:51:46 +00:00
Flugente 1b39535b15 Fix: during retreat, mercs got a morale penalty for being a pacifist, instead of getting it unless they are pacifist 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8360 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-11 23:26:30 +00:00
Flugente 4d48876c1f added new disability "Self-Harming" 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8359 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-11 22:32:33 +00:00
Flugente 322d307980 Fix: background value drink_energyregen not only increased breath gain, but also loss, which was not intended 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8358 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-10 21:21:07 +00:00
Flugente bb6872787d - Fix: if merc cannot complain about his equipment due to being asleep or on duty, retry an hour later 
- Fix: in AIM bios, show max life, not life at start of game
- Fix: typo resulted in AIM mercs not refusing job because of hated mercs present when they should do so
- Dialogue clarification: QUOTE_PRE_NOT_SMART is now used for complaints about food, QUOTE_POST_NOT_SMART to refuse smoking

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8354 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-06 01:17:45 +00:00
Flugente 4ab21a08c2 Fix: crash in pong due to bad iterator usage 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8353 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-01-04 22:58:38 +00:00