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
1,766 Commits 9 Branches 6 Tags
71274fdf55f152fa1ab072f4e7aa959ae8ff8e57
Commit Graph
1766 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Flugente 71274fdf55 - new function: militia can be ordered to pick up gear from sector in tactical, just like ordering them to drop it. does not work in combat for obvious reason. 
- if militia stand in water and are ordered to drop their equipment, they will drop it on land.

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6263 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-31 18:59:32 +00:00
Flugente 64f7d6e616 new item tag <ItemChoiceTimeSetting> forbids AI from picking an item at night if set to 1 and at day if set to 2 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6262 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-30 19:32:49 +00:00
Flugente 8f5ac3a935 Fix: NCTH throws error if not firing at soldier 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6261 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-30 18:17:54 +00:00
Flugente 5742725c19 - Fix: recent code additions broke savegame compatibility. Some code now also works for UB, as otherwise code gets needlessly complicated. 
- Improved code

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6260 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-30 18:02:53 +00:00
Flugente b53fe0cd72 Militia equipped from sector inventory take along NVGs/sunglasses to use them later 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6259 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 20:04:45 +00:00
Wanne c74e13fb5c - Added playable mercs: John Kulba (the tourist) and 3 JA1 natives (Elio, Juan, Wahan) (by anv) 
o Added faces (except camo faces), speech, bio, ...
o All those 4 mercs are available at M.E.R.C
o Added INI options for enabling/disabling recruitable Speck, Kulba and natives
o If enabled, Kulba becomes available as a MERC merc after finishing escort quest, delay is configurable (two weeks by default). He won't be available earlier even if MERC_WEBSITE_ALL_MERCS_AVAILABLE is set to TRUE
see: http://www.bears-pit.com/board/ubbthreads.php/topics/298288/47.html

- Improvement: MERC mercs get unlocked according to their own availability conditions, not to their order in MercAvailability.xml


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6258 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 11:48:53 +00:00
Wanne 0e3865a4ef - Fixed a few compilation warnings (uninitialized variables, ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6257 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 09:15:21 +00:00
Wanne 76d517be0c - Fixed compilation errors when trying to compile a UB-Version (#define JA2UB & define JA2UBMAPS) 
o The compilation was broken when enabling Speck as a playable mercs in JA2 113 (revision 6215)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6256 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 09:05:08 +00:00
Wanne 4982281ddb NCTH: Minor Adjustments (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6255 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-29 07:39:13 +00:00
Flugente 828b7758d4 - more reasonable food poisoning values 
- Settings were never read

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6254 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-28 18:32:55 +00:00
Flugente cf5e7ea3af Fix: if militia moves strategically, sometimes gear would be moved unnecessary. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6250 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-28 15:19:58 +00:00
Flugente 8c2df1803a If COVERT_ELITES_DETECT_NEXTTILE is set to TRUE, elite soldiers will uncover spies disguised as soldiers next to them if more experienced. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6249 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-28 14:05:45 +00:00
Flugente cfe8ea5ea5 - Feature improvement: enemy soldiers can now free captured comrades 
- Fix: when jumping through windows, AI soldiers no longer need to end their turn to avoid a deadlock

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6248 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-26 21:50:08 +00:00
Wanne 4e3e07ed55 - Translated Chinese Text (by zwwooooo) 
- Added missing text string to all the languages (except English)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6246 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-26 07:21:58 +00:00
Flugente 6a1b923abc Fix: wrong item name displayed when uncovered 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6245 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 22:05:45 +00:00
Flugente bc49864000 Fix: crash when transforming attached items on guns with magsize modifiers 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6244 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 21:43:04 +00:00
Flugente 1860fee5b8 increased possible number of soldier/militia profiles to 300 for each category 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6243 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 18:11:16 +00:00
Flugente 7964e90c0a Fix: preplaced items with incompatible attachments causes entire sector inventories to vanish if entering the sector a second time 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6242 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 17:32:15 +00:00
Flugente f835b04598 spies lose cover if they try to handcuff but fail 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6241 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 17:30:48 +00:00
Wanne acf4968253 - HackFix: Crash on maps with isolated entry points (by silversurfer) 
o see http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/312260/Re_BUGZILLA_report_all_bugs_he.html#Post312260
o see http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/312612/Re_BUGZILLA_report_all_bugs_he.html#Post312612
o The main problem of the crash is, that some memory gets overwritten -> Workaround (hackfix): Increased the array for the map edgepoints to a fixed size of 400 so we can avoid the crash
o Of course this is not the best fix (because of increased memory usage), so if someone can improve the fix, do it :)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6240 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-25 08:38:43 +00:00
Wanne a5bbc40756 - Bugfix: Mike & Iggy: Fixed wrong ";" (thx to silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6239 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-22 08:00:50 +00:00
Wanne 4dcdd17a91 - Bugfix: After Mike has been recruited, he could still show up as an enemy later in the game (a Mike clone) (by anv and silversurfer) 
o Similar fix is also applied for Iggy

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6238 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-21 21:23:53 +00:00
Wanne 7ae802505c - Bugfix: After loading a game, mercs gearkits are bugged and game crashes when hiring a merc (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6237 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-21 21:19:12 +00:00
Wanne b967890d45 Added possibility to show rank and name on enemies (by silversurfer) 
- If a name is available for the enemy, the name will be shown and if INDIVIDUAL_ENEMY_RANK = TRUE also the rank will be shown
- The name will be shown if INDIVIDUAL_ENEMY_NAMES = TRUE or SOLDIER_PROFILES_ENEMY = TRUE. If both are true, then the name will be taken from the enemies profiles


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6236 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-21 17:41:25 +00:00
Wanne 1b7c69dd0e NCTH CalcNewChanceToHitGun refactoring / cleanup (by silversurfer) 
o Externalized ja2_options.ini value if you want to use / or not the cleaned up version of CalcNewChanceToHitGun: USE_NEW_CTH_CALCULATION
o The cleanup only effects the game if you play with NCTH system
o The refactoring makes the code much easier to read and also shrinks the locs
o Fixed some old bugs in calculation
o In the future the switch USE_NEW_CTH_CALCULATION can be removed completely
o more infos: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/322986/Re_Potential_NCTH_Code_Change_.html#Post322986


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6235 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-21 17:08:42 +00:00
Wanne 502f5f6b77 - Bugfix: Re-Fixed merc records get erased (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6234 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-17 18:23:03 +00:00
Flugente cd6f731b4d Fix: merc records get erased when restarting the exe. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6233 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-15 22:34:18 +00:00
Wanne e25d7482b1 Bugfix: Money-amount was not shown anymore in UDB if you click on "Deposit/Withdraw Money" (by silversurfer) 
Bugfix: If we open the UDB for money, the "Description Page" is now shown automatically (by silversurfer)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6231 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-15 13:18:30 +00:00
Flugente a4998d6309 Fix: exp bonus from interrogation was too high 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6229 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-14 18:58:41 +00:00
Flugente d5fcc6b65f Fix: faulty lua call broke NPC escort quests 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6221 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-13 00:46:28 +00:00
Flugente 580f6b4984 Fix: monsters did not take damage from fire 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6220 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-13 00:17:47 +00:00
Flugente a1f49b3ca3 Feature improvement: the prisoner system now distinguishes between different types of prisoners (admin, regular, elite). Advanced troops are harder to interrogate, but have a high chance of retaining their rank, should they join yor militia. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6219 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-12 23:54:50 +00:00
Wanne 957e8cc76c Added Speck as a playable merc (by anv) 
o Speck can be hired by M.E.R.C
o From now on, as long as Speck is hired (or dead, or POW, or travelling), he won't be sitting on Speck Com nor sending you emails. However, is he's able to, he'll comment on current situation from battlefield: player owing money, Flo getting married, MERC merc dying, etc., so keeping him alive might be a good idea
o GameDir data revision >= 1701

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6215 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-11 19:54:50 +00:00
Wanne e48ad7ad56 - Bugfixes (by Jazz) 
o ActionItems: Problem with the adding of  new actions to the file ActionItems.xml.
o LuaInitNPCs: Wrong data type for fUpdateHistory (int -> bool)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-10 21:55:22 +00:00
Wanne 0650b2b3ed - Bugfix: Santos Barkeeper (!= HERVE) misses speech and edt files 
o This bug was introduced when making the possibility to have different EDT / NPC / speech files for the 4 Santos barkeepers (see revision: 6183)
o Now the fallback to HERVE (id = 151) if a file is missing seems to work correctly

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6208 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-08 06:58:12 +00:00
Wanne 739d9a47d8 - Now it is possible to use the newly added DG M.E.R.C merc on an "older" savegame before those merc got integrated (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6207 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-07 19:55:35 +00:00
Flugente 3b4d32be40 Fix: loading a savegame that was started with an exe without ENABLE_BRIEFINGROOM was impossible with an exe with ENABLE_BRIEFINGROOM enabled. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6202 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-07 11:10:12 +00:00
Wanne 2b23cbad54 - Bugfix: When "Enemy drop all" is selected, sometimes default attachments were not dropped (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-07 09:01:45 +00:00
Flugente 09b56d534c - print interrogation progress as float number 
- spy selftest in pointless without disguise
- inventory explosion creates a sound

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6192 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-04 19:37:27 +00:00
Flugente 86f1a862a5 Fix: militia profile names weren't used 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6187 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-02 19:42:12 +00:00
Flugente 45f27fd815 Fix: covert gear was uncovered due to too high coolness when disguised as a soldier (should only apply to hand items) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6186 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-02 19:03:14 +00:00
Wanne c7f5dda4d7 - Bugfix: ETA Travel Popup screen location was wrong (not initialized) in the new additional screen resolutions (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6184 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-01 18:38:04 +00:00
Wanne 5089f24cba Brother Santos Patch (by Jazz) 
- Brothers Santos use these same files edt and npc (151.edt and 151.npc). After use of this small patch, brothers can use separate files npc and edt.
o Herve - 151.edt and 151.npc
o Peter - 152.edt and 152.npc
o Alberto - 153.edt and 153.npc
o Carlo - 154.edt and 154.npc

If the files do not exist, then the game reads default files 151.edt and 151.npc

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6183 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-01 18:34:49 +00:00
Wanne 36c0d5b56d - Bugfix: Fixed encyclopedia crash after selecting menu entry in main menu 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6182 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 19:28:45 +00:00
Wanne 4c7e235e81 - Reworked LuaInitNPCs.cpp\h, Luaglobal.cpp\h and few cosmetic changes (by Jazz) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6181 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 19:16:35 +00:00
Flugente 50f0b71fb1 Fix: CIV_NAMES_VALUES were overwritten after reading 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6179 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 16:48:43 +00:00
Wanne fabb28ee14 - Enabled the briefing room feature (define) in the executable 
o To use the briefing room on the laptop, the BRIEFING_ROOM option has to be enabled in ja2_options.ini

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6178 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 16:46:32 +00:00
Wanne b0687c344a - Externalized 2 breathing values to APBPConstants.ini (by silversurfer) 
o With those values you can define the minutes needed to regenerate BP in real-time mode
o BP_RT_BREATH_RECOVER_MODIFIER, BP_RT_BREATH_DEDUCT_MODIFIER
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/322238/Re_Breath_regeneration_is_too_.html#Post322238


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6177 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 16:29:17 +00:00
Wanne fe6d9e8a13 - Fixed MERC Buy Equipment flag not properly set by reverting & fixing buggy code optimizations in r6075 (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6176 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 16:08:04 +00:00
Flugente 952e40a427 - changed poison symbol position 
- added SOLDIERTYPE* argument to GunIncreaseHeat(), which allows for soldier-specific heat generation modification

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6172 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-30 02:56:10 +00:00