465 Commits

Author	SHA1	Message	Date
Ivan Savenko	8346d71c98	Remove more subID access	2023-11-01 14:44:05 +02:00
Ivan Savenko	7107b3202f	Merge pull request #3069 from SoundSSGood/artifact-location-id ... ArtifactLocation now use ID for artHolder identification	2023-11-01 14:41:36 +02:00
SoundSSGood	ab2f6abb87	ArtifactLocation now use ID for artHolder identification part2	2023-10-29 17:46:13 +02:00
SoundSSGood	61fc236d79	ArtifactLocation now use ID for artHolder identification part1	2023-10-29 17:46:13 +02:00
Alexander Wilms	5cbc75d3b7	Merge remote-tracking branch 'upstream/develop' into develop	2023-10-29 13:35:37 +00:00
Ivan Savenko	0169c65937	Merge pull request #3100 from IvanSavenko/split_net_packs ... Split netpacks.h into multiple files	2023-10-29 13:46:40 +02:00
Alexander Wilms	0a6c82c639	AI/Nullkiller/Behaviors/DefenceBehavior.{h,cpp}: treat -> threat	2023-10-27 23:34:11 +00:00
Ivan Savenko	b88a8da4e8	Split off some netpack structures into separate files	2023-10-23 13:59:15 +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	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
Alexandre Detiste	15e45f966c	typos found by lintian	2023-10-17 22:06:08 +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	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 ... a651f3d13e	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	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	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
nordsoft	98f7ed9dfd	Implement player start turn query	2023-08-28 18:56:36 +04:00
Ivan Savenko	ce20d913e0	Fix checking PlayerColor's for validness	2023-08-27 01:35:38 +03:00
Andrii Danylchenko	274bf739b8	BattleAI: damage cache and switch to different model of spells evaluation	2023-08-26 13:06:51 +03:00
Ivan Savenko	e54287ea5d	Converted remaining identifier to new system	2023-08-25 13:38:02 +03:00
Ivan Savenko	0240ee886d	Converted (almost) all namespace enum's to enum classes	2023-08-25 13:38:02 +03:00
Ivan Savenko	62cd8b12d4	Converted several namespace enums to enum class	2023-08-25 13:38:02 +03:00
Ivan Savenko	17d3d663ee	Converted creature ID and spell ID to new form	2023-08-25 13:38:02 +03:00
Ivan Savenko	d83aa828f6	Fix turn ending	2023-08-24 23:34:33 +03:00
Ivan Savenko	44d16b32fe	Use API identical to std classes where possible	2023-08-23 16:32:29 +03:00
Ivan Savenko	87957e74c1	Replaced boost::thread_specific_ptr with thread_local	2023-08-23 16:32:29 +03:00
Andrii Danylchenko	1eabb738dc	NKAI: fix heroes not recruited	2023-08-13 09:08:30 +03:00
Ivan Savenko	92ce97bbc7	Merge remote-tracking branch 'vcmi/master' into beta	2023-08-12 16:20:06 +03:00
Ivan Savenko	67b7c39761	Fix possible nullptr dereference	2023-08-11 18:50:39 +03:00
Ivan Savenko	e57f8742cd	Rename ambiguos 'clear' to 'clearSlots' ... A lot of map objects inherit from CCreatureSet and as result - get clean() method that resets object army	2023-08-07 19:13:02 +03:00
Andrii Danylchenko	1eb58bcc32	NKAI: fix potential concurrency and town treat calculation	2023-08-07 17:29:27 +03:00
Andrii Danylchenko	04fe78d31c	NKAI: fix freeze on army gathering	2023-08-07 17:29:17 +03:00
Ivan Savenko	3f6cbc6312	Merge pull request #2484 from vcmi/nkai-fix-freeze ... NKAI: fix freeze on army gathering	2023-08-07 16:52:59 +03:00
Andrii Danylchenko	60f0a4553a	NKAI: fix freeze on army gathering	2023-08-06 09:03:29 +03:00
Andrii Danylchenko	a4297ebdf6	NKAI: fix potential concurrency and town treat calculation	2023-08-06 08:57:14 +03:00
Tomasz Zieliński	3b238ff15e	Fix weekly visitable check	2023-08-01 17:30:47 +03:00
Andrii Danylchenko	4c0aae6fbd	NKAI: fix crash for specific map	2023-07-31 22:01:12 +03:00
Andrii Danylchenko	ccfc6f5716	NKAI: increase towns priority, buy heroes more often	2023-07-31 22:01:12 +03:00
Andrii Danylchenko	ec0596f3dd	NKAI: fix error message can not take away last stack	2023-07-31 22:01:12 +03:00
Andrii Danylchenko	f1a9ae99ee	NKAI: various behavior fixes, undo max_gold_preasure	2023-07-31 22:01:12 +03:00
Andrii Danylchenko	fb7477047a	NKAI: loosen gold presure on build system.	2023-07-31 22:01:12 +03:00
Andrii Danylchenko	6490c65490	nkai: fix freezes	2023-07-31 22:01:12 +03:00
Andrii Danylchenko	c93bb0a502	nkai: fixes and skill rewards	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	202e13ce2e	NKAI: log paths scan depth	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	5083100d3b	NKA: fix accessing removed hero and heroExchangeCount	2023-07-31 22:01:11 +03:00
Tomasz Zieliński	db2be3ee05	Anoother unused variable	2023-07-31 22:01:11 +03:00
Tomasz Zieliński	850da65f80	Another build fix	2023-07-31 22:01:11 +03:00
Tomasz Zieliński	88178567b1	Remove unused variable	2023-07-31 22:01:11 +03:00
Tomasz Zieliński	e483f06e0f	Remove unused variable	2023-07-31 22:01:11 +03:00
Tomasz Zieliński	5bffea0aac	Use new interface	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	69ceee5dd6	NKAI: penalty for extra chains	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	0fd118d3ce	NKAI: gold reward	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	6ba74f02bc	NKAI: playing around with defence	2023-07-31 22:01:11 +03:00
Andrii Danylchenko	b19ac01bf9	Fuzzy rework, added more defence and gather army routines	2023-07-31 22:01:10 +03:00
Andrii Danylchenko	b1ca663eb6	Fuzzy rework	2023-07-31 22:01:10 +03:00
Andrii Danylchenko	38a98387e4	Temp fix for blocked in garrison ai.	2023-07-31 22:01:10 +03:00
Ivan Savenko	aed8c411fc	Minor rework & cleanup of combat replays	2023-07-27 19:25:55 +03:00
Ivan Savenko	9acab48bc3	Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework ... CArtifact CArtifactInstance refactoring	2023-07-11 14:36:08 +03:00
Andrii Danylchenko	b1ef0f6301	#1912 Some logging and fix for allied garrison	2023-07-09 10:21:58 +03:00
SoundSSGood	9b5f6ec7cf	CArtifact getters setters	2023-07-05 15:48:08 +03:00
Ivan Savenko	1cbc6457ce	Fix possible assertion failure on removing non-owned town	2023-07-04 20:28:02 +03:00
Ivan Savenko	85262cf4f5	Moved CGameState files into a separate directory	2023-06-26 17:15:59 +03:00
Ivan Savenko	08cfbe79cf	Added encapsulation for movement points access	2023-06-25 17:42:36 +03:00
Ivan Savenko	f7b27da00e	Implemented support for "coast visitable" objects: ... - objects marked as coast visitable can be visited from land even when placed in water - added isBlockedVisitable and isCoastVisitable method to CGObjectInstance - implemented json config for these properties in banks	2023-06-25 17:42:33 +03:00
Ivan Savenko	69dc95c3c8	Merge pull request #2235 from IvanSavenko/hota_h3m_support ... Hota h3m support	2023-06-23 13:32:10 +03:00
Ivan Savenko	ebc7a82c2e	Converted pathfinder enum's to enum class	2023-06-21 15:38:57 +03:00
Ivan Savenko	f78470a301	Fix build	2023-06-21 14:55:25 +03:00
Ivan Savenko	bd4d2788ed	Split pathfinder into multiple smaller files	2023-06-21 13:46:09 +03:00
Ivan Savenko	87fcfa4add	Removed excessive pathfinder includes	2023-06-21 12:00:44 +03:00
Ivan Savenko	d51fe62804	Win/loss condition texts use MetaString	2023-06-20 19:37:27 +03:00
Ivan Savenko	6aedb99117	Cleaned up IShipyard interface	2023-06-16 17:59:10 +03:00
Ivan Savenko	5cfbdd2967	Partially split CommonConstructors.cpp into few separate files	2023-06-16 17:59:10 +03:00
Ivan Savenko	d6a357fd17	Split some map object files into smaller files. Reduced includes usage.	2023-06-02 21:47:37 +03:00
Ivan Savenko	acac42291e	Remove excessive CMap.h includes	2023-05-31 23:18:38 +03:00
Andrii Danylchenko	0829593356	NKAI: composite pathfinder actions and fix for guarded bordergate	2023-05-07 09:15:37 +03:00
Konstantin	05eccbc2bb	vcmi: split bonus to enumerator and HeroBonus.h	2023-05-03 18:01:06 +03:00
Konstantin	fbc05c70ac	vcmi: camelCase methods of new classes ... Also use EGameSettings for clamping morale and luck	2023-05-02 12:09:13 +03:00
Konstantin	af25ad0866	vcmi: split creatures and faction members	2023-05-02 00:53:50 +03:00
nordsoft	97a1758e8e	Merge remote-tracking branch 'upstream/develop' into rewardable-expand	2023-05-01 21:51:10 +04:00
nordsoft	eb577a03b5	Deprecating enum constants	2023-05-01 21:49:37 +04:00
nordsoft	4b1b58b617	Change Callback to abstract	2023-05-01 21:49:37 +04:00
nordsoft	203d0a4f91	Merge remote-tracking branch 'upstream/develop' into rewardable-expand ... # Conflicts: # lib/JsonRandom.cpp	2023-05-01 02:07:20 +04:00
nordsoft	1b4d117790	deeper decoupling	2023-04-30 17:13:07 +04:00
Konstantin	86f5d6de69	vcmi: modernize headers	2023-04-30 13:35:54 +03:00
nordsoft	e47bb3f1f9	Separate configuration and object	2023-04-30 00:59:02 +04:00
Ivan Savenko	48abf46824	Merge pull request #2005 from IvanSavenko/advmap_refactor ... Refactoring of adventure map interface	2023-04-24 17:19:22 +03:00
Andrii Danylchenko	fbc9a32ad8	#2018 - fix shipyard usage for NKAI, allied shipyard should work now	2023-04-22 18:42:36 +03:00
Andrii Danylchenko	d347db4c16	Fix hero count calculation for resourceful ai mod	2023-04-22 14:47:31 +03:00
Ivan Savenko	7db67a3101	int3 now has proper hasher function	2023-04-20 22:04:24 +03:00
nordsoft	de159df481	Rename boats	2023-04-20 21:20:51 +04:00
nordsoft	0a28262c15	Merge remote-tracking branch 'upstream/develop' into boats ... # Conflicts: # AI/VCAI/Pathfinding/AINodeStorage.cpp	2023-04-19 02:22:19 +04:00
nordsoft	37027ad17f	Fix AI boat logic	2023-04-18 18:33:44 +04:00
nordsoft	ed798b06da	Prepare transport enum	2023-04-18 13:04:49 +04:00
Konstantin	7a5775a9f9	vcmi: use std::optional	2023-04-17 00:43:13 +03:00
Ivan Savenko	3738171b21	Refactoring of H3M loader to make HotA format support easier ... - extracted low-level reader from MapFormatH3M class - added separate structure to define version-specific values - cleared up some H3M format edge cases - replaced witch hut skill vector with set - converted several fields to enum type	2023-04-15 17:20:38 +03:00
Ivan Savenko	63b197b78a	Converted attributes to use c++17 functionality	2023-04-12 01:03:14 +03:00
nordsoft	8e77b833d9	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 15:54:08 +04:00
nordsoft	bfc75ccd39	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 02:22:42 +04:00
Konstantin	fedf7d377c	vcmi: remove TFaction ... This is a huge change and will break save compatibility	2023-04-10 19:28:16 +03:00
nordsoft	ce3028bd73	Intermediate commit	2023-04-06 19:34:07 +04:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Konstantin	22dd97ad18	vcmi: use entilites when possible part 1	2023-04-04 23:02:54 +03:00
Andrii Danylchenko	10bf9bc7a0	Merge pull request #1678 from vcmi/nkai-fix-build ... NKAI: more fixes to defense and pandora	2023-04-03 22:39:11 +03:00
Andrii Danylchenko	ab84cb9931	NKAI: fix defense tasks priority evaluation	2023-04-02 10:10:17 +03:00
Andrii Danylchenko	34abc9f82d	NKAI: disallow using allied shipyard	2023-04-02 10:04:10 +03:00
Andrii Danylchenko	88fb532d90	NKAI: more fixes to defense and pandora	2023-04-02 10:02:33 +03:00
Andrey Filipenkov	3602645a30	improve iterating over EPathfindingLayer	2023-03-20 11:35:19 +03:00
Ivan Savenko	a0e9e01b48	Renamed & reorganized all game mechanics settings names	2023-03-16 18:11:35 +02:00
Ivan Savenko	383387ef29	Integrated defaultMods into mod system	2023-03-16 17:55:09 +02:00
Konstantin	c4a3216288	NKAI: evaluate speciality correctly ... With removal of SECONDARY_SKILL_PREMY, we need to evaluate speciality by using TargetSourceType. Just do it.	2023-03-16 16:46:41 +03:00
Konstantin	95503d0623	vcmi: unify movement ... 1. Now there is only one bonus: MOVEMENT, with 2 subtypes: 0 is sea, 1 is land For movement value on land depends on creature speed we use a new ARMY_MOVEMENT updater with global bonus. If we does not like such dependency, we can just remove this updater from json. 2. All specialities and secondary skills for movement moved to new system AFAIK	2023-03-16 16:46:41 +03:00
Andrii Danylchenko	fa9e1d2d83	NKAI: fix crash	2023-03-12 16:31:15 +02:00
Andrii Danylchenko	4bf570763a	NKAI: improve neutral town priority handling, reduce priority of objects like star axis	2023-03-12 16:31:15 +02:00
Andrii Danylchenko	87638aafc0	NKAI: improve build behavior	2023-03-12 16:31:15 +02:00
Konstantin	bc228a938a	vcmi: use enum class for EComponentType ... There is really no reason not to use it	2023-03-11 21:41:57 +03:00
Konstantin	4617ce10e5	vcmi: allow showing more than one components in infobar ... Up to 8, AFAIK. So, we can show multi-reward in infobox now. One issue remain - cannot dynamically choose components size based on text size.	2023-03-11 21:41:57 +03:00
Konstantin	5366f9190e	vcmi: reduce boost::lexical_cast usage	2023-03-09 16:36:46 +03:00
Andrii Danylchenko	148c3436df	NKAI: improve army gathering	2023-03-08 11:53:26 +02:00
Andrii Danylchenko	8b0c7b6601	NKAI improve defence and some fixes	2023-03-07 20:10:58 +02:00
Ivan Savenko	144ddba97d	Replaced AI assertion failure with error in log	2023-03-07 00:06:58 +02:00
Ivan Savenko	aeb653c919	Fix typos	2023-03-07 00:06:58 +02:00
Ivan Savenko	11e4d84749	Implemented View Earth / View Air spells	2023-03-05 17:48:02 +02:00