42 Commits

Author	SHA1	Message	Date
Ivan Savenko	f8541d0ae4	Merge branch 'vcmi/master' into 'vcmi/develop'	2023-09-15 13:59:02 +03:00
Krisztián Szabó	cb3cc84c61	Give bonus experience for capturing a town even if the enemy hero escaped.	2023-09-11 19:51:23 +02:00
Krisztián Szabó	6a5e71aa63	Award 500 experience for towns conquered during a battle.	2023-09-11 09:37:48 +02:00
Ivan Savenko	e8453916cf	Merge remote-tracking branch 'vcmi/beta' into develop	2023-09-08 18:49:06 +03:00
Ivan Savenko	bef97889e9	Merge pull request #2773 from wb180/blindedStackMoraleFix ... Blinded stack should not be able to get morale	2023-09-07 10:54:51 +03:00
Ivan Savenko	1f1f978328	Fixed battle replay	2023-09-06 16:03:47 +03:00
Ivan Savenko	8bdddd1324	Fix tests compilation	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	3a88180494	Separated game and battle callback (server & client only)	2023-09-06 16:03:39 +03:00
Ivan Savenko	fc4dfda00f	Added support for concurrent battles to gamestate and server	2023-09-06 16:03:02 +03:00
Evgeniy Meshcheryakov	e9c2d4e857	Blinded stack should not be able to get morale	2023-09-06 12:40:05 +03:00
Nordsoft91	c45ab07d0b	Merge pull request #2698 from Nordsoft91/turn-timer ... Turn timer fixes	2023-09-01 00:31:52 +04:00
Ivan Savenko	0f4f9b3233	Fix handling of opening spells when tactics is present	2023-08-31 01:32:32 +03:00
nordsoft	cc3ca9a41e	Timers fixes	2023-08-30 03:33:59 +04:00
nordsoft	b4c20734f3	Support timer logic for pve and pvp	2023-08-30 02:17:29 +04: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	b0eec85aca	Merge pull request #2632 from rilian-la-te/resist-rework-pt1 ... Spell resistance rework: part 1	2023-08-25 01:13:57 +03:00
Ivan Savenko	66f555f1f7	Fix error messages on bad morale	2023-08-24 23:34:33 +03:00
Ivan Savenko	b6d8c7d4a5	Fix retreating in player-with-player battles	2023-08-24 23:34:33 +03:00
Ivan Savenko	f451c15932	Fix handling of retreating of AI's	2023-08-24 23:34:33 +03:00
Ivan Savenko	c4bc6840ea	Moved management of turn order into a new class	2023-08-24 23:34:33 +03:00
Ivan Savenko	a84c5fa371	Fix battle replaying	2023-08-23 22:46:42 +03:00
Ivan Savenko	81242d3500	Fixed ending of battles due to retreat/surrender	2023-08-23 18:46:56 +03:00
Konstantin	8724181a0f	vcmi: spell resistance rework ... Now instead of XXX_IMMUNITY bonuses we have 2 bonuses with spellSchool subtype: SPELL_SCHOOL_IMMUNITY and NEGATIVE_EFFECT_IMMUNITY. All previous bonuses of subtype 0 is covered by SPELL_SCHOOL_IMMUNITY, and all previous bonuses of subtype 1 is covered by NEGATIVE_EFFECT_IMMUNITY. Unit tests are updated accordingly.	2023-08-23 17:52:16 +03:00
nordsoft	fb21620c60	Fix battle timer reset after refactoring	2023-08-22 14:14:50 +04:00
nordsoft	7b4b01a280	Adopt turn timer to battle refactoring	2023-08-22 01:49:50 +04:00
Ivan Savenko	8154e84825	Fix tactics usage	2023-08-21 17:55:49 +03:00
Ivan Savenko	276c00b284	Removed excessive includes	2023-08-21 17:55:49 +03:00
Ivan Savenko	2be9664d26	Remove no longer used code	2023-08-21 17:55:49 +03:00
Ivan Savenko	67eaef3520	Fixed few more discovered regressions	2023-08-21 17:55:49 +03:00
Ivan Savenko	013417fb7e	Code cleanup	2023-08-21 17:55:49 +03:00
Ivan Savenko	c516b5a64e	Fixes for several discovered edge cases	2023-08-21 17:55:49 +03:00
Ivan Savenko	a1092e0f3f	Fix battle ending	2023-08-21 17:55:49 +03:00
Ivan Savenko	a1d3181a98	Unified spellcasting handling with other actions	2023-08-21 17:55:49 +03:00
Ivan Savenko	6297140bf5	Start of stabilization - battles now start correctly	2023-08-21 17:55:49 +03:00
Ivan Savenko	44832f3797	Split BattleProcessor into few more parts	2023-08-21 17:55:49 +03:00
Ivan Savenko	5c78060a07	Moved battle netpack validation to battle processor	2023-08-21 17:55:48 +03:00
Ivan Savenko	323772fc2e	Split CQuery file into multiple files	2023-08-21 17:55:07 +03:00
Ivan Savenko	629ca3f13e	Created directory structure for server files	2023-08-21 17:55:07 +03:00