7604 Commits
Author SHA1 Message Date
Hazapuza a0f9e8ec42 Fixed typos, reworded some parts of the new backgrounds 2024-03-20 21:31:04 +02:00
KittyandGitHub b92b9d857c Merge pull request #84 from kitty624/backgrounds
Alternative IMP Background Selection (gamedir)
2024-03-19 23:13:40 +01:00
KittyandGitHub fad3a27059 Merge pull request #296 from kitty624/Backgrounds
Alternative IMP Background Selection
2024-03-19 22:43:33 +01:00
kitty624 7413aff1ef 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
kitty624 682dbaa8fc Alternative IMP Background Selection
- two new options in ja2options.ini
 ALTERNATIVE IMP CREATION
- adds new additional backgrounds, exclusive to this option
- which IMP backgrounds will be available at selection is determined by previously made choices for skills, character traits and disablities
- if a tag in background is contradicting to content of skill/character/disability, it won't be shown at selection
- what's considered contradicting is based on what's been found in code for conntent of skill/character/disability
- i.e. HeatIntolerant adds a penalty for desert and tropical sectors, so don't show backgrounds that add bonus for those sectortypes instead
- a new tag <alt_impcreation, has been added to backgrounds for this as well
- if that tag is found, it will be considered as additional IMP background exclusive to the option

REDUCED IMP CREATION
- same as above, but this time only the new additional backgrounds will be avaialable at selection
- same rules for possible restrictions to be shown

ALTERNATIVE IMP CREATION is required for REDUCED IMP CREATION to work

For ja2options.ini, a new category, "Backgrounds" was created.
This will contain the two new options and the general option to enable backgrounds

Accompanying changes in gamedir:

INIEditorJA2Options.xml
ja2options.ini
backgrounds.xml
2024-03-19 19:37:16 +01:00
KittyandGitHub 42cbf3fdbb Merge branch '1dot13:master' into Backgrounds 2024-03-18 12:58:32 +01:00
KittyandGitHub aa32847b43 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 c6df5bd238 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 236eb08b68 Merge pull request #295 from andrzejfalkowski/xml-backgrounds-parse-fix
Fixed drugtypes and drugitems background tags causing subsequent tags in the same background to be skipped
2024-03-16 17:18:26 +01:00
Andrzej Fałkowski e6c5f95d73 Fixed drugtypes and drugitems background tags causing subsequent tags in the same background to be skipped 2024-03-16 15:48:22 +01:00
AsdowandGitHub bf01f87cb4 Revert "Cache result of evaluating strategicmap.lua (#32)" (#293)
This reverts commit 8f22d13fd9.
2024-03-16 13:00:04 +02:00
KittyandGitHub 5e01c00d7b 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 c838380f93 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
AsdowandGitHub 9dfbc7d394 Use correct gridno for XY conversion (#289) 2024-03-13 19:29:28 +02:00
KittyandGitHub 60d58f5f50 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 61746d382d 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 7db32e1d24 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 872923c658 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 5d22db114e 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 a0327441d3 Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-03-06 15:43:48 +02:00
Hazapuza cc8d1b9e4f Change AR57 11" and 6"-Silenced weapon class from Rifle to SMG 2024-03-06 15:36:16 +02:00
AsdowandGitHub 2191b8d896 LOBOT: Add ghillie suit and camo uniform (#77) 2024-03-05 11:54:46 +02:00
KittyandGitHub fb41373c33 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 0b38cf10e7 Fixed a crash caused by wrong formatting 2024-02-29 02:50:00 +02:00
KittyandGitHub 3246edc39e 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 d390aaf818 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 b303937ea5 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 4521f6cad7 Merge pull request #74 from Hazapuza/1dot13-gamedir-dev
Updated Data-UB-1.13...
2024-02-21 00:49:23 +01:00
Hazapuza 767662b0db 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 60502cf273 Merge pull request #73 from Hazapuza/1dot13-gamedir-dev
Fix more typos
2024-02-19 22:19:17 +01:00
Hazapuza f2c28f6d64 Fix more typos 2024-02-19 23:09:23 +02:00
KittyandGitHub 129bd4519d Merge pull request #72 from Hazapuza/1dot13-gamedir-dev
Fix typos in backgrounds.xml
2024-02-19 21:53:50 +01:00
Hazapuza 151c461ed8 Fix typos 2024-02-19 22:40:34 +02:00
KittyandGitHub 9e4b1d83f0 Merge pull request #71 from Hazapuza/1dot13-gamedir-dev
Rewrite background names and descriptions
2024-02-19 21:32:19 +01:00
Hazapuza f3e93e961d 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 0616507282 Merge branch '1dot13:master' into Backgrounds 2024-02-18 01:46:43 +01:00
KittyandGitHub dd84d3c9b7 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 557c802b2c Fix/update several weapon and item weights 2024-02-12 21:17:37 +02:00
AsdowandGitHub 65698284c3 Re-enable extracover check for A* (#283)
Allows smarter pathfinding for AI, only done during turnbased pathing  to alleviate its extra cost
2024-02-11 14:57:53 +02:00
AsdowandGitHub 4338b5b909 Fix AI tactical retreat (#282)
Only perform tactical traversal if pSoldier is at the map edge
2024-02-11 12:42:21 +02:00
AsdowandGitHub ef69f9b2e6 Allow enemy to retreat (#279)
This check was preventing enemies from retreating into another sector if tactical AI retreat was enabled, leading into AI deadlock every time AI_ACTION_RUNAWAY was the decision.
2024-02-11 00:27:14 +02:00
Hazapuza 9c0b130b99 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
AsdowandGitHub 28a4db0355 Guard against nullptr dereference (#278)
Encountered a situation where a pSoldier between bFirstID and bLastID was null and then we'd dereference it.
2024-02-10 17:18:19 +02:00
KittyandGitHub 6ef6303eb1 Merge branch '1dot13:master' into Backgrounds 2024-02-10 00:56:00 +01:00
KittyandGitHub 3eae80ddda 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
kitty624 2cce518ea7 Update to ja2.ini for scaling tooltips
the source pr https://github.com/1dot13/source/pull/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:28:57 +01:00
KittyandGitHub 2093c90b28 Merge pull request #67 from Hazapuza/1dot13-gamedir-dev
Fix for errors in enemy and militia gun choices
2024-02-09 18:11:06 +01:00
KittyandGitHub 77fd0769cc Merge pull request #68 from kitty624/gamedir-dev
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:07:40 +01:00
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 8a8b850dec Update GunChoices_Militia_Regular.xml 2024-02-08 21:37:50 +02:00