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,171 Commits 9 Branches 6 Tags
dbdaecd30aab2b953efaf339d943a67aedf19964
Commit Graph
1171 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Flugente 0cee3c3783 added missing options to ini 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1681 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-23 21:41:57 +00:00
Wanne 83a8bda8bb - Added the last missing DG mercs (by anv) 
o Mitch (AIM), Carp (AIM), Lance (MERC), Raffi (MERC), Wink (MERC)
o added voice sets for above
o added love/hate talk for Spam, Vicki, Biff, Fidel, Bud 
o added gear kits for all MERC mercs, now everyone should have 5 choices (I hope they're somewhat balanced)
o added 2 signature weapons from DG: Postie's letter opener, Reuban's hedge trimmer, now in their kits

Notes:
o Carp has skill evolution set to 1/4 - as he "has slowed with age" according to his bio,
o hedge trimmer doubles up as wire cutter, so no puny fence will save you from getting chopped up,

see: http://www.bears-pit.com/board/ubbthreads.php/topics/321770.html#Post321770


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1680 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-20 19:38:57 +00:00
Wanne a136707d4d New Lua Externalization (Quests.lua) (by Jazz) 
- New File "Quests.lua"
- Modders can now define new events relating to tasks (from 0 to 254)
- Fixed missing laptop history quest text when escorted S. to Estoni

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1679 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-06-19 11:22:57 +00:00
Flugente 0821babe4d SHOW_HEALTHBARSOVERHEAD allows hiding the health and fatigue bars over your selected mercs 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1678 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-24 16:58:23 +00:00
Flugente c090d20e6e Clarified ini settings. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1677 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-15 21:06:05 +00:00
Wanne ba97ece129 - Re-added missing TOPTION_ZOMBIES to Ja2_Settings.INI 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1676 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-13 21:22:59 +00:00
Wanne 7b142dd704 - Added new JA/DG Mercs to M.E.R.C: Pops, Wally, Eli (by Anv) 
o Added speech for those mercs
o Updated Jimmy's Portraits


git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1675 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-13 19:42:32 +00:00
Wanne 2407705ea2 INI Adjustments (by Buggler) 
- Added RandomStats & RandomSalary options to INIEditorJA2Options.xml
- More detailed description for RandomStats settings
- Set faster laptop transition & website loading in Ja2_Options.ini for 1.13 & UB

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1674 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-11 16:58:49 +00:00
Flugente 525ff5b1c6 per default, random stats are off 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1673 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-10 23:32:15 +00:00
Flugente 3fde30a988 new feature: soldier profiles allows defining individual names/bodytypes/hair/skin/traits of soldiers and militia. The game will choose randomly from this pool. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1672 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-10 23:14:57 +00:00
Wanne e8d07c0656 Improved Random Stats Feature (by Buggler) 
- Added random starting salaries in Ja2_options.ini
- Added more options for random stats & tweaked existing formula

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1671 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-10 20:37:53 +00:00
Flugente 04a92b0599 new feature: fixed bayonets (still in need of animation) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1670 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-05 21:26:40 +00:00
Wanne aeb7c7a46d - Minor fixes (by anv & merc05) 
o Hector has bad MouthY coordinate (should be two numbers higher)
o Stella has Fox as a hated merc (should be Hurl)
o Reaper has Shadow as a buddy merc
o Reaper has Blood as "learn to like"
o Changed some GenderQuotes 
o fixing Larry's alumni page text

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1669 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-04 15:04:29 +00:00
Wanne bd8923e6bd - Added soundset for "Hector" (by merc05) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1668 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-04 14:36:55 +00:00
Flugente ea79346cf3 new feature: dynamic flashlights allows useable flashlights 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1667 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-03 23:29:01 +00:00
Wanne 78ef37e487 - Added random stats for Bernie and It (by Thor) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1666 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-03 07:43:24 +00:00
Wanne 8bd19f0b01 - Added ini property to control how long (in seconds) the load screen should be visible before disposal: Default: 2 seconds 
o This is needed, so we can read the new loadscreen hints text
o Property name: ADDITIONAL_DELAY_UNTIL_LOADSCREEN_DISPOSAL

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1665 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-02 20:50:03 +00:00
Wanne 5ac8c86872 - Updated LoadScreenHints.xml 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1664 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-02 17:01:30 +00:00
Wanne 3bb4f3ebad - Added reworked "Bernie" faces (now he looks older) (by anv) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1663 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-02 16:55:31 +00:00
Flugente 63bfdab9f0 - changed disabilities for Sam, Kaboom and Needle 
- externalised rocket rifle gridno

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1662 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-05-02 00:29:17 +00:00
Flugente 60674b63da Changes (all by anv): 
- added voicesets for It, Bernie and Ears
- added battle sounds for Elroy (previously overlooked somehow)
- added some hate talk to Spike, Boss, Leech, Rusty and Sidney
- fixed wrong ammo in Weasel's equipment
- added some cheap knives to Mouse's and Elroy's kits, so they can make use of their new traits right away
- unlocked extra banter dialogue for some mercs (quote 45)
- added new gargantuan MercOpinions.xml, containing 255 opinion records per merc. Most new ones are 0 by default, I changed those for buddies and foes to 25/-25.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1661 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-30 22:26:20 +00:00
Flugente 86a6a5481c added a few hints 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1660 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-29 23:07:21 +00:00
Flugente 205aa6a852 added soundset for Stella (by merc05) 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1659 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-29 23:02:52 +00:00
Flugente a9d6c9e252 Feature improvement: allow accessing other merc inventories when ACCESS_OTHER_MERC_INVENTORIES is TRUE. Even works with dying mercs. 
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1658 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-28 22:57:53 +00:00
Flugente 8fd19010d7 - added soundset for Smoke (by merc05 & steggieav) 
- fixed one sound for Moses (by merc05)

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@1657 4f8fa57e-7814-0410-bad4-adc449f26b7c
 2013-04-27 02:22:12 +00:00