Commit Graph
2077 Commits
Author SHA1 Message Date
kitty624 401c115773 Adding a separate attachment slot for batteries
previously a glitch could happen when one attachment used batteries while weapon did have a stock attachment as well
now batteries have their own attachment slot, no longer in conflict with slot for weapon stocks
2025-09-07 03:59:55 +02:00
kitty624 8af1fe10ad Better graphic for Flamethrower
taken from mod MFM by WilGates
2025-09-04 17:42:23 +02:00
Marco Antonio J. Costaandmajcosta 65f5404384 fully externalize QueenAttacksLosingControlOfSector 2025-09-02 20:01:55 -03:00
Asdow 8f6e057828 Add revolver holster to filter 2025-08-30 14:21:01 +03:00
KittyandGitHub f2666abbef Update Drugs.xml
fix missing tag

Signed-off-by: Kitty <58940527+kitty624@users.noreply.github.com>
2025-08-23 16:49:11 +02:00
kitty624 f5fcd66ff8 Harmless or beneficial drugs don't trigger opinion about druguse anymore
removed tag opinionevent from reg-boster and energydrink
2025-08-23 16:42:06 +02:00
kitty624 035bd9d3b7 Sector C5 and D5 updated Commando in inventory of Kingpin goons
replaced the Commando in their inventory with up-to-date version
now will have inbuild stock as intented
2025-08-19 01:01:14 +02:00
BeatAroundTheBuscherandGitHub 9fb4179f5b NPCs wear more hats, non helmet hats can attach NVGs, etc. (#173)
* Hand out some hats

* Added Attachments (NVGs, etc.) to non helmet head gear
2025-08-17 17:46:43 +02:00
KittyandGitHub c62c3758a6 Remove BDU Pants attachments from the M1911 pistol (#172)
Remove BDU Pants attachments from the M1911 pistol
2025-08-16 17:10:25 +02:00
Buscher 1ade224394 Remove BDU Pants attachments from the M1911 pistol 2025-08-16 14:24:26 +02:00
kitty624 1de2cc7aee Some items meant for OAS now excluded when not using that
A.L.I.C.E. backpack
First Response KIt
gave tag AttachmentSystem and set it to 1 (OAS only)
with this they won't show without using OAS
there are probably more that should get it, but gotta start somewhere
2025-08-16 08:06:54 +02:00
BeatAroundTheBuscherandGitHub e7f36002bb More products for the Drassen Factory + item name changes to reflect camo type (#170)
Item names were also changed as szItemName is displayed in the factory screen
W-Woodland
D-Desert
U-Urban
2025-08-15 23:50:02 +02:00
BeatAroundTheBuscherandGitHub 0e117f1fff New INI value BACKPACK_WEIGHT_FACTOR (#169)
* Added a clarification that these values refer to empty backpack weights

* Added an explanation for BACKPACK_WEIGHT_FACTOR
2025-08-15 23:19:17 +02:00
KittyandGitHub d2bfa6c4b7 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
kitty624 70744d7cef Pacos moves into rebel basement
- npc script 101 Fatima
Pacos won't go into hiding in A10 anymore, instead will follow to basement entrance and enter it with us
- npc script 114 Pacos
can give us gifts when talked to, if Food quest is active (male and female variation)
current items are Marbels and LameBoyDisplay, considered palceholders for now
will change them in later commit for adding crafting recipes to player files (like RIS report)
record 18 was used to prevent boxing before delivering letter, changed that to record 20
(same content as former 18)
- map A10_b1
small adjsutment to placements to have Pacos at a fitting place
2025-08-07 23:53:28 +02:00
kitty624 5fca3cab9d IniOption ALWAYS_FOOD and some default changes
- added ALWAYS_FOOD, allows to choose wether food items appear even when not using FOOD
- set Extra Civilians and Extra Merchants (blackmarket, etc.) to TRUE as default
- climbing with backpacks: no climbing, except if backpack is less or at 0.5 kg
- with current items, that's only the Tactical Sling (0.2 kg)
2025-08-03 09:07:53 +02:00
kitty624 ea6b107389 Fixed typo in EnemyAmmoDrops.xml 2025-08-02 20:20:56 +02:00
kitty624 3c454e61ae Added missing AmmoTypes to Choices and Drop xml
Those xml didn't contain all the latest ammotypes, added them
Also added comments for ease of modding files
(comment with item name for item-id)
2025-08-02 19:28:03 +02:00
kitty624 535a7a3a7d Fixed Steyr Aug A2 in J9 (Tixa)
- two enemies in Tixa do have a Steyr Aug A2 set as dropable in
their MapEditor placement
- this did use a version of the Steyr Aug A2 with outdated attachments
- replaced those with up-to-date versions of Steyr Aug A2
2025-08-01 05:16:59 +02:00
kitty624 98b79751b6 Item updates
items.xml
- Soda (from vending machine), added drugtype
- Sawed-off and Super Shorty, item size changed to fit SG Holster
- Pepper spary and canister, item size added, prior didn't have one
- Added covert-tag to a few pistols with matching description text
drugs.ml
- added drugtype for Soda (vending machine)
pockets.xml
- changed pocket 25 for SG Holster
- lower itemsize allowed to restrict to short shotguns
2025-08-01 00:58:17 +02:00
kitty624 0d513fa93e Qol Made choice about climbing with backpack easier
Previously that choice required users themself to add tags to items.
Added those tags, <AllowClimbing> and <BackpackWeightModifier>, to relevant backpack items in items.xml.
Changed the description in ja2options.ini to reflect that change.
2025-07-27 21:27:35 +02:00
KittyandGitHub c11a406e9d Merge pull request #151 from edawgsnizzle/master
Missing Rooftile
2025-07-16 03:22:46 +02:00
kitty624 692f606395 Fixed outdated Steyr Aug A2 at I13, added loot variations to I13
map contained a Steyr Aug A2 with outdated attachments, fixed to use up-to-date version of Steyr Aug A2
added some loot variation to the locker the Steyr Aug A2 is found in, loot will vary depending on chosen game difficulty (but always a Steyr Aug A2)
2025-07-15 04:22:27 +02:00
Asdow 041459aa5f Externalized UB bloodcat quest sector 2025-06-25 22:54:22 +03:00
Asdow 8f4ab010c0 Fixes quest ending if you kill bloodcats before talking to Betty first 2025-06-25 22:53:38 +03:00
Asdow c66163abfd 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 b10e59c79c 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 9b11678c43 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 b682cf4d7e 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 a2a5ea127e Missing Rooftile
replaced missing rooftile
2025-05-25 05:26:41 +10:00
Asdow 8eb4308f53 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 90853fbb61 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
kitty624 ab1ac2c28f Removed tags for detonators
no longer needed and also previously been unused
2025-04-09 21:19:31 +02:00
Hazapuza e843b4d71c 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 cfae93fdbd 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 ffc8e88093 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 a95f9fa3df 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 6efc13e7c3 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 7876eadfa6 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 68a3167924 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 697889b5ad 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 2b35e05953 Fixed a crash caused by missing palette files 2025-02-28 16:04:11 +02:00
Hazapuza b45c78afdb 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
edawgsnizzleandGitHub 5737818675 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
kitty624 a4d65edb05 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 997b49a96e Use the same enums for IntroType as Ja2 2025-01-09 21:34:20 -03:00
Asdow 5db8e811bb Revert "Update Silhouette.xml"
This reverts commit 104fa35d07.
2025-01-08 11:02:45 +02:00
Asdow 104fa35d07 Update Silhouette.xml 2025-01-08 00:44:00 +02:00
Asdow 709c454bda Update ExplosionType.xml 2025-01-08 00:44:00 +02:00
kitty624 2b40bcd515 Fix Carp Starting Gear Carp
- fixed doublette in tags in set Ammo
- added additional AP ammo
2025-01-07 19:51:32 +01:00