Commit Graph
7619 Commits
Author SHA1 Message Date
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
HazapuzaandGitHub da324822ff Merge branch '1dot13:master' into 1dot13-gamedir-dev 2024-12-17 19:12:31 +02: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 bfc78e2ef8 Simplified rework foodsystem allowed items (#357)
Simplified rework foodsystem allowed items
now no more need for a tag when checking IsItemLegal for Food System
ontop of checking for foodpoints, now also check if is drug
as a result, as previously, all eatable food will be excluded without food system,
but now only if it isn't a drug at the same time
and no more tag to check for that in items.xml needed
2024-12-17 13:23:58 +01:00
kitty624 0bd932f20f Simplified rework foodsystem allowed items
simplified the previous commit, now no more need for a tag
when checking IsItemLegal for Food System, ontop of checking for foodpoints, now also check if is drug
as a result, as previously, all eatable food will be excluded without food system, but now only if it isn't a drug at the same time
and no more tag to check for that in items.xml needed
2024-12-17 13:13:37 +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 28a51e0e7b 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:07:20 +01:00
kitty624 2fcba8b9f7 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 09:54:54 +01:00
Marco Antonio Jaguaribe Costaandmajcosta 184b44c386 a couple consistency extension changes
iniErrorReport is a log file, all other log files have .log extension, so make it
consistent with that

make Ja2_settings.ini's extension lowercase. OCD, sorry.
2024-12-15 15:25:28 -03:00
Marco Antonio J. Costaandmajcosta 86ad401186 add newline at end of file where it's lacking
.editorconfig already enforces it but it's getting changed piecemeal in
every commit. just get it done with.

the script:
```

find . -type f -not -path "./.git/*" -not -path "./.vs/*" | while read -r file; do
	isFile=$(file -0 "$file" | cut -d $'\0' -f2)
	case "$isFile" in
		(*text*)
			echo "$file is text"
			if [[ $(tail -c 1 "$file" | wc -l) -ne 1 ]]; then
				echo "" >> "$file"
			fi
			;;
		(*)
			echo "file isn't text"
			;;
	esac
done
```
2024-12-14 19:05:48 -03:00
Marco Antonio J. Costaandmajcosta 1d58bda82d cross-compilation scaffolding WIP
requires clang/lld or mingw, obviously

just make sure the MSVC_DIRECTORY env variable points to valid Visual Studio Build Tools directory
and do: `cmake -S . -B build -DCMAKE_TOOLCHAIN_FILE=clang_or_mingw_toolchain_file`
2024-12-13 19:24:59 -03: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
momoko-handGitHub 87f51f0f6e Fix warning C4715 in Music Control.cpp (#351) 2024-12-10 17:15:21 +02:00
Marco Antonio Jaguaribe Costaandmajcosta 98cdffe5fd (actually) fix broken MS2022 behavior
a recent Visual Studio update introduced an error unless there is a
CMakePresets.json file present, completely blowing up the previous
setup.

after this commit, you should either delete the CMakeUserPresets.json
file from your root or add it to your system - NOT repo! - excludesFile:
https://stackoverflow.com/questions/7335420/global-git-ignore
2024-12-09 14:19:25 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 2424066aab Revert "fix broken MS2022 behavior"
This reverts commit b89c63058f.
2024-12-09 13:45:08 -03:00
Marco Antonio Jaguaribe Costaandmajcosta b89c63058f fix broken MS2022 behavior
a recent Visual Studio update introduced an error unless there is a
CMakePresets.json file present, this patches it over for now and makes
note to remove it once this is fixed
2024-12-09 13:38:40 -03:00
Marco Antonio Jaguaribe Costaandmajcosta 0b21d1d798 add a TODO file
put your TODOs here so you won't forget, or in case you do, maybe
someone can pick it up in the decades to come
2024-12-09 12:58:43 -03:00
AsdowandGitHub dcde413b7b Initialize AI morale to normal instead of hopeless (#345) 2024-12-05 23:05:50 +02:00
Asdow febb283c3a Allow bloodcats in RED state to roam farther
Bloodcat lair had a few cats with CLOSE PATROL orders, resulting them to move only 15 tiles from their starting point, allowing them to be picked off from afar with scoped rifles.
2024-12-05 22:56:57 +02:00
Asdow 678ef822ca Fix passive bloodcats 2024-12-05 22:56:57 +02:00
AsdowandGitHub 1eff9f6aaa Fix bloodcat ambush endless loop (#343)
Some bloodcats during ambushes could have ubInsertionDirection with values > 100, which then causes endless looping in pathfinding algorithms as valid direction values range from 0 to 7
2024-12-05 16:13:09 +02:00
Asdow 20a33893d9 Fix Teamlist for smaller resolutions
Merc names were being printed past the end of teamlist area
2024-12-04 20:49:53 +02:00
Asdow ffccdfa654 Fix Tactical Placement GUI for increased teamsizes
Requires new file OverheadInterface_scrollarea.sti in Gamedir/Data/Interface/
2024-12-04 00:18:22 +02:00
Asdow 5c193f0757 Create OverheadInterface_scrollarea.sti
Required for scrollable mercs in tactical placement gui
2024-12-04 00:15:20 +02:00
AsdowandGitHub 11bb0f741f Fix music playing when crepitus is present (#341)
UseCreatureMusic( HostileZombiesPresent() ); was overriding the music mode set in PrepareCreaturesForBattle() when encountering crepitus or being in the creature caves, resulting in regular tense and battle music being played.
2024-12-02 01:10:58 +02:00
Asdow abe6877d90 Delete VS project files
Remnant from the initial branch commit
2024-12-01 21:51:56 +02:00
Asdow d0dbb9afb1 Remove unused function 2024-12-01 21:37:52 +02:00
Asdow 1013531a7f Remove #pragma optimize("", off) calls 2024-12-01 21:17:23 +02:00
Asdow bfb724eab9 Use SoldierID 2024-12-01 18:23:52 +02:00
Asdow e59d915e58 Use SoldierID 2024-12-01 00:20:41 +02:00
Asdow 4e8c5fa9ab Remove unused function & globals 2024-11-30 23:50:17 +02:00
Asdow de56f653ec Use SoldierID 2024-11-30 23:47:00 +02:00
Asdow 79b57c326e Move check for surgery into its own function 2024-11-30 18:29:55 +02:00
Asdow c2b1ac0109 use SoldierID 2024-11-30 18:29:17 +02:00
Asdow 2eb16c583c Use SoldierID 2024-11-30 17:18:04 +02:00
Asdow 5bbbec18bb Use SoldierID 2024-11-30 17:06:11 +02:00
Asdow 66f5156f03 Use SoldierID 2024-11-30 16:52:18 +02:00
Asdow 4645a09722 Use SoldierID 2024-11-30 16:07:36 +02:00
Asdow d244ef4c91 use SoldierID 2024-11-30 15:25:48 +02:00
Asdow 24656f2810 Use SoldierID 2024-11-30 15:20:18 +02:00
Asdow d960403514 Use SoldierID 2024-11-21 23:56:57 +02:00