Commit Graph
2092 Commits
Author SHA1 Message Date
KittyandGitHub 3b6f044b57 Merge pull request #123 from FunkyFr3sh/master
update to cnc-ddraw 7.1
2024-12-31 21:23:21 +01:00
Asdow 14622db156 LOBOT: Fix invisible sprites for hand mortar
Uses sawn off shotgun graphics for now as we lack unique sprites for it
2024-12-30 19:27:57 +02:00
FunkyFr3sh 48b40e262c update to cnc-ddraw 7.0 2024-12-29 06:28:21 +01:00
KittyandGitHub 1aad262246 Fix ja2options.ini UB-vanilla
accidently previously committed the one for UB-1.13 here
fixed with correct ini
that way preserving vanilla settings, instead of overwriting with 1.13 settings
2024-12-26 12:25:10 +01:00
kitty624 3e380eb12e Fix ja2options.ini UB-vanilla
accidently previously committed the one for UB-1.13 here
fixed with correct ini
that way preserving vanilla settings, instead of overwriting with 1.13 settings
2024-12-26 12:21:11 +01:00
KittyandGitHub 418ac72026 Update Backgrounds.xml in JA2 vanilla
Update Backgrounds.xml in JA2 vanilla, to allow functionalty of Alternative_IMP_Creation
2024-12-26 11:32:40 +01:00
kitty624 c835fd1c23 Update Backgrounds.xml in JA2 vanilla
- to allow functionalty of Alternative_IMP_Creation
2024-12-26 11:28:29 +01:00
KittyandGitHub fbb780ee30 Update/Fix JA2 vanilla
- added UB-tilesets to allow to use them for JA2 maps in JA2 vanilla as well (follow up to previous commit)
- added missing "Alternative_IMP_Creation" entry into Data/ja2options.ini
2024-12-26 11:00:36 +01:00
kitty624 cdab5736c8 Update/Fix JA2 vanilla
- added UB-tilesets to allow to use them for JA2 maps in JA2 vanilla as well
(follow up to previous commit)
- added missing "Alternative_IMP_Creation" entry into Data/ja2options.ini
2024-12-26 10:41:29 +01:00
KittyandGitHub 1c5eec83c9 Fix using UB-tilesets in JA2-mapeditor
- using "UB tilesets for JA2" by Snap as template
-  in tilesets 53-59 snow-covered graphics, such as sandbags, were replaced with more appropriate JA2 graphics
- updated ja2set.dat in Data/BinaryData to match this change
- added updated ja2set.dat in Data-1.13/BinaryData, as preperation for comming update to sector fortification
- adjusted ja2setdat.xml in Data and Data-1.13 to match the changes
- added a ja2setdat.xml to Data-UB, this one will match the UB-tilesets in UB
- NOTE:
- The UB-tilesets in 1.13 are solely meant to be used with 1.13
- UB-1.13 and UB-vanilla DON'T use the UB-tilesets in Data-1.13
- UB-1.13 and UB-vanilla use the UB-tilesets in Data-UB instead
- to edit UB-maps, use UB-mapeditor
- to edit JA2-maps, use JA2-mapeditor
- editing JA2, tileset Generic 1 (directory 0) will be the default tileset
- editing UB, the default tileset will be Heavy Snow (directory 50)
- that's why ja2set.dat and ja2setdat.xml differ between JA2 and UB
2024-12-26 09:31:45 +01:00
kitty624 19cca9e005 Fix using UB-tilesets in JA2-mapeditor
- using "UB tilesets for JA2" by Snap as template
- in tilesets 53-59 snow-covered graphics, such as sandbags, were replaced with
more appropriate JA2 graphics
- updated ja2set.dat in Data/BinaryData to match this change
- added updated ja2set.dat in Data-1.13/BinaryData,
as preperation for comming update to sector fortification
- adjusted ja2setdat.xml in Data and Data-1.13 to match the changes
- added a ja2setdat.xml to Data-UB, this one will match the UB-tilesets in UB
NOTE:
- The UB-tilesets in 1.13 are solely meant to be used with 1.13
- UB-1.13 and UB-vanilla DON'T use the UB-tilesets in Data-1.13
- UB-1.13 and UB-vanilla use the UB-tilesets in Data-UB instead
- to edit UB-maps, use UB-mapeditor
- to edit JA2-maps, use JA2-mapeditor
- in JA2-MapEditor, tileset Generic 1 (directory 0) will be the default tileset
- in UB-MapEditor, the default tileset will be Heavy Snow (directory 50)
- that's why ja2set.dat and ja2setdat.xml differ between JA2 and UB
2024-12-26 09:09:04 +01:00
KittyandGitHub aa503c3e40 Update Ja2_Options.ini UB-1.13 and UB-vanilla (#118)
- added the missing entries for Alternative_IMP_Creation
- set Backgrounds to FALSE in UB-1.13 and UB-vanilla
- ID in MercProfiles differs for some mercs between UB and 1.13
- that and the associated backgroundnumber in MercProfiles results in mismatching background in UB
- until UB gets updated with own Backgrounds.xml to avoid this, backgrounds set to false
2024-12-26 08:51:04 +01:00
kitty624 6b127e0e8b Update Ja2_Options.ini UB-1.13 and UB-vanilla
- added the missing entries for Alternative_IMP_Creation
2024-12-26 08:38:54 +01:00
Asdow c377ba57b5 Harmonize load screen delay
Gameplay hints are shown in the message log after a load so let's not make the player wait for extra time
2024-12-24 18:21:39 +02:00
Asdow 9e3a12f2ea Enable extra mouse keys
Consistent with other default configs
2024-12-24 12:16:38 +02:00
Asdow eb8211a3dc Limit maximum enemy spawns 2024-12-24 00:17:08 +02:00
Asdow 6c8de01989 Add missing tags back to Items.xml
FoodType & PercentAim were missing
2024-12-22 14:11:32 +02:00
KittyandGitHub f5ad184885 LBE fix and changes (#112)
- new pocket added
    replaces previously used pocket for belts at LRAK-Vest
    restricted useable item sizes to focus more on belts, drums and such
- new silhouette added
    used with new pocket, belt shaped to highlight belt feeding capability
- fixed Shotgun Holster
    pocket for weapon was misplaced (medium sized pocket at small slot)
    moved to correct slot to avoid glitch
    added a small pocket to enhance useability
- removed tags at pocket 2 (knife)
    pocket is for default inventory knife slot, type and restriction unneeded, already restricted to knives and throwing knives
2024-12-22 10:43:16 +01:00
kitty624 459d855a61 LBE fix and changes
- new pocket added
replaces previously used pocket for belts at LRAK-Vest
restricted useable itemsizes to focus more on belts, drums and such
- new silhouette added
used with new pocket, belt shaped to highlight belt feeding capability
- fixed Shotgun Holster
pocket for weapon was misplaced (medium sized pocket at small slot)
moved to correct slot to avoid glitch
added a small pocket to enhance useability
- removed tags at pocket 2 (knife)
pocket for default inventory knife slot, type and restriction unneeded,
already restricted to knives and throwing knives
2024-12-22 10:23:52 +01:00
KittyandGitHub b28579140c Adjusted belt feeding (#111)
- boxes of 7.62x54R are no longer considered ammobelt
- renamed 7.62x54R belts to "belt" instead of "box"
- added amount of rounds to belt description, if missing
- crates of 7.62x51, 5.56x45 and 7.62x54R are considered ammobelt
- such crates can be used to externally feed suitable weapons
- since they are to big for vest, can only be done out of merc hand
(second merc has them in hand, is close and looking at weaponholder)
2024-12-22 07:14:06 +01:00
kitty624 0029bbc156 Adjusted belt feeding
- boxes of 7.62x54R are no longer considered ammobelt
- renamed 7.62x54R belts to "belt" instead of "box"
- added amount of rounds to belt description, if missing
- crates of 7.62x51, 5.56x45 and 7.62x54R are considered ammobelt
- such crates can be used to externally feed suitable weapons
- since they are to big for vest, can only be done out of merc hand
(second merc has them in hand, is close and looking at weaponholder)
2024-12-22 07:07:40 +01:00
Asdow f476a9ab24 Add individual tags for ItemFlags bitmasks
Requires updated .exe
2024-12-22 00:08:05 +02:00
KittyandGitHub 81ca81c438 Adjusted item prices out of UINT16 range (#109)
some item prices were higher than allowed by UINT16 (>65535) lowered them
2024-12-21 22:43:03 +01:00
kitty624 fb72d10279 Adjusted item prices out of UINT16 range
some item prices were higher than allowed by UINT16 (>65535)
lowered them
2024-12-21 22:35:24 +01:00
KittyandGitHub 357fbe3e9a More consistent naming conventions LBE (#108)
adjusted some text to achieve a more consistent naming convention
i.e., for leg rigs used "rig" instead of "pouch", etc.
edited some description to highlight purpose and use
i.e., mentioned the included hydration system on USMC backpack, etc.
2024-12-21 22:22:16 +01:00
kitty624 83b82997d1 More consistent naming conventions LBE
adjusted some text to achieve a more consistent naming convention
i.e., for leg rigs used "rig" instead of "pouch", etc.
edited some description to highlight purpose and use
i.e., mentioned the included hydration system on USMC backpack, etc.
2024-12-21 22:15:56 +01:00
KittyandGitHub 3a4714f214 More distinguishable Molle items
More distinguishable Molle items

names:
LongName - added "3.11" as prefix
item and BR descriptions:
added term "MOLLE" to descriptions (if missing)

to make Molle LBE more distinguishable from standard LBE, added the prefix "3.11" to all LongNames (EDB and mouseover)
and revisited descriptions (item and BR), adding the term "MOLLE" to them, if it wasn't already there
2024-12-20 01:23:53 +01:00
kitty624 29eeabc744 More distinguishable Molle items
names:
LongName - added "3.11" as prefix
item and BR descriptions:
added term "MOLLE" to descriptions
2024-12-20 01:15:30 +01:00
KittyandGitHub 4d5330afac fix: let tony buy .45 ACP boxes (#106)
fix: let tony buy .45 ACP boxes
2024-12-19 21:42:09 +01:00
Marco Antonio Jaguaribe Costa c211ec6115 fix: let tony buy .45 ACP boxes
but not sell them
2024-12-19 15:52:55 -03:00
KittyandGitHub 9d2a0c817a Workarround for issue #358
Workarround for issue #358 
moved ItemFlag-tag above Attachment-tag
2024-12-19 19:45:28 +01:00
kitty624 f933bf3bdd Workarround for issue #358 https://github.com/1dot13/source/issues/358 moved ItemFlag-tag above Attachment-tag 2024-12-19 19:41:45 +01:00
KittyandGitHub 382d4fec0b 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 ef4fc1ce6c 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 483b7d021e 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 eb367ab5b0 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 da3432fe50 Adjusted item coolness
Adjusted item coolness
2024-12-13 22:28:21 +01:00
kitty624 11dd18469a 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
KittyandGitHub 1ab6838b30 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 bf07967961 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
HazapuzaandAsdow 3af47a0967 Update Filters.xml
Removed unnecessary item ID exclusions from several filters.
2024-11-07 20:42:57 +02:00
HazapuzaandAsdow 6bc0417d3f Thicken the barrel on the P-08's graphics 2024-11-07 20:42:57 +02:00
HazapuzaandAsdow a97a98acea 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 2e55533f04 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 eb7d7d4231 Merge pull request #97 from kitty624/dev-gamedir
New item PPE Bag
2024-11-07 08:14:14 +01:00
kitty624 8e9cabe749 BigItem sti for PPE Bag
- missed in previous commit
2024-11-07 07:58:55 +01:00
kitty624 c1bc6de3d0 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 39b688530b Comments on Merges.xml 2024-11-07 04:39:26 +01:00
AsdowandGitHub af15468bbe 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 9063f87359 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