Commit Graph
1108 Commits
Author SHA1 Message Date
kitty624 7305948209 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
Marco Antonio J. Costaandmajcosta f08eaf3cc9 fully externalize QueenAttacksLosingControlOfSector 2025-09-02 20:01:55 -03:00
KittyandGitHub b2da63f7d9 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 3e26384202 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
BeatAroundTheBuscherandGitHub 840f1c2cd0 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 f30cb3d12c 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 aac12c244c Remove BDU Pants attachments from the M1911 pistol 2025-08-16 14:24:26 +02:00
kitty624 757b267ac3 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 2737223b22 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
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
kitty624 ba76f2da95 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 85ec1ecaa7 Fixed typo in EnemyAmmoDrops.xml 2025-08-02 20:20:56 +02:00
kitty624 e10bca4cad 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 443a9cef43 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 f0f551346d 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
kitty624 62fda3c2ac 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
kitty624 03e5bb61f7 Removed tags for detonators
no longer needed and also previously been unused
2025-04-09 21:19:31 +02: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 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
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 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
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
Asdow 65e384480b Update ExplosionType.xml 2025-01-08 00:44:00 +02: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
Asdow b37234d539 Add missing entry to Silhouttes.xml 2025-01-02 22:29:00 +02: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
Asdow 958bd7dec4 Add missing tags back to Items.xml
FoodType & PercentAim were missing
2024-12-22 14:11:32 +02:00
kitty624 c3a2f9513f LBE fix and changes
- new pocket added
replaces previously used pocket for belts at LRAK-Vest
restricted useable itemsizes to focus more on belts, drums and such
- new silhouette added
used with new pocket, belt shaped to highlight belt feeding capability
- fixed Shotgun Holster
pocket for weapon was misplaced (medium sized pocket at small slot)
moved to correct slot to avoid glitch
added a small pocket to enhance useability
- removed tags at pocket 2 (knife)
pocket for default inventory knife slot, type and restriction unneeded,
already restricted to knives and throwing knives
2024-12-22 10:23:52 +01:00
kitty624 9f95be134b Adjusted belt feeding
- boxes of 7.62x54R are no longer considered ammobelt
- renamed 7.62x54R belts to "belt" instead of "box"
- added amount of rounds to belt description, if missing
- crates of 7.62x51, 5.56x45 and 7.62x54R are considered ammobelt
- such crates can be used to externally feed suitable weapons
- since they are to big for vest, can only be done out of merc hand
(second merc has them in hand, is close and looking at weaponholder)
2024-12-22 07:07:40 +01:00
Asdow 6320e6c8cc Add individual tags for ItemFlags bitmasks
Requires updated .exe
2024-12-22 00:08:05 +02:00
kitty624 99dc6b761e Adjusted item prices out of UINT16 range
some item prices were higher than allowed by UINT16 (>65535)
lowered them
2024-12-21 22:35:24 +01:00
kitty624 fda9b4b014 More consistent naming conventions LBE
adjusted some text to achieve a more consistent naming convention
i.e., for leg rigs used "rig" instead of "pouch", etc.
edited some description to highlight purpose and use
i.e., mentioned the included hydration system on USMC backpack, etc.
2024-12-21 22:15:56 +01:00
kitty624 a3a99637e2 More distinguishable Molle items
names:
LongName - added "3.11" as prefix
item and BR descriptions:
added term "MOLLE" to descriptions
2024-12-20 01:15:30 +01:00
Marco Antonio Jaguaribe Costa 8ab67bebed fix: let tony buy .45 ACP boxes
but not sell them
2024-12-19 15:52:55 -03:00
kitty624 3b2f4312ff Workarround for issue #358 https://github.com/1dot13/source/issues/358 moved ItemFlag-tag above Attachment-tag 2024-12-19 19:41:45 +01:00
kitty624 d2d3f48fd1 Removed unneeded tag in items.xml
preventing drug items to be excluded when also food items and food system is off,
now no longer need a tag in items.xml
2024-12-17 14:19:05 +01:00
kitty624 4dcc14f85d Reworked foodsystem exclusive items
no food items if the food system is off
whether the item is exclusive is defined by tag in items.xml
replaced previous way of decision, which used Item[usItemIndex].foodtype > 0 as criteria
that also restricted dual use items (i.e. drugs that also have a foodtype, like coffee, etc.)
2024-12-16 10:27:22 +01:00
kitty624 caf94e449d Adjusted item coolness
- surgical mask and gloves lowered coolness
- medical splint lowered coolness
- empty PPE-Bag lowered coolness
- full PPE-Bag lowered coolness
reasoning: those are semi-essential for disease feature,
therefore it's important to have the otion to get them soon.
and all are rather common items in the real world, so that's reasonable
Typo Fix
- typo fix in merchant inventory
2024-12-13 22:17:59 +01:00
kitty624 93a69baa63 Updated AttachmentPoint.xml
- Surgical Mask and Gloves use AttachmentPoint to attach to PPE Bag
- updated xml with that
2024-11-08 10:45:09 +01:00
HazapuzaandAsdow 33704ac904 Changed the OA-93 and CMMG 7.3 into one-handed weapons
While AR-15 pistols such as these two are usually somewhat awkward to shoot with one hand only, it's still perfectly possible to do so.
2024-11-07 20:42:57 +02:00
kitty624 52fbd83c23 New Item PPE Bag
- empty PPE Bag will transform into full PPE Bag when Surgical Mask and Gloves get attached
- full PPE Bag will have both disease protection qualities (face and hand)
- instead of two inventory slots (mask and glove) it takes only one while providing same level of protection
- replaced mask and gloves in Fox's Starting Gear with PPE Bag
- added PPE Bag to (one) Starting Gear of Stella and Hurl
- added PPE Bag to dealer inventory of Rebel-Quartermaster, Pharmacy Cambria and Tina
- empty PPE Bag available at BR (can be filled/transformed with surgical mask and gloves also available at BR)
2024-11-07 07:28:07 +01:00
kitty624 1aba98d5a0 Comments on Merges.xml 2024-11-07 04:39:26 +01: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
kitty624 41941b114d Update Items.xml
accompanying to rework of  r9343

- a tag introduced with r9343 never got actually implemented in gamedir

- added the tag, items with this tag will be exclusive to disease feature

- added a few other tags suitable for those items

- slightly adjusted their coolness
2024-04-15 06:01:29 +02:00
kitty624 0a4f5b62d4 Update StructureConstruct.xml
the tag fFortifyAdjacentAdjustment doesn't mesh well with how actual graphics for concertina look like and are sorted in .sti-file

that resulted in concertina being shown facing wrong direction when using fortification assignment and placing them next to each other

which was caused by that attempt to align to adjacent tile

setting the tag to 0 instead of 1 solved that issue
2024-04-01 17:50:41 +02:00
Hazapuza 9e1597771b Several changes to backgrounds
- Tentatively rebalanced background bonuses
- Tentatively reordered IMP backgrounds
- Changed most combination background names
2024-03-31 15:12:25 +03:00