Commit Graph
2624 Commits
Author SHA1 Message Date
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
Hazapuza c2a4bb6404 Added a new weapon, the FN PS90
The rifle class is now once again mostly devoid of any notable end-game weapons, and this is meant to compensate for that a bit. The PS90 is available from BR's and Tony, at coolness 7.
2024-03-10 20:26:20 +02:00
KittyandGitHub 047cdc6805 Merge pull request #79 from Hazapuza/1dot13-gamedir-dev
New LOBOT graphics for XM25 and G11
2024-03-07 09:08:38 +01:00
Hazapuza 12848a06ef LOBOT graphics for XM25 and G11
- XM25, OICW and AICS set to use the XM-25 graphics

- G11 and CAWS set to use the G11 graphics

-Added '25mm' to XM-25's descriptions, fixed several typos
2024-03-07 07:33:46 +02:00
KittyandGitHub e6927d6452 Merge pull request #78 from Hazapuza/1dot13-gamedir-dev
Change AR57 11" and 6"-Silenced variants' weapon class from Rifle to SMG
2024-03-06 23:28:14 +01:00
HazapuzaandGitHub 6464c49794 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-03-06 15:43:48 +02:00
Hazapuza 4af3df0dac Change AR57 11" and 6"-Silenced weapon class from Rifle to SMG 2024-03-06 15:36:16 +02:00
AsdowandGitHub 6e2de6c617 LOBOT: Add ghillie suit and camo uniform (#77) 2024-03-05 11:54:46 +02:00
KittyandGitHub c5f3392f19 Merge pull request #76 from Hazapuza/1dot13-gamedir-dev
Fixed a crash caused by wrong formatting
2024-02-29 02:09:24 +01:00
Hazapuza 90c1fe6eca Fixed a crash caused by wrong formatting 2024-02-29 02:50:00 +02:00
KittyandGitHub 146c2e1384 Merge pull request #75 from Hazapuza/1dot13-gamedir-dev
Add a few new hints, update LoadScreenHints.xml in Data to match …
2024-02-27 17:12:25 +01:00
Hazapuza 14dbad3987 More updates to LoadScreenHints.xml
One new hint, reworded a few hints to include secondary hotkeys and to be within the character limit.
2024-02-27 15:38:42 +02:00
Hazapuza 0d86549924 Add a few new hints, update LoadScreenHints.xml in Data to match the one in Data-1.13 2024-02-27 01:02:32 +02:00
KittyandGitHub 87b3a8cca8 Merge pull request #74 from Hazapuza/1dot13-gamedir-dev
Updated Data-UB-1.13...
2024-02-21 00:49:23 +01: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
KittyandGitHub 7a84ce082a Merge pull request #73 from Hazapuza/1dot13-gamedir-dev
Fix more typos
2024-02-19 22:19:17 +01:00
Hazapuza 3264e6f724 Fix more typos 2024-02-19 23:09:23 +02:00
KittyandGitHub cb194fddff Merge pull request #72 from Hazapuza/1dot13-gamedir-dev
Fix typos in backgrounds.xml
2024-02-19 21:53:50 +01:00
Hazapuza 1a2695d3a2 Fix typos 2024-02-19 22:40:34 +02:00
KittyandGitHub b26cb411cf Merge pull request #71 from Hazapuza/1dot13-gamedir-dev
Rewrite background names and descriptions
2024-02-19 21:32:19 +01:00
Hazapuza 1e8b7b9006 Rewrote background descriptions
Rewrote background descriptions and changed some bonuses and penalties.  An overhaul of all background stats is still pending.
2024-02-19 22:13:52 +02:00
KittyandGitHub 7beb8e10e3 Merge pull request #70 from Hazapuza/1dot13-gamedir-dev
Add missing AIM alumni entries, fix typos in MERCBIOS
2024-02-14 01:12:52 +01:00
Hazapuza 4d6f28a305 Fix/update several weapon and item weights 2024-02-12 21:17:37 +02:00
Hazapuza d4427947ea Add missing AIM alumni entries, fix typos in MERCBIOS
- Added Sam, Beth, Sparky, Postie and Leon to the AIM alumni, with partially altered vanilla alumni texts.

- Capitalized two letters in Skitz's bio
2024-02-10 18:00:38 +02:00
KittyandGitHub dc701fc495 Merge pull request #69 from kitty624/gamedir-dev
Update to ja2.ini for scaling tooltips

he source pr 1dot13/source#151 made it possible to scale up tooltips

added the setting and description to ja2.ini to allow to make use of it
2024-02-09 23:32:49 +01:00