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
7,604 Commits 9 Branches 6 Tags
master
Commit Graph
7604 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 9e9b3fa774 - Added possibility to create 7 IMP males instead of only 4 (by Parkan) 
o Added profiles & other needed XML data for 3 new IMPs (MercProfiles.xml, ...)
o The 3 new IMPs use voice set (speech & edt) of IMP (51, 52, 53). All speeches are Russian currently, texts in English


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1713 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-23 13:14:06 +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 5dea75e703 - Bugfix: Dialog is not triggered after escorting John & Mary to the Drassen airfield (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1712 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-21 21:17:01 +00:00
Wanne 366b3c1205 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

- Added missing entries to Data/Ja2_Options.INI

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1711 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-21 17:43:30 +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 3d56b61dda o Externalized ja2_options.ini value if you want to use / or not the cleaned up version of CalcNewChanceToHitGun: USE_NEW_CTH_CALCULATION (by silversurfer) 
o see: 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_v1.13_data@1710 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-21 17:09:14 +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 42020087bf - Re-added the <ubGraphicNum>245</ubGraphicNum> for uiIndex=445 (5.56x45mm Belt M) which got lost in revision 1708 (thx to silversurfer for reporting) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1709 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-19 07:30:30 +00:00
Wanne dbdaecd30a Added / Updated Item graphics (by Bambusar) 
o see: http://www.bears-pit.com/board/ubbthreads.php/ubb/showflat/Number/322670/Searchpage/1/Main/12303/Words/Bambusar+/Search/true/Re_BUGZILLA_report_all_bugs_he.html#Post322670

Pepper Spray      SM
Spray Canister    SM
Scuba Mask        SM
Diving Bottle     SM
Scuba Fins        SM
Binders           SM

Flashlight        SM MD BIG
Flashlight        SM MD BIG
Garotte           SM MD BIG
Body              SM MD BIG
Binders

TIMS Backpack     SM
ARUC Backpack     SM
MALICE3 Backpack  SM
TIMS Pack         SM
TT 3-Day Pack     SM
Patrol Pack       SM 

Light knife       MD



git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1708 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-17 19:07:33 +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
Wanne b1dcf5fb56 - Bugfix: Fixed missing <ubGraphicNum>245</ubGraphicNum> for uiIndex=445 (5.56x45mm Belt M) (by Bambusar) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1707 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-16 09:27:28 +00:00
Wanne 573370a302 - Bugfix: Added missing nAccuracy tag with value 6 for uiIndex = 675 (HK P7M8) (by Bambusar) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1705 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-16 06:25:14 +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 535b558683 - Updated Chinese.MercProfiles.xml (by zwwooooo) 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameData@6232 3b4a5df2-a311-0410-b5c6-a8a6f20db521
 2013-07-15 13:20:46 +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
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