7623 Commits
Author SHA1 Message Date
kitty624 71667aba27 Update XML_Items.cpp
reworking r9343

- part about food system was obsolete, that was already a thing prior to r9343 (see IsItemLegal)

- disease changed because instead of flag now boolean is used
2024-04-15 01:26:50 +02:00
kitty624 e386a66f03 Update Item Types.h
reworking r9343

- no need for Foodsystem flag, restricting food items to food system was already part of the code prior to r9343 (in IsItemLegal by silversurfer)
- for disease system changed flag to boolean
2024-04-15 01:22:26 +02:00
kitty624 c03bd3ff3a Update ShopKeeper Interface.cpp
reworking r9343

- already decided in IsItemlegal
- if it ain't legal, it won't be shown in ShopKeeperInventory, no need to bother with it again
2024-04-15 01:17:18 +02:00
kitty624 6650f70c93 Update AimMembers.cpp
reworking r9343

- this resulted in player being forced to choose features to allways see all possible merc gear sets

- loosing whole gearsets to avoid a few items is too much

- in some item-mods that even could result in some mercs not having any

- therefore deleted
2024-04-15 01:08:41 +02:00
KittyandGitHub cdb267ea17 Merge pull request #300 from kitty624/source-dev
Fix Attachable Launchers Slot  Tooltips

fix:
launchables made valid by attached launchers are now again shown as tooltip and can be attached to slot with click

fixes issue #298
2024-04-10 09:26:50 +02:00
kitty624 72f01b5379 Fix Attachable Launchers Slot Tooltips
fix:
launchables made valid by attached launchers are now again  shown as tooltip and can be attached to slot with click

fixes

https://github.com/1dot13/source/issues/298
2024-04-10 09:22:01 +02:00
Marco Costaandmajcosta dee2415d4a simplify SOLDIERTYPE::GetDiseaseContactProtection( ) 2024-04-03 22:09:05 -03:00
Marco Costaandmajcosta 049ec47219 make OBJECTTYPE::Exists() const 2024-04-03 22:09:05 -03:00
Marco Costaandmajcosta d670383f3a add const accessor to Inventory 2024-04-03 22:09:05 -03:00
KittyandGitHub 4d07dd83ca Merge pull request #89 from kitty624/gamedir-dev
Update StructureConstruct.xml
2024-04-01 17:54:07 +02:00
kitty624 a4bd59ca64 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 f4bd4c9a52 Merge pull request #88 from Hazapuza/1dot13-gamedir-dev
Several changes to backgrounds
2024-03-31 21:24:43 +02:00
Hazapuza 136dc768db 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 4a0372db8d Merge pull request #87 from kitty624/gamedir-dev
Update ItemFlag.xml
2024-03-30 05:40:29 +01:00
kitty624 7a2fb45f00 Update ItemFlag.xml
- added a missing name
2024-03-30 05:38:56 +01:00
KittyandGitHub d69fb403b9 Merge pull request #86 from kitty624/gamedir-dev
Updates to TableData/Lookup
2024-03-30 04:48:40 +01:00
kitty624 64f7de80ff 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 e6f510cd18 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 8137421220 Small changes to Backgrounds setting descriptions 2024-03-20 22:34:51 +02:00
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