Commit Graph
7619 Commits
Author SHA1 Message Date
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
Asdow 49a56d01ac Load correct militia icons for 720p resolution 2025-07-08 20:21:54 +03:00
Asdow 9d1e9e8948 Fix line highlighting 2025-06-27 20:28:15 +03:00
Asdow b3b3270e1e Adjust constructors 2025-06-27 19:59:01 +03:00
Asdow 1a8db5d15b More conversions to SoldierID 2025-06-27 19:58:20 +03:00
Asdow 09ce332721 Allow 10 size squads for 720p resolution in UB 2025-06-27 16:00:10 +03:00
Asdow 5e2c61ef12 Externalized UB bloodcat quest sector 2025-06-25 22:54:53 +03: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 4d948fda06 Fix powergen fan stopping in UB
Sector Y & Z coordinates were mixed up in code, which would then always fail the check for correct sector.
2025-06-24 22:54:44 +03:00
Asdow 2ae110971b spelling fixes 2025-06-24 22:54:44 +03:00
Asdow 9a78e7dfa0 Formatting changes 2025-06-24 22:54:44 +03:00
Asdow d95bae2bf6 Re-enable power generator fan sound effect for UB 2025-06-24 22:54:44 +03:00
Asdow a1bb85ca95 Externalize fan exitgrid location in the source sector 2025-06-24 22:54:44 +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
Asdow d9391de58a Fix laptop crush popup text
Due to additional dialogue flag having the value 8, and UB not having a specific flag for mercs standing up after heli crash, the FindSoldierByProfileID would always find Steroid if he was on the team, and then display the crunched laptop popup text.

Adding a new flag that is checked before we go into that branch in HandleDialogue fixes the issue.
2025-06-22 12:43:33 +03:00
Asdow c02bbc90cb Fix helicopter for UB
No need to force an assert error here. We can simply ignore the meanwhile scene just like all the others.
2025-06-18 22:58:17 +03:00
Asdow efb54202ea Fix Mercprofile usStrategicInsertionData for bigmaps
NPCs would not appear in the map if their gridno was over 65535 in large maps
2025-06-15 14:42:34 +03:00
edawgsnizzleandGitHub a2a5ea127e Missing Rooftile
replaced missing rooftile
2025-05-25 05:26:41 +10:00
KittyandGitHub e666b04acb Update chinese translation (#18) (zwwooooo)
Chinese translation update(by Forum of Playbar): 1dot13/gamedir a9ba654
2025-05-11 17:07:04 +02:00
zwwooooo 042f474d66 Chinese translation update(by Forum of Playbar): 1dot13/gamedir a9ba654 2025-05-11 17:11:28 +08:00
zwwoooooandmajcosta 11caa6529c Fix the issue of garbled UTF-8 text in the szTileSetDisplayName field of the StructureMove.xml file in the game's "Drag" menu.(Method provided by @Learner) 2025-05-10 14:28:14 -03:00
Asdow e2f296c42c Remove #pragma optimize("", off)
Managed to slip in in commit f21cb38. Bad Asdow, bad!
2025-05-01 10:39:19 +03:00
Asdow ee2807ae64 Default to 1st kit if deciding not to buy gear in UB
1st one is included in the hiring fee
2025-04-26 00:37:38 +03:00
Asdow b23c9ac8b1 Do not prompt for buying inventory for 1st kit in UB 2025-04-26 00:37:38 +03:00
Asdow fa0c5a2862 Prevent hiring MERC in UB if not enough funds 2025-04-26 00:37:38 +03:00
Asdow db6da100e1 Reset selected gear kit when browsing mercs 2025-04-26 00:37:38 +03:00
Asdow a3e7ce5794 Display special offer for 1st M.E.R.C. inv kit in UB
* Use weekly instead of daily salary for total cost calculation
2025-04-26 00:37:38 +03:00
Asdow 5062ae74f2 Display correct salary info for MERCs in UB campaign 2025-04-26 00:37:38 +03: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
Asdow dd58f904f4 Do not offer surrender for multiplayer 2025-04-24 21:52:11 +03:00
Asdow 8dcb431ef2 Use (0,0) sector coordinates as unused cache
Makes the comment in Mod_Settings.ini valid advice
2025-04-17 23:51:44 +03:00