Commit Graph
1521 Commits
Author SHA1 Message Date
Andrii Danylchenko f74daa2e1f BattleAI: fix health bounty calculation 2023-10-22 22:06:42 +03:00
Andrii Danylchenko 870fbd50e3 BattleAI: bigger reachability map 2023-10-22 21:37:55 +03:00
Andrii Danylchenko 9eb9404f28 BattleAI: divide only positive part of score onto turns count 2023-10-22 21:37:54 +03:00
Ivan Savenko 3880ea58b9 Merge branch 'josch/dos2unix' into develop 2023-10-22 18:39:03 +03:00
Ivan Savenko 4f47555977 Split OBJECT bonus source into OBJECT_TYPE and OBJECT_INSTANCE 2023-10-22 16:55:19 +03:00
Ivan Savenko ac925bb786 Renamed new types for consistency with code style 2023-10-22 16:55:19 +03:00
Ivan Savenko 80e6485965 MetaIdentifier now uses std::variant internally 2023-10-22 16:55:19 +03:00
Ivan Savenko b394158dc9 Bonus Source ID now uses metaidentifier 2023-10-22 16:55:18 +03:00
Ivan Savenko 77facf9387 Implement missing functions, fixes linking errors 2023-10-22 16:54:56 +03:00
Ivan Savenko 910ad50417 Fix client & server compilation 2023-10-22 16:54:48 +03:00
Ivan Savenko 0a10fc30b8 (lib) Bonus subtype is now stored as metaidentifier that can store any
other identifier inside it
2023-10-22 16:54:43 +03:00
Ivan Savenko 454ba44ac5 Merge pull request #2988 from IvanSavenko/configurable_extensions
Extension of configurable object functionality
2023-10-22 16:24:47 +03:00
Johannes Schauer Marin Rodrigues a1a5bc28c2 convert line endings from CRLF (Windows) to LF (Linux/Unix)
Mixed line endings cause problems when exporting patches with
git-format-patch and then trying to "git am" a patch with mixed and
non-matching line endings. In such a situation git will fail to apply
the patch.

This commit runs the dos2unix tools on the remaining files with CRLF
(\r\n) line endings to convert them to line-feeds (\n) only.

Files that are Windows specific like *.vcxproj and *.props files were
not converted.

Closes: #3073
2023-10-19 16:23:21 +02:00
Johannes Schauer Marin Rodrigues f9e1b302c7 some spelling fixes 2023-10-18 01:41:02 +02:00
Ivan Savenko fd01a25352 Implemented basic version of configurable Witch Hut 2023-10-16 00:12:38 +03:00
nordsoft fadf086e61 Fix review comments 2023-10-12 13:30:01 +02:00
nordsoft 7ccd4cdcb2 Refactor quests progress 2023-10-11 21:10:42 +02:00
nordsoft 5b10b457cf Fix code review suggestions 2023-10-11 00:47:19 +02:00
nordsoft 5eeda3cd25 Quests mostly work 2023-10-10 23:44:29 +02:00
nordsoft bb238f9b72 New quests work 2023-10-10 23:44:29 +02:00
nordsoft 1460541ee5 New limiter based quests 2023-10-10 23:44:29 +02:00
Ivan Savenko 46e4d862a5 Fix AI recruitment 2023-10-04 17:47:12 +03:00
Ivan Savenko 39a92cdde3 Add query for dwellings dialog 2023-10-04 17:47:12 +03:00
Ivan Savenko 898733eed7 Added Query to track visit duration for Taverns and Markets 2023-10-04 17:47:12 +03:00
Andrii Danylchenko ebe155fa95 NKAI: mana recovery 2023-09-30 10:37:36 +03:00
Andrii Danylchenko 2dd0d76412 NKAI: water and air walking 2023-09-30 10:37:32 +03:00
Maxim Korotkov 56061d116e vcai: Combined cases with the same actions 2023-09-27 09:05:58 +03:00
Maxim Korotkov f874d27797 AI: removed redundant checks
The pointers "up" and "down" were checked against nullptr
but it's always non-null
Also added curly braces for if statement. It's good practice
for avoiding shooting yourself to the foot

Signed-off-by: Maxim Korotkov <korotkov.maxim.s@gmail.com>
2023-09-27 09:05:58 +03:00
nordsoft 5f2023c8d5 Fix typo 2023-09-23 04:33:08 +02:00
Ivan Savenko 8c0d78f1d9 Added initiator-player to packs that add/remove/move objects 2023-09-19 19:24:34 +03:00
Ivan Savenko c8e6a7cd27 Fixed most common cases of movement actions 2023-09-16 20:07:26 +03:00
Andrii Danylchenko 988531c6cb Merge pull request #2845 from Alexander-Wilms/fuzzylite
Support include path of more recent fuzzylite versions
2023-09-16 11:05:55 +03:00
Andrii Danylchenko a005829a57 NKAI: cancel checking building which needs itself as prerequisite 2023-09-16 11:04:28 +03:00
Alexander Wilms 6c15e5b426 Add include path of a more recent version of fuzzylite, which is required to build it with gcc 12.2.0
https://github.com/fuzzylite/fuzzylite/commit/a651f3d13e192352d7a02ee9da65ab591a963ab9
2023-09-16 05:13:16 +00:00
Ivan Savenko f39fbe5151 Merge pull request #2757 from IvanSavenko/filesystem_refactor
Filesystem refactor - part 1
2023-09-07 10:51:02 +03:00
Ivan Savenko ef94e7a78a Fix build 2023-09-06 16:03:47 +03:00
Ivan Savenko 9fa7a93fb0 Properly pass battleID in all battle netpack's 2023-09-06 16:03:47 +03:00
Ivan Savenko 41210c1dbf Client-side support for multiple battles 2023-09-06 16:03:47 +03:00
Ivan Savenko 036df2e0ad Support multiple battles in AI 2023-09-06 16:03:46 +03:00
Ivan Savenko 3a88180494 Separated game and battle callback (server & client only) 2023-09-06 16:03:39 +03:00
Ivan Savenko 86a7f5f5cd Removed getStr(bool), replaced with similar toString() 2023-09-04 22:21:02 +03:00
Ivan Savenko 8dfdfffd87 Use ResourcePath for audio files 2023-09-04 18:22:34 +03:00
Ivan Savenko 823ffa7a07 Always use ResourcePath for referencing images and animations 2023-09-04 18:22:34 +03:00
Evgeniy Meshcheryakov ecf9b1aa2f Fix NKAI compilation with NKAI_PATHFINDER_TRACE_LEVEL>=2 2023-09-04 10:08:56 +03:00
Ivan Savenko f6a4a1ae0c Merge pull request #2686 from vcmi/fix-battle-freeze
BattleAI: fix freeze
2023-08-31 01:06:47 +03:00
Ivan Savenko 695a51d8c8 Merge remote-tracking branch 'vcmi/beta' into develop 2023-08-28 21:19:53 +03:00
nordsoft 98f7ed9dfd Implement player start turn query 2023-08-28 18:56:36 +04:00
Andrii Danylchenko 4b807e01f1 BattleAI: fix freeze 2023-08-27 21:03:55 +03:00
Ivan Savenko ce20d913e0 Fix checking PlayerColor's for validness 2023-08-27 01:35:38 +03:00
Andrii Danylchenko 5f13a0bbda BattleAI: spellcast fixes and floating point score 2023-08-26 14:17:33 +03:00