Commit Graph
1597 Commits
Author SHA1 Message Date
kitty624 f83ce4db0d Adjusted attachments.xml for G36C
previous change removed the default in-build 2xscope from G36C in items.xml

to avoid assertion error, adjusted attachments.xml to refelct the change in there as well
2024-02-08 22:05:58 +01:00
Hazapuza a21ada2a89 Fix for two wrong default attachments
Removed the built-in 2x scope from the G36C (only iron sights and a picatinny rail in reality) and replaced the built-in retractable stock on the G36K with a folding stock.
2024-02-08 18:06:54 +02:00
kitty624 b682856044 Update SectorNames.xml
D2 Changed water type to 1 (drinkable) since there are watertabs in buildings, a reasonable watersource
2024-01-03 03:52:10 +01:00
Andrzej FałkowskiandGitHub 01635863e3 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 ff40da8acf 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 a28f6dabad [Fix] missing attachment for G36C
item 664, the G36C, has two default attachments defined in items.xml (1746, Folding Stock and 1322, in-build 2x Scope)

It missed 1322 in attachments.xml and  when using the Folding Stock (fold/unfold) it resulted in an error for not finding 1322 attached after the transformation

Added entry for 1322 (in-build 2x Scope) on 664 (G36C) in attachments.xml to fix that
2023-09-25 00:31:39 +02:00
Andrzej Fałkowski f2c4a7e0bd Merge branch 'master' into loading-screens-multi-res 2023-08-31 23:29:07 +02:00
kitty624 b04c594b35 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 f5372b8e4f adjustments to ExtraItems
- currently only works on ground-level
- adjusted readme to inform that it doesn't work at  underground levels
- replaced the former example file that happened to be underground with one at groundlevel
2023-08-22 09:44:14 +02:00
kitty624 7e560bcb30 Update Extra Sector Items readme.txt
- small fix on Extra Items readme
2023-08-22 03:52:27 +02:00
kitty624 c15ff19673 Extra Items by difficulty
- sector specific xml that allow to add extra items
- based on difficulty level
- as I understand, it's realtime
- an old forgotten feature, now revived
- added a few examples, nothing realy fancy, just to show the idea
- when novice the stuff is slightly usefull, when insane it's bonkers
- the readme informs about details
2023-08-22 03:00:01 +02:00
kitty624 d456d7d8ad Update Items.xml
- added  <usAdministrationModifier>-tag to items.xml
- it already exists in code and feature description at forum indicates that it just was forgotten to be added
- used the tag for item Laptop, just as picture in feature description shows
2023-08-21 16:38:29 +02:00
kitty624 165e38bc2a 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
kitty624 4f693c4151 Update strategicmap.lua
fix to comment in latest commit

- comment in lua said B2, but it's B8
2023-08-21 02:58:04 +02:00
kitty624 dc531cfcf2 fix invalid GridNo Maria/Angel BH-quest
maria/angel bountyhunter quest

- the common used GridNo for one bountyhunter was invalid in some of the possible sectors
- this had been already addressed for B14 in original commit
- now expanded to use altenate GridNo in B2 and B12 as well
- checked in MapEditor, other possible sectors allow a valid spawn at common used GridNo
2023-08-21 02:38:39 +02:00
Andrzej Fałkowski fb692db5ca Merge branch 'master' into loading-screens-multi-res 2023-08-19 22:59:21 +02:00
Andrzej Fałkowski 28dfcff389 INI settings for loading screen stretch mode 2023-08-19 22:54:51 +02:00
kitty624 5fc41b17df Update MercProfiles.xml
- adjusted Sidney, Dimitri, Grace and Wink to remodeled throwing/demolition trait
- therefore removed their demolition-trait, since grenade throwing bonus is now under throwing-trait
- they still have throwing-trait to match what their Bio descriptions

- Igor now Hunter instead of Survivalist, according to balance discussion at discord
2023-08-15 23:49:50 +02:00
rftrdevandGitHub 9e5bc3cdd4 Update Skills_Settings.ini (#41) 2023-08-11 11:27:08 -07:00
rftrdevandGitHub 3d9e482414 Growth modifiers gamedir changes (#40)
* Replace bEvolution with fRegresses

An evolution value of 2 meant that they devolved, so only Moses and non-sober Larry regress

* Update growth modifiers for specific mercs

Since we can't (currently) force a merc to not grow, we'll just set their growth modifier to an extremely high (slow) value

Len: extremely slow
Spike: extremely slow
Henning: extremely slow
Pops: extremely slow
Wally: very slow (Marksmanship only)
Carp: slow
Leon: extremely slow
Sam: extremely slow

* Add default growth modifiers (0) to the rest of the mercs
2023-08-09 18:35:42 -07:00
kitty624 5e4e673de3 Update MercProfiles.xml
balance attempt, as discussed in discord

- give high-price mercs more traits
- more available radio-operators
- change some trait-choices that seemed unreasonable/bad fit according to Bio of merc
- preperation for further planned changes
2023-08-05 21:09:18 +02:00
rftrdevandGitHub 9899f7cbca Add reduced stat growth options to ja2_options.ini (#36) 2023-07-21 22:53:30 -07:00
rftrdevandGitHub 577a21bf78 Add missing transport group options (#34) 2023-07-05 18:30:38 -07:00
rftrdevandGitHub cf11a63583 Transport group gamedir changes (#33) 2023-07-04 20:57:43 -07:00
dpapadamandGitHub 053ccef9b0 Update Explosives.xml (#16)
<ubType>12 is FIRE RETARDANT, Setting to <ubType>11 for DEBRIS SMOKE
2023-01-16 01:26:16 +02:00
AsdowandGitHub 7704c78d22 Merge pull request #8 from 1dot13/LOBOT
- Add Sawnoff shotgun animations to LOBOT
- Move LOBOT xml data to Data from Data-1.13
-- Items.xml uiIndexes match between 1.13 and Vanilla so a separate filters.xml is not needed for Data-1.13
2022-11-10 19:33:28 +02:00
Asdow b6955889a0 Move LOBOT tabledata to Data from Data-1.13 2022-11-10 19:29:28 +02:00
rftrdevandGitHub 5cd339d402 Gamedir changes for ARC missions (#7) 2022-11-07 00:35:37 -08:00
Asdow acdd783344 Add Sawnoff shotgun animations to LOBOT 2022-11-06 11:52:11 +02:00
rftr 45a0441a06 update email text and clarify ghillie armour/attachments (by Antonia)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2653 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-08-12 04:29:45 +00:00
rftr d6dab713fe 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 6922f7dc53 New option LIMIT_SIMULTANEOUS_SOUND.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2649 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-05-05 07:54:41 +00:00
Sevenfm 3c479de41c 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
Sevenfm 9ffc67ee27 Added loadscreen hints for new/changed hotkeys.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2646 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-04-22 17:10:09 +00:00
rftr f2b97382ac 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 0f278e1a26 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
rftr 6270c63e6c added options, item tags, and blank inventory image for new feature: upgradeable robot
https://thepit.ja-galaxy-forum.com/index.php?t=msg&goto=364403

git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2642 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-03-21 17:33:00 +00:00
Sevenfm 0143d0f37e Fixed SIG MP41/44 picture.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2641 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-26 01:41:24 +00:00
Sevenfm 81e2021e4f Missing LOBOT slap animation for female bodytype (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2639 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-17 20:27:29 +00:00
Sevenfm 220fad2b7d Removed unsupported yet G11 from LOBOT xml to fix starting error.
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2638 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-11 11:01:18 +00:00
Sevenfm 74c5311047 Alternate hip aim animation for big male (by Asdow)
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2637 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-10 18:57:00 +00:00
Sevenfm d55568962c This will make LOBOT work on mercs with face index 200 (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2635 4f8fa57e-7814-0410-bad4-adc449f26b7c
2022-01-03 23:53:58 +00:00
Sevenfm 29af8abd72 Full set of LOBOT animations (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2633 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-12-31 07:50:26 +00:00
Sevenfm 9c2fd350ea Fix for female, big male cowering LOBOT animations (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2632 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-12-06 07:06:38 +00:00
Sevenfm 170c855f55 Fix for female throwing animations causing a crash with lobot (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2631 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-12-05 19:13:45 +00:00
Sevenfm bd350a8b9f Fixed recon gear kit for Blood (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2629 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-11-18 16:26:27 +00:00
Sevenfm cdfffa4e64 Added missing explosion size defines (by Asdow).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2628 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-11-18 16:14:19 +00:00
Sevenfm ccd9fd519b New ingame options screen (by rftr).
git-svn-id: https://ja2svn.mooo.com/source/ja2_v1.13_data@2627 4f8fa57e-7814-0410-bad4-adc449f26b7c
2021-11-17 07:51:02 +00:00
Sevenfm 3d054fc286 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 0c1f070c69 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