Commit Graph
2000 Commits
Author SHA1 Message Date
HazapuzaandAsdow b36c7d0008 Added a name and description to the Robot's background 2025-09-28 22:35:57 +03:00
Asdow dff4c929d5 Move tileset 10 from Data-1.13 to Data
Fixes JA2 vanilla vfs config assertion error
2025-09-27 14:27:14 +03:00
AsdowandGitHub a089a93163 Merge pull request #167 from 1dot13/ExtraMercs
Increased Team Sizes
2025-09-24 17:07:40 +03:00
KittyandGitHub 69230893ff fixed .50 BMG CRATE (#180) from DemiDemiDeminutiv
.50 bmg couldn't be merged into crates due to wrong ammo type
2025-09-16 09:52:47 +02:00
kitty624 d5eea00907 Added missing tag to Talon
Added tag AttachmentSystem 1 to Talon. It's an item meant for use with OAS, the tag now sets it to that.
2025-09-16 09:18:07 +02:00
kitty624 009ec0e643 Added foregrip to appropiate weapons
Added a built-in foregrip to weapons with graphics showing a built-in foregrip.
Updated attachments of Rocket Rifle and Auto Rocket Rifle, giving them attachments simular to other weapons of that range and coolness.
2025-09-16 05:49:59 +02:00
kitty624 7ceff463c9 Adjusted stand modifiers for HK MP5KA4
due to the newly added attchemt of a foregrip, the stand modifiers of that weapon in items.xml are no longer needed.
Removed them so that they don't add up to the ones provided by foregrip, would be to much otherwise.
2025-09-15 02:42:41 +02:00
kitty624 307eb6246a Added built-in foregrip for HK MP5KA4
this weapon those have one going by its graphic
made it a default attachment
2025-09-15 01:59:14 +02:00
kitty624 251b6d3903 Added missing entries for some BDU pants 2025-09-13 22:50:03 +02:00
kitty624 aec6acfa63 Added Bear Traps as ActionItem
That way a Bear Trap can be placed in MapEditor (simular to a landmine, etc)
2025-09-13 21:36:47 +02:00
kitty624 3bd5264ed5 Removed BigGunList-tag from scopes
and fixed coolness of stocks (had wrong number due to me testing things prior)
2025-09-13 21:02:51 +02:00
kitty624 1c0c298c74 Added graphics for treated and coated (red and green) variations of EOD and SWAT armor parts 2025-09-13 20:04:28 +02:00
kitty624 17f1f282bd Adjustments to Flamethrower
Part of the ongoing progress to restore functionalty of it.
Further steps will follow.
2025-09-13 19:58:09 +02:00
kitty624 3ac2914377 Added treated and coated EOD and SWAT armor parts and some adjustments
Added the treated and coated variations of EOD and SWAT armor parts.
Removed faulty and outdated entries.
2025-09-13 19:54:07 +02:00
kitty624 915cd2523b Adjustments, updates and text changes
Text changes for multi-grenade stacks (Cylinders, 4, 3) used with OIS/OAS to avoid confusion with modern grenade variations.
Text changes for built-in Grenade Launchers (i.e. OICW internal launcher), to avoid confusion with other launchers.
Text changes to M18 Claymore and Tripwire variations (multiple items used for placing those in networks or MapEditor), to avoid confusion with regular items of that kind.
Added AP cost to attachment point batteries.
Updated tags for Che G. Canteen to make it functional.
Text changes to Folding Stock and Retractable Stock variations (there are two pairs of each), to allow players to see ingame which one they found.
Adjustments to Flamethrower, to allow better functionalty. Palnned to flesh out further, considering this just a step.
Text changes to Flamethrower.
Changed graphic numbers for coated/treated (green/red) variations of EOD and SWAT armor parts. Thos now have graphics in correct colour.
Added missing tags to some items.
2025-09-13 19:34:44 +02:00
kitty624 f093eb6282 Added items and changed some text
Added M18 Claymore to allow to transform variations placed via network or MapEditor.
That way, if player finds and disarms them, they can transform to the standard M18 Claymore.
This will allow them to accept attachments and be stackable, simular to tripwire transformation.
Adjusted tooltip texts for tripwire and claymore.
2025-09-13 19:29:02 +02:00
kitty624 7a9dcebc25 Added Officers Coat 2025-09-13 19:26:49 +02:00
kitty624 fd8110dd5c Cleanup and adjustments
Removed false entries (i.e. QueenBugSpit+lasersight)
Added missing attachments to some weapons (i.e., AR57 variants now with retractable stocck)
2025-09-13 19:22:43 +02:00
kitty624 24ce7f060a Added Remote Defuse and Remote Combo 2025-09-13 19:20:58 +02:00
kitty624 267ec0f571 MERC Watch now also results in Detonator 2025-09-13 19:18:52 +02:00
kitty624 ed1a5f01ee Painkiller: lowered effect and only available with disease feature 2025-09-09 22:11:32 +02:00
DeminutivandGitHub 9ae6da05af fixed .50 BMG ammo crate 2025-09-09 07:39:08 +02:00
DeminutivandGitHub 4e2b45ce07 fixed .50 BMG CRATE 2025-09-08 19:20:03 +02:00
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
kitty624 51342c6301 Better graphic for Flamethrower
taken from mod MFM by WilGates
2025-09-04 17:42:23 +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
kitty624 ba3a53ae60 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 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
BeatAroundTheBuscherandGitHub fff1dd6fc8 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 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
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 033cbb5735 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 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 1c3e69c767 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 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