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
1,196 Commits 9 Branches 6 Tags
8cb5d41a4d31cf04f095467e2e67261ecbb9a02e
Commit Graph
1196 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Wanne 8cb5d41a4d - Cosmetic Improvements to MERC hiring page (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1736 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-22 19:36:22 +00:00
Wanne 8c6c13d335 - Added optional profile names to the XML files (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1735 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-21 22:25:16 +00:00
Wanne b891c8e99b - Updated Vehicles.xml (by silversurfer) 
o Added the jeep

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1734 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-21 07:52:47 +00:00
Wanne 62a16871e7 - Updated some JA DG faces and added missing camo faces for JA1 natives (by anv) 
o Face improvements: Spam & Roachburn family members
o Added missing camo faces for the 3 JA1 natives

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1731 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-20 06:45:46 +00:00
Flugente 6d0f1059ce added a few loadscreen hints (by Acqsen & Flugente) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1730 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-19 19:43:33 +00:00
Flugente 5884224bbb made tripwire merges not that hard, thereby reducing the stat gain 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1729 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-16 22:27:29 +00:00
Wanne 26807ae8e8 - Fixed wrong index of drunken Larry in MercAvailability.xml (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1728 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-15 20:21:19 +00:00
Wanne b9b5abb11d - Fixed missing and placeholder face files for the 3 JA1 natives (by Buggler) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1727 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-14 11:20:06 +00:00
Wanne abd112fec4 - Bugfix: Fixed duplicated tags that were introduced in revision 1725 (thx to silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1726 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-11 20:08:25 +00:00
Wanne 2bfb133c2b - Re-added missing buddies/hates for some merc that were overwritten in revision 1715 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1725 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-11 19:19:35 +00:00
Wanne da041d4558 - Quickfix: Added the missing 33-faces for the 3 JA1 natives to fix the crash 
o Currently all the 3 uses the face of John Kulba, until we get the correct ones

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1724 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-11 19:11:23 +00:00
Flugente a2322a6dc4 new feature: 'Move item' assignment allows quick and easy mass transfer of items between city sectors. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1723 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-11 15:07:36 +00:00
Flugente eac402f47e added and adjusted the following features by zwwooooo to help restoring IoV to a pure item mod: 
- externalized the brightness vision range modifiers to allow for different ratios of day/night vision range
- added <PercentRangeBonus> as a complement to <Rangebonus>
- added the possibility for LBE vests to function as plate carriers

These were the missing features from IoV previously not in the 1.13 trunk. Thereby, IoV is now fully compatible to the current trunk (by DepressivesBrot)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1722 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-08 21:08:44 +00:00
Flugente fb93c07517 R-Holster is now covert. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1721 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-06 20:44:38 +00:00
Wanne 42210095bd - Bugfix: Overhead.lua (by Jazz) 
o Entering Kinpgin room through the window. Demon (bodyguard) has to let in the player and Kingpin has to expect the player

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1720 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-08-02 11:18:54 +00:00
Wanne 837d54cf45 - Added missing MERC level up emails for John Kulba and the 3 JA1 natives 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1719 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-31 20:25:48 +00:00
Wanne 17f4b648e1 - Bugfix: Fixed wrong bio index for the 3 JA1 natives (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1718 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-31 20:10:47 +00:00
Flugente 43fe6ec3d1 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_v1.13_data@1716 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-07-30 19:34:13 +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
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
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 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 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 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 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
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 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
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 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
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 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
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
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 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
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 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 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
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 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 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
Wanne 4dcca6488b - Added the new CIVILIANS_DROP_ALL option to Ja2_Options.INI (by silversurfer) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1683 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-25 06:37:41 +00:00
Flugente b6b1504296 reverted unnecessary changes 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1682 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-23 21:52:11 +00:00