1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-12 14:10:23 +02:00
Code Issues Packages Projects Releases Wiki Activity
7,623 Commits 9 Branches 6 Tags
latest
Commit Graph
7623 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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 a4c2f079ed - 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
-> RECRUITABLE_SPECK, RECRUITABLE_JOHN_KULBA, RECRUITABLE_JOHN_KULBA_DELAY, RECRUITABLE_JA1_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


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1715 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-29 11:55:20 +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 ac5bebff2c 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_v1.13_data@1714 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-28 14:06:17 +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 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