Commit Graph
2829 Commits
Author SHA1 Message Date
Asdow 0cd872a3b2 Fixes quest ending if you kill bloodcats before talking to Betty first 2025-06-25 22:53:38 +03:00
Asdow 3a5be2bd39 Fix Speck speech after hiring a merc
Speech file formats take precedence in order of mp3 > ogg > wav
Data-1.13 had two of Speck's lines as .ogg format which would then get loaded even in UB instead of UB specific lines that were in .wav format.
2025-06-25 16:26:55 +03:00
Asdow 6dc2cd329e Use correct backgrounds for UB mercs
Gaston, Stogie and Manuel had wrong backgrounds as the profiles we use in UB are different from the ones that were added to JA2
2025-06-25 13:45:12 +03:00
Asdow b52b42b82d Improve ini setting descriptions
* Externalized the fan tunnel starting sector exitgrid location that was still hardcoded.
2025-06-24 22:53:03 +03:00
Asdow ffe72a156b Update Biggins NPC script
* Trying to walk past him, he will now stop the player, move to the correct tile, trigger the mine explosives and turn hostile
* Threatening him will close the dialogue, he moves to the correct tile, triggers explosives and turns hostile
* Shooting him makes him turn hostile. Does not trigger explosives. Game keeps freezing if he gets interrupted while on his way to the tile where bombs are set off so this functions as a workaround.
2025-06-24 19:34:23 +03:00
edawgsnizzleandGitHub 6ed41b15d5 Missing Rooftile
replaced missing rooftile
2025-05-25 05:26:41 +10:00
Asdow a9ba654eb7 Add weekly & bi-weekly salaries
UB will rely on weekly salary as the onetime fee and new M.E.R.C members were working for free
2025-04-25 23:07:58 +03:00
Asdow 47267a6194 Remove duplicate salary
UB Gaston (profile 58) had salary tags duplicated with the latter tags having value 0 making him a free mercenary. A veritable oxymoron!
2025-04-25 22:23:51 +03:00
KittyandGitHub dbb6762173 Removed tags for detonators (#148) from kitty624
Removed tags for detonators
no longer needed and also previously been unused
2025-04-09 21:23:16 +02:00
kitty624 03e5bb61f7 Removed tags for detonators
no longer needed and also previously been unused
2025-04-09 21:19:31 +02:00
KittyandGitHub 3519efb60d LOBOT: Officer's Coat, palette fixes (#147) from Hazapuza
LOBOT: graphics for Officer's Coat, palette fixes
2025-03-26 12:56:09 +01: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
KittyandGitHub acd611f950 LOBOT: Various fixes to filters, added a new Army Cap hat (#146) by Hazapuza
LOBOT: Various fixes to filters, added a new Army Cap hat
2025-03-24 05:43:12 +01: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
KittyandGitHub 8a0cebd049 Cowboy Hat item and LOBOT graphics (#145) from Hazapuza
Added a Cowboy Hat item and LOBOT graphics, minor changes and fixes
2025-03-21 23:18:46 +01: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
KittyandGitHub ca1cef4576 LOBOT: Updated Filters.xml... (#143) from Hazapuza
LOBOT: Updated Filters.xml...
2025-03-20 20:31:00 +01: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
KittyandGitHub c23cabd8de LOBOT: New blunt melee weapon strike ... (#142) from Hazapuza
LOBOT: New blunt melee weapon strike animation, other small refinements
2025-03-19 22:00:07 +01: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
KittyandGitHub a346fa2790 Yet more LOBOT (#141) from Hazapuza
Yet more LOBOT fixes, new BDU jacket and pants items, new berets,...
2025-03-09 17:55:13 +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
KittyandGitHub 83bac5f0c3 More LOBOT (#140) from Hazapuza
More LOBOT .sti file fixes, new graphics for Pepper Spray, new...
2025-03-07 20:51:59 +01: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
KittyandGitHub 897d4116ca LOBOT add missing palette (#139) from Hazapuza
Fixed a crash caused by missing palette files
2025-02-28 15:08:38 +01:00
Hazapuza e9700f2a09 Fixed a crash caused by missing palette files 2025-02-28 16:04:11 +02:00
KittyandGitHub a25d867cea LOBOT updates and fixes (#138) from Hazapuza
LOBOT: added new gear graphics, fixed graphical bugs, assorted other fixes
2025-02-28 02:13:41 +01: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
HazapuzaandGitHub 7a6987ca99 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2025-02-10 22:58:02 +02:00
edawgsnizzleandGitHub 6097fd891f New AI Voice dialogues for Kyle Lemmos and Tina (#135)
* Add files via upload

* Add files via upload

Kyle Lemmons additional voice dialogue

* AI generated Tina's missing voice dialogues

Not 100% happy with tina's generated voice (due to lack of sample audio) but it's better than nothing. The existing dialogue doesn't really match her merchant type either.

* Rename 129_011.gap to Data-1.13 /Npc_Speech/129_011.gap

* Delete Data-1.13 /Npc_Speech directory

* Delete 129_012.gap

* Delete 129_011.wav

* Delete 129_012.wav

* Delete 129_013.wav

* Delete 129_015.wav

* Delete 129_016.wav

* Delete 129_017.wav

* Delete 129_018.gap

* Delete 129_018.wav

* Delete 129_019.gap

* Delete 129_020.gap

* Delete 129_019.wav

* Delete 129_021.wav

* Delete 129_020.wav

* Delete 129_022.gap

* Delete 129_022.wav

* Delete 129_023.wav

* Delete 129_024.gap

* Delete 129_024.wav

* Delete 129_025.gap

* Delete 129_025.wav

* Delete 129_026.wav

* Delete 129_027.gap

* Delete 129_027.wav

* Add files via upload
2025-02-09 10:18:59 +01:00
HazapuzaandGitHub 9346f0d726 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2025-02-05 23:00:27 +02:00
KittyandGitHub 0110505164 Fix Items.xml classindex (#133)
Fixed Items.xml classindex of Flashlight(s) and RifleGrenadeDevive to match their entry in weapons.xml
2025-01-24 22:10:52 +01:00
kitty624 2beafda349 Fix Items.xml classindex
classindex of Flashlight(s) and RifleGrenadeDevive changed to match their entry in weapons.xml
2025-01-24 22:06:01 +01:00
Marco Antonio J. Costaandmajcosta aae6270e9d Use the same enums for IntroType as Ja2 2025-01-09 21:34:20 -03: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
KittyandGitHub 40935c7e77 Fix Staring Gear Carp (#128) 2025-01-07 19:56:14 +01:00
kitty624 0700d8b378 Fix Carp Starting Gear Carp
- fixed doublette in tags in set Ammo
- added additional AP ammo
2025-01-07 19:51:32 +01:00
kitty624 b9be2b3c91 Fix Starting Gear Carp
- had two times tag big0 in set "ammo", which doesn't work
- fixed doubled tag and also added additional one
- this set will now come with ammo in Ball, AP and Glaser
2025-01-07 19:42:26 +01:00
KittyandGitHub 3864ec9e04 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 19:03:04 +01: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 b37234d539 Add missing entry to Silhouttes.xml 2025-01-02 22:29:00 +02:00
KittyandGitHub 6088175555 LBE update (#125)
LBE update
small changes to possible combos
Tactical Sling can now be used with 3-day Pack and Blackhawk Patrol Pack as well
2025-01-02 00:01:24 +01:00
kitty624 8e79f13631 LBE update
small changes to possible combos
Tactical Sling can now be used with 3-day Pack and Blackhawk Patrol Pack as well
2025-01-01 23:57:46 +01:00
HazapuzaandGitHub 00994692b9 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2025-01-01 02:26:47 +02:00
KittyandGitHub c339482221 Merge pull request #123 from FunkyFr3sh/master
update to cnc-ddraw 7.1
2024-12-31 21:23:21 +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
FunkyFr3sh 544e96945e update to cnc-ddraw 7.0 2024-12-29 06:28:21 +01:00