Commit Graph
762 Commits
Author SHA1 Message Date
Hazapuza 38431dd41b Added palette-swapped black versions of the basic shotgun and sawn-off shotgun
- Super-Shorty no longer invisible, uses black version of the sawn-off shotgun graphics

- Moved Fabarm FP6, SDASS and Benelli M3 from SPAS-12 to black shotgun graphics
2024-03-17 22:09:06 +02:00
Hazapuza c942bacb66 Added LOBOT graphics for a short AK-style compact carbine
The AKS-74U and AKMSU now use a wooden furniture version, and several short-barreled black/dark-colored rifles use an all-black version.
2024-03-15 15:16:12 +02:00
Hazapuza c2a4bb6404 Added a new weapon, the FN PS90
The rifle class is now once again mostly devoid of any notable end-game weapons, and this is meant to compensate for that a bit. The PS90 is available from BR's and Tony, at coolness 7.
2024-03-10 20:26:20 +02:00
Hazapuza 12848a06ef LOBOT graphics for XM25 and G11
- XM25, OICW and AICS set to use the XM-25 graphics

- G11 and CAWS set to use the G11 graphics

-Added '25mm' to XM-25's descriptions, fixed several typos
2024-03-07 07:33:46 +02:00
AsdowandGitHub 6e2de6c617 LOBOT: Add ghillie suit and camo uniform (#77) 2024-03-05 11:54:46 +02:00
Hazapuza 90c1fe6eca Fixed a crash caused by wrong formatting 2024-02-29 02:50:00 +02:00
Hazapuza 14dbad3987 More updates to LoadScreenHints.xml
One new hint, reworded a few hints to include secondary hotkeys and to be within the character limit.
2024-02-27 15:38:42 +02:00
Hazapuza 0d86549924 Add a few new hints, update LoadScreenHints.xml in Data to match the one in Data-1.13 2024-02-27 01:02:32 +02:00
Andrzej FałkowskiandGitHub 7e1c337e55 Specific drug types and drug items for background and facilities - template, bar items and hidden bars for vanilla. (#62) 2023-10-02 19:31:10 +03:00
Andrzej FałkowskiandGitHub 70a31331bf Map recolours (#59)
* INI settings for radar and overhead map color variants

* Option translations

* UB INI options.
2023-10-02 19:30:36 +03:00
Andrzej Fałkowski 6236c73367 Merge branch 'master' into loading-screens-multi-res 2023-08-31 23:29:07 +02:00
Andrzej FałkowskiandGitHub 89fef39a37 Battle panel interface with support for multiple resolutions and scrollable list (#46) 2023-08-20 20:52:11 +03:00
Andrzej Fałkowski 93fa9ed17f Merge branch 'master' into loading-screens-multi-res 2023-08-19 22:59:21 +02:00
Andrzej Fałkowski 0cf9ef37db INI settings for loading screen stretch mode 2023-08-19 22:54:51 +02:00
rftrdevandGitHub d9850444f6 Update Skills_Settings.ini (#41) 2023-08-11 11:27:08 -07:00
rftrdevandGitHub 47bb45efe7 Growth modifiers gamedir changes (#40)
* Replace bEvolution with fRegresses

An evolution value of 2 meant that they devolved, so only Moses and non-sober Larry regress

* Update growth modifiers for specific mercs

Since we can't (currently) force a merc to not grow, we'll just set their growth modifier to an extremely high (slow) value

Len: extremely slow
Spike: extremely slow
Henning: extremely slow
Pops: extremely slow
Wally: very slow (Marksmanship only)
Carp: slow
Leon: extremely slow
Sam: extremely slow

* Add default growth modifiers (0) to the rest of the mercs
2023-08-09 18:35:42 -07:00
AsdowandGitHub 98f17aad86 Lobot: Added blood pools to 3 death animations (#37)
* LOBOT: Add blood pools to most common death anims

* Move HasRifleInHand layerprop down in priority

Allows more specific graphics to take over precedence, eg. when a rifle instead of AR class weapon uses FAL graphics
2023-07-22 14:14:29 +03:00
rftrdevandGitHub 9a08e588bd Add reduced stat growth options to ja2_options.ini (#36) 2023-07-21 22:53:30 -07:00
AsdowandGitHub 7a888677a4 Update F_N_PRNE_kevlar.sti (#35)
Fix faulty sprite for female merc
2023-07-19 15:37:39 +03:00
rftrdevandGitHub 61060d4522 Add missing transport group options (#34) 2023-07-05 18:30:38 -07:00
rftrdevandGitHub 1e75f36d4b Transport group gamedir changes (#33) 2023-07-04 20:57:43 -07:00
AsdowandGitHub e95214e641 Lobot: Fix dual wielding sawed off shotguns (#27) 2023-01-25 15:58:19 +02:00
AsdowandGitHub 832b1a7bf2 Lobot: Fix flying back with bloodspurt animation (#20)
There was an error where this animation was 7 frames per direction long, when it should be 24 frames per direction.

Using regular flying back animation as a placeholder until animations with gore are implemented.
2023-01-20 13:16:49 +02:00
AsdowandGitHub b90e364d7a Lobot (#19)
Make use of new  attachment filter criterion for lobot

Balaclava still requires to be defined as a valid attachment for helmets, but kneepads should now show up already when they are attached to leg armor.
2023-01-19 14:22:32 +02:00
AsdowandGitHub d0684923db Fix rendering mistake in EOD pants for big male (#17) 2023-01-16 13:39:51 +02:00
AsdowandGitHub 5f071ca86a Merge pull request #14 from 1dot13/LOBOT
New graphics for LOBOT
2023-01-15 02:09:23 +02:00
Asdow ab9335a2ce EOD suit for big male 2023-01-15 01:59:12 +02:00
Asdow 25f6fbc931 Update Hats.stp 2023-01-14 15:25:51 +02:00
Asdow af0ede3d60 Fix regular male EOD helmet when prone 2023-01-14 15:24:57 +02:00
Asdow f76c9ce5a2 Fix rolling with rifle and eod suit on 2023-01-14 14:59:33 +02:00
Asdow 70f8c2ae09 Added alternative eod helmet graphics
When prone and wearing eod helmet and vest, the vest collar needs to cover part of the helmet
2023-01-14 14:34:00 +02:00
Asdow fd0e73ab92 Remove EOD helmet and vest from other filters 2023-01-14 02:39:05 +02:00
Asdow 465f39a9e1 Added EOD suit animations for female 2023-01-14 02:38:25 +02:00
Asdow 7045e4c2de update EOD vest sti files 2023-01-13 19:19:20 +02:00
Asdow f42e439a4a Update LOBOT xml files 2023-01-13 18:43:02 +02:00
Asdow 30fcda5501 EOD suit anims for regular male 2023-01-13 18:38:31 +02:00
Asdow 78791b9789 Add spectra & balaclava for big male and female 2023-01-12 20:41:21 +02:00
Asdow 120ce28c66 Added balaclava, heavy armor vest and holsters for regular male 2022-11-19 20:04:39 +02:00
Asdow ae2dd0f6fe Added Kevlar vest graphics 2022-11-18 19:47:20 +02:00
AsdowandGitHub 464865994b Merge pull request #11 from 1dot13/LOBOT
Update Filters.xml
2022-11-10 19:57:55 +02:00
Asdow f1c4897408 Update Filters.xml
Fix typo, for whatever reason this error only triggered in JA2_vanilla vfsconfig
2022-11-10 19:57:13 +02:00
AsdowandGitHub b92130c76b Merge pull request #8 from 1dot13/LOBOT
- Add Sawnoff shotgun animations to LOBOT
- Move LOBOT xml data to Data from Data-1.13
-- Items.xml uiIndexes match between 1.13 and Vanilla so a separate filters.xml is not needed for Data-1.13
2022-11-10 19:33:28 +02:00
Asdow 6c3a6c9ad1 Move LOBOT tabledata to Data from Data-1.13 2022-11-10 19:29:28 +02:00
rftrdevandGitHub 4aec27af28 Gamedir changes for ARC missions (#7) 2022-11-07 00:35:37 -08:00
Asdow 747c90c13c Add Sawnoff shotgun animations to LOBOT 2022-11-06 11:52:11 +02:00
rftr b01f07af0e Added graphics for new imp gear selection (by Asdow)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2652 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-08-01 21:07:15 +00:00
rftr 1a5e00996b added new options to limit merc salary increases on level up:
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2650 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-05-28 21:08:59 +00:00
Sevenfm 73d3974407 New option LIMIT_SIMULTANEOUS_SOUND.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2649 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-05-05 07:54:41 +00:00
Sevenfm a393642517 Set SIDE_FACING_DIVISOR = 1.0 by default.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2648 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-05-03 11:36:40 +00:00
rftr 8bf29862c1 added new option in Skills_Settings.ini: [Covert Ops] COVERT_TURNCOATS_ACTIVATE_IN_AUTORESOLVE
if enabled, turncoats will automatically activate when entering an autoresolve battle

requires r9365

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2645 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-04-14 06:50:59 +00:00