1828 Commits

Author	SHA1	Message	Date
Ivan Savenko	537f9fa048	Merged master into develop	2023-08-03 23:38:32 +03:00
Ivan Savenko	62fddca21e	Split massive CModHandler class/file into multiple parts: ... - IdentifierStorage is now a separate handler in VLC - Renamed ModHandler::Incompatibility exception to ModIncompatibility - Extracted ModScope namespace from ModHandler - Extracted ModUtilities namespace from ModHandler - Split CModHandler.cpp on per-class basis - Replaced some direct members with unique_ptr to reduce header includes	2023-07-30 22:17:47 +03:00
Tomasz Zieliński	943e3e888c	Merge remote-tracking branch 'origin/beta' into fix-freeze-ai-attacking-dwelling ... # Conflicts: # server/CGameHandler.cpp	2023-07-29 08:11:27 +02:00
Andrii Danylchenko	8e1dc785eb	Wrong player was engaged for 5lvl dwelling	2023-07-28 14:19:12 +03:00
Ivan Savenko	aed8c411fc	Minor rework & cleanup of combat replays	2023-07-27 19:25:55 +03:00
Ivan Savenko	e733b55c90	Removed buggy and poorly designed fromString method ... Use VLC->modh directly with proper parameters instead	2023-07-25 22:36:45 +03:00
Ivan Savenko	705cdb846d	Merge pull request #2403 from IvanSavenko/error_detection_fix ... Attempt to fix & improve error reporting	2023-07-25 18:15:28 +03:00
Andrii Danylchenko	ec8898a0e7	#1965 - treat dwelling defenders as neutrals	2023-07-25 10:13:41 +03:00
Ivan Savenko	21e794268b	Attempt to fix & improve error detection: ... - use std::fstream instead of boost::iostreams for properly working flush - removed some catch-all blocks - reduce catch scope of some try/catch blocks to clearly indicate intent	2023-07-24 18:48:56 +03:00
Ivan Savenko	280085b95d	Merge pull request #2308 from IvanSavenko/remove_client_savegame ... Remove client savegames	2023-07-19 14:46:46 +03:00
Ivan Savenko	baa865d857	Extracted message-related functionality of CGameHandler to separate file	2023-07-15 21:01:13 +03:00
Ivan Savenko	ec7e046617	Fix hero pool persistency between saves	2023-07-15 19:55:30 +03:00
Ivan Savenko	19ace6a849	Moved hero pool logic to the separate files	2023-07-15 19:55:29 +03:00
Dydzio	afb9bfc180	Revert apparently broken changes from commits 96420bf, 92dcfd1, c4cf2a1	2023-07-11 21:22:24 +02:00
Ivan Savenko	9acab48bc3	Merge pull request #2268 from SoundSSGood/CArtifactInstance-rework ... CArtifact CArtifactInstance refactoring	2023-07-11 14:36:08 +03:00
Ivan Savenko	8750aa2c5b	Merged server savegame and (broken and unused) client savegame files	2023-07-09 15:30:47 +03:00
SoundSSGood	9b5f6ec7cf	CArtifact getters setters	2023-07-05 15:48:08 +03:00
SoundSSGood	fd9c7352a0	suggested changes	2023-07-03 22:54:03 +03:00
Ivan Savenko	48eb8ab54f	Play sound when receiving message, not just on sending ours	2023-07-03 17:12:31 +03:00
SoundSSGood	670999d40e	BattleResultAccepted fixed	2023-07-01 14:59:16 +03:00
SoundSSGood	060aecc61c	CArtifact refactoring	2023-06-30 19:41:26 +03:00
SoundSSGood	07c811dd67	CCombinedArtifactInstance refactoring	2023-06-30 19:40:57 +03:00
Ivan Savenko	8420a90aa4	Reorganization of campaigns code	2023-06-26 17:15:59 +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	ce3e150d59	Minor formatting	2023-06-23 13:55:52 +03:00
Ivan Savenko	6a08a96d0c	Added createObject call as wrapper around NewObject netpack	2023-06-23 13:42:08 +03:00
Ivan Savenko	d8879f1e53	NewObject pack now receives visitable position instead of h3m position	2023-06-23 13:34:51 +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	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	3913b8e98c	Heroes placed on water in map will be automatically given boat	2023-06-20 19:37:27 +03:00
Ivan Savenko	a84666edf6	MetaString can be serialized in json	2023-06-20 19:37:27 +03:00
Ivan Savenko	d51fe62804	Win/loss condition texts use MetaString	2023-06-20 19:37:27 +03:00
Ivan Savenko	56d69e790b	Renamed MetaString methods to more logical names	2023-06-20 19:37:27 +03:00
Ivan Savenko	f35b3a0dc3	Replace MetaString operator << with member function	2023-06-20 19:37:27 +03:00
Ivan Savenko	6ed0fbe579	Fix excessive warning - neutral town with Portal is perfectly legal	2023-06-20 19:37:27 +03:00
Ivan Savenko	ece9982ca0	Fix build	2023-06-16 18:11:45 +03:00
Ivan Savenko	6aedb99117	Cleaned up IShipyard interface	2023-06-16 17:59:10 +03:00
Tomasz Zieliński	adec58f5bf	- Set fixed boat type for Tavern / Prison ... - Move magical boat offset to static function	2023-06-15 17:53:18 +02:00
Tomasz Zieliński	351d596bdc	Handle water Prisons and Taverns.	2023-06-08 09:17:08 +02:00
Tomasz Zieliński	db917ae435	Fix #1140	2023-06-07 17:29:07 +02:00
Ivan Savenko	1e9eea30e1	Merge remote-tracking branch 'soundsgood/CArtHandler-rework' into develop	2023-06-05 18:53:17 +03:00
Michael	70bdec41a3	case-insensitive cheats	2023-05-20 01:14:06 +02:00
SoundSSGood	021f94a579	artifact utils	2023-05-17 17:00:31 +03:00
SoundSSGood	a10279e1cc	Grail fix	2023-05-16 16:51:45 +03:00
Ivan Savenko	79982c4ad4	Fix broken bonuses due to calling PutArtifact before NewArtifact	2023-05-09 16:48:52 +03:00
nordsoft	ce80c83ca2	Merge remote-tracking branch 'upstream/develop' into town-buildings ... # Conflicts: # lib/CTownHandler.cpp # lib/rewardable/Interface.cpp	2023-05-04 22:23:44 +04:00
Konstantin	05eccbc2bb	vcmi: split bonus to enumerator and HeroBonus.h	2023-05-03 18:01:06 +03:00
nordsoft	92dcfd1f68	Fix garrisons hero	2023-05-02 15:09:02 +04:00
nordsoft	96420bfc05	Fix configurable reward for non-query scenrio	2023-05-02 14:45:42 +04: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	a6de9097be	vcmi: rename HeroBonus.h to Bonus.h	2023-05-02 11:20:58 +03:00
nordsoft	c4cf2a100b	Fix behavior for hero bought in town tavern	2023-05-02 04:44:09 +04:00
Ivan Savenko	916b41d9a7	Merge pull request #2078 from IvanSavenko/shortcuts ... Basic shortcuts system	2023-05-01 21:45:52 +03:00
nordsoft	59bc9326e9	Remove excess pointer from market interface	2023-05-01 21:49:37 +04:00
Ivan Savenko	a654cc2391	Removed vstd::advance. Added vstd::next to handle similar cases.	2023-05-01 17:58:18 +03:00
Ivan Savenko	4aa232a60a	Merge pull request #2055 from SoundSSGood/cartifactholder-rework ... Artifact related code refactoring part2 (client CArtifactHolder)	2023-05-01 02:33:08 +03:00
Ivan Savenko	d985ac90d3	Merge master -> develop	2023-04-28 22:57:25 +03:00
Ivan Savenko	c55f52e84f	Fixed disabled special weeks	2023-04-28 16:54:00 +03:00
Konstantin P	b472c89276	vcmi: make some CStack properties private ... There is a getters for this properties already available	2023-04-27 20:58:49 +03:00
Ivan Savenko	fb739e7186	Merge beta -> develop	2023-04-26 22:48:08 +03:00
Ivan Savenko	9296306fa3	Merge pull request #2041 from IvanSavenko/bugfixing_for_hotfix ... Fixes for 1.2.1	2023-04-24 18:13:00 +03: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	eff158a9a8	Fix killing hero with grail	2023-04-23 16:17:27 +03:00
SoundSSGood	c86af54ce1	arts move condition fix	2023-04-23 14:18:55 +03:00
Nordsoft91	a553a4aa66	Merge pull request #2030 from Nordsoft91/boats	2023-04-22 03:27:00 +04: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
Ivan Savenko	9882c37ce3	Good morale can no longer happen after battle is over	2023-04-20 13:10:03 +03:00
Ivan Savenko	d9939f0918	Bad morale can no longer happen after waiting	2023-04-20 13:08:55 +03:00
Ivan Savenko	4bb4d7e7a5	Merge pull request #1989 from SoundSSGood/refactoring-arts-p1 ... Artifact related code refactoring part1 (initial)	2023-04-19 15:31:11 +03: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	008db447e7	Minor changes	2023-04-19 02:11:24 +04:00
nordsoft	22da7a931d	Boat as bonus system node	2023-04-19 01:11:51 +04:00
nordsoft	1c66cd221d	Polish transport mechanics	2023-04-18 19:18:44 +04:00
nordsoft	3ff99a1a15	Mechanic for air and land transport	2023-04-18 18:33:28 +04:00
nordsoft	ddcdfb643a	Try to enable air/land movement	2023-04-18 17:36:42 +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
Konstantin	0d35606a44	vcmi: use std::variant	2023-04-17 00:43:13 +03:00
Ivan Savenko	e3ed728193	Merge pull request #1932 from rilian-la-te/proper-teleport ... VCMI: teleport redesign	2023-04-16 22:52:01 +03:00
SoundSSGood	9a838598a6	arts refactoring part1	2023-04-15 00:10:39 +03:00
Konstantin P	f11fa8f0c8	Teleport: can trigger obstacles now	2023-04-13 11:24:19 +03:00
Konstantin	bc1aad3b26	vcmi: remove deprecated CStack::getCreature() ... Function battle::Unit::unitType() does the same.	2023-04-13 11:24:19 +03:00
Ivan Savenko	63b197b78a	Converted attributes to use c++17 functionality	2023-04-12 01:03:14 +03:00
Nordsoft91	3951bbb395	Merge pull request #1108 from Nordsoft91/battle-dialog ... [HDMod features] Quick combat	2023-04-11 21:18:04 +04:00
Ivan Savenko	dfa2e2a349	Merge beta into develop	2023-04-11 19:37:35 +03:00
nordsoft	8e77b833d9	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 15:54:08 +04:00
Ivan Savenko	ff66592fad	Merge pull request #1882 from rilian-la-te/native-terrain-refactor ... Native terrain refactor	2023-04-11 02:14:37 +03:00
nordsoft	bfc75ccd39	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2023-04-11 02:22:42 +04:00
Nordsoft91	ebd17c9e4a	Merge pull request #1928 from Nordsoft91/cast-reward ... Spell cast reward	2023-04-10 22:49:36 +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
Ivan Savenko	42b2be4bbb	Merge pull request #1908 from SoundSSGood/art-client-server-fixes ... Artifact related fixes	2023-04-10 18:26:49 +03:00
Konstantin	2eaecfd1ae	ObstacleCasterProxy: beta branch	2023-04-10 15:41:58 +03:00
nordsoft	c0b90432cb	Change callback interface	2023-04-10 05:40:03 +04:00
nordsoft	e440343921	Bypass initial version of spell callback	2023-04-10 04:34:24 +04:00
SoundSSGood	e58be8e7f7	vcmiartifacts fixed	2023-04-08 12:28:53 +03:00
SoundSSGood	ea7dd14d8b	client is able to erase artifact	2023-04-08 00:41:55 +03:00
Ivan Savenko	f3aed901fd	Merge pull request #1883 from rilian-la-te/fixup-healing-destination ... CGameHandler: fixup healing destination	2023-04-07 12:42:52 +03:00
nordsoft	b1d06b6141	Complete quick combat feature	2023-04-06 22:49:38 +04:00
nordsoft	e85593dbb3	Save & restore mana	2023-04-06 21:19:46 +04:00
nordsoft	ece8a2a41f	Merge branch 'battle-dialog' into battle-dialog2 ... # Conflicts: # AI/BattleAI/BattleAI.h # AI/StupidAI/StupidAI.h # client/CPlayerInterface.cpp # client/CPlayerInterface.h # client/Client.cpp # client/NetPacksClient.cpp # client/battle/CBattleInterface.cpp # client/battle/CBattleInterface.h # client/battle/CBattleInterfaceClasses.cpp # client/battle/CBattleInterfaceClasses.h # config/schemas/settings.json # lib/CGameInterface.h # lib/IGameEventsReceiver.h # lib/NetPacks.h # lib/NetPacksLib.cpp # lib/battle/BattleInfo.cpp # server/CGameHandler.cpp # server/CQuery.h	2023-04-06 19:53:52 +04:00
nordsoft	ce3028bd73	Intermediate commit	2023-04-06 19:34:07 +04:00
Konstantin	dc7d0297a7	CGameHandler: fixup healing destination ... If it contains hex, not unit, server complains. Add actual unit there.	2023-04-06 00:21:21 +03:00
Konstantin	11b237a23c	vcmi: massive refactoring v1	2023-04-05 22:33:12 +03:00
Konstantin	e0715a76c8	vcmi: reduce CStack usage a little bit	2023-04-04 23:02:54 +03:00
Konstantin	e946ddcfeb	CGameHandler: obstacle trigger does not use CStack	2023-04-04 23:02:54 +03:00
Konstantin	4259d116e1	vcmi: move ServerSpellCastEnvironment in separate file ... In theory, it should not know about CGameHandler	2023-04-04 23:02:54 +03:00
Ivan Savenko	307065a633	Merge beta into develop	2023-04-04 16:06:20 +03:00
Ivan Savenko	c661419897	Merge pull request #1700 from rilian-la-te/resource-array ... Modernize resourceSet.	2023-04-02 20:12:45 +03:00
Ivan Savenko	2b1def4ef1	Merge pull request #1813 from Laserlicht/patch-1 ... hide messages from AI	2023-04-02 20:08:45 +03:00
Ivan Savenko	f471d1b23a	Merge pull request #1816 from krs0/feature/all_cheats_should_have_lotr_equivalent ... Added LotR alternatives for vcmiarmy and vcmiexp	2023-04-02 20:08:33 +03:00
Ivan Savenko	efbc5cf581	Merge pull request #1815 from IvanSavenko/beta_fixes ... Beta fixes	2023-04-02 20:02:41 +03:00
krs	28486a0b40	In the Silmarillion, Gandalf is referred to as "Olórin"	2023-04-02 10:58:20 +03:00
krs	7bec5bf606	Added LotR alternatives for vcmiarmy and vcmiexp	2023-04-02 10:58:20 +03:00
Ivan Savenko	63d0e437a9	Merge pull request #1820 from rilian-la-te/fix-magogs ... GGameHandler: fix spell-like attack targeting	2023-04-01 23:09:08 +03:00
Konstantin	05cc7fbf67	GGameHandler: fix spell-like attack targeting	2023-04-01 01:06:26 +03:00
Ivan Savenko	56e1866db9	Remove final path node when directly attacking guards	2023-03-31 23:18:45 +03:00
Ivan Savenko	820c9be61b	Use own resources when buying boat in allied shipyard	2023-03-31 23:18:45 +03:00
Michael	f7feeacc1f	hide messages from AI	2023-03-31 22:10:48 +02:00
Konstantin	6d17b9342d	ResourceSet: resolve .at troubles	2023-03-31 14:12:38 +03:00
Konstantin	d8a237ba46	vcmi: add getTrigger method to obstacles ... Fixes advanced remove obstacle spell	2023-03-31 01:01:26 +03:00
Konstantin	d5e2933bee	CGameHandler: slightly rework obstacle caster	2023-03-31 01:01:26 +03:00
Konstantin	53a6fb2836	CGameHandler: do not open-code toInfo ... There is an obstacle function which is doing exactly this.	2023-03-31 01:01:25 +03:00
Konstantin	f704a17e1a	vcmi: add a last hex setting ... I consider this behaviour as H3 bug, but this is H3. So, added a setting to disable this behaviour.	2023-03-31 01:01:25 +03:00
Konstantin	a8478a012b	vcmi: check long bridge by moat ... If moat is on GATE_BRIDGE hex, then it is a long bridge. No need to check town type.	2023-03-31 01:01:25 +03:00
Konstantin	aab5b47038	vcmi: setup moats using MoatAbility ... Setup moats using moat ability, need playtest for now. -3 to defence not added for now.	2023-03-31 01:01:25 +03:00
Konstantin	cd1730b1fb	vcmi: remove obstacle caster logic ... It is possible now to cast something via obstacle Immune creatures should not trigger an obstacle trigger now and should not reveal it.	2023-03-30 14:41:40 +03:00
Konstantin	5716925b47	NetPacks: change GiveBonus enum to enum class.	2023-03-30 12:41:17 +03:00
Ivan Savenko	484f0a175a	Blocked movement of war machines in tactics phase	2023-03-30 12:20:13 +03:00
Ivan Savenko	3e1506dba3	Merge pull request #1767 from Adriankhl/fix_battle_thread_shutdown ... Properly shutdown battle thread	2023-03-29 14:40:15 +03:00
Ivan Savenko	b2f5042942	Merge pull request #1783 from vcmi/beta ... Merge beta -> develop	2023-03-27 21:21:25 +03:00
Ivan Savenko	b875da108b	Merge pull request #1717 from SoundSSGood/backpack-limit-size ... Introducing backpack size limit functionality	2023-03-27 17:17:49 +03:00
Ivan Savenko	e3b5db0ade	Merge pull request #1778 from rilian-la-te/fix-obstacle-removal-mechanincs ... Fix landmines staying on battlefield after trigger	2023-03-27 17:17:14 +03:00
Konstantin	9a229d6e48	vcmi: really correct obstacle trigger ... Now obstacle trigger really matches H3	2023-03-27 16:11:17 +03:00
Konstantin	5b50191af7	NetPacksLib: remove obstacle ACTIVATE* actions ... Actually these actions was not working anyway.	2023-03-26 22:59:34 +03:00
Adriankhl	21a4113fc1	Properly shutdown battle thread in CGameHandler destructor	2023-03-25 20:29:33 +01:00
Ivan Savenko	5288e3761e	Merge pull request #1764 from IvanSavenko/selectable_spellcaster ... Implemented support for multi-spell casters	2023-03-25 20:08:47 +02:00
Ivan Savenko	dc099b2a35	Implemented support for multi-spell casters	2023-03-25 00:48:14 +02:00
Ivan Savenko	970981cfc9	Show information on potential kills in attack tooltip	2023-03-24 17:18:47 +02:00
SoundSSGood	19096f39f0	Backpack limit. Amount of fixes.	2023-03-21 22:11:42 +02:00
SoundSSGood	f0f9eecf97	Backpack limit part5. End of battle. Other stuff	2023-03-21 12:14:33 +02:00
SoundSSGood	9f8aa25297	Backpack limit part4 (Using cheats, buying)	2023-03-21 12:14:33 +02:00
SoundSSGood	e23766280f	Backpack limit part2 (Pick up, Dig up, Object rewards)	2023-03-21 12:14:33 +02:00
SoundSSGood	96e8a1f21c	Backpack limit part1 (move, disassemble)	2023-03-21 12:14:33 +02:00
SoundSSGood	72122fb433	CArtifact, CArtifactInstance, CCombinedArtifactInstance reorganization	2023-03-21 12:14:33 +02:00
Andrey Filipenkov	aae9e70771	remove duplicate call ... already performed in CPathfinderHelper constructor	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	ebbc8cf208	vcmi: remove BLOCK_LUCK bonus ... To block a luck, just set both INDEPENDENT_MAX and INDEPENDENT_MIN to 0 of LUCK bonus	2023-03-16 16:46:42 +03:00
Konstantin	c07e74250b	vcmi: remove BLOCKS_MORALE bonus ... To block morale, just set INDEPENDENT_MAX and INDEPENDENT_MIN to 0, there is no need for separate bonus.	2023-03-16 16:46:42 +03:00
Konstantin	20a9332a3f	vcmi: translate wisdom ... Make wisdom as separate bonus. It will be enough for now. But next is should be done as IsLearnable for each spell.	2023-03-16 16:46:41 +03:00
Konstantin	64ad7558c6	vcmi: skill-agnostic artillery ... Now it should work for any creature and with any damage percentage.	2023-03-16 16:46:41 +03:00
Konstantin	9205ef2c91	vcmi: skill-agnostic ballistics ... Made ballistics by using spell action and more code is shared now.	2023-03-16 16:46:41 +03:00
Konstantin	84f53485e2	vcmi: skill-agnostic first aid ... Now first aid is passive battle spell, and skill just bumps specific spell power for this spell. Everything about healing is handled into Heal spell effect.	2023-03-16 16:46:41 +03:00
Konstantin	300a8a15ba	vcmi: remove estates bonus ... Now it is handled by GENERATE_RESOURCE::GOLD.	2023-03-16 16:46:41 +03:00
Konstantin	43f09dd2e4	vcmi: convert scholar to new bonus ... Convert scholar to new skill-agnostic bonus. Now works only for any school (not from specific). In all schools form identical to past's SECONDARY_SKILL_PREMY::SCHOLAR	2023-03-16 16:46:41 +03:00
Konstantin	4a89418ada	vcmi: replace SecondarySkillPremy:EAGLE_EYE ... Replace this bonus to new ArcaneIntuition bonus, which will work independently from the rest of skill bonuses. Proof of concept for other skills.	2023-03-16 16:46:41 +03:00
Konstantin	496c1def12	vcmi: remove FULL_HP_REGENERATION bonus ... Just set HP_REGENERATION to high number (in OH3 doubled stack health is sufficient)	2023-03-16 16:46:41 +03:00
Ivan Savenko	2a2af34788	Merge pull request #1650 from SoundSSGood/arts-swap-regression-fix ... Arts swap regression fixed	2023-03-16 14:47:31 +02:00
Konstantin	4c31db52be	vcmi: add artifact component to second grail msg	2023-03-11 21:41:57 +03: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	716dd9a43b	vcmi: remove a bunch of duplicated showInfoDialog ... These methods duplicated in almost every map object Just replace it by one such method	2023-03-11 21:41:57 +03:00
Konstantin	8edba4fb06	vcmi: use MODAL by default ... Convert only some objects to AUTO, need futher testing than no non-adventure objects will not use AUTO or INFO	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
SoundSSGood	e24eb6cc12	regression fixed	2023-03-08 17:20:38 +02:00
Ivan Savenko	7ef5163d9d	Merge pull request #1581 from IvanSavenko/map_render_rewrite ... Adventure Map - rendering rewrite	2023-03-05 19:51:07 +02:00
Ivan Savenko	5905dd6111	Grail digging check is now in library	2023-03-05 17:48:02 +02:00
Ivan Savenko	4501036a04	Basic version of hero movement on map. Removed old code.	2023-03-05 17:48:02 +02:00
Ivan Savenko	8b3309b47d	Fixed custom hero names text ID's	2023-03-05 17:39:27 +02:00
Andrii Danylchenko	9f55666931	rework netpacks to avoid double typeinfo	2023-02-13 20:26:39 +02:00
Andrii Danylchenko	14d27c788f	hide AI cheating message	2023-02-05 11:00:58 +02:00
Ivan Savenko	dbbbba5f2d	Fix typo	2023-02-02 13:25:55 +02:00
Dydzio	5b8e8e60fb	Change vcmiarmy handling a bit	2023-01-25 12:50:18 +01:00
Dydzio	3d9f04c6e0	Minor cheats code changes	2023-01-25 12:10:48 +01:00
Dydzio	583f1ce911	Implemented vcmiexp cheat	2023-01-23 23:12:41 +01:00
Dydzio	75e0bfa80c	Add vcmiarmy cheat	2023-01-23 21:18:43 +01:00
Dydzio	d5b02f8dc2	Add sane aliases for cheat names + "vcmiazure" "vcmifaerie" cheats	2023-01-23 18:56:00 +01:00
Ivan Savenko	05a1d7c6e3	All text for factions/towns/building are passed through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	388ed88b5d	All artifact strings now pass through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	d2b837b116	All creature-related texts go through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	fa6f7513e8	All heroes-related strings are passed through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	b86969909a	Fixes compilation due to changes in callback interface	2023-01-20 15:18:10 +02:00
Ivan Savenko	17fc9d8d8f	Merge with vcmi/develop	2023-01-18 01:04:34 +02:00
Ivan Savenko	05ac217b0f	Merge with vcmi/develop	2023-01-17 23:02:25 +02:00
Ivan Savenko	246281e62a	Merged vcmi/beta with vcmi/develop	2023-01-15 17:46:42 +02:00
Ivan Savenko	6ea7add4bb	Merge pull request #1394 from SoundSSGood/art-move-fix ... Artifact movement refactoring	2023-01-15 17:29:36 +02:00
Ivan Savenko	ccc6ebee0d	Cleared up gate blocking, Force Field can now block gates	2023-01-13 15:44:42 +02:00
Ivan Savenko	1d7f004658	Implemented reinforced walls in towns with Castle	2023-01-13 01:09:24 +02:00
Ivan Savenko	500cf7f15d	EWallPart & EWallState are now enum class	2023-01-13 00:35:58 +02:00
Ivan Savenko	b86704bece	Ballistics mechanics should now match H3	2023-01-12 23:53:29 +02:00
Ivan Savenko	e188060480	Fix server shutdown on transferring artifact to commander	2023-01-12 16:27:59 +02:00
SoundSSGood	a0568823a9	swap contitutient	2023-01-11 13:17:33 +02:00
Ivan Savenko	4f3ea0d1d9	Renamed Terrain.h/cpp -> TerrainHandler.h/cpp	2023-01-10 00:01:35 +02:00
Ivan Savenko	7c7ae26e67	Map/Road/River identifiers are now private members	2023-01-10 00:01:35 +02:00
Ivan Savenko	e1799379dd	Terrain/Road/River handler are now in compileable state	2023-01-10 00:01:35 +02:00
Ivan Savenko	1468f6aded	Converted terrainTypeHandler into proper handler class	2023-01-10 00:01:35 +02:00
Ivan Savenko	1fece0ce18	Merge pull request #1229 from IvanSavenko/battle_improvements ... Battle: Fixing bugs & Implementation of missing features	2023-01-09 22:07:13 +02:00
Ivan Savenko	bde988ca43	Merge pull request #1329 from IvanSavenko/translate_game ... Translations support - base functionality for main game texts	2023-01-09 20:33:56 +02:00
SoundSSGood	4005b48360	Regressions fixed	2023-01-08 23:31:12 +02:00
SoundSSGood	6b7ce798d0	artifactTransitionPos created	2023-01-08 23:24:13 +02:00
SoundSSGood	d5cef0c069	end of battle art assembling fix	2023-01-05 17:37:14 +02:00
Ivan Savenko	a1eaf4d9c8	Do not apply Fire Shield effect that deals 0 damage	2023-01-04 17:55:19 +02:00
Ivan Savenko	85d7b470d4	Access to quests texts is now processed via translator	2023-01-01 14:56:45 +02:00
Ivan Savenko	bdb8e0ee5c	Introduced string identifiers for H3 texts, still WIP	2023-01-01 14:56:44 +02:00
Ivan Savenko	5d80457eda	Merge with vcmi/develop branch	2022-12-30 00:52:23 +02:00
Ivan Savenko	405b2976d5	Renamed getUpgradeInfo -> fillUpgradeInfo	2022-12-25 14:03:43 +02:00
Ivan Savenko	325c29da0d	Merge remote-tracking branch 'vcmi/develop' into battle_improvements	2022-12-23 14:51:34 +02:00
Ivan Savenko	9248e06ae0	Demon summon is now a spell. DEMON_SUMMONING bonus has been removed	2022-12-22 23:11:55 +02:00
Ivan Savenko	b423b3fa6b	Fix dragon breath & fire shield	2022-12-21 18:04:54 +02:00
Ivan Savenko	52fc5b3c39	Exploded mines now send ACTIVATE flag to client to play effect	2022-12-17 19:37:00 +02:00
Ivan Savenko	deffba01b9	All battle effects are now fully client sided	2022-12-17 17:35:15 +02:00
Ivan Savenko	ced2ece954	Fixes #809 - do not print error message after stepping onto mine	2022-12-17 14:40:54 +02:00
Ivan Savenko	a1ab90fb05	Creatures with double strike will not hit 2nd time after blinding	2022-12-16 21:52:46 +02:00
Ivan Savenko	60a00b450e	Multiple fixes & improvements to animation ordering	2022-12-13 21:31:49 +02:00
Ivan Savenko	c79634b6a7	Moved all animation ordering logic to callers ... Previously, CBattleAnimation & inheritors were controlling animation ordering - e.g. which animations should play after which. Now, this is controlled by caller, e.g. BattleInterface & its controllers. H3 animations are fairly linear and can be split in stages which are already somewhat implemented via waitForAnims	2022-12-13 21:31:49 +02:00
Ivan Savenko	b3deea24e0	Earthquake spell: do not target already destroyed sections	2022-12-13 21:31:49 +02:00
Ivan Savenko	25bceda4ea	Added convertToVisitablePos/convertFromVisitablePos to CGHeroInstance ... This method replaces old convertPosition, but with more clear names and without hardcoded magic constants.	2022-12-09 14:42:47 +02:00
Ivan Savenko	facf77b3ae	vstd::unique -> std::unique	2022-12-07 23:36:20 +02:00
Ivan Savenko	d85ee019ec	Removed CGHeroInstance::convertPosition method	2022-12-07 22:51:32 +02:00
Ivan Savenko	49cbd5adc9	CGHeroInstance::convertPosition is no longer static method	2022-12-07 22:34:08 +02:00
Ivan Savenko	908e6892f3	Removed CGHeroInstance::getPosition pseudo-override ... Now access to hero visible position is always done via visitablePos	2022-12-07 22:10:08 +02:00
Ivan Savenko	2855606a88	Enabled & fixed -Woverloaded-virtual warning from gcc/cland ... - fixed almost all instances of overloaded-virtual warning - cleared up inheritance & method overrides in code affected by warning	2022-12-07 21:50:45 +02:00
Ivan Savenko	848454d48a	Check for end-of-battle after opening spells are cast, fixes potentially ... infinite battle	2022-12-02 21:38:59 +02:00
nordsoft	b7cab0e01d	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2022-11-30 01:03:57 +04:00
nordsoft	e865f484ff	Fix some problems with network game	2022-11-30 00:10:40 +04:00
nordsoft	e9e172164c	Implemented correct logic for battle queries	2022-11-25 03:02:34 +04:00
SoundSSGood	e6e669d024	ArtifactUtils::isSlotBackpack() func + refactoring	2022-11-18 23:13:44 +02:00
SoundSSGood	e9ab894638	backpack assemble	2022-11-18 01:55:29 +02:00
SoundSSGood	2d078132bf	assemble in backpack initial	2022-11-17 19:43:54 +02:00
nordsoft	b253b19dc3	Support draw scenario (doesnt work properly)	2022-11-16 02:50:47 +04:00
nordsoft	9b597fc8d4	Merge remote-tracking branch 'upstream/develop' into battle-dialog	2022-11-15 23:08:20 +04:00
Andrii Danylchenko	6974d4ea53	Merge pull request #1130 from IvanSavenko/banned_skills_fix ... Fixes #1096 - do not propose banned skills on levelup	2022-11-15 09:32:12 +02:00
Ivan Savenko	729357824b	Added common method for secondary skill availability checks	2022-11-14 19:08:49 +02:00
SoundSSGood	f9738f0d0b	nullptr checks	2022-11-13 16:28:26 +02:00
SoundSSGood	aef87dd482	Apply suggested cosmetic changes	2022-11-13 15:28:09 +02:00
SoundSSGood	3142f32cbb	Fix for callback return. More code optimization	2022-11-11 01:28:04 +02:00
SoundSSGood	30db38c0fe	Unified CGameHandler::bulkMoveArtifacts and CGameHandler::bulkSwapArtifacts to one	2022-11-10 20:11:26 +02:00
SoundSSGood	ad47a7573c	Code style. Typo. Code clean up.	2022-11-10 18:29:39 +02:00
SoundSSGood	b9087e2d63	Apply suggestions from code review ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2022-11-10 17:45:54 +02:00
SoundSSGood	f2afd9e831	Update server/CGameHandler.cpp ... Co-authored-by: Nordsoft91 <nordsoft@yahoo.com>	2022-11-10 17:37:50 +02:00
SoundSSGood	3a3b559a0b	attempt to fix the build	2022-11-07 14:20:28 +02:00
SoundSSGood	203c54e956	BulkMoveArtifacts structure optimization	2022-11-07 14:13:36 +02:00
SoundSSGood	f72a3e3884	function ArtifactUtils::checkSpellbookIsNeeded for the artifacts like a Titan's thunder	2022-11-07 00:18:05 +02:00
SoundSSGood	0f391e19d5	server side funcs	2022-11-06 23:59:30 +02:00
nordsoft	4ccad9178e	Fix potential BattleInfo destruction before usage	2022-11-06 21:46:56 +04:00
nordsoft	e9cf3ede2a	Try to handle queries by ai	2022-11-05 06:34:38 +04:00
nordsoft	0c4e50b63c	Initial prototype works	2022-11-05 03:35:51 +04:00
nordsoft	48925a50f2	Development	2022-11-05 03:35:46 +04:00
nordsoft	219a282916	First step	2022-11-05 03:35:32 +04:00
nordsoft	63b29cbaea	Code review tweaks	2022-10-08 19:52:53 +04:00
nordsoft	16e185343a	Add host commands to control game	2022-10-06 15:54:46 +04:00
nordsoft	895ec2d302	Make console available during other players' turn	2022-10-05 19:04:51 +04:00
nordsoft	77ff6a64e6	Show message about client connecting and disconnecting	2022-10-05 00:51:34 +04:00
nordsoft	0ea5a8fbe7	Merge remote-tracking branch 'upstream/develop' into mp-disconnection ... # Conflicts: # server/CVCMIServer.cpp	2022-10-04 17:41:43 +04:00
Andrii Danylchenko	5c44c8f4da	Merge pull request #1011 from kambala-decapitator/fix-multiple-heals ... allow healing ability only before first turn of each round	2022-10-03 21:43:08 +03:00
nordsoft	f4b7cf8196	Transfer player ownership to AI	2022-10-03 20:47:00 +04:00
Andrey Filipenkov	52371a4d3e	allow healing ability before first turn attempt of each round	2022-10-03 15:48:39 +03:00
Tomasz Zieliński	20c102e648	Remove T prefix from new typedefs	2022-09-29 11:44:46 +02:00
Tomasz Zieliński	f386f42166	Merge remote-tracking branch 'origin/develop' into terrain-rewrite ... # Conflicts: # lib/Terrain.cpp # lib/Terrain.h # lib/battle/CBattleInfoEssentials.cpp # lib/rmg/ObstaclePlacer.cpp # lib/rmg/RiverPlacer.cpp	2022-09-27 07:50:17 +02:00
Nordsoft91	d4f97aadf0	Merge branch 'develop' into incomatibility-response	2022-09-25 13:26:07 +04:00
Tomasz Zieliński	4ea57ea7fc	A variety of suggested style tweaks	2022-09-25 09:33:56 +02:00
Andrey Filipenkov	ff635edc0b	wrap all library code into namespace if VCMI_LIB_NAMESPACE is defined ... preparation for having client and server in a single process	2022-09-24 15:55:21 +03:00
Tomasz Zieliński	a5077245a8	Merge remote-tracking branch 'origin/develop' into terrain-rewrite ... # Conflicts: # lib/Terrain.cpp # lib/Terrain.h	2022-09-23 20:01:13 +02:00
nordsoft	8f6f9707a6	Read error message from translate.json	2022-09-23 15:20:11 +04:00
nordsoft	e74890c4b1	Add system message about mods incompatibility	2022-09-23 15:02:45 +04:00
Andrii Danylchenko	328fe4a556	Merge pull request #952 from kambala-decapitator/fix-vampire-drain-effect ... server-side fixes to battle events	2022-09-22 18:37:29 +03:00
Andrii Danylchenko	b4d3445559	Merge pull request #971 from kambala-decapitator/fix-warnings ... Fix most project warnings	2022-09-22 16:05:32 +03:00
Andrey Filipenkov	1d57c40740	wrap && conditions in parentheses when near ||	2022-09-22 11:54:09 +03:00
Andrey Filipenkov	7e6ed0583c	disable all scripting code when configuring without scripting modules	2022-09-21 19:31:42 +03:00
Tomasz Zieliński	494b0f0226	First version that compiles	2022-09-21 11:34:23 +02:00
Andrey Filipenkov	87a88da3a9	add Fire Shield damage to the battle log	2022-09-21 10:42:42 +03:00
Andrey Filipenkov	b95841dabb	fix creating "creatures perished" battle log entry	2022-09-21 10:38:42 +03:00
Andrey Filipenkov	1313da191b	trigger Drain Life effects after the attack ... - animation and sound are played after the attack - amount of drained life appears after damage dealt in the battle log	2022-09-20 18:00:00 +03:00
DjWarmonger	7ba271edf1	Rotation rebase2 (#912) ... * Instead of [x][y][z] coordinates, map will be stored as [z][x][y]. * Nullkiller AI can get it too. * Use boost::multi_array instead of nested vectors * In MapHandler too * Rotate foreach algorithms, too * VCAI gets rotated, too	2022-09-18 17:39:10 +03:00
Tomasz Zieliński	40585a66c0	Style, commend - requested	2022-09-11 11:31:28 +03:00
Tomasz Zieliński	6fb7301e8e	Fixed issue with taking creatures from a Bank, Pandora or joiners	2022-09-11 11:31:27 +03:00
Andrii Danylchenko	4b4cc3cf4b	battlefields in VLC and custom bonuses for terrain patches	2022-09-11 11:31:27 +03:00
Nordsoft91	c4035134e5	New battlegrounds (#758)	2022-09-11 11:31:26 +03:00
Nordsoft91	aaa07e4d2e	New terrain support - part 1 (#755) ... Initial support of new terrains	2022-09-11 11:31:26 +03:00
Andrii Danylchenko	0d15089dd4	Do not remove hero if left only with commander	2022-05-01 09:30:30 +03:00
Arseniy Lartsev	bfd57ab5b5	Fixed scholar skill icon in the scholar dialog ... The icon was for one level higher than the actuall skill level, especially problematic for expert where right-clicking the icon woould cause a crash	2022-03-13 16:47:52 +02:00
Dmitry Orlov	8cae3398ba	Feature: Army Management Shortcuts should work as in HD+ Mod	2021-11-28 20:00:43 +02:00
Dmitry Orlov	7cfd1fe0ca	Fix: Captured town should not be duplicated on the UI	2021-10-31 17:33:26 +02:00
Dmitry Orlov	e4c2f0c822	Fix: Skyship Grail should work immediately after capturing without battle	2021-10-31 09:01:49 +02:00
Dmitry Orlov	30b879ae5d	Fixed: duplicated bonusing building. Improved: opposite bonus propagation	2021-09-12 14:30:54 +03:00
Dmitry Orlov	2a39c401b8	Feature: Opposite Side Limiter. Added: Old saves support.	2021-09-04 14:15:38 +03:00
Dmitry Orlov	25d9ea1ddf	Feature: Opposite Side Limiter	2021-09-04 14:15:38 +03:00
Andrii Danylchenko	9c8d776398	Merge branch 'develop' into handlersAbstraction ... # Conflicts: # CI/linux/before_install.sh # CI/mac/before_install.sh # CI/mxe/before_install.sh # lib/CModHandler.cpp # lib/mapObjects/CObjectClassesHandler.cpp # lib/mapObjects/CObjectClassesHandler.h # lib/mapObjects/CommonConstructors.cpp # server/CGameHandler.cpp # test/CMakeLists.txt # test/spells/effects/TeleportTest.cpp	2021-07-16 00:32:13 +03:00
Andrey Filipenkov	7f3b06eb86	fix server crash on unexpected client disconnect	2021-03-20 17:12:56 +03:00
AlexVinS	483a4689ce	Fixes for code review issues	2021-02-20 04:57:50 +03:00
AlexVinS	ecaa9f5d0b	Entities redesign and a few ERM features ... * Made most Handlers derived from CHandlerBase and moved service API there. * Declared existing Entity APIs. * Added basic script context caching * Started Lua script module * Started Lua spell effect API * Started script state persistence * Started battle info callback binding * CommitPackage removed * Extracted spells::Caster to own header; Expanded Spell API. * implemented !!MC:S, !!FU:E, !!FU:P, !!MA, !!VR:H, !!VR:C * !!BU:C, !!BU:E, !!BU:G, !!BU:M implemented * Allow use of "MC:S@varName@" to declare normal variable (technically v-variable with string key) * Re-enabled VERM macros. * !?GM0 added * !?TM implemented * Added !!MF:N * Started !?OB, !!BM, !!HE, !!OW, !!UN * Added basic support of w-variables * Added support for ERM indirect variables * Made !?FU regular trigger * !!re (ERA loop receiver) implemented * Fixed ERM receivers with zero args.	2021-02-14 19:05:43 +03:00
Dmitry Orlov	854a2e6c39	Feature: Mods system improvement, Part III. Bunusing buildings customization.	2021-01-14 01:02:13 +03:00
Andrii Danylchenko	3614330b3d	moat bypass when no targets to attack	2020-12-02 19:40:24 +02:00
Andrii Danylchenko	4e359cd2a3	fix automatic towers when out of ammo	2020-12-02 08:38:31 +02:00
Dmitry Orlov	39de2f6435	Fix: Morale bonus should be shown correctly	2020-11-11 22:43:40 +03:00
Dmitry Orlov	b25baf66be	Fix level up crashes: 1) Crash on double level up. 2) Crash on custom class level up.	2020-10-19 22:39:57 +03:00
Dmitry Orlov	934c4e511d	Special buildings support : Patch 1	2020-10-15 15:03:01 +03:00
Dmitry Orlov	bf07cd0ad9	Mod system improvement Part I : Old saves support & MSVS build fix	2020-10-07 15:12:32 +03:00
Dmitry Orlov	f4816b0824	Mod system improvement Part I : Special buildings should work in the modders towns	2020-10-07 12:35:11 +03:00
John Bolton	a05ae78e67	Fixed lots of warnings. ... Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed. 4003: not enough actual parameters for macro 'identifier' 4250: 'class1' : inherits 'class2::member' via dominance 4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2' 4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'	2020-10-04 02:20:18 -07:00
John Bolton	6d8f1e4530	Fixed incorrect usage of const std::shared_ptr. Resolves 0003142. ... Replaced const TBonusListPtr with TConstBonusListPtr where necessary Replaced const std::shared_ptr<T> with std::shared_ptr<const T> where necessary. Removed superfluous use of const. Replaced const std::shared_ptr<T> with const std::shared_ptr<T> & in function parameters and ranged for-loops.	2020-09-30 22:56:28 -07:00
Dmitry Orlov	38fd05f655	Minor fix: apply Monday bonuses to heroes who have slept overnight	2020-09-28 01:32:33 +03:00
Toney Sui	dca5d86e7a	Fix bug: LandMine is not exploding to enemies. (#630) ... * The reason is, the mine has attribute hidden=true; when enemy unit moves, the code in BattleInfo.cpp MoveUnit() (line 817) will update the revealed to true; then in the CGameHandler.cpp handleDamageFromObstacle() (line 4846) is checking , and the condition battleIsObstacleVisibleForSide() will return true, so the effect will not be triggerred. Resolution: 1. Remove the "revealed=true" in moveUnit(), and in handleDamageFromObstacle, remove the "const" restrict for obstacle, and then update revealed to true; 2. After the takeDamage function, add a pack "BattleObstaclesChanged" to update the obstacle to be "revealed=true".	2020-02-12 20:12:12 +03:00
Dydzio	2f15ca9406	Do not build pseudo-buildings explicitly with events	2019-06-04 22:29:07 +02:00
Dydzio	e1b72ead6e	Update CGameHandler.cpp ... Fix hero recruit serverside check	2019-06-01 20:29:49 +03:00
Dydzio	f49bd3f18b	Do not display warning if player already lost	2019-05-28 22:34:55 +02:00
Ewilhan	ec4797d856	Fix Neutral Creatures Weekly Growth ... Made it so neutral creatures could not be picked as "Flavour of the Week". It is checking neutral creatures hometown to do so. Fixes #3046.	2019-05-06 14:12:14 +01:00
Dydzio	e1857df4bb	Fix defense battle action logic (#563) ... * Fix defense battle action logic	2019-03-25 02:16:47 +03:00
Alexander Shishkin	549d8c97df	Merge pull request #557 from dydzio0614/CrystalDragonAbility ... Fix crystal dragon ability to match H3	2019-03-21 17:02:20 +03:00
Dydzio	53f4ba6464	Fix crystal dragon ability to match H3	2019-03-17 19:48:47 +01:00
Dydzio	36cb9f11c4	Hardcoded feature: no random week/month effects	2019-03-17 18:27:05 +01:00
Alexander Shishkin	b00e935e4d	Warnings fixes (#538) ... Warnings fixes * Suppress `missing-braces` for Clang * Fixed many C4275 warnings * Fixed almost all Clang/GCC warnings * Silence most frequent MSVC warning. * Fixed some pessimizing-move warnings * Fixed some unused capture warnings	2019-01-19 13:52:02 +03:00
AlexVinS	da20aa2388	Use the same cost value in Pathfinder and fuzzy evaluations.	2019-01-17 10:54:41 +03:00
Andrii Danylchenko	035d279ae8	Refactor CGHeroInstance, make spells private	2018-12-23 15:49:26 +03:00
Andrii Danylchenko	6ac987794c	AI: first rule extracted for pathfinder	2018-09-23 15:26:53 +03:00
Konstantin Vukolov	96215233bc	macOS: fix packet deserialization (#479)	2018-08-14 01:03:45 +03:00
Alexander Shishkin	84be667363	Merge pull request #463 from dydzio0614/skel_transformer_fix ... Fix bone/ghost dragon handling in skeleton transformer	2018-07-19 00:03:32 +03:00
Dydzio	301b70ddd8	Fix bone/ghost dragon handling in skeleton transformer	2018-07-18 20:21:19 +02:00
Dydzio	d5d2c65c4b	Fix counterattack wrong mechanics	2018-07-18 15:52:33 +02:00
Arseniy Shestakov	74e5c5bf05	CGameHandler: rename CPackForClient argument and add network logging	2018-04-04 14:24:32 +07:00
Arseniy Shestakov	ac66fc7f42	Full rework of pre-game interface and networking ... New features for players: * Loading for multiplayer. Any save could be used for multiplayer. * Restart for multiplayer. All clients will restart together. * Loading from single save. * Hotseat mixed with network game. Multiple players per client. * Now connection to server could be cancelled. * Return to menu on disconnections instead of crashes. * Restoring of last selected map, save or campaign on next run. TLDR on important changes in engine code: * UI: work with server separated from UI * UI: all explitic blitting replaced with IntObject's * UI: all new code use smart pointers instead of DISPOSE * Gameplay always start through lobby controlled by server. * Threads receiving netpacks now shared for lobby and gameplay. * Campaigns: heroes for crossover now serialized as JsonNode.	2018-04-04 14:24:26 +07:00
AlexVinS	03cfd2cb78	Do not use StackLocation in netpacks	2018-03-17 13:24:12 +08:00
AlexVinS	8cec07afbd	Replaced CGHeroInstance and CGObjectInstance with ObjectInstanceID in NetPacks	2018-03-17 13:24:12 +08:00
Henning Koehler	7f76648a7c	Extend Bonus.addInfo to integer vector (#427) ... * changed Bonus::additionalInfo to integer vector * fixed deserialization for old savegames * removed newline from JsonNode::toJson() * updated bonus schema; SPELL_AFTER_ATTACK and SPELL_BEFORE_ATTACK use new addInfo format * removed unnecessary init in Bonus constructor	2018-03-12 08:20:18 +03:00
ArseniyShestakov	079cd470c2	Merge pull request #425 from vcmi/CatapultRework ... Catapult rework	2018-03-06 01:16:53 +08:00
Dydzio	07cf59592b	Updated catapult spell effect to match new code	2018-03-05 12:55:44 +01:00
AlexVinS	f126a34a5e	Fixed https://bugs.vcmi.eu/view.php?id=2904	2018-03-04 11:15:24 +03:00
Dydzio	fb9ee9ddf7	Visual fix - destroy shooters together with tower	2018-03-02 15:36:44 +01:00
Dydzio	e68a2e7ef5	Fix arrow tower destruction mechanics	2018-03-02 15:23:07 +01:00
Dydzio	b55d506e22	Grant advanced catapult proficiency with CATAPULT_EXTRA_SHOTS	2018-03-02 13:46:14 +01:00
Alexander Shishkin	8b002ad774	Issue2888 (#421) ... Fixed issue 2888 * Merged AFTER_ATTACK & BEFORE_ATTACK cast modes. * Introduced new caster class for creature ability usage * Added few tests	2018-03-02 13:22:51 +03:00
Arseniy Shestakov	8bbe747e8e	Cleanup undef for min / max. NOMINMAX is already in Global.h	2018-02-11 05:42:49 +03:00
Ivan Romanov	eea50a044c	Hide "this statement may fall through" warnings	2018-02-10 22:27:00 +05:00
AlexVinS	35b01eb379	Fixed https://bugs.vcmi.eu/view.php?id=2466	2018-02-10 08:37:15 +03:00
AlexVinS	c94daf6faa	Fixed https://bugs.vcmi.eu/view.php?id=2864	2018-02-10 07:31:02 +03:00
AlexVinS	b194f8f13b	Fixed https://bugs.vcmi.eu/view.php?id=2865	2018-02-10 00:02:56 +03:00
AlexVinS	0b70baa95e	Spells configuration version 2 (effect-based) ... * Indirect spell effects loading * Json serializer improvements * spell->canBeCastAt do not allow useless cast for any spell * Added proxy caster class for spell-created obstacles * Handle damage from spell-created obstacles inside mechanics * Experimental GameState integration/regression tests * Ignore mod settings and load only "vcmi" mod when running tests * fixed https://bugs.vcmi.eu/view.php?id=2765 (with tests) * Huge improvements of BattleAI regarding spell casts * AI can cast almost any combat spell except TELEPORT, SACRIFICE and obstacle placement spells. * Possible fix for https://bugs.vcmi.eu/view.php?id=1811 * CStack factored out to several classes * [Battle] Allowed RETURN_AFTER_STRIKE effect on server side to be optional * [Battle] Allowed BattleAction have multiple destinations * [Spells] Converted limit|immunity to target condition * [Spells] Use partial configuration reload for backward compatibility handling * [Tests] Started tests for CUnitState * Partial fixes of fire shield effect * [Battle] Do HP calculations in 64 bits * [BattleAI] Use threading for spell cast evaluation * [BattleAI] Made AI be able to evaluate modified turn order (on hypothetical battle state) * Implemented https://bugs.vcmi.eu/view.php?id=2811 * plug rare freeze when hypnotized unit shots vertically * Correctly apply ONLY_MELEE_FIGHT / ONLY_DISTANCE_FIGHT for unit damage, attack & defense * [BattleAI] Try to not waste a cast if battle is actually won already * Extended JsonSerializeFormat API * fixed https://bugs.vcmi.eu/view.php?id=2847 * Any unit effect can be now chained (not only damage like Chain Lightning) ** only damage effect for now actually uses "chainFactor" * Possible quick fix for https://bugs.vcmi.eu/view.php?id=2860	2018-02-08 11:37:21 +03:00
Arseniy Shestakov	7c77249d37	Refactoring: get rid of macro in server-side request validation code	2018-01-28 08:03:48 +03:00
Arseniy Shestakov	da117e9255	Code style: remove void from constructors without arguments	2018-01-13 11:51:47 +03:00
DjWarmonger	c2a0b13332	Merge pull request #371 from dydzio0614/NewAbilities ... Tested and approved. Congrats!	2017-12-29 14:19:05 +01:00
Dydzio	da6d01b0c7	Ability rename + bugfix + changelog extend	2017-11-13 01:59:41 +01:00
Alexander Shishkin	fd4ecbd40b	Merge pull request #385 from Chocimier/altar ... Fixed "Altar of Sacrifice only sacrifices creatures one kind at a time" * https://bugs.vcmi.eu/view.php?id=2607	2017-10-28 14:04:34 +03:00
Piotr Wójcik	7171fa7ad4	Formatting	2017-10-28 11:04:55 +02:00
AlexVinS	c39cd5f951	Town building build mode fixes ... * CGameHandler::buildStructure was using wrong requirements for buildings in auto mode. * Build mode loading was wrong in case of omitted value * Show town hall slot for not built building only if it have normal build mode	2017-10-28 03:27:39 +03:00
Piotr Wójcik	58b427345f	Constify	2017-10-18 21:39:04 +02:00
Piotr Wójcik	f9ed952869	Properly calculate experience on altar	2017-10-14 22:10:59 +02:00
Piotr Wójcik	f145b4be91	Correctly sacrifice many stacks or many atrifacts, fixes #2607	2017-10-14 21:30:56 +02:00
Dydzio	14c07afd3c	Merge branch 'develop' into NewAbilities	2017-09-09 21:04:40 +02:00
Dydzio	3eef689005	Add TERMINATOR ability support, small fixes	2017-09-09 21:01:12 +02:00
Dydzio	d2e9848443	Fix RANGED_RETALIATION bug	2017-09-04 23:35:48 +02:00
Dydzio	4cab76900f	Add SYNERGY_TARGET and [wip]-SHOOTS_ALL_ADJACENT	2017-09-04 23:32:24 +02:00
Henning Koehler	31ca4db8bd	fixed manual control for arrow towers	2017-09-05 00:30:43 +12:00
Henning Koehler	654ca96e9d	fixed code format and other minor issues	2017-08-30 19:19:54 +12:00
Henning Koehler	69a538a600	added bonus type MANUAL_CONTROL	2017-08-28 20:09:27 +12:00
Henning Koehler	7e5c1ec7f8	made artillery bonus-based; supports multiple bonus shots	2017-08-27 21:05:17 +12:00
Henning Koehler	8bdb8f01ca	made scholar skill bonus-based	2017-08-27 20:10:25 +12:00
Henning Koehler	25e6b5cc07	added bonus type SECONDARY_SKILL_VAL2; refactored CSkillHandler::defaultBonus; made eagleEye level bonus-based	2017-08-27 17:40:52 +12:00
Henning Koehler	fc77c40a82	made ballistics bonus-based	2017-08-26 21:16:05 +12:00
Henning Koehler	19e619f61e	wisdom is now bonus-based	2017-08-26 20:49:29 +12:00
Dydzio	1df939bf70	Working FIRST_STRIKE ability	2017-08-19 20:39:24 +02:00
AlexVinS	8c0fab1dcf	fixes	2017-08-12 14:36:37 +03:00
AlexVinS	15138c23de	Finished conversion to new logging API ... * removed logger streams * (float3|int3)::operator() -> (float3|int3)::toString(), it was too ugly and confusing.	2017-08-11 23:06:27 +03:00
AlexVinS	046e1a7c29	Prepared JsonNode for new logging API.	2017-08-11 16:27:42 +03:00
ArseniyShestakov	cb40c093f8	Avoid boost::optional assignment for Boost 1.64 compatibility (#360) ... Two options here: to use emplace from 1.56 or boost::make_optional. Unfortunately Ubuntu 14.04 is using 1.54 and I'd rather not to break it.	2017-08-05 16:09:29 +03:00
Arseniy Shestakov	6d9f99d4de	Code style: and one more pass on lambda expressions parameter list	2017-07-19 02:11:17 +03:00
ArseniyShestakov	b52cfe5283	Code style: use parentheses for creating heap-based objects (#344)	2017-07-16 12:58:05 +03:00
AlexVinS	7374689301	Fixed https://bugs.vcmi.eu/view.php?id=2715	2017-07-16 00:02:55 +03:00
ArseniyShestakov	a4c0ad94b1	Code style: remove default value hints in definitions (#342) ... Some are outdated and this is something IDE are useful for.	2017-07-15 14:08:20 +03:00
ArseniyShestakov	ea0ceb1805	Merge pull request #323 from vcmi/CStackTweaks ... CStack tweaks	2017-07-15 00:42:08 +03:00
ArseniyShestakov	006fa6c6df	Merge pull request #332 from FeniksFire/SmallBugFix ... Fix handling damage from obstacles	2017-07-15 00:09:37 +03:00
AlexVinS	df13851176	fixed wrong battle result	2017-07-14 23:43:03 +03:00
Arseniy Shestakov	f1e5797834	Code style: move or add licensing information on top of every file	2017-07-14 01:26:03 +03:00
Arseniy Shestakov	dbcd79c48a	Code cleanup: remove double and unneded semicolons	2017-07-12 22:01:10 +03:00
AlexVinS	e677373241	tweak	2017-07-10 08:53:29 +03:00
AlexVinS	1fe01b7254	Moved defensive stance log message building to server side.	2017-07-10 04:05:36 +03:00
AlexVinS	ea3502ed60	Removed CStack::totalHealth()	2017-07-09 20:23:51 +03:00
AlexVinS	44fc0cb57b	Broken CHealth dependency on CStack	2017-07-09 19:49:52 +03:00
FeniksFire	43d324b561	Fix handling damage when stack wait in moat. ... Currently stack don't take any damage from moat when he stay in same place.	2017-07-09 15:07:20 +02:00
FeniksFire	ce09da783a	Fix taking double damage from the same moat. ... When stack move to the double moat in the fortress, he will be damaged twice. I fixed it like in original h3, now stack will be damaged once a time.	2017-07-08 21:44:26 +02:00
AlexVinS	4f14f22d3a	Unified CStack ammo, casts and counterattacks ... * it is possible now to add casts and shoots OTF (f.e. with spell bonus) Centralized stack 'ammo' loading from bonus system. * introduced small proxy class for local bonus cache (no need to use global cache if particular selector used on node only in one place) * handle killing resurrected creatures * use IBonusBearer::MaxHealth() where possible * Fixed https://bugs.vcmi.eu/view.php?id=2486 * Possible fix for 0 HP after resurrection. * Hack-fixed https://bugs.vcmi.eu/view.php?id=2584 * Unified CStack health API * Use CHealth for CStack count and health points * increased SERIALIZATION_VERSION	2017-07-08 20:29:59 +03:00
FeniksFire	45a63e003c	Fix: getting additional damage from destination obstacles ... When the stack was selected to pass through 2 field in moat, first hex stopped him but then he got also additional damage from destination obstacle.	2017-07-08 17:40:27 +02:00
ArseniyShestakov	b670bcb46f	Merge pull request #313 from vcmi/spellCastQuery ... Spell cast query	2017-07-04 02:43:22 +03:00
FeniksFire	8577445b10	Simple fix: http://bugs.vcmi.eu/view.php?id=2366	2017-07-03 22:41:16 +03:00
AlexVinS	a65befaa08	Moved town portal logic to mechanics class	2017-07-03 21:43:04 +03:00
AlexVinS	3d1a84875e	Queries refactoring ... * Moved SUMMON_BOAT special case to mechanics * Partially moved Town portal logic to mechanics class * Added generic query reply to CCallback * Redesigned Queries so that base API do not depends on CGameHandler * Got rid of CGameHandler::castSpellRequest * Removed CGameHandler::castSpell * Added new Query type for town portal dialog (not used yet)	2017-07-03 21:43:04 +03:00
ArseniyShestakov	5dfb7a5771	Merge pull request #317 from vcmi/attackerOwned ... Refactored CStack::attackerOwned to CStack::side	2017-07-03 16:19:54 +03:00
AlexVinS	e4c14c4cc2	avoid assertions in stack position checks	2017-07-03 12:59:33 +03:00
AlexVinS	4f8c7bd4bb	CStack refactoring ... * removed all occurrences of attackerOwned * Use BattleSide enum * more tweaks	2017-07-01 19:17:08 +03:00
ArseniyShestakov	2f305cc68d	Remove code related to duel mode (#312) ... Remove code related to duel mode	2017-07-01 16:30:13 +03:00
FeniksFire	4113bdab01	Moving some files from lib to the battle subdirectory.	2017-06-26 15:26:08 +02:00
AlexVinS	bb0f388f23	Cheat 'vcminahar' now give FREE_SHIP_BOARDING bonus ... https://bugs.vcmi.eu/view.php?id=2092	2017-06-14 11:41:36 +03:00
AlexVinS	754d63f7a5	hack-fixed ENCHANTED trigger for first 2 rounds	2017-06-13 21:50:59 +03:00
AlexVinS	0f5202689e	Cumulative spell effects ... * Added experimental support for cumulative effects for ENCHANTED bonus * Updated and fixed SPECIAL_PECULIAR_ENCHANT processing * Initial implementation of cumulative spell effects. * Scheme for new spell feature - cumulative bonus.	2017-06-13 21:50:50 +03:00
AlexVinS	0190c9804e	formatting	2017-06-06 19:45:34 +03:00
AlexVinS	a31c28ec33	Unified war machine mechanics. ... * it is possible to define new war machines * added warMachine field to artifact configuration	2017-06-06 19:18:26 +03:00
Arseniy Shestakov	a2284c3209	Automated testing: graceful shutdown for when game is ended ... Before when CloseServer / LeaveGame applied there was no thread sync on server. Now server use std::atomic bool for synchronization and graceful shutdown.	2017-06-06 07:30:16 +03:00
Arseniy Shestakov	18161d3688	Client: implement spectator mode via command-line options ... If running with --spectate/-s CPlayerInterface will appear even without human players. Following command-line options also available: --spectate-ignore-hero --spectate-hero-speed=N --spectate-battle-speed=N --spectate-skip-battle --spectate-skip-battle-result Boolean options can also be changed in runtime via client console: set spectate-ignore-hero on / off Spectator mode also: - Work with --onlyAI option when starting game or loading saves. - Allow to use any cheat codes. - Give recon on towns and heroes.	2017-06-06 07:30:16 +03:00