Commit Graph
794 Commits
Author SHA1 Message Date
AsdowandGitHub a089a93163 Merge pull request #167 from 1dot13/ExtraMercs
Increased Team Sizes
2025-09-24 17:07:40 +03:00
Asdow 55ae5d5f72 Add revolver holster to filter 2025-08-30 14:21:01 +03:00
KittyandGitHub 3d1e9fc34c Adjusted MercProfiles to expanded and sorted nationalities (#168)
associated source change

https://github.com/1dot13/source/commit/11202d7e7e595012233a4c93874c4e42b355f6c0
2025-08-14 13:20:20 +02:00
Asdow f68c60afbb Remove default value text 2025-08-09 11:40:29 +03:00
Asdow 5371ab5505 Adjust Ja2_options.ini 2025-08-08 20:36:09 +03:00
edawgsnizzleandGitHub 6ed41b15d5 Missing Rooftile
replaced missing rooftile
2025-05-25 05:26:41 +10:00
Hazapuza 2509b025ce LOBOT: graphics for Officer's Coat, palette fixes
LOBOT:
- Added graphics for the Officer's Coat
- Added a separate palette for tan-colored firearms (the SCAR and XM8 families and the Milkor)
- Added a separate palette for the Guardian Vest

Items:
- The Officer's Coat can now also be attached to most vest armors
2025-03-26 08:28:25 +02:00
Hazapuza 1b904ccb89 LOBOT: Various fixes to filters, added a new Army Cap hat
LOBOT:
- Fixed and renamed several filters in Filters.xml and the related LogicalBodyType .xml files
- Leather jackets now display longsleeved graphics

Items:
- Added a new Army Cap hat, uses the existing ballcap LOBOT graphics
2025-03-23 20:11:01 +02:00
Hazapuza e92581f2ed Added a Cowboy Hat item and LOBOT graphics, minor other changes and fixes
LOBOT:
- Added cowboy hat graphics
- Added a palette swap for the SVDS
- Fixed female SWAT Helmet palette
- Ghillie cover, jacket and leggings now display ghillie suit graphics when attached to armor items

Other:
- Added a new Cowboy Hat item, available from BR's later in the game and in Tex's starting gear kits
2025-03-22 00:12:15 +02:00
Hazapuza b8b675ab92 LOBOT: Updated Filters.xml...
...to correctly display Woodland BDU Jacket when it's attached to a vest armor item.
2025-03-20 16:06:04 +02:00
Hazapuza ca22a7d9b6 LOBOT: New blunt melee weapon strike animation, other small refinements
LOBOT:
- Added a new blunt melee weapon strike animation, currently used by the Retractable Baton, Shovel and Pipe Wrench
- Touched up some .sti files
- Changed SWAT Vest, Leggings and Helmet color to a more subdued one
2025-03-19 21:16:27 +02:00
edawgsnizzleandGitHub 55fa6749e2 Fixed IMP Male 4 voice (#137)
* Add files via upload

* Add files via upload

* Delete Data-1.13/Speech/169_064.GAP

* Delete Data-1.13/Speech/169_004.WAV

* Delete Data-1.13/Speech/169_004.GAP

* Delete Data-1.13/Speech/169_005.WAV

* Delete Data-1.13/Speech/169_007.WAV

* Delete Data-1.13/Speech/169_009.GAP

* Delete Data-1.13/Speech/169_009.WAV

* Delete Data-1.13/Speech/169_037.WAV

* Delete Data-1.13/Speech/169_055.GAP

* Delete Data-1.13/Speech/169_055.WAV

* Delete Data-1.13/Speech/169_064.WAV

* Delete Data-1.13/Speech/169_067.WAV

* Delete Data-1.13/Speech/169_069.GAP

* Delete Data-1.13/Speech/169_069.WAV
2025-03-09 18:44:46 +01:00
Hazapuza 6f5821a1b2 Yet more LOBOT fixes, new BDU jacket and pants items, new berets, minor item/text changes and fixes
LOBOT:
- Fixed SPAS 12 and basic shotgun ground shadows and water animation palettes
- Added palettes and filters for desert and urban camouflage jackets and pants, originally made by shadics
- Added palettes and filters for green and blue berets, originally made by shadics

Items:
- Changed Field Uniform into Woodland BDU jacket, can be worn in the vest slot and also attached to most body armors, +15% woodland camo, +5% desert camo, reduced armor values, can't take ceramic/titanium plates anymore
- Added Desert (+15 desert camo, +5 woodland camo) and Urban (+15 urban camo) BDU jackets, otherwise identical to above
- Added Woodland (+10 woodland camo, +3 desert camo), Desert (+10 desert camo, +3 woodland camo) and Urban (+10 urban camo) BDU pants, can be worn in the legs slot and also attached to most leg armors
- Added Green and Blue Berets, originally made by shadics
- Gave the Underarmor Camo Shirt +5% stealth bonus
- Folding Stock (folded) and Retractable Stock (retracted) now have their own distinct inventory images
- Touched up Fire Extinguisher inventory images
2025-03-09 17:30:28 +02:00
Hazapuza 79ebdd1fec More LOBOT .sti file fixes, new graphics for Pepper Spray, new Balaclava and Woodland Camo Pants items, assorted other minor fixes and changes
LOBOT:
- Fixed more bugged LOBOT ground shadows and water animation palettes
- Added LOBOT graphics for the Pepper Spray weapon
- Added more missing melee weapon LOBOT graphics
New items:
- Added a new Balaclava item, available from BR's, fits into the helmet slot and also works as an attachment on most other headgear
- Added Woodland Camo Pants, available from BR's, fits into the legs slot and also works as an attachment on most other leg armors
Other:
- Dress Uniform can be attached to most armor vests, also reduced its armor protection to minimum
- Reduced Officer's Coat armor protection to minimum
- Reduced Underarmor Shirt coolness from 5 to 4
- Touched up the big inventory image of the Empty Sandbag item (removed the light blue pixels)
- Fixed several typos in item descriptions
- Made minor changes to item descriptions
2025-03-07 21:44:29 +02:00
Hazapuza e9700f2a09 Fixed a crash caused by missing palette files 2025-02-28 16:04:11 +02:00
Hazapuza dd27eab64f LOBOT: added new gear graphics, fixed graphical bugs, assorted other fixes
- Added unique LOBOT graphical assets for most clothing and armor that previously lacked them
- Added assets for most bladed melee weapons
- Added assets for combat pack
- Recolored several LOBOT weapons to match the relevant inventory images (including all SCAR, XM8 and FN FAL models)
- Fixed (re-rendered) a large number of bugged two-handed weapon LOBOT .sti files: many had bugged ground shadows in several camera angles and faulty palette in most water animation camera angles
- Fixed a few miscolored pixels in two regular male EOD Vest prone stance .sti files
- Changed the Hand Mortar into a two-handed weapon
- Changed the Jatimatic's weapon type to machine pistol
- Unified regular male LOBOT .sti file names of rifle crouched walk and rifle ready crouched walk animations
- Removed unused Uzi LOBOT files
2025-02-28 03:00:11 +02:00
Asdow 97df7fce77 Revert "Update Silhouette.xml"
This reverts commit 84e00679de.
2025-01-08 11:02:45 +02:00
Asdow 84e00679de Update Silhouette.xml 2025-01-08 00:44:00 +02:00
Asdow 65e384480b Update ExplosionType.xml 2025-01-08 00:44:00 +02:00
kitty624 3bbfc274f3 Reintroduction of Intro and Outro video files
- past issues for video files (blackscreen on start) appear to be solved
- therefore reintroducing of video files (from an unpacked Intro.slf)
- using a directory instead of .slf for ease of access
2025-01-04 18:41:48 +01:00
Asdow a148f8f633 LOBOT: Fix invisible sprites for hand mortar
Uses sawn off shotgun graphics for now as we lack unique sprites for it
2024-12-30 19:27:57 +02:00
kitty624 cee087e64a Update Backgrounds.xml in JA2 vanilla
- to allow functionalty of Alternative_IMP_Creation
2024-12-26 11:28:29 +01:00
kitty624 6ad650c6f7 Update/Fix JA2 vanilla
- added UB-tilesets to allow to use them for JA2 maps in JA2 vanilla as well
(follow up to previous commit)
- added missing "Alternative_IMP_Creation" entry into Data/ja2options.ini
2024-12-26 10:41:29 +01:00
kitty624 fc1233eb2c Fix using UB-tilesets in JA2-mapeditor
- using "UB tilesets for JA2" by Snap as template
- in tilesets 53-59 snow-covered graphics, such as sandbags, were replaced with
more appropriate JA2 graphics
- updated ja2set.dat in Data/BinaryData to match this change
- added updated ja2set.dat in Data-1.13/BinaryData,
as preperation for comming update to sector fortification
- adjusted ja2setdat.xml in Data and Data-1.13 to match the changes
- added a ja2setdat.xml to Data-UB, this one will match the UB-tilesets in UB
NOTE:
- The UB-tilesets in 1.13 are solely meant to be used with 1.13
- UB-1.13 and UB-vanilla DON'T use the UB-tilesets in Data-1.13
- UB-1.13 and UB-vanilla use the UB-tilesets in Data-UB instead
- to edit UB-maps, use UB-mapeditor
- to edit JA2-maps, use JA2-mapeditor
- in JA2-MapEditor, tileset Generic 1 (directory 0) will be the default tileset
- in UB-MapEditor, the default tileset will be Heavy Snow (directory 50)
- that's why ja2set.dat and ja2setdat.xml differ between JA2 and UB
2024-12-26 09:09:04 +01:00
Asdow 958bd7dec4 Add missing tags back to Items.xml
FoodType & PercentAim were missing
2024-12-22 14:11:32 +02:00
Asdow 6320e6c8cc Add individual tags for ItemFlags bitmasks
Requires updated .exe
2024-12-22 00:08:05 +02:00
Asdow 5aca2e4727 Create OverheadInterface_scrollarea.sti
Required for scrollable mercs in tactical placement gui
2024-12-04 00:15:20 +02:00
HazapuzaandAsdow 86c5e96b65 Update Filters.xml
Removed unnecessary item ID exclusions from several filters.
2024-11-07 20:42:57 +02:00
HazapuzaandAsdow 8fd17b75b9 Thicken the barrel on the P-08's graphics 2024-11-07 20:42:57 +02:00
HazapuzaandAsdow d97bd882e9 Add tons more LOBOT weapon graphics
Added unique LOBOT graphics for the vast majority of 1.13's firearms.

Also edited and re-rendered some of the existing LOBOT weapon graphics, in order to fix missing pixels (mainly thin barrels disappearing on some animation frames), and made wooden parts somewhat lighter for slightly better shading.
2024-11-07 20:42:57 +02:00
AsdowandGitHub b9f77e8483 Replace MercOpinion.xml files with the new format (#95)
Instead of storing all opinions in unique <Opinion1>, <Opinion2>, ... <Opinion254> tags for all profiles, only opinions with a value other than 0 is now stored in <AnOpinion id = "1" modifier = "-10" /> tag

This change changed the loading time for merc opinions from 4.047 s to 0.011 s

A small cmd utility tool for converting existing MercOpinions.xml data into the new format is available at https://github.com/Asdow/JA2-ConvertXMLData/tree/master
2024-08-13 00:29:17 +03:00
AsdowandGitHub a57876d507 Added item graphics up to Barrett M82A2 for Vanilla config (#94)
Fixes CTD / Assertion error from missing graphics when playing the game with Vanilla config and seeing the M82A2 in BR shop or when encountering the item in strategic/tactical modes
2024-08-06 18:34:21 +03:00
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