1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-26 14:30:26 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,637 Commits 9 Branches 6 Tags
98c1e6a1f529104f2984c3192da76472ce7a53be
Commit Graph
7637 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Wanne dbaecdda61 - Removed double (wrong) Speck Entry on index = 1 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1704 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-15 13:12:36 +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 068a8feddb 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 your militia. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1703 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-12 23:56:41 +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 d7b9542668 - Fixed Speck Merc Bio (by Charlie_May ) 
- Removed empty lines in EncyclopediaQuests.xml

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1702 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-11 20:39:48 +00:00
Wanne 3f27022859 - Added Speck Bio to MERCBIOS.EDT (German Version) 
- Translated Polish Encyclopedia texts to English (German Version)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6216 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-11 20:36:34 +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 6bb79e6b93 Added Speck to M.E.R.C (by anv) 
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. Also added quotes for MERC website:
- on recruiting Speck
- on trying to recruit unavailable Speck
- on trying to recruit unavailable Biff (present in game files and code, but previously unused)
- Speck advertising himself

Fixed Biggin's wrong ammo (by anv)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1701 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-11 19:44:24 +00:00
inshy d8f0ec2f9f Renamed and "Data1.13" folder to "Data-1.13". 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6214 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-11 05:17: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 1e1e226403 - Hireable Mike (by merc05) 
http://www.bears-pit.com/board/ubbthreads.php/topics/322512/1/Improved_hireable_Mike_script.html

How to recruit Mike?
It doesn't matter if you have an AIM member and what you do in the initial dialogue with Mike. First you have to get him to around critical state, but not kill him. Now use the mouth icon to talk to him during combat. Choose recruit (you will need a merc with leadership skills >= 70). Mike will end combat and offer you his services for 10000$. If you decline he leaves for good, if you accept you get him as your merc.

Credits:
o Face: http://kermi.pp.fi/JA_2/Faces/Kazuya/Veterans/
o Soundset: http://www.chironkft.net/ja2mike.htm (not available anymore)


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1700 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-10 21:00:23 +00:00
Flugente a6c3319156 Fix: corrected .50 BMG Mag AP size to 10 (by DepressivesBrot) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1699 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-08 16:28:28 +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 fd257f1a55 - Updated Snakes Face (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1698 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-07 09:16:03 +00:00
Wanne 9d686ada6a - Fixed wrong scope magnification factor for PS0-3 (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1697 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-07 09:03:33 +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 69d319810a - Darrel now sells farm products 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1696 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-05 21:48:45 +00:00
inshy 6f1931a83c French translation by hrvvillers. 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6195 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-05 16:28:59 +00:00
Wanne cbe096ca58 - Updated faces (Elroy, Mouse) (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1695 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-05 14:53:00 +00:00
Wanne 8ffdddea79 - Updated faces (Snake, Reuban) (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1694 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-05 14:52:15 +00:00
Wanne e84d5fcccf - Bugfix: MERC, Kit 5, Wrong ammo or no West/Bag to Carry Stuff : Flo, Gumpy, Sktiz 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1693 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-05 14:49:58 +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 07e88add97 added enemy profiles from 'Modders to Backers Event' (by Shanga) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1692 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-02 19:44:12 +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 c6c3a90da9 - Fixed Polish.EmailMercAvailable.xml (by Jazz) 
o Missing <EMAIL> tag 

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6185 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-01 18:41:45 +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 6cd6a6ccec - Added a collection of links from Bears Pit Links for common Problems and their Solutions (Windows 8, Graphic, Mouse Wheel ...) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1691 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-01 06:31:12 +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 f90e068f00 - Updated comment for the ENCYCLOPEDIA feature 
o Currently this feature is disabled in the executable, because of hugh memory problems

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1690 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-30 16:47:22 +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 8464867bdc - 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_v1.13_data@1689 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-30 16:32:14 +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
Flugente d35a6cb87d changed poison symbol position 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1688 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-30 02:54:43 +00:00
Wanne 57ab1e2378 - Bugfix: DG Mercs (fixed missing approaches values) (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1687 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-27 11:12:36 +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 781239df5b - Removed unused TONY_USES_BOBBY_RAYS_SETTING and DEVIN_USES_BOBBY_RAYS_SETTING options from Ja2_Options.INI (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1686 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-26 07:29:20 +00:00
Wanne f43521f1fb BUGZILLA #629: Removed unused TONY_USES_BOBBY_RAYS_SETTING and DEVIN_USES_BOBBY_RAYS_SETTING from game, because they are externalized to the merchants xml files (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6160 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-06-26 07:22:06 +00:00
Wanne 19202a708b DG Merc Bugfixes (by anv) 
- fixed few quotes (Wink, Carp, Turtle, Sparky)
- changed Wink's throwing trait to demolitions
- changed incorrect zeroes in buddy/hate records to 255s
- changed Sparky opinion of Gary from buddy to hated

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1685 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-26 07:15:03 +00:00