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,878 Commits 9 Branches 6 Tags
125fda39052d079dfef61757847806cbc1e45f03
Commit Graph
405 Commits
Author SHA1 Message Date
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
Flugente 12ae810316 - New feature: sector fortification allows to construct structures in sectors in a much easier way than by using amerc to build 'by hand'. Fortification nodes are in a subfolder in Profiles and can easily be altered and exchanged, even in an ongoing game. 
Fully savegame compatible.
GameDir >= r2296 is recommended, but not required.
- Cleaned up cover display functions.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-06 12:44:57 +00:00
Wanne b905632044 Moved WHO logo on the laptop page a view pixels to the right (to make more space for the headline text) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-03-03 18:50:45 +00:00
Wanne 757e094a89 Bugfix: Doubled the string buffer size the bio text field for OldAIMArchive.xml file, because in Russian language, character Bio was cut (in Russian language one character needs 2 bytes) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8073 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-02-27 17:49:04 +00:00
Flugente d1e1759aa2 Removed ENABLE_ZOMBIES-define 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8047 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2016-01-31 17:54:51 +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
Wanne 6d08593bd0 MeLoDy Updates 
- Increased horizontal table column width to fit longer merc names


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7991 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-09-13 15:21:55 +00:00
Wanne b9a07dd36a MeLoDy Updates 
- Increased horizontal table column width to fit longer merc names
- Externalized header texts 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7990 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-09-13 13:49:41 +00:00
Wanne a2589f7034 Bugfixes / Improvements (macros) of Assignments (by Franimus) 
- Fixed warning for INT8 overflow on scroll region priority, seemingly had no effect though
- Use new assignment macros
- Bugfix - POWs' activity level being overwritten
- Feature - automatically bandage bleeding mercs on a PATIENT assignment
- Bugfix - mercs treated at facilities should not use mercs' medkits
- Added 3 new enums for facility doctor, patient, and repair
- Bugfix for facility patients not detected as being in a facility
- Bugfix - iBurstAPCost was ignoring half of its calculation due to extraneous semicolon


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7988 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-09-12 11:27:28 +00:00
Flugente 5385ae1295 - Fix: cleaning weapons prompt read parameters wrong 
- when a merc regains HP via surgery, display the gain
- if an EPC leaves the team, add them to the list of departed characters

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7977 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-17 20:00:19 +00:00
Flugente 90486b015b Oly start PMC hiring if > 0 militia have been selected 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7958 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-08-04 19:11:13 +00:00
Flugente 0a748a02b3 Message boxes can have a dropdown. For usage, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=341863&#msg_341863 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7935 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-25 17:34:18 +00:00
Flugente 6aa4e1e6c6 New background property: if <croucheddefense> is set, enemy CTH is modified if they fire on us while we are crouched against thick cover (size >= 2) in the direction of the shot. 
Backgrounds.xml tag was added in GameDir r2267.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7933 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-25 12:49:37 +00:00
Flugente d682b28a31 Fix: progress bar on dropdown menus was too small 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7932 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-24 22:23:13 +00:00
silversurfer 1d8136aa06 Fix: New IMP gear selection method didn't include the Sidearm category so mercs could be left without a gun if their trait selection didn't include one. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7908 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-07-09 16:19:47 +00:00
Flugente 4d9140da57 New Feature: Drug System Overhaul. The drug system has been completely overhauled. 
Requires GameDir >= r2257.

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

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7896 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-28 17:47:25 +00:00
Flugente 806aa458ac If debt to MERC includes gear, tell us so 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7893 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-16 20:09:51 +00:00
Flugente eff368f099 - New Quest: if Kingpin is unaware Maria escaped with the player's help, he enlists the player to kill the DaSilvas 
- Moved civ factions for mod compatibility (UC)

Does not break savegame compatibility.
Requires GameDir >= r2252.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7889 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-13 17:26:16 +00:00
Flugente ec90c52bd2 - Stat losses are now displayed in the laptop 
- Breath regeneration through sleep is now displayed in a tooltip
- If NOTIFY_IF_SLEEP_FAILS is set to FALSE, there is no popup box is ordering a merc to sleep fails

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7884 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-06-01 20:23:02 +00:00
Flugente c677c462bc In order to keep trait-related settings where traits are defined, moved MERCS_CAN_DO_ADVANCED_REPAIRS from JA2_Options.ini to Skills_Settings.ini under [Technician] settings. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2015-05-19 20:47:07 +00:00