Commit Graph
1723 Commits
Author SHA1 Message Date
Greysa 00964207bf Set back to default values 2026-03-12 21:12:29 +11:00
Greysa 0766ab19b6 changed readability 2026-03-12 17:52:21 +11:00
Greysa ad31fe719f Added NUMBER_TRAITS_NEEDED_FOR_ADVANCED_REPAIR option for technician level skill check 2026-03-12 17:29:30 +11:00
noooooo4499andAsdow cb6a988298 Use guiHour lua global instead of cHour, add HealBoxers
- The cHour variable was not being properly updated in the code creating a discrepancy between the game clock and it in this script. The guiHour variable already exists and is a direct copy of the guiHour in Game Clock.cpp so use this

- Add HealBoxers function after boxers rest so they don't die as easily after multiple fights
2026-02-12 10:24:33 +02:00
noooooo4499andAsdow 05094330c6 Fix lua hourly update script
Use lua setters instead of reassigning the global so it actually does something
Reverted the time conditionals so that it only updates on the opening/closing hours instead of every hour in between. Why was this change necessary to begin with? It also makes it so it resets all the boxing variables every hour instead of daily (not that it even worked before the setter change anyway)

In practice, this fixes a few things so they work as originally intended:
Boxers will actually rest for 1 day after every 3 fights as originally intended
After every rest, boxers will get progressively stronger and harder to beat as originally intended
2026-02-09 15:57:51 +02:00
Asdow 150c499c98 Add externalized emails
* Data -> Emails.xml contains both JA2 and JA2UB emails, which simplified things and we no longer need 4 different EmailSenderNameList.xml files either

* Gameinit.lua scripts have been switched over to use externalized emails
2026-01-03 17:31:33 +02:00
edawgsnizzleandGitHub f31fd01900 Added images for M82A1
Forgot to add these on the last PR
2025-12-11 21:15:25 +11:00
edawgsnizzleandGitHub 524c86b16d Added M82A1
Item, Attachments and Weapons xml
2025-12-10 16:09:20 +11:00
kitty624 57a5e38c9a Replacing OAS items with NAS items at G2
replacing Talon (OAS) with NAS underbarrel launchers at map G2 to ensure useabilty when found
2025-11-30 01:15:28 +01:00
KittyandGitHub 1793fcbb44 Change FAMAS attachment (#210)
* Change bipod attachment of FAMAS to not built-in

* Change default attachment of FAMAS
changed from built-in bipod to bipod
2025-10-15 17:36:01 +02:00
kitty624 baa827d96f Make Acog 4x Combo only available with OAS
This combo doesn't make much sense in NAS and originaly stems from OAS, so keep it to OAS
2025-10-10 19:03:12 +02:00
kitty624 7cc1ffc8ca Fix another line in lookup for XML-Edior 2025-10-09 18:55:30 +02:00
kitty624 ba13c42684 Another iix lookup data XML-Editor
Fixed wrong open/close
2025-10-09 18:36:50 +02:00
kitty624 03206a6226 Fix lookup data for Xml-Editor
fix in AttachmentPoints lookup
2025-10-09 18:25:22 +02:00
kitty624 0fef835e9e Fixed typo
Typo caused duplicate entry for AR57 16
now fixed so that there's the intented entry for AR57 11 and no more duplicate
2025-10-08 22:21:39 +02:00
kitty624 3b554c379a Remove a duplicate entry for Ares M4 Shrike 2025-10-08 21:23:19 +02:00
KittyandGitHub 043bc417e0 Changed misleading wording about Advanced Repairs (#197)
* Changed misleading wording for AdvancedRepairs setting
Changed wording to clarify that another setting in SkillSettings.ini is needed for mercs to do advacnced repairs.

* Added missing description for Advanced Repairs
Description lacked the fact that another setting in SkillSettings.ini is needed for mercs to do advanced repairs.
2025-10-01 05:05:50 +02:00
BeatAroundTheBuscherandGitHub c4615dd87c Add attachments to hats again (#194)
* Hand out some hats

* Added Attachments (NVGs, etc.) to non helmet head gear
2025-09-29 00:01:17 +02:00
kitty624 a9a7e19102 Removed BDU as attachment for M1911 2025-09-28 22:48:44 +02:00
HazapuzaandAsdow 72f3b57f07 Added a name and description to the Robot's background 2025-09-28 22:35:57 +03:00
Asdow 4a9c2dab4b 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 62210f2c21 Merge pull request #167 from 1dot13/ExtraMercs
Increased Team Sizes
2025-09-24 17:07:40 +03:00
KittyandGitHub 3fc7402261 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 bace397217 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 19ab0b5eb8 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 20b553035b 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 68e601ac64 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 3e7764904a Added missing entries for some BDU pants 2025-09-13 22:50:03 +02:00
kitty624 c7ebee63aa 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 83e321fa60 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 8aa5272bb8 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 521e366f42 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 540b896123 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 a837a8ed4f 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 c3283b941b 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 c4fc8ea1a0 Added Officers Coat 2025-09-13 19:26:49 +02:00
kitty624 74083041ec 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 ebd24b6e89 Added Remote Defuse and Remote Combo 2025-09-13 19:20:58 +02:00
kitty624 a5b5eb19b1 MERC Watch now also results in Detonator 2025-09-13 19:18:52 +02:00
kitty624 8b83853853 Painkiller: lowered effect and only available with disease feature 2025-09-09 22:11:32 +02:00
DeminutivandGitHub d59b4e5191 fixed .50 BMG ammo crate 2025-09-09 07:39:08 +02:00
DeminutivandGitHub 008cdaa9ca fixed .50 BMG CRATE 2025-09-08 19:20:03 +02:00
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
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