156 Commits
Author SHA1 Message Date
Asdow 29a6af3875 Update HourlyUpdate scripts for Data and Data-UB 2026-02-12 16:25:41 +02:00
Asdow 92904bca28 Show correct AIM email at game start 2026-01-04 13:26:10 +02:00
Asdow 1ed08c024b Prevent 1.13 extra items appearing in UB
VFS uses the files from Data-1.13 since Data-UB did not have alternative files, the extra items meant for 1.13 sectors would show up in UB campaigns as well.
2026-01-04 12:33:25 +02:00
Asdow 42cc46f5ab 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
Asdow 81c97f85e7 Add externalized tunnel sectors 2025-11-27 22:38:54 +02:00
Asdow 969be37a1d Fix UB sector enemy counts
Due to changes in source code lua calls, these were not working and thus most of UB sectors were devoid of enemies.
2025-10-06 22:34:09 +03:00
AsdowandGitHub a089a93163 Merge pull request #167 from 1dot13/ExtraMercs
Increased Team Sizes
2025-09-24 17:07:40 +03: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
Asdow b97e5cb90a Externalized UB bloodcat quest sector 2025-06-25 22:54:22 +03:00
Asdow 0cd872a3b2 Fixes quest ending if you kill bloodcats before talking to Betty first 2025-06-25 22:53:38 +03:00
Asdow 3a5be2bd39 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 6dc2cd329e 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 b52b42b82d 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 ffe72a156b 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 a9ba654eb7 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 47267a6194 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
Marco Antonio J. Costaandmajcosta aae6270e9d Use the same enums for IntroType as Ja2 2025-01-09 21:34:20 -03:00
kitty624 a2504dfa0b Fix ja2options.ini UB-vanilla
accidently previously committed the one for UB-1.13 here
fixed with correct ini
that way preserving vanilla settings, instead of overwriting with 1.13 settings
2024-12-26 12:21:11 +01:00
kitty624 fc1233eb2c Fix using UB-tilesets in JA2-mapeditor
- using "UB tilesets for JA2" by Snap as template
- in tilesets 53-59 snow-covered graphics, such as sandbags, were replaced with
more appropriate JA2 graphics
- updated ja2set.dat in Data/BinaryData to match this change
- added updated ja2set.dat in Data-1.13/BinaryData,
as preperation for comming update to sector fortification
- adjusted ja2setdat.xml in Data and Data-1.13 to match the changes
- added a ja2setdat.xml to Data-UB, this one will match the UB-tilesets in UB
NOTE:
- The UB-tilesets in 1.13 are solely meant to be used with 1.13
- UB-1.13 and UB-vanilla DON'T use the UB-tilesets in Data-1.13
- UB-1.13 and UB-vanilla use the UB-tilesets in Data-UB instead
- to edit UB-maps, use UB-mapeditor
- to edit JA2-maps, use JA2-mapeditor
- in JA2-MapEditor, tileset Generic 1 (directory 0) will be the default tileset
- in UB-MapEditor, the default tileset will be Heavy Snow (directory 50)
- that's why ja2set.dat and ja2setdat.xml differ between JA2 and UB
2024-12-26 09:09:04 +01:00
kitty624 f75efd6bee Update Ja2_Options.ini UB-1.13 and UB-vanilla
- added the missing entries for Alternative_IMP_Creation
2024-12-26 08:38:54 +01:00
Asdow 3f31a1e451 Harmonize load screen delay
Gameplay hints are shown in the message log after a load so let's not make the player wait for extra time
2024-12-24 18:21:39 +02:00
Asdow ebeade551e Enable extra mouse keys
Consistent with other default configs
2024-12-24 12:16:38 +02:00
Asdow 3266e6328f Limit maximum enemy spawns 2024-12-24 00:17:08 +02:00
KittyandGitHub 1f8811efb6 UB added missing subdirectory for Extra Items (#91)
added rhe missing subdirectory for Extra Items and moved existing files into the new subdirectory
2024-04-15 18:48:02 +02:00
Hazapuza 1d5eccff10 Updated Data-UB-1.13 with AIM and MERC bios and AIM alumni from Data-1.13 2024-02-20 10:27:25 +02:00
Andrzej FałkowskiandGitHub 7e1c337e55 Specific drug types and drug items for background and facilities - template, bar items and hidden bars for vanilla. (#62) 2023-10-02 19:31:10 +03:00
Andrzej FałkowskiandGitHub 70a31331bf Map recolours (#59)
* INI settings for radar and overhead map color variants

* Option translations

* UB INI options.
2023-10-02 19:30:36 +03:00
kitty624 d6a50c6a2a added possible nationalities to mercprofiles
- code has more posabilities as comment in header of mercprofiles
- added the missing ones to comment
2023-08-23 06:41:59 +02:00
kitty624 dd7721ef7e updated mercprofiles25.xml
- edited to match recent changes to merc traits in mercprofiles.xml
- to ensure UB-1.13 and ja2-1.13 mercprofiles are in sync

- fix to manuel in mercprofiles.xml (ja2-1.13)
I previously neglected to delete athletics  after he gained covert ops, did that now
2023-08-21 10:33:49 +02:00
rftrdevandGitHub dbf4e586f3 Replace evolution with growth modifiers in MercProfiles25.xml (#51) 2023-08-21 00:40:05 -07:00
AsdowandGitHub 0f38bd990d Create SectorNames.xml (#38)
Renamed traversable sectors according to original Unfinished Business campaign
2023-07-25 18:50:13 +03:00
rftr 1a5e00996b added new options to limit merc salary increases on level up:
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_DAILY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_WEEKLY
MERC_LEVEL_UP_MAXIMUM_SALARY_INCREASE_BIWEEKLY

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2650 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-05-28 21:08:59 +00:00
Sevenfm a393642517 Set SIDE_FACING_DIVISOR = 1.0 by default.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2648 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-05-03 11:36:40 +00:00
rftr 8bf29862c1 added new option in Skills_Settings.ini: [Covert Ops] COVERT_TURNCOATS_ACTIVATE_IN_AUTORESOLVE
if enabled, turncoats will automatically activate when entering an autoresolve battle

requires r9365

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2645 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-04-14 06:50:59 +00:00
rftr 4d2308e506 remove SHOW_SKILLS_IN_HIRING_PAGE from ja2_options.ini. it is always enabled as of trunk r9331.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2643 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-03-22 08:41:17 +00:00
Sevenfm 8685b59bd1 Fix for the wrong strategic map in the new widescreen strategic UI (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2636 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-09 13:41:54 +00:00
Sevenfm bc93fb52b7 Added camouflage bonus to the survival trait (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2625 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-10-24 09:02:15 +00:00
Sevenfm 313d3e52c7 Set default COVER_SYSTEM_CAMOUFLAGE_EFFECTIVENESS = 80
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2624 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-10-24 08:56:17 +00:00
Sevenfm 527bc4c4c1 Removed AI_DECISION_INFO option.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2622 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-10-14 08:36:35 +00:00
Sevenfm d6814918b5 Added NEW_SUPPRESSION_CODE option.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2621 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-10-04 17:56:07 +00:00
Sevenfm 6efd78ccfa Added missing options to UB ini files.
Set NUMBER_OF_MAJOR_TRAITS_ALLOWED for UB to 2 to fix max value error.

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2620 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-09-29 12:55:14 +00:00
Sevenfm 5ba9485fdf Removed AP_SUPPRESSION_SHOCK_DIVISOR option.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2584 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-02-28 16:23:19 +00:00
silversurfer 8d69551025 Enhancement (by Sevenfm/Kitty): added the option to repair wire fences with any wire cutter device to UB map tilesets as well.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2568 4f8fa57e-7814-0410-bad4-adc449f26b7c
2020-10-03 07:53:05 +00:00
Flugente ba08197de2 New feature: the refilling of the queen's army resevere now requires her to train recruits, which the player can disrupt to some degree (by sun_alf)
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20659&goto=360475&#msg_360475 and http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=24433&goto=359872&#msg_359872

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2555 4f8fa57e-7814-0410-bad4-adc449f26b7c
2020-06-29 20:11:25 +00:00
Flugente a8a1a78092 Disease update:
- <InfectionChance_WOUND_FIRE> can cause infections when taking fire damage
- <InfectionChance_WOUND_GAS> can cause infections when taking non-fire gas damage
- <fSpecialFlagLimitedUseArms> causes the infected to be unable to use one arm
- <fSpecialFlagLimitedUseLegs> causes the infected to be unable to run, and walk and travel slowly
- JA2_options.ini option DISEASE_SEVERE_LIMITATIONS controls whether <fSpecialFlagContractDisability>, <fSpecialFlagLimitedUseArms> and <fSpecialFlagLimitedUseLegs> are used

For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=22099&goto=360451&#msg_360451

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2553 4f8fa57e-7814-0410-bad4-adc449f26b7c
2020-06-25 22:38:08 +00:00
Flugente 276ab530d5 We can play external dialogue lines for NPC merchants via the lua function HandleNPCMerchantQuote(...)
For more info, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=20611&goto=360388&#msg_360388

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2550 4f8fa57e-7814-0410-bad4-adc449f26b7c
2020-06-17 20:21:10 +00:00
Flugente 3ba9b85345 Added general modifier to grenade throw AP cost
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2549 4f8fa57e-7814-0410-bad4-adc449f26b7c
2020-06-15 23:11:55 +00:00
Flugente 7f0750feb3 Updated JA2_options inis
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2540 4f8fa57e-7814-0410-bad4-adc449f26b7c
2020-06-02 15:06:55 +00:00