2848 Commits
Author SHA1 Message Date
HazapuzaandGitHub ee6669290f Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-12-17 19:12:31 +02:00
KittyandGitHub 0c04bbd3bc Removed unneeded tag in items.xml (#104)
Removed unneeded tag in items.xml
preventing drug items to be excluded when also food items and food system is off, now no longer need a tag in items.xml
2024-12-17 14:24:18 +01:00
kitty624 d2d3f48fd1 Removed unneeded tag in items.xml
preventing drug items to be excluded when also food items and food system is off,
now no longer need a tag in items.xml
2024-12-17 14:19:05 +01:00
KittyandGitHub b8105807f1 Reworked foodsystem exclusive items (#103)
no food items if the food system is off
whether the item is exclusive is defined by tag in items.xml 
replaced previous way of decision, which used Item[usItemIndex].foodtype > 0 as criteria 
that also restricted dual use items (i.e. drugs that also have a foodtype, like coffee, etc.)
2024-12-16 10:38:40 +01:00
kitty624 4dcc14f85d Reworked foodsystem exclusive items
no food items if the food system is off
whether the item is exclusive is defined by tag in items.xml
replaced previous way of decision, which used Item[usItemIndex].foodtype > 0 as criteria
that also restricted dual use items (i.e. drugs that also have a foodtype, like coffee, etc.)
2024-12-16 10:27:22 +01:00
KittyandGitHub 55871baca4 Adjusted item coolness
Adjusted item coolness
2024-12-13 22:28:21 +01:00
kitty624 caf94e449d Adjusted item coolness
- surgical mask and gloves lowered coolness
- medical splint lowered coolness
- empty PPE-Bag lowered coolness
- full PPE-Bag lowered coolness
reasoning: those are semi-essential for disease feature,
therefore it's important to have the otion to get them soon.
and all are rather common items in the real world, so that's reasonable
Typo Fix
- typo fix in merchant inventory
2024-12-13 22:17:59 +01:00
Asdow 5aca2e4727 Create OverheadInterface_scrollarea.sti
Required for scrollable mercs in tactical placement gui
2024-12-04 00:15:20 +02:00
HazapuzaandGitHub 08a957063f Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-11-08 23:45:13 +02:00
KittyandGitHub c687d4eed1 Updated AttachmentPoint.xml (#99)
- Surgical Mask and Gloves use AttachmentPoint to attach to PPE Bag
- updated xml with that
2024-11-08 10:55:14 +01:00
kitty624 93a69baa63 Updated AttachmentPoint.xml
- Surgical Mask and Gloves use AttachmentPoint to attach to PPE Bag
- updated xml with that
2024-11-08 10:45:09 +01:00
HazapuzaandGitHub a000309690 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-11-07 21:39:40 +02:00
HazapuzaandAsdow 86c5e96b65 Update Filters.xml
Removed unnecessary item ID exclusions from several filters.
2024-11-07 20:42:57 +02:00
HazapuzaandAsdow 8fd17b75b9 Thicken the barrel on the P-08's graphics 2024-11-07 20:42:57 +02:00
HazapuzaandAsdow 33704ac904 Changed the OA-93 and CMMG 7.3 into one-handed weapons
While AR-15 pistols such as these two are usually somewhat awkward to shoot with one hand only, it's still perfectly possible to do so.
2024-11-07 20:42:57 +02:00
HazapuzaandAsdow d97bd882e9 Add tons more LOBOT weapon graphics
Added unique LOBOT graphics for the vast majority of 1.13's firearms.

Also edited and re-rendered some of the existing LOBOT weapon graphics, in order to fix missing pixels (mainly thin barrels disappearing on some animation frames), and made wooden parts somewhat lighter for slightly better shading.
2024-11-07 20:42:57 +02:00
KittyandGitHub 157ca0fc8f Merge pull request #97 from kitty624/dev-gamedir
New item PPE Bag
2024-11-07 08:14:14 +01:00
kitty624 0981111ab4 BigItem sti for PPE Bag
- missed in previous commit
2024-11-07 07:58:55 +01:00
kitty624 52fbd83c23 New Item PPE Bag
- empty PPE Bag will transform into full PPE Bag when Surgical Mask and Gloves get attached
- full PPE Bag will have both disease protection qualities (face and hand)
- instead of two inventory slots (mask and glove) it takes only one while providing same level of protection
- replaced mask and gloves in Fox's Starting Gear with PPE Bag
- added PPE Bag to (one) Starting Gear of Stella and Hurl
- added PPE Bag to dealer inventory of Rebel-Quartermaster, Pharmacy Cambria and Tina
- empty PPE Bag available at BR (can be filled/transformed with surgical mask and gloves also available at BR)
2024-11-07 07:28:07 +01:00
kitty624 1aba98d5a0 Comments on Merges.xml 2024-11-07 04:39:26 +01:00
Hazapuza 04f1b2aace Update Filters.xml
Removed unnecessary item ID exclusions from several filters.
2024-11-01 18:28:19 +02:00
Hazapuza 42d93eb776 Thicken the barrel on the P-08's graphics 2024-10-26 12:54:06 +03:00
Hazapuza 3b145376e8 Changed the OA-93 and CMMG 7.3 into one-handed weapons
While AR-15 pistols such as these two are usually somewhat awkward to shoot with one hand only, it's still perfectly possible to do so.
2024-10-23 18:54:47 +03:00
Hazapuza f17fcc3068 Add tons more LOBOT weapon graphics
Added unique LOBOT graphics for the vast majority of 1.13's firearms.

Also edited and re-rendered some of the existing LOBOT weapon graphics, in order to fix missing pixels (mainly thin barrels disappearing on some animation frames), and made wooden parts somewhat lighter for slightly better shading.
2024-10-22 20:51:12 +03:00
AsdowandGitHub b9f77e8483 Replace MercOpinion.xml files with the new format (#95)
Instead of storing all opinions in unique <Opinion1>, <Opinion2>, ... <Opinion254> tags for all profiles, only opinions with a value other than 0 is now stored in <AnOpinion id = "1" modifier = "-10" /> tag

This change changed the loading time for merc opinions from 4.047 s to 0.011 s

A small cmd utility tool for converting existing MercOpinions.xml data into the new format is available at https://github.com/Asdow/JA2-ConvertXMLData/tree/master
2024-08-13 00:29:17 +03:00
AsdowandGitHub a57876d507 Added item graphics up to Barrett M82A2 for Vanilla config (#94)
Fixes CTD / Assertion error from missing graphics when playing the game with Vanilla config and seeing the M82A2 in BR shop or when encountering the item in strategic/tactical modes
2024-08-06 18:34:21 +03:00
KittyandGitHub 9c43e3d9cf Merge pull request #92 from kitty624/gamedir-dev
Fix to C5.npc and CIV36.edt
2024-04-30 07:33:26 +02:00
kitty624 556cc7c447 Fix to CIV36.edt
The correspomding .npc-file for CIV35.edt and CIV36.edt  is Miners.npc
This .npc is looking for quote lines up to 14 in those .edt
CIV36.edt did only have up to line 9 which was resulting in an "AAAA" in dialogue box when lines 10-14 couldn't be found
In vanilla this "only up to 9" was working, but sometime inbetween the Quote system had a code-rework and the .edt probably wasn't adjusted at that time

Fix: added lines 10-14 to CIV36.edt
2024-04-30 07:28:10 +02:00
kitty624 b22e95cd03 Fix to C5.npc
Record 03 in the .npc-file was pointing to non existing line 03 in corresponding .edt-file, resulting in an "AAAAA" in dialogue text when trying to call it

fixed record
2024-04-30 07:20:29 +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
KittyandGitHub f214a81a8a Merge pull request #90 from kitty624/gamedir-dev
Accompanying to rework of  r9343
2024-04-15 07:18:54 +02:00
kitty624 41941b114d Update Items.xml
accompanying to rework of  r9343

- a tag introduced with r9343 never got actually implemented in gamedir

- added the tag, items with this tag will be exclusive to disease feature

- added a few other tags suitable for those items

- slightly adjusted their coolness
2024-04-15 06:01:29 +02:00
KittyandGitHub 9ac36af106 Merge pull request #89 from kitty624/gamedir-dev
Update StructureConstruct.xml
2024-04-01 17:54:07 +02:00
kitty624 0a4f5b62d4 Update StructureConstruct.xml
the tag fFortifyAdjacentAdjustment doesn't mesh well with how actual graphics for concertina look like and are sorted in .sti-file

that resulted in concertina being shown facing wrong direction when using fortification assignment and placing them next to each other

which was caused by that attempt to align to adjacent tile

setting the tag to 0 instead of 1 solved that issue
2024-04-01 17:50:41 +02:00
KittyandGitHub 3a3850efe6 Merge pull request #88 from Hazapuza/1dot13-gamedir-dev
Several changes to backgrounds
2024-03-31 21:24:43 +02:00
Hazapuza 9e1597771b Several changes to backgrounds
- Tentatively rebalanced background bonuses
- Tentatively reordered IMP backgrounds
- Changed most combination background names
2024-03-31 15:12:25 +03:00
KittyandGitHub 76d9014d3d Merge pull request #87 from kitty624/gamedir-dev
Update ItemFlag.xml
2024-03-30 05:40:29 +01:00
kitty624 f5b1d2ebbc Update ItemFlag.xml
- added a missing name
2024-03-30 05:38:56 +01:00
KittyandGitHub b2dbb63f16 Merge pull request #86 from kitty624/gamedir-dev
Updates to TableData/Lookup
2024-03-30 04:48:40 +01:00
kitty624 48c8b42be3 Updates to TableData/Lookup
- updated AttachmentClass.xml, ItemClass.xml and ItemFlag.xml to match code
- removed wrong ItemFlag 8 (camera) from items 1724 and 1725 (Wooden Wall and Wooden Planks)
2024-03-30 04:34:35 +01:00
KittyandGitHub 72e5ca57d1 Merge pull request #85 from Hazapuza/1dot13-gamedir-dev
Fixed typos, reworded some parts of the new backgrounds
2024-03-20 21:43:55 +01:00
Hazapuza e37279c159 Small changes to Backgrounds setting descriptions 2024-03-20 22:34:51 +02:00
Hazapuza fc0f82f85f Fixed typos, reworded some parts of the new backgrounds 2024-03-20 21:31:04 +02:00
KittyandGitHub 276c6df27c Merge pull request #84 from kitty624/backgrounds
Alternative IMP Background Selection (gamedir)
2024-03-19 23:13:40 +01:00
kitty624 a08a15b18a Alternative IMP Background Selection (gamedir)
- added two new options in ja2options.ini
- added new category, "Backgrounds", in INIEditorJA2Options.xml
and ja2options.ini
- added new tag, <alt_impcreation>
in backgrounds.xml
- added information about new options into backgrounds.xml
- added new backgrounds for the new options into backgrounds.xml

- also added tags needed for disease feature to medical staff in merc backgrounds

this change is accompanying the relevant change in source
2024-03-19 21:35:02 +01:00
KittyandGitHub 10d755b075 Merge pull request #83 from Hazapuza/1dot13-gamedir-dev
Added palette-swapped black versions of the basic shotgun and sawn-of…
2024-03-17 22:25:52 +01:00
Hazapuza 38431dd41b Added palette-swapped black versions of the basic shotgun and sawn-off shotgun
- Super-Shorty no longer invisible, uses black version of the sawn-off shotgun graphics

- Moved Fabarm FP6, SDASS and Benelli M3 from SPAS-12 to black shotgun graphics
2024-03-17 22:09:06 +02:00
KittyandGitHub ee5ad205f4 Merge pull request #82 from Hazapuza/1dot13-gamedir-dev
Added LOBOT graphics for a short AK-style compact carbine
2024-03-16 02:11:15 +01:00
Hazapuza c942bacb66 Added LOBOT graphics for a short AK-style compact carbine
The AKS-74U and AKMSU now use a wooden furniture version, and several short-barreled black/dark-colored rifles use an all-black version.
2024-03-15 15:16:12 +02:00
KittyandGitHub ed7f7d177b Merge pull request #80 from Hazapuza/1dot13-gamedir-dev
Added a new weapon, the FN PS90
2024-03-11 01:24:55 +01:00