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
3,028 Commits 9 Branches 6 Tags
c96bed1110cd166d295b169dedcb2f5c200bcd1e
Commit Graph
424 Commits
Author SHA1 Message Date
Flugente 8469d4398a Fix: IMP creation with HP < OKLIFE possible 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8574 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-06-19 18:04:37 +00:00
Flugente 0f31a8616a Fix: face sti files were not found for profiles >= 100 using ubFaceIndex < 100 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8569 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-06-05 20:56:08 +00:00
Flugente 80674249cc New feature: bloodcat/zombie/bandit raids on player-controlled sectors 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23711&goto=353154&#msg_353154

Requires GameDir >= r2420

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8554 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-04-15 14:42:01 +00:00
Flugente 56f9864441 - Fix: wrong print format in militia battlereports 
- Added flag for militia desertion

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8547 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-14 19:46:43 +00:00
Flugente 524fc502f8 Fix: clean up email functions (WIP) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8546 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-12 22:57:13 +00:00
Flugente 82a2b6c2db Added new assignments for training existing militia and doctoring them. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23044&goto=352617&#msg_352617

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8537 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-03-04 21:20:38 +00:00
Flugente abb8152d24 Fix: missing files 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8529 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-02-27 00:49:42 +00:00
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
Flugente fadb7710e6 Fix: during hiring, AIM mercs only complained about their hated ones if these were already in the country, thus ignoring other mercs in transit 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8515 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-01-09 23:30:50 +00:00
Flugente 70162ece95 Change: In the militia overview laptop website, do not display militia faces, instead colour their names. This way we can display more militia at once without losing information 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8514 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-01-04 18:57:33 +00:00
Flugente a8e62cc406 - To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums. 
- Merged IsMercOnTeam...(...) functions into one
- Fix: during hiring, AIM mercs only complained about their hated ones if these were already in the country, thus ignoring other mercs in transit


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8512 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2018-01-04 15:50:31 +00:00
Flugente 9c74bb75dc To make it easier to search for dialogue and understand what a line is supposed to mean, changed a few dialogue enums. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8503 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-31 19:18:35 +00:00
Flugente 380d858d2c Added VS2017 solution and project files (by DepressivesBrot) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8490 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-02 13:00:46 +00:00
Flugente a57d9455f3 Dynamic dialogue boxes cause less issues when scrolling 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8486 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-10-01 11:08:38 +00:00
Flugente c20604f16a Fix: various individual militia issues 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8477 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-09-21 18:38:22 +00:00
Flugente 561f6387cd - Fix: individual militia are not properly disbanded if player runs out of funds 
- Fix: wrong website names used
- Removed confusing links on militia overview website

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8448 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-08-15 11:57:10 +00:00
Flugente 0992a423e7 New feature: mercs with a gun-related trait (New trait system only) can use the 'Focus' skill via the skill menu ([$] in tactical). This skill grants an interrupt modifier bonus in the targeted area, but also a penalty outside of it. 
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=350400&#msg_350400

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8432 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2017-07-26 13:49:38 +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
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
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 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 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
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 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 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 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 3ab70dde90 - added new disability "Fear of heights" 
- Fix: wrong backgrounds were filtered out when checking for personality/disability/traits

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8351 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-31 12:00:45 +00:00
Flugente 58eb840439 Cleaned up IMP creation code 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8350 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-30 17:43:30 +00:00
Flugente d6b7dd4d52 Fix: when buying gear kits from AIM/MERC, prices are incorrect for item stacks 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8349 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-30 00:09:15 +00:00
Flugente 200899593e Fix: New IMP gear selection method: If identical items are selected in several slots, only those of one slot are given to the IMP 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8348 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-12-15 21:05:23 +00:00
Flugente 57ec4e7fa1 Due to erroneous code, the encyclopedia feature has been deactivated. for more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=23090&goto=345928&#msg_345928 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8273 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-16 12:21:22 +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 ce6e63831d New feature: environment hazards pose danger to soldiers in certain sectors - first use are snakes that attack anybody in water sources in swamps. 
Requires GameDir >= r2327.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8266 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-07-03 21:26:45 +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 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 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 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 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 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 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
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
Wanne 80bfe613e8 Bugfix: Briefing Room: Deleted unused/wrong text box from briefing room (by Jazz) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-10 21:01:35 +00:00
Flugente 908923e813 New display mode: "CTH mode" displays a very rough cth indication in the current merc's firing cone. For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=344441&#msg_344441 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8099 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-08 22:36:39 +00:00