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
3,321 Commits 9 Branches 6 Tags
b45af3f57504f75bc1ea3fe44e68d119e73fe08d
Commit Graph
1861 Commits
Author SHA1 Message Date
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 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 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 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 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 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 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 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 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 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 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
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
Wanne 12ec4ad8bb - NCTH Scope Modes Update (by silversurfer) 
o Updated formula to get better results with different scopes
o 10x scopes are still useless on "normal" maps. Could be better on bigmaps (70+ tiles)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6165 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-27 11:08:12 +00:00
Flugente 5a89f6fa62 Fix: civilians could openly wield covert guns 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6161 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-26 18:19:33 +00:00
Wanne 58e9e8a7db - New Feature: Added possibility to swap merc position order in tactical team panel (by silversurfer) 
o Just select the merc and press CTRL + Left Key for moving the merc one position to the left / CTRL + right key for moving the merc one position to the right
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/321935/Re_Drag_mercs_around_on_Merc_b.html#Post321935


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6156 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-25 06:33:47 +00:00
Wanne fa2fe99b1d - Bugfix: NCTH - Scope Penalties (by silversurfer) 
o see: http://www.ja-galaxy-forum.com/board/ubbthreads.php/topics/321860/Re_NCTH_Scope_penalties_below_.html#Post321860


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6155 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-25 06:30:57 +00:00
Wanne 911e255bb0 - New Feature: Added possibility for CIV_TEAM (e.g: Kingpin, ...) to drop ALL their stuff (like you can do for enemies and militia) (by silversurfer) 
o On/Off feature in ja2_options.ini (CIVILIANS_DROP_ALL)


git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6154 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-25 06:29:02 +00:00
Flugente 270766a080 Fix: for day vision range reduction formula for daylight was wrong for non-gun items 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6145 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-20 21:40:56 +00:00
Flugente 821893ce68 - Fix: item name in spy disguise notification was wrong 
- MTAs don't have to stop when no hand item is found (the ones in the trunk use this though)
- Fix: militia drops sector equipment it took, even if it should not drop other gear - otherwise militia ould 'consume' sector invetories

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6141 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-20 17:41:23 +00:00
Flugente 24476657f6 switch order of arguments to make function faster 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6138 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-17 21:57:34 +00:00
Flugente 49018d85ec improved multiturn action cost handling 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6126 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-16 16:40:15 +00:00
Flugente 38308680db Fix: AMMOTYPE::highExplosive was sometimes interpreted as an item number, sometimes as boolean, and sometimes a an index over explosives. It is now treated as an item number 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6124 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-16 15:05:41 +00:00
Wanne 8f41617845 - Encyclopedia / Briefing Room Updates (by Jazz) 
o Improved record
o Restart game of Briefing Rooms
o New Action for NPC (recruiting / unrecruiting)
NPC_ACTION_RECRUIT_PROFILE_TO_EPC = 700
NPC_ACTION_UNRECRUIT_EPC = 701

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6120 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-13 22:34:43 +00:00
Flugente b5835754cc Fixed display bar of attached ammo 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6115 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-05 19:38:41 +00:00
Flugente 2d7443213b Fix: last shot of magazine-fed launcher was removed too early 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6104 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-30 00:12:10 +00:00
Flugente c38e079edc - interrogation point calculation was suboptimal 
- Fix: removed unnecessary check
- robots cannot climb roofs, windows, fences or walls anymore

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6103 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-28 21:32:40 +00:00
Flugente 9bd26015e5 cleaned up code: some comiler-warnings fixed, obsolete code removed (oops..and some whitespace stuff) (by CleaningWoman) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6102 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-27 21:01:04 +00:00
Flugente f92f70c78d cleaned up code: various stuff (out-of-bounds, null-pointer, uninitialized vars,...) (by CleaningWoman) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6101 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-27 20:38:52 +00:00
Flugente 921394b24c Fix: allow longer soldier names to be displayed 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6100 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-25 21:31:30 +00:00
Flugente e4d345dc48 Fix: crash when using switches connected to doors 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6099 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-25 19:19:59 +00:00
Flugente 64e4677ba7 SHOW_HEALTHBARSOVERHEAD allows hiding the health and fatigue bars over your selected mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6098 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 16:57:52 +00:00
Flugente 10a0c07822 Fix: scope modes take Aimlevel modifiers on scopes/sights into account 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6095 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 15:52:05 +00:00
Flugente 45659c18a3 made sure that faulty xmls don't lead to three major traits 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6094 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 15:10:27 +00:00
Flugente 2bf92c7301 Vehicle data is no longer saved and loaded into savegames, as it was externalised to xml a long time ago 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6093 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-24 14:25:47 +00:00
Wanne befe76b049 - Fixed 'Unsettled bills' for MercID > 170 on game restart (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6088 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-19 10:31:34 +00:00
Flugente 27f18605d9 sope modes no longer uses fixed magnifications, and no longer differs per team 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6084 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 20:14:02 +00:00
Flugente 22bd1956f1 Fix: status bar of attached grenades was shown incorrectly 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6083 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-17 18:05:18 +00:00
Flugente 1b00117b7e when using alternate weapon holding under NCTH, still apply projection factor from non-scope/sight attachments 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6079 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-15 23:04:09 +00:00
Flugente cefa9cfcc1 Fix: when using scope modes with NCTH, non-internal projection factor from lasers was ignored. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6078 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-05-14 21:11:24 +00:00