7604 Commits
Author SHA1 Message Date
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
KittyandGitHub 42b0b286a6 Some items meant for OAS now excluded when not using that #171
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:15:58 +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 e9b12908f7 ASD/ARC: Fix Error by One in gasCan Vector (#472)
* ASD/ARC: Fix Error by One in gasCan Vector

* Add size check for the gasCan vector as part of ARC

* Remove unused Vectors for ARC
2025-08-15 18:40:43 -07: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
BeatAroundTheBuscherandGitHub e8399bb7c8 Make backpack AP stance costs depend on actual weight instead of a bool checking if a backpack is equipped or not (#486)
* Externalize the Divisor for usBackPackWeight

A new ini value BACKPACK_WEIGHT_FACTOR is introduced to replace the hard coded 50.
The value goes from 1 to 250 and its default value is 50 as before.

* Refactor usBPPenalty into its own function GetBackbackAPPenaltyFromBackpack

The same code is also used in GetAPsCrouch as well as GetAPsProne

The intent of the change is to make sure that backpacks including their content
do not add an additional AP cost of +1. Now it checks if
the backpack weight is > ubBackPackWeightFactorForAPPenalty (default value 50).
The min exists to make sure that the AP cost does not become higher than previously.

Previously the bool fBackpackCheck was used to add +1 if there is any backpack.
But this also includes an empty tactical sling (backpack with 0.2 kg) and
therefore makes the item much less interesting to use.
2025-08-15 22:52:43 +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
KittyandGitHub 11202d7e7e Expanded and sorted nationalities (#485)
- added Tracona for use with UB, etc
- sorted alphabetical (english) for more ease of use during IMP creation
- that sorting starts only after original nationalities (from after Metaviran)
- expanded and adjusted the existing ones
- tried to achieve a decent amount from every continent
- while sorting the language specific files, preserved existing translations
- adjusted MercProfiles in related gamedir change
2025-08-14 12:53:10 +02:00
Marco Antonio J. Costaandmajcosta 616d9a08e6 Fix NOTIFY_IF_SLEEP_FAILS for multiple mercs selected 2025-08-12 23:18:49 -03:00
Asdow becae223cd Remove default value text 2025-08-09 11:40:29 +03:00
Asdow f3194718e4 Remove useless check for savegame version
ITS breaks save games.
2025-08-08 21:21:48 +03:00
Asdow b0e3f66833 Adjust Ja2_options.ini 2025-08-08 20:36:09 +03:00
Asdow fd9611ae04 Remove compiler warnings 2025-08-08 18:38:53 +03:00
Asdow c62d767622 Update to Master 2025-08-08 18:00:31 +03:00
Asdow b7bfd8a2eb Use FLAGS64 for flagmasks 2025-08-08 17:42:25 +03:00
Asdow c78f8faefc Whitespace changes 2025-08-08 17:41:51 +03:00
Asdow 63f614f957 Add FLAGS64 typedef 2025-08-08 17:41:40 +03:00
Asdow d078a3439f Fix squad movement popupbox for increased squads 2025-08-08 17:01:13 +03:00
Asdow 9b83d6a3bc Increase squad amount to 40 2025-08-08 16:39:52 +03:00
KittyandGitHub 036d52c7fe Pacos moves into rebel basement
Pacos moves into rebel basement
2025-08-08 00:05:57 +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
KittyandGitHub 9ff8476c15 Fixes to npc-actions Pacos
Fixes to npc-actions Pacos
v3
2025-08-07 23:33:35 +02:00
kitty624 6a9df9f22c Fixes to npc-actions Pacos 2025-08-07 23:30:09 +02:00
Asdow 56dc0088b6 Fix underflow in loop 2025-08-07 23:46:24 +03:00
Asdow c3a34a660d Check squads are on the same level 2025-08-07 22:02:49 +03:00
Asdow 1074e9c408 Fix save game compability for MERCPROFILESTRUCT 2025-08-07 21:34:54 +03:00
KittyandGitHub 73e94c57f1 IniOption ALWAYS_FOOD and some default changes (#165 )
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:21:27 +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
KittyandGitHub 4537f5d4dc IniOption Food items can show without using Food (#475)
IniOption: Food items can show without using Food

food items are usualy not shown in game without using Food

option ALWAYS_FOOD allows them to be shown even without
    
default is false, no food items without Food
2025-08-03 08:23:34 +02:00
kitty624 4ae331c19e IniOption Food items can show without using Food
- food items are usualy not shown in game without using Food
- option ALWAYS_FOOD allows them to be shown even without
- default is false, no food items without Food
2025-08-03 08:12:48 +02:00
KittyandGitHub e961f14e25 Fixed typo in EnemyAmmoDrops.xml
Fixed typo in EnemyAmmoDrops.xml
2025-08-02 20:23:44 +02:00
kitty624 ea6b107389 Fixed typo in EnemyAmmoDrops.xml 2025-08-02 20:20:56 +02:00
KittyandGitHub 15ea51e58d Added missing AmmoTypes to Choices and Drop xml (#163)
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:34:54 +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
KittyandGitHub b85380c958 Reverting Commit 9122d7a (#474) from kitty624
Reverting Commit 9122d7a

 it made: CAN_FAN_THE_HAMMER = FALSE now disables the burst mode on pistols

 which effectivly resulted in pistols burst mode only being avaialbale with can fan the hammer active

 which further resulted in being required to fire from hip mode when using burst with pistols

 that's not a desired behaviour for burst on pistols, their burst should not depend on fan the hammer

 therefore reverted
2025-08-01 21:10:57 +02:00
kitty624 eb3f62c3d5 Reverting Commit 9122d7a
it made: CAN_FAN_THE_HAMMER = FALSE now disables the burst mode on pistols
which effectivly resulted in pistols burst mode only being avaialbale with can fan the hammer active
which further resulted in being required to fire from hip mode when using burst with pistols
that's not a desired behaviour for burst on pistols, their burst should not depend on fan the hammer
therefore reverted
2025-08-01 20:52:22 +02:00
KittyandGitHub ea0bca8a19 Fixed Steyr Aug A2 in J9 (Tixa) (#162) from kitty624
Fixed Steyr Aug A2 in J9 (Tixa)
2025-08-01 05:25:37 +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
KittyandGitHub 1c4b9310ef Item updates (#161) from kitty624
Item updates

items.xml

    Soda (from vending machine), added drugtype
    Sawed-off and Super Shorty, item size changed to fit SG Holster
    Pepper spray and canister, item size added, prior didn't have one
    Added covert-tag to a few pistols with matching description text

drugs.xml

    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 01:13:09 +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
KittyandGitHub 572f8b6826 Qol Made choice about climbing with backpack easier (#160) from kitty624
Qol Made choice about climbing with backpack easier

Previously that choice required users themself to add tags to items.

Added those tags, and , to relevant backpack items in items.xml.

Changed the description in ja2options.ini to reflect that change.
2025-07-27 21:38:43 +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
CptMoore 8644e5f8b9 Update build.yml 2025-07-25 10:25:46 +02:00
Asdow 872a356e82 Correct column size check 2025-07-23 15:11:03 +03:00
AsdowandGitHub 7bb7c54317 Guard against integer underflow (#462) 2025-07-20 17:30:22 -07:00
KittyandGitHub c11a406e9d Merge pull request #151 from edawgsnizzle/master
Missing Rooftile
2025-07-16 03:22:46 +02:00
KittyandGitHub e1062cb708 Fixed outdated Steyr Aug A2 at I13, added loot variations to I13 (#159)
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 will always have a Steyr Aug A2)
2025-07-15 04:36:58 +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