1283 Commits

Author	SHA1	Message	Date
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	c759400767	vcmi: allow showing simple rewardables in infobox	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	d503c875a4	vcmi: fix mana points displayed	2023-03-11 21:41:57 +03:00
Ivan Savenko	0c847c85cc	Fix serialization of rewardable objects	2023-03-07 00:06:58 +02:00
Ivan Savenko	0b3c10d990	Fix crash on hovering Market of Time (unfinished H3 object)	2023-03-07 00:06:58 +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	ca13e7dedf	Implemented terrain palette animatiions. Removed old code	2023-03-05 17:48:02 +02:00
Ivan Savenko	bd70b6fabd	Unicode conversion functions now require source encoding	2023-03-05 17:39:27 +02:00
Ivan Savenko	8b3309b47d	Fixed custom hero names text ID's	2023-03-05 17:39:27 +02:00
Ivan Savenko	623cae7d47	All translatable strings now have language identifier	2023-03-05 17:30:38 +02:00
Ivan Savenko	84fa19dadf	Merge pull request #1547 from dydzio0614/game-start-unrandomization ... Hardcoded features for HotA-like starting conditions	2023-03-05 17:29:49 +02:00
Ivan Savenko	8c52cbcd00	Merge pull request #1429 from dydzio0614/creature-numeric-quantities ... Implement numeric creature descriptions with config toggle on/off	2023-02-26 22:57:01 +02:00
Dydzio	e48a4185ed	Use config values from new settings	2023-02-15 23:36:09 +01:00
Andrii Danylchenko	c6feafc367	Hack to fix campaigns	2023-02-15 20:37:18 +02:00
Ivan Savenko	f65c6ad275	fix regressions from modernization	2023-02-15 14:27:12 +02:00
Konstantin	5f181e25af	vcmi: modernize lib/mapObjects	2023-02-14 14:39:56 +03:00
DjWarmonger	94bc418e34	Update CRewardableConstructor.cpp ... Fixed swapped identifiers in Limiter.	2023-02-11 08:28:29 +01:00
Dydzio	8604bde69e	Apply suggestions from code review ... Commit code review changes Co-authored-by: Ivan Savenko <saven.ivan@gmail.com>	2023-02-09 19:20:41 +01:00
Dydzio	7095e9d8f9	Allow heroes to start with empty armies if configured properly	2023-02-05 00:36:51 +01:00
Dydzio	3f79a9806c	Allow flexible configuration - starter dwellings and max stacks count	2023-02-04 23:40:02 +01:00
Konstantin	7b8aebe4e3	vcmi: deprecate MAXED_SPELL ... It is almost identical to SPECIAL_FIXED_VALUE_ENCHANT. Replace its usage in JSON and inside deprecated converter to SPECIAL_FIXED_VALUE_ENCHANT. Remove buggy string inside getEffectLevel.	2023-02-04 16:23:03 +03:00
Dydzio	4f4660e82d	Hardcoded feature to allow new heroes always have 3 stacks like in HotA	2023-02-02 22:28:14 +01:00
Ivan Savenko	34772ef830	Fixed includes	2023-02-01 21:45:06 +02:00
Ivan Savenko	c5508d33fc	Merge pull request #1514 from IvanSavenko/rewardable_fixes ... Minor fixes to rewardable objects	2023-01-31 12:47:24 +02:00
Ivan Savenko	57df0a6995	Fix crash on hovering prison	2023-01-30 19:00:51 +02:00
Ivan Savenko	57ee9a9bf3	Merge vcmi/beta into vcmi/develop	2023-01-29 18:21:55 +02:00
Ivan Savenko	a2cd17197e	Fix Campfire Gold reward amount. Now always one of 400/500/600	2023-01-28 13:12:03 +02:00
Ivan Savenko	d82822d37a	Fix reset of rewardable objects with reset period of 1 day	2023-01-28 13:12:03 +02:00
Ivan Savenko	e87adf334d	Fix loading of vcmi json maps	2023-01-26 23:32:56 +02:00
Ivan Savenko	8b2d336562	Fix initialization of visitDir in templates	2023-01-26 23:32:56 +02:00
Ivan Savenko	a3846f1b31	Fix incorrect identifiers format	2023-01-26 23:32:56 +02:00
Ivan Savenko	eebc6fd625	Map object use format mod:object (or mod:object.subobject)	2023-01-26 23:32:56 +02:00
Ivan Savenko	7b82387a49	Dwellings & Banks will register custom names for their objects	2023-01-26 23:32:56 +02:00
Ivan Savenko	bc27faea57	All objects will register single name per object type	2023-01-26 23:32:55 +02:00
Ivan Savenko	f71cbc5d9b	Fixed loading of object names	2023-01-26 23:27:26 +02:00
Ivan Savenko	b13637cdd5	Fix regressions in RMG & map editor	2023-01-26 23:27:26 +02:00
Ivan Savenko	6f324216db	Bugfixing	2023-01-26 23:27:24 +02:00
Ivan Savenko	6c472339ce	Refactoring of ObjectClassesHandler	2023-01-26 23:26:49 +02:00
Ivan Savenko	c5f72ccdc7	Names for object supertypes are passed through translator	2023-01-26 23:19:53 +02:00
DjWarmonger	25ef065dbe	Merge pull request #1486 from IvanSavenko/configurable_rewardables ... Well, it works for my brand new objects with arbitrary bonus, so likely will work with everything else.	2023-01-26 17:01:01 +01:00
Andrii Danylchenko	94f483c1e7	Merge pull request #1481 from kambala-decapitator/owner-tooltip ... display owner of ownable objects in tooltip	2023-01-25 10:38:13 +02:00
Ivan Savenko	7a9e5e4e30	Cleanup & consistency changes	2023-01-25 00:38:50 +02:00
Ivan Savenko	af5ff0c9df	Remove no longer used code	2023-01-24 23:34:02 +02:00
Ivan Savenko	44bdd2cbf3	Implemented selectable messages for visited & empty state	2023-01-24 23:31:07 +02:00
Andrey Filipenkov	90cb0cdc9b	fix displaying growth bonus from Statue of Legion	2023-01-24 18:35:30 +03:00
Andrey Filipenkov	5b10903116	reorder growth bonuses display to match oh3	2023-01-24 18:35:07 +03:00
Ivan Savenko	ca6947b2cc	Fixed Tree of Knowledge component	2023-01-24 17:35:06 +02:00
Ivan Savenko	c793527b44	Added "days since start of the game" limiter. Fixes Water Wheel	2023-01-24 16:54:14 +02:00
Ivan Savenko	ca521fb129	Removed incomplete functionality from rewardable object	2023-01-24 16:29:05 +02:00
Ivan Savenko	c9dcb921ab	Implemented "changeCreatures" option for Stables	2023-01-24 16:18:59 +02:00
Ivan Savenko	ecbcafefbc	It is now possible to configure what exactly will be reset in object	2023-01-24 13:54:03 +02:00
Ivan Savenko	0c70822928	Implemented logical expression (allOf/anyOf/noneOf) for limiters	2023-01-23 23:54:54 +02:00
Ivan Savenko	f8f6df02f3	Removed remaining hardcoded objects	2023-01-23 15:27:27 +02:00
Ivan Savenko	62e127fb59	Bonusing objects are now configured in json	2023-01-23 01:05:10 +02:00
Ivan Savenko	bfd6c40f25	Moved all once-per-hero visitable (sans Tree) to config	2023-01-22 22:58:53 +02:00
Ivan Savenko	a6bda58276	Moved CGOnceVisitable to config	2023-01-22 20:26:19 +02:00
Ivan Savenko	fcb455b7f4	Fixed remaining bugs with converted objects	2023-01-22 18:37:26 +02:00
Ivan Savenko	695a94c3c8	Fixed all major bugs with newly converted objects	2023-01-22 18:17:26 +02:00
Ivan Savenko	9f3f9cc563	Added some missing functionality for configurable object	2023-01-22 02:08:58 +02:00
Ivan Savenko	83bb70cd8a	All CGPickable objects are now fully configurable	2023-01-21 16:45:04 +02:00
Ivan Savenko	9565cae3cb	Fix potential assertion failure on map load	2023-01-21 15:57:25 +02:00
Dydzio	685d63603d	Merge branch 'develop' into creature-numeric-quantities	2023-01-21 12:57:29 +01:00
Andrey Filipenkov	2a43b7cfbc	display owner of ownable objects in tooltip ... also displays owner of towns (deviation from oh3)	2023-01-21 14:25:43 +03:00
Ivan Savenko	47c1803c42	Finalization of refactoring: ... - Entity interface now has getNameTranslated & getNameTextID methods - Entity interface no longer has getName method - removed (most) usages of normalizeIndentifier workaround method - all moddable objects have identifier in form of mod:name - all moddable object register strings in form of mod.type.name	2023-01-20 15:18:36 +02: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	e22f6283c2	Secondary skills strings are now passed through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	5da407e822	All spell texts are now passed through translator	2023-01-20 15:18:36 +02:00
Ivan Savenko	30d7bdc884	Moved tower damage computation to town instance	2023-01-20 15:18:10 +02:00
Ivan Savenko	05ac217b0f	Merge with vcmi/develop	2023-01-17 23:02:25 +02:00
Ivan Savenko	633b9ef3be	Native terrain is now required for faction, opt-out with value "none"	2023-01-17 22:59:14 +02:00
Ivan Savenko	246281e62a	Merged vcmi/beta with vcmi/develop	2023-01-15 17:46:42 +02:00
Dydzio	8248feebf7	Implement numeric creature descriptions with config toggle on/off	2023-01-14 15:55:08 +01:00
Ivan Savenko	e48bd39b9c	Moved road & river handlers into a separate file	2023-01-11 15:17:24 +02:00
Ivan Savenko	5e72ef76cf	Fix quest texts accessing	2023-01-11 15:10:44 +02:00
Ivan Savenko	1e37e66e6c	Replaced Terrain::BORDER and WRONG with NONE	2023-01-10 20:09:09 +02:00
Ivan Savenko	4f3ea0d1d9	Renamed Terrain.h/cpp -> TerrainHandler.h/cpp	2023-01-10 00:01:35 +02:00
Ivan Savenko	f51b3bca57	use JsonKey or NameTranslated instead of ambiguos Name	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	64885bdf6b	Better names for terrain parameters. Support for new movement sounds.	2023-01-10 00:01:35 +02:00
Ivan Savenko	4e4dae854f	Final stabilization changes	2023-01-10 00:01:35 +02:00
Ivan Savenko	2de3178158	Fixed game startup	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	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
Ivan Savenko	2f5ee44cbe	Fixes patrol position initialization on H3M load	2023-01-09 18:34:13 +02:00
Ivan Savenko	7e8516f927	Changed Sirens behavior to match H3 logic	2023-01-09 13:04:56 +02:00
Ivan Savenko	c479504646	Formatting cleanup	2023-01-01 22:50:38 +02:00
Ivan Savenko	7c0d5666a0	Return string by copy to fix cases when string is constructed on stack	2023-01-01 20:55:43 +02:00
Ivan Savenko	9a620a9091	Refactoring of GeneralTextHandler to reduce boilerplate code in callers	2023-01-01 15:13:02 +02:00
Ivan Savenko	84493e1bff	Translate received string identifier before storing	2023-01-01 14:56:45 +02:00
Ivan Savenko	1979b3e97f	Fixes typo	2023-01-01 14:56:45 +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
Dydzio	2c09bfb22a	Fix code formatting	2022-12-30 15:51:13 +01:00
M	23de4a188b	Change cartographer tile reveal logic to match H3	2022-12-30 15:09:09 +01:00
Ivan Savenko	7a35bcc812	Merge pull request #1221 from IvanSavenko/warnings_fix ... Fix remaining compiler warnings	2022-12-29 21:51:55 +02:00
Andrey Filipenkov	b030a88ca5	fix gold check for School of War	2022-12-29 01:45:51 +04:00
Ivan Savenko	eb20a4b208	Merge remote-tracking branch 'vcmi/develop' into warnings_fix	2022-12-23 14:40:45 +02:00
Ivan Savenko	26985600b2	Fixed several more cases of incorrect scope for identifiers resolving	2022-12-21 23:02:19 +04:00
Ivan Savenko	23cb47b457	Fixed several scenarios with incorrect scope for requesting identifiers	2022-12-21 23:02:19 +04:00
Ivan Savenko	5f8cfadc4d	Better formatting for not found terrains ID's	2022-12-20 01:55:59 +04:00
Ivan Savenko	b13723305d	Better error reporting for usages of invalid terrain in mods ... TODO: switch to proper mechanism via identifier requests	2022-12-20 01:55:59 +04: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	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	65802d958b	Integrated valid fixes from PR #1143	2022-12-07 18:13:54 +02:00
Andrii Danylchenko	89f0cc66e8	Merge pull request #1213 from IvanSavenko/clone_fix ... Fix crash on casting clone on modded creature	2022-12-07 17:34:52 +02:00
Ivan Savenko	2cbe6bcb47	Added common method to get names of hardcoded mod scopes	2022-12-07 15:18:19 +02:00
Ivan Savenko	17f9c3af23	Library of Enlightenment fix ... Do not offer choice between multiple identical option if hero is qualified to receive multiple of them due to diplomacy skill	2022-12-06 18:08:10 +02:00
Andrii Danylchenko	40e55e2788	Merge pull request #1196 from IvanSavenko/hero_positioning_fix ... Fixes incorrect positioning of heroes on spawn/release from prison	2022-12-05 10:35:24 +02:00
Ivan Savenko	b6b6063505	Fix positioning of heroes after release from prisons	2022-12-04 22:00:33 +02:00
nordsoft	bbe51bfaf4	Fix hero experience deserialization	2022-12-04 16:58:46 +04:00
nordsoft	8d1024fcfc	Clear error message	2022-12-03 20:56:05 +04:00
Andrii Danylchenko	d9c4b28ccc	Merge pull request #1177 from IvanSavenko/fix_mod_identifiers ... Fix mod identifiers registration & incorrect mod validation	2022-12-02 09:20:49 +02:00
SoundSSGood	45a3064e5d	suggested changes	2022-11-30 18:28:33 +02:00
Ivan Savenko	5cd405bce8	Fixed meta field handling in JsonUtils::inherit function, removed ... workarounds	2022-11-30 17:38:53 +02:00
Ivan Savenko	79c96e94fa	Cleared up comments	2022-11-30 17:37:36 +02:00
Ivan Savenko	36ae26bc37	Fixed several scenarios which could lead to json with incorrectly set ... mod origin info, leading to non-resolving identifiers	2022-11-29 22:34:32 +02:00
Ivan Savenko	abe11aaf54	Introduced "map" scope for accessing identifier on map loading. ... Currently it allows access to all mods, should be restricted to mods that map depends on	2022-11-29 22:33:08 +02:00
SoundSSGood	96d8e952c4	attempt to fix the build	2022-11-29 21:45:37 +02:00
SoundSSGood	909dcb82fa	use ArtifactID	2022-11-29 00:32:18 +02: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
Andrii Danylchenko	8b964be71f	Merge pull request #1111 from GermanAizek/develop ... Code refactor and fix condition bug	2022-11-15 09:23:16 +02:00
lainon	7fdad4e0f6	Code refactor following C++ standard and condition fixes	2022-11-15 03:20:55 +03:00
Ivan Savenko	729357824b	Added common method for secondary skill availability checks	2022-11-14 19:08:49 +02:00
Ivan Savenko	e06db2365d	Fixes #1096 - do not propose banned skills on levelup ... Remove possibility to get banned skill on levelup as "obligatory skill" if all other such skills have been learned before. May happen under some conditions, e.g. if hero quickly learns other magic schools - in witch hut/university, leading to case where banned skill is the only obligatory skill that can be offered on levelup	2022-11-14 17:16:49 +02:00
nordsoft	0f35082024	Fix crash with objects belonging players without state	2022-11-06 03:26:13 +04:00
Andrii Danylchenko	6cbaa40e29	#1065 - fix random hero initial position	2022-10-13 11:58:32 +03:00
Tomasz Zieliński	8c481dff46	Fix incorrect templates for mines in HoTA	2022-10-08 12:42:10 +03:00
Andrey Filipenkov	b26db479d7	don't add Necromancy to Witch Hut on random maps	2022-10-01 16:01:47 +03:00
Andrey Filipenkov	acfdbe87fe	remove duplicate entry	2022-10-01 16:01:02 +03:00
Andrey Filipenkov	aa217236b3	check amount of artifacts on hero when checking requirements of a quest that requires artifact(s) ... fixes case when 2 or more identical artifacts are required	2022-10-01 09:28:32 +03:00
Andrey Filipenkov	86708841f8	code improvement	2022-10-01 09:24:58 +03:00
Tomasz Zieliński	127d7ec40b	Fixed asserts (only for debug build)	2022-09-29 21:10:44 +02:00
Andrii Danylchenko	557512b308	Merge pull request #1006 from AgostonSzepessy/dev/agos/small-fixes ... Small misc fixes	2022-09-29 19:53:27 +03:00
Tomasz Zieliński	20c102e648	Remove T prefix from new typedefs	2022-09-29 11:44:46 +02:00
Tomasz Zieliński	475f835769	More style tweaks	2022-09-28 11:38:08 +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
Tomasz Zieliński	2bd30556a3	Store TerrainType by havlue and handle by reference	2022-09-26 09:17:55 +02:00
Tomasz Zieliński	4ea57ea7fc	A variety of suggested style tweaks	2022-09-25 09:33:56 +02:00
Agoston Szepessy	0718acdb6d	Use tuple instead of vector for comparing values ... There are only 3 values, and they're only used for doing a comparison, so it's wasteful to create a whole vector for that. std::tuple is better suited for this use case.	2022-09-24 23:50:31 -07: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
Tomasz Zieliński	ebe45d512d	Moved roads and rivers to TerrainTypeHandler, by analogy to TerrainType.	2022-09-23 16:24:01 +02:00
Tomasz Zieliński	e53613caa7	Fixed crash in pathfinder	2022-09-21 21:44:39 +02:00
Andrey Filipenkov	6cd810e065	fix showing "visited" message for Warrior's Tomb	2022-09-21 15:19:04 +03:00
Tomasz Zieliński	c9c4603f75	Firts working version that launches original maps	2022-09-21 13:43:57 +02:00
Tomasz Zieliński	494b0f0226	First version that compiles	2022-09-21 11:34:23 +02:00
Tomasz Zieliński	b20f649521	stash	2022-09-19 16:13:58 +02: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
Nordsoft91	e4ac0d4370	Editor prerequisites [part 2] (#889)	2022-09-17 14:04:01 +03:00
nordsoft	a598925a0b	Support pickable objects	2022-09-16 09:41:23 +03:00
nordsoft	7dc05d8e81	Support rewardable objects	2022-09-15 11:05:13 +03:00
Tomasz Zieliński	77e43cb36f	Cache Pathfinding skill	2022-09-14 15:24:24 +02:00
Tomasz Zieliński	d0f857c3c4	- Generate caching string with sprintf ... - Reserve BonusList space to avoid costly vector reallocation - Tweaks in int3 and UNDEAD bonus	2022-09-14 11:00:40 +02:00
DjWarmonger	3d2dc2335b	Switch ObjectTemplate to shared_ptr<const> (#870)	2022-09-11 16:13:53 +03:00
Tomasz Zieliński	22b4795f86	Well, we should have some sensible exception handling in VCMI	2022-09-11 11:31:28 +03:00
Tomasz Zieliński	1649cf2bb9	misc comments	2022-09-11 11:31:27 +03:00
Tomasz Zieliński	efb6580958	Fix for mislaced hero rescued from Prison - https://bugs.vcmi.eu/view.php?id=3227	2022-09-11 11:31:27 +03:00
Andrii Danylchenko	665bd4346e	Fix getting battlefield crash	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
Andrii Danylchenko	3b1d271ae0	allow configurable battleground graphics	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
Nordsoft91	5c1a66ab69	Rmg water support (#745) ... * RMG: water support and refactoring * Fix seers hut bug	2022-06-11 18:40:24 +03:00
Nordsoft91	a8265c7052	[0002285] Implement feature with extra resources near mines (#742) ... * RMG: clear start position * [0002285] some heaps of resources are placed nearby mines * Fix leak in case of inability to place resource * Fix indentation according to vcmi style * Add constant for random amount of resources * Code review fixes	2022-05-23 13:08:36 +03:00
Konstantin	c6b198ce14	Warning fix (I moved C++17 and CI to another branch) (#739) ... * clang warning fixes * use CMake 3.10 due to MXE CI does not have 3.13 yet Co-authored-by: Konstantin <rilian@niisi.ras.ru>	2022-05-19 15:14:50 +03:00
Andrii Danylchenko	0d15089dd4	Do not remove hero if left only with commander	2022-05-01 09:30:30 +03:00
Agoston Szepessy	5080f26235	Fix 3184 ... Taken from !684. This fixes a bug with primary skills that results in heroes not being able to interact with objects, or skills being incorrect when moving from mission to mission.	2022-03-14 09:18:57 +02:00
Dmitry Orlov	9e3c4b69c4	Minor fixes	2021-12-22 21:37:56 +02:00
Dmitry Orlov	0427fa45dd	Fix: Terrain description should be shown correctly	2021-11-08 21:01:30 +02:00
Dmitry Orlov	e4c2f0c822	Fix: Skyship Grail should work immediately after capturing without battle	2021-10-31 09:01:49 +02:00
Andrii Danylchenko	e219e1febf	3187 - fix whirlpool crash when exits are blocked	2021-10-23 21:40:52 +03:00
Andrii Danylchenko	98c6215ab6	fix negative tile cost from pathfinding skill	2021-10-06 08:45:06 +03: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
Dmitry Orlov	6f0864b47c	Feature: Town Negative Bonuses. Fix: Negative bonus bearers should not be affected	2021-09-04 14:15:37 +03:00
Dmitry Orlov	3cb88b6964	Feature: Magic Well should work in the fan towns	2021-09-04 14:15:37 +03:00
Dmitry Orlov	b1db6e26d1	Fix: nextPrimarySkill crash in case when probability values are incorrect	2021-07-30 12:10:33 +03:00
Andrii Danylchenko	d47564955e	Nullkiller: fix/refactor temporary bonus nodes, fix gather army quest completion	2021-07-26 21:02:50 +03:00
Andrii Danylchenko	3fa7e0976f	Nullkiller: update / fix build, core changes required for Nullkiller AI	2021-07-26 21:02:50 +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
Dmitry Orlov	8b08973283	Fix: ID-collisions when processing large mods collections	2021-04-25 15:07:06 +03:00
AlexVinS	483a4689ce	Fixes for code review issues	2021-02-20 04:57:50 +03:00
AlexVinS	a59e12ca5f	tweaks	2021-02-15 15:03:32 +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
Dmitry Orlov	8f331dce31	Feature: Lodestar Grail should work.	2020-12-10 04:05:37 +03:00
Dmitry Orlov	39de2f6435	Fix: Morale bonus should be shown correctly	2020-11-11 22:43:40 +03:00
Dmitry Orlov	d6a4767865	Mod system improvement: Patch 2	2020-10-25 01:04:34 +03:00
Dmitry Orlov	3cb0dfb143	Fix: RMG issues: 1) hota 2) assertions	2020-10-25 01:03:32 +03:00
Dmitry Orlov	643cc00db6	Mod system improvement: Special buildings should work in the modders towns. Part II	2020-10-19 22:38:06 +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	6a7296fbe9	Mod system improvement Part I : Fix redefined content handler assertion	2020-10-07 12:35:12 +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
Andrii Danylchenko	d782ee39df	hacks to optimize a few bonus requests	2020-07-04 17:52:22 +03:00
Andrii Danylchenko	42cab00c38	Fix quest handling	2020-01-31 00:48:01 +02:00
Alexander Shishkin	49404bfa24	Merge pull request #579 from vcmi/dydzio0614-patch-1 ... Hackfix crash on "victory by town capture"	2019-05-04 10:35:13 +03:00
Ewilhan	91177c412c	Fixed Crypt/Pyramid double visit sound. ... Removed sound call from CBank to avoid two sounds from being launched at same time. Gave priority to JSON files.	2019-05-02 23:46:18 +01:00
Dydzio	a79f11bed2	Hackfix crash on "victory by town capture"	2019-04-23 20:04:07 +02:00
Michał Kalinowski	ac6b477aa2	Simplify statements ... -Simplify return statements across the code	2019-03-31 09:43:14 +03:00
Dydzio	5718048752	Fix magic school gold payment	2019-03-11 18:56: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
AlexVinS	4b5910c2f4	VCAI performance improvements ... * Node graph initialization optimized. * Fixed "Unathorized obstacle access". * Pathfinding tracing disabled with ifdef. * Misc bonus calculation optimizations. * Removed timestamp from log lines. Date formatting eats too much CPU. * Paths for all heroes in Client are now cached	2019-01-17 10:50:56 +03:00
Andrii Danylchenko	035d279ae8	Refactor CGHeroInstance, make spells private	2018-12-23 15:49:26 +03:00
Arseniy Shestakov	708705aa96	CGLighthouse: workaround crash on map initialization. Fix issue 3020 ... Dirty hack here since proper fix would require to break saves	2018-11-01 23:31:23 +03:00
godric3	f9ac46576b	Add description for bonuses from hero specialty	2018-10-29 21:33:13 +01:00
Dydzio	2288e9b8aa	Merge branch 'develop' into AIMapObjectEvaluation	2018-07-30 01:33:49 +02:00
Dydzio	393b25eb7f	Minor tweaks/fixes	2018-07-29 19:31:01 +02:00
Dydzio	b37ba8e046	Initial version of AI object value config	2018-07-28 00:43:56 +02:00
Dydzio	615df6203d	Oprator overload correction...	2018-07-26 16:43:40 +02:00
DJWarmonger	273802c92c	I have no idea what I'm doing	2018-07-26 12:14:29 +02:00
Dydzio	21c1f47a78	Fixes	2018-07-22 19:12:11 +02:00
Dydzio	2c1d91e2ff	Move object ID struct to lib	2018-07-22 18:38:45 +02:00
Karlis Senko	69330de89c	Avoid integer overflow and conversion related UB.	2018-05-01 00:02:07 +03: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
Henning Koehler	6ddcb079a4	Enabled new secondary skills to be created (#438) ... * Universities, Scholars and Witch Huts may offer new skills * Moved encode/decodeSkill to CSkillHandler * Refactored CSkill interface and CSkill::LevelInfo image storage * Legacy game constants renamed to ORIGINAL_XXX_QUANTITY	2018-03-31 12:56:40 +07:00
Henning Koehler	1685641357	Flexible necromancy (#430) ... * made IMPROVED_NECROMANCY bonus configurable * updated cloak of the undead king	2018-03-17 16:46:16 +08: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	6263c4c3eb	renamed CGHeroInstance::updateSkill to updateSkillBonus	2018-03-05 22:13:23 +08:00
Henning Koehler	4c0a67041b	secondary skill bonuses get updated via replacement (issue 2796)	2018-03-05 22:13:23 +08:00
AlexVinS	f126a34a5e	Fixed https://bugs.vcmi.eu/view.php?id=2904	2018-03-04 11:15:24 +03: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
ArseniyShestakov	7fd090786c	Merge pull request #379 from henningkoehlernz/hero_specialty_scaling ... Hero specialty scaling	2018-02-28 15:03:24 +08:00
Henning Koehler	6c443d7094	SPECIAL_SPELL_LEV and SPECIAL_BLESS_DAMAGE no longer scale with hero level	2018-02-21 09:56:20 +13:00
AlexVinS	6d8536b12a	Fixed https://bugs.vcmi.eu/view.php?id=2882	2018-02-20 14:29:06 +03:00
Henning Koehler	9850e7254e	updated serialization version to 781	2018-02-18 23:32:52 +13:00
Henning Koehler	f9a8cb2876	fixed formatting and other small issues	2018-02-18 20:22:23 +13:00
Henning Koehler	00f51e0f98	Updaters replace bonuses during inheritance	2018-02-18 20:22:23 +13:00
Henning Koehler	ad5a9f7205	made HeroSpecial public again	2018-02-18 20:08:34 +13:00
Henning Koehler	6037c19b9a	removed specialtyDeprecated from CGHeroInstance; improved savegame compatibility	2018-02-18 19:47:38 +13:00
Henning Koehler	81c44dac41	minor fixes	2018-02-18 19:47:38 +13:00
Henning Koehler	5d3f6c3b91	removed CHeroInstance::specialty	2018-02-18 17:33:23 +13:00
Henning Koehler	ef7900d0a2	added support for older saves (fails)	2018-02-18 17:33:23 +13:00
Henning Koehler	3e0022be27	added support for new specialty json format; old format is converted to bonuses with updaters	2018-02-18 17:33:23 +13:00
Ivan Romanov	eea50a044c	Hide "this statement may fall through" warnings	2018-02-10 22:27:00 +05: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
AlexVinS	6033d32b5b	Fixed https://bugs.vcmi.eu/view.php?id=2845	2018-01-09 10:14:56 +03:00
Arseniy Shestakov	c5ca75bc53	CRewardableObject: remove now unused soundID	2018-01-02 09:49:04 +01:00
Arseniy Shestakov	f15cadc87b	Implement configurable object sounds: ambient, visit and removal ... * If there more than one sound for visit or removal random is played * At moment only the first ambient sound will be used	2018-01-02 09:49:03 +01:00
Michał Kalinowski	26a222ac62	Change JsonType to enum class (#393) ... Change enum JsonType to enum class JsonType	2017-11-27 00:18:18 +03:00
godric3	5a01aba9c8	fix for banks(crypt, ships) not giving morale penalty (#384) ... * fix for banks(crypt, ships) not giving morale penalty also texts should be closer to original now	2017-11-15 23:16:44 +03:00
AlexVinS	d93ef36750	Fixed https://bugs.vcmi.eu/view.php?id=2818	2017-11-15 15:54:54 +03:00
Hao Hu	9cc2464cf6	Fixing bugs for external dwelling bonus of Golem Factory (#382) ... * Fixing bugs for external dwelling bonus of Golem Factory. [Problem] The occupied Golem Factory on adventure map doesn't give the player corresponding weekly growth bonus. [Solution] 1. Add the dwelling (of multiple generators) to a player's dewelling set. 2. Created helper function to calculate external dwelling bonus points. [Test] Manual testing on the map, works fine. https://bugs.vcmi.eu/view.php?id=2789	2017-10-07 17:42:33 +03:00
godric3	e3f0126e41	Removed unnecessary code, fix #2737 ... bonus value is added to desciption inside Bonus	2017-10-05 16:50:39 +02:00
godric3	7d8adcc083	Add missing artifact name in wagon text, fix #2763	2017-10-05 14:52:51 +02:00
ArseniyShestakov	ca066841f1	Merge pull request #370 from vcmi/issue/2780 ... Issue/2780	2017-09-05 01:21:58 +03:00
AlexVinS	2f7968b803	Fixed wrong animation paths	2017-09-04 18:41:22 +03:00
Henning Koehler	abdca71828	skill names and descriptions are fully managed by CSkillHandler	2017-08-30 22:35:23 +12:00
Henning Koehler	3fe9bc34b8	CGHeroInstance::recreateSecondarySkillsBonuses() restores bonuses for all levels	2017-08-28 23:59:01 +12:00
Henning Koehler	9b3c61616f	made diplomacy join chance bonus-based	2017-08-28 23:33:19 +12:00
Henning Koehler	5091b117e2	fixed serialization for older savegames	2017-08-28 13:56:00 +12:00
Henning Koehler	0153d0fc78	made fire/air/water/earth magic skills bonus-based	2017-08-27 19:37:54 +12:00
Henning Koehler	9bbfb57b93	cleaned up secondary skill bonus merging	2017-08-27 15:35:04 +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
Henning Koehler	1fa6cbe514	scouting uses SIGHT_RADIUS bonus	2017-08-26 18:01:39 +12:00
Henning Koehler	e8c32e05d8	turned pathfinding effect into a bonus	2017-08-26 14:59:24 +12:00
Henning Koehler	0357a4fe3b	enabled config of skill descriptions	2017-08-26 10:08:06 +12:00
Henning Koehler	9811fbe02c	updateSkill attempts to update existing bonus instead of adding new	2017-08-26 09:33:08 +12:00
Henning Koehler	a6c3352d7c	moved secondary skill default bonus initialization into CSkillHandler	2017-08-26 09:33:08 +12:00
AlexVinS	0868164147	(int) -> static_cast<int>	2017-08-12 15:43:41 +03: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	143ff682bc	Logging cleanup	2017-08-10 21:59:55 +03:00
AlexVinS	85e952f25f	Logging cleanup 3	2017-08-10 20:17:10 +03:00
AlexVinS	61e241308d	Logging cleanup	2017-08-10 19:52:05 +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
ArseniyShestakov	9d9c026c85	Code style: serialize everything on own lines for easier debugging (#357)	2017-07-31 16:35:42 +03:00
Piotr	f931b19a16	Show correct quantity of guards of dwelling, fixes #2502 (#356)	2017-07-26 00:00:29 +03:00
Dydzio	8314e8234f	Fix water wheel gold amount (#348)	2017-07-18 15:00:30 +03:00
ArseniyShestakov	b52cfe5283	Code style: use parentheses for creating heap-based objects (#344)	2017-07-16 12:58:05 +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
Dydzio	0cb6515ae8	VCAI tweaks (#311) ... * Add extra priority support for town capture evaluation * Improve building algorithm * GatherArmy: check free gold instead of total for when hiring heroes	2017-07-15 01:15:08 +03:00
Dydzio	98140aab6b	Add option to toggle monthly artifact change in black market (#341) ... * Add black market art change as hardcodedFeature	2017-07-15 00:46:18 +03:00
ArseniyShestakov	ea0ceb1805	Merge pull request #323 from vcmi/CStackTweaks ... CStack tweaks	2017-07-15 00:42:08 +03:00
Arseniy Shestakov	98406d127d	CGMonolith: fix crash on initialization here too	2017-07-14 16:50:29 +03:00
Arseniy Shestakov	ee7862b12f	CGSubterraneanGate: fix crash on initialization ... There is some reason it's appear in campaign maps.	2017-07-14 15:03:55 +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	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
Piotr Wójcik	7bc9853175	Squashed commit of PR #314: ... commit 437c6c6fd4931abe69d3b7fe501b231a74182159 Author: Piotr Wójcik <chocimier@tlen.pl> Date: Sat Jun 24 18:36:16 2017 +0200 Rename CPlayersVisited to CTeamVisited commit baf1423cd9b090eaaa0a6962f2bd0f440e2e0747 Author: Piotr Wójcik <chocimier@tlen.pl> Date: Wed Jun 21 16:41:37 2017 +0200 Share visited status of CPlayersVisited objects across team	2017-06-30 23:51:43 +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
AlexVinS	9f1451c1a3	[Map format] more correct handling of default hero primary skills	2017-06-06 02:37:07 +03:00
AlexVinS	4b2a118ffa	fixed assertion if hero instance in VCMI map have 0 at one of primary skills	2017-06-06 02:01:24 +03:00
Piotr	9d5d291e6b	Do not show whether Witch Hut is visited by hero, if was not visited by player yet, fixes #2604 (#304)	2017-06-01 23:36:46 +03:00
AlexVinS	8a494b7820	fix	2017-05-28 18:42:36 +03:00
AlexVinS	9718ef1543	Fix	2017-05-28 18:40:13 +03:00
AlexVinS	70a092f58c	[Refactoring] use virtual method for object specific actions when new map object is created ... * --TODO * fixes CID 1366291, CID 1366297	2017-05-28 16:23:42 +03:00
AlexVinS	a7ed27c73f	Fixed CID 1375705, CID 1375709, CID 1375708	2017-05-28 14:40:35 +03:00
FeniksFire	1f215d2306	Fix http://bugs.vcmi.eu/view.php?id=2677.	2017-05-28 12:23:03 +02:00
AlexVinS	a85b4cf2a5	* WIP on event condition format ... * Hero portrait serialization * Fix town spells serialization * Added support for float exponential part in Json * Added support for int64 in Json * Added basic Hero definitions serialization * Added rumors serialization * Advanced player info serialization. * Added Disposed heroes serialization, (!) not covered with tests yet * Added Local event serialization * Added Pandoras box serialization * Added Seer hut reward serialization * Added CQuest serialization * Added API for map object instance names serialization. * Added random dwelling options serialization * Advanced town options serialization * Advanced hero options serialization * More map format tests * A lot of fixes, cleanup and refactoring	2017-05-27 00:23:19 +03:00
Piotr Wójcik	e3992de50e	Give hero move points at day of visiting stable, fixes #2598	2017-05-11 20:52:10 +02:00
FeniksFire	3de891b4b4	Moving/dividing classes from BattleState to separate files.	2017-03-17 16:48:44 +01:00
AlexVinS	c86304ac3b	Fixed http://bugs.vcmi.eu/view.php?id=2634	2017-01-26 10:52:19 +03:00
AlexVinS	478890df5f	Fixed CID 1366431, CID 1366430	2016-12-05 02:55:05 +03:00
AlexVinS	c23d3ac83c	Fixed CID 1366432	2016-11-28 03:59:03 +03:00
AlexVinS	3216422307	Fixed a few CWE-457	2016-11-27 22:07:01 +03:00
AlexVinS	c4ab962cc0	Fixed a few CWE-457	2016-11-27 17:48:18 +03:00
AlexVinS	30663f15ea	Fixed CID 1288863	2016-11-26 22:12:52 +03:00
AlexVinS	0a4e5fcdca	Fixed CID 1366337	2016-11-26 20:54:07 +03:00
AlexVinS	86e33a4c45	[Refactoring] Unified SetResources NetPack API.	2016-11-26 15:14:43 +03:00
AlexVinS	fa4e00573f	Fixed CID 1366350	2016-11-25 15:34:38 +03:00
AlexVinS	692d23e580	Fixed CID 1366376	2016-11-25 13:38:26 +03:00
AlexVinS	f538aae95e	Partial fix for http://bugs.vcmi.eu/view.php?id=2590	2016-11-02 14:52:02 +03:00
Vadim Markovtsev	99a3a58cbb	Add commander resurrection info window upon entering town	2016-10-29 21:55:00 +02:00
Vadim Markovtsev	9f967b4d7a	Fix formatting	2016-10-29 17:00:12 +02:00
AlexVinS	f760e22707	Fixed two recursive infinite loops in case of alternate buildings. ... * introduced in https://github.com/vcmi/vcmi/pull/211	2016-10-15 04:19:47 +03:00
AlexVinS	cf143cd257	Hack-fix crash in CGTownInstance::genBuildingRequirements related to alternate town buildings ... * this disables features of #211, but actual problem may be deeper inside logical expressions	2016-10-14 23:46:24 +03:00
AlexVinS	552f28c10b	fix	2016-10-11 21:25:22 +03:00
AlexVinS	ef9bff9006	fixes related to http://bugs.vcmi.eu/view.php?id=2520	2016-10-11 20:04:30 +03:00
AlexVinS	9834db1b7d	simplified CGScholar::onHeroVisit	2016-10-11 20:04:28 +03:00
AlexVinS	4173a5064c	Fixed http://bugs.vcmi.eu/view.php?id=2545	2016-10-11 20:04:27 +03:00
AlexVinS	24585cde87	complete fix for http://bugs.vcmi.eu/view.php?id=2507	2016-10-11 18:19:42 +03:00
AlexVinS	5c3f84138b	fixed random reward generation in CGVisitableOPW	2016-10-11 18:00:54 +03:00
AlexVinS	7db7ece143	Do not send netpack inside netpack handler.	2016-10-09 19:38:13 +03:00
Piotr Wójcik	bb890098df	Fix regression for week-visitable objects	2016-10-09 18:51:41 +03:00
AlexVinS	799b8519e0	Allow cast avdmap spells without spellbook ... * fixes http://bugs.vcmi.eu/view.php?id=1898 * partial fix for http://bugs.vcmi.eu/view.php?id=482 * fixes http://bugs.vcmi.eu/view.php?id=2155	2016-10-01 17:21:39 +03:00
Vadim Markovtsev	2c1dddde33	Fix memory problems with BonusList ... Bonus * -> std::shared_ptr<Bonus> This cures the following problems: 1) Memory corruption at exit. Some Bonus-es were deleted twice (mods?). 2) Memory leaks. Some Bonuses were not deleted. 3) Reduce the number of "Orphaned child" messages. Valgrind reports 0 leaked memory now and no invalid reads/writes.	2016-09-29 15:08:00 +02:00
ArseniyShestakov	6c63041d1a	Merge pull request #198 from vcmi/SpellsRefactoring8 ... No reason to not merge this now.	2016-09-24 05:29:55 +03:00
Arseniy Shestakov	bb05db90e5	CRewardableObject::onHeroVisit: avoid crash on pickable objects ... Missed this problem when tested #214	2016-09-23 11:47:07 +03:00
ArseniyShestakov	50b271393c	Merge pull request #214 from Chocimier/iss1975 ... Properly check if corpse was visited	2016-09-23 06:26:10 +03:00
AlexVinS	ea2e336f54	Merge branch 'develop' into SpellsRefactoring8	2016-09-22 16:40:32 +03:00
Piotr Wójcik	97d358b70f	Marking visited for team ... Also no longer gives reward every player	2016-09-20 22:05:44 +02:00
Dydzio	bd651ec5ef	Improve pandora box secondary skill handling	2016-09-20 12:40:58 +02:00
Dydzio	563a5d53c0	Update secondary skill handling. Fix issue 2307 ... Also making secondary skill icon display behavior same as in H3 during popup message.	2016-09-19 20:05:57 +02:00
Arseniy Shestakov	635c48f889	CGHeroInstance::setType: fix to give proper subID to random heroes ... Hero class id is used to determine hero object appearance, but after than we use subID to store it's unique id. This change should fix issues 2127 and 2277 since random heroes not going to override others in heroesPool.	2016-09-18 10:01:09 +03:00
Arseniy Shestakov	f6df107a55	Replace more magic subIDs with readable enums	2016-09-18 00:53:37 +03:00
Dydzio	beae354536	Correcting random amount of gold in gold piles ... In original H3 allowed amounts of gold in treasure piles are multipliers of 100. Before this fix gold amount can be any value from range 500-1000.	2016-09-17 23:22:13 +02:00
AlexVinS	53fbf88316	Spell cast logging refactored.	2016-09-17 23:04:23 +03:00
AlexVinS	d993710f8e	Merge branch 'develop' into SpellsRefactoring8	2016-09-17 20:29:44 +03:00
Piotr Wójcik	28d859419c	Revert the old code	2016-09-16 22:01:21 +02:00
Piotr Wójcik	29d6fb0f04	Properly check if corpse was visited ... Fixes two issues: - corpse without loot couldn't be marked as visited - taking loot from once visitable objects marked them as visited for all players	2016-09-16 20:59:07 +02:00
ArseniyShestakov	b5fa97b697	Merge pull request #211 from Chocimier/iss2321 ... Tested. Everthing looks fine so merging.	2016-09-14 00:37:17 +03:00
Piotr Wójcik	c5e4eaf9c1	Check if hero knows spell even without wisdom	2016-09-13 22:28:21 +02:00
Arseniy Shestakov	1e60ba6516	Only delete CQuest in CMap destructor and not with IQuestObject ... Quest information must remain accessible even if map object removed. Fix issue 2472	2016-09-13 01:30:47 +03:00
AlexVinS	505e53c17d	Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring8 ... # Conflicts: # client/battle/CBattleInterface.cpp # lib/spells/BattleSpellMechanics.cpp	2016-09-12 10:13:40 +03:00
AlexVinS	33d1895d21	Merge branch 'develop' into SpellsRefactoring8	2016-09-11 18:34:18 +03:00
Arseniy Shestakov	c8faca8f39	Refactoring: only use RNGs explicitly to avoid bug prone code in future ... Now server-side code should always use CRandomGenerator::getDefault which is serialized in GH. CGameState::getRandomGenerator should be only used from GS code and CPackForClient-based applyGs.	2016-09-11 00:10:46 +03:00
Piotr Wójcik	40003460ca	Check if building's dependencies are allowed	2016-09-10 19:38:49 +02:00
AlexVinS	62abde6c46	Prepare battle log for spell-cast on server side.	2016-09-10 18:23:55 +03:00
Arseniy Shestakov	ca819b3cda	CGHeroInstance::nextPrimarySkill: don't use GS RNG directly ... Code used from both GS and CGameHandler.	2016-09-09 23:16:42 +03:00
Arseniy Shestakov	85f49bc968	CGHeroInstance::initArmy: don't use GS RNG. Get RNG through a ref ... This function used by both server-side and gamestate so it's must use appropriate random source.	2016-09-09 23:16:42 +03:00
Arseniy Shestakov	2ba3b20928	Multiple changes to RNG usage to both client and server ... Server should never use RNG from CGameState directly. Instead server get's own RNG that's state is secret for client.	2016-09-09 23:16:42 +03:00
Arseniy Shestakov	02f70464fb	Fix mismatched-tags Clang warnings ... They're not important at all, but sicne there only few of them left just fix them.	2016-09-08 19:42:59 +03:00
AlexVinS	a109580b91	Use const for ObjectTemplate	2016-09-08 18:06:28 +03:00
AlexVinS	114dac7e81	Added ObjectTemplate copy constructor and assignment operator	2016-09-08 17:02:59 +03:00
Piotr Wójcik	044e2b9e51	Properly calculate building requirements ... In OH3 you can't build Capitol when Tavern is not builded. In VCMI up to now you could.	2016-08-30 22:15:24 +02:00
Piotr Wójcik	326be61ecb	Show atrifact's name in message of Warrior's tomb	2016-08-30 20:50:03 +02:00
Piotr Wójcik	52797082aa	Do not show whether Shrine is visited by hero, if was not visited by player yet	2016-08-30 20:48:03 +02:00
AlexVinS	c6d257f328	Fixed CQuest leak	2016-08-30 09:48:10 +03:00
Arseniy Shestakov	94bb5b9901	CGKeys::wasMyColorVisited: fix to not change playerKeyMap on client	2016-08-25 16:47:52 +03:00
Arseniy Shestakov	a90b657b86	Add reset to some static variables on client	2016-08-25 15:52:20 +03:00
Arseniy Shestakov	355f0a74ab	CGSeerHut: add initialization to constructor	2016-08-23 01:19:03 +03:00
Arseniy Shestakov	52e660f087	CQuest: add proper constructor to avoid uninitialized fields	2016-08-22 20:41:37 +03:00
Arseniy Shestakov	206c5699cf	CGHeroInstance::SecondarySkillsInfo: always set rand seed ... Seed will always be set again on hero initialization, but for save sync it's must be same before that. Related to issue 2459	2016-08-19 23:31:54 +03:00
Arseniy Shestakov	ab06cfd586	More fixes for uninitialized fields	2016-08-18 18:53:28 +03:00
AlexVinS	e26384062f	Fixed memory leak in CObjectClassesHandler	2016-08-17 09:24:01 +03:00
Arseniy Shestakov	b0045fa357	Fix TurnInfo memory leaks	2016-08-16 15:47:21 +03:00
DjWarmonger	2410f0af61	- WeightedRule optimization - part 1 ... - comments, style	2016-08-11 07:49:08 +02:00
DjWarmonger	2bffd4e5c1	Moar optimization!	2016-08-09 13:40:46 +02:00
DjWarmonger	201ed26795	Fixed #1213	2016-06-06 09:30:45 +02:00
Arseniy Shestakov	10dbbead2d	Fix indentation of logging code and around it ... That wouldn't be as big issue if problem affected few files, but it everywhere in codebase. Fixed it everywhere since in most files that is the only code with wrong indentation.	2016-03-12 04:46:21 +03:00
DjWarmonger	8f1fba9551	Merge pull request #146 from vcmi/feature/VCMIMapFormat1 ... Ok let's try it.	2016-03-01 07:49:54 +01:00
AlexVinS	5408b6c1ff	Formatting	2016-02-26 18:19:41 +03:00
AlexVinS	8e3e574900	Fix map object appearance serialization	2016-02-26 02:03:14 +03:00
AlexVinS	0de1a37d65	Fix missing template zIndex saving	2016-02-26 01:01:07 +03:00
AlexVinS	2021decb91	Serialize town spells	2016-02-25 22:59:17 +03:00
AlexVinS	d2f04332d0	Load object appearance and pos before addNewObject call, it is required for block-visit calculation. ... Added a test for tile block-visit.	2016-02-24 00:44:17 +03:00
AlexVinS	17e557be17	Advance Logical identifier condition	2016-02-23 16:36:21 +03:00
AlexVinS	4bcfb8c27d	Draft of new Event conditions	2016-02-22 23:43:57 +03:00
AlexVinS	dc5ad7d7b3	Make string instance names persistent	2016-02-22 19:26:42 +03:00
AlexVinS	ac281f3fec	Tweaks	2016-02-22 04:53:14 +03:00
Arseniy Shestakov	9428f865d3	CGTownInstance: erase all stacks when town is captured by enemy	2016-02-22 03:33:15 +03:00
AlexVinS	64cb0267a3	Do not save "visitableFrom" if object do not have active tiles.	2016-02-22 03:22:10 +03:00
AlexVinS	51bee1000b	Implemented CGWitchHut::serializeJsonOptions	2016-02-22 03:16:33 +03:00
Arseniy Shestakov	d15106bf63	CGTownInstance: implement armies merging on siege. Fix issue 169 ... Merging algorithm is replicate one from original game.	2016-02-22 02:46:31 +03:00
AlexVinS	dd1aabbe23	Use JsonSerializeFormat for map objects	2016-02-22 02:37:19 +03:00
AlexVinS	53b5587c2e	Advance map header serialization	2016-02-21 21:21:22 +03:00
Arseniy Shestakov	07961766ca	CGPandoraBox: don't use giveCreatures object removal feature ... For pandora box there's own removal function and for CGEvent based on it we sometimes don't want to remove object at all.	2016-02-17 11:28:54 +03:00
AlexVinS	4d9058e412	Whitespace cleanup. (No code changes.)	2016-02-15 13:34:37 +03:00
AlexVinS	67b03b9658	Fixed remaining tempOwner testsю	2016-02-14 12:25:49 +03:00
AlexVinS	fb322b41bc	Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1	2016-02-14 12:14:57 +03:00
AlexVinS	800f32c4cb	Fix few cases of tempOwner initialization.	2016-02-14 12:13:30 +03:00
AlexVinS	709dd833d5	Added hacks for hero identification.	2016-02-14 11:25:01 +03:00
AlexVinS	e0af4a665a	Added hacks fot spell scroll support.	2016-02-13 19:43:05 +03:00
Arseniy Shestakov	d4524c2fbd	CGDwelling: dont set owner for Refugee Camp. Fix issue 2029	2016-02-13 19:26:47 +03:00
AlexVinS	a59f0c23ce	Dedug tweaks	2016-02-13 17:16:00 +03:00
AlexVinS	fb17914ae5	Debug tweaks	2016-02-10 08:59:24 +03:00
AlexVinS	6db94ab74c	Explicit army serialization - too much CArmedInstance descendants	2016-02-09 10:11:59 +03:00
AlexVinS	53dc49e92a	CGShipyard, CGShrine serialization	2016-02-09 09:17:20 +03:00
AlexVinS	401ba48257	CGScholar serialization	2016-02-09 09:02:34 +03:00
AlexVinS	a00dbd3dd1	Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1 ... Conflicts: lib/CMakeLists.txt lib/VCMI_lib.cbp lib/filesystem/CFileInputStream.cpp lib/filesystem/CZipLoader.cpp lib/rmg/CRmgTemplateZone.cpp vcmi.workspace	2016-02-08 10:17:25 +03:00
Arseniy Shestakov	a13aec4fd7	Aplly some fix for merge and explicitly specify type for std::max	2016-02-08 04:09:02 +03:00
DjWarmonger	6f5706352d	Possible fix for #2371	2016-02-06 12:36:56 +01:00
AlexVinS	081a20d047	Fix a crash.	2016-02-05 09:40:20 +03:00
AlexVinS	483276b128	Merge fixes	2016-02-04 12:28:12 +03:00
AlexVinS	6e205a58b4	Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1 ... Conflicts: lib/VCMI_lib.cbp lib/filesystem/CZipLoader.cpp lib/filesystem/CZipLoader.h lib/mapObjects/CGTownInstance.cpp	2016-02-04 10:27:51 +03:00
AlexVinS	97f19b5176	CGResource serialization	2016-02-04 09:22:14 +03:00
AlexVinS	d8d574ed84	CGSignBottle serialization	2016-02-04 08:50:46 +03:00
AlexVinS	a6c719ee11	CGCreature serialization. Added rewardResources.	2016-02-04 08:44:46 +03:00
AlexVinS	1bc41b3ba3	Merge commit '3c844002626f48007a888d4dd8b0b45ec867fc9a' into feature/VCMIMapFormat1 ... Conflicts: lib/mapObjects/CGHeroInstance.cpp	2016-02-03 05:04:44 +03:00
AlexVinS	b176734418	CGCreature serialization	2016-02-03 04:18:03 +03:00
Vadim Markovtsev	88bc21952b	Make stables message appear if hero has cavaliers but visited stables before	2016-02-01 09:41:15 +03:00
Vadim Markovtsev	c30a6f2ff3	Fix 1989 cavaliers -> champions in stables	2016-01-31 21:09:11 +03:00
Vadim Markovtsev	3926920103	Rename radious -> radius ... There is no such English word, "radious" Some files get new lines in the end - BSD sed bug + best practices	2016-01-31 18:01:58 +03:00
Vadim Markovtsev	e18b21b78e	Fix 2264 learning stone & Learning skill	2016-01-31 10:12:01 +03:00
Vadim Markovtsev	eb4331baf6	Fix 1916 water wheel reward	2016-01-30 19:11:22 +03:00
Vadim Markovtsev	918fbd8530	Refactor hero's mana regain	2016-01-30 13:51:07 +03:00
ArseniyShestakov	94fa25d56d	Merge pull request #179 from vmarkovtsev/issue/2405 ... Fix 2405 quest timeout mechanics	2016-01-29 12:19:31 +03:00
Vadim Markovtsev	30d64e3e3c	Fix 2405 quest timeout mechanics	2016-01-29 09:28:37 +03:00
AlexVinS	0011507e42	wipe constexpr on @DjWarmonger request	2016-01-29 00:34:54 +03:00
Arseniy Shestakov	b7fbbfdebe	CQuest: add missing completedOption initialization for CGQuestGuard	2016-01-27 23:24:17 +03:00
ArseniyShestakov	4e8486da7b	Merge pull request #160 from vmarkovtsev/issue/2388 ... Fix 2388 obelisks puzzle revealing	2016-01-27 20:49:03 +03:00
Vadim Markovtsev	0ac833cca4	Fix 2377 "Seer Empty Text"	2016-01-27 19:52:45 +03:00
Alexander Shishkin	1472ed970d	Merge pull request #176 from vmarkovtsev/issue/2160 ... Fix 2160 dismissing a VIP hero.	2016-01-27 18:28:57 +03:00
Vadim Markovtsev	9f3313524e	Fix 2160 dismissing a VIP hero	2016-01-27 17:10:19 +03:00
DjWarmonger	94ecc3f520	Compilation fix. MVS 2013 doesn't support constexpr and it's not needed either.	2016-01-27 10:13:33 +01:00
DjWarmonger	fc62cabb68	Merge pull request #174 from vmarkovtsev/issue/981 ... Fix CGHeroInstance::isInitialized implementation	2016-01-27 09:43:53 +01:00
Vadim Markovtsev	f6679bba50	Fix CGHeroInstance::isInitialized implementation	2016-01-27 09:44:23 +03:00
DjWarmonger	f626c0f9ed	Merge pull request #173 from vmarkovtsev/issue/981 ... Fix 981 reset hero on hiring after retreat/surrender	2016-01-26 21:24:22 +01:00
Vadim Markovtsev	7772b6de74	Fix 981 reset hero on hiring after retreat/surrender	2016-01-26 22:48:31 +03:00
Vadim Markovtsev	40cb48d65e	Replace std::remove_if with vstd::erase_if	2016-01-26 10:19:58 +03:00
Arseniy Shestakov	97a8874ed7	CGCreature: fix crash on draw ... Also according to H3 behaviour if there artifact monster guarded it's will be lost on draw.	2016-01-26 08:41:09 +03:00
AlexVinS	0ec07b38ac	fix build	2016-01-24 16:58:24 +03:00
AlexVinS	89d986fc6a	Merge remote-tracking branch 'remotes/origin/develop' into feature/VCMIMapFormat1 ... Conflicts: lib/CArtHandler.h lib/mapObjects/MiscObjects.cpp	2016-01-24 15:39:41 +03:00
AlexVinS	408f346541	Drafts for hero serialization	2016-01-24 15:35:08 +03:00
ArseniyShestakov	b19e082f37	Merge pull request #166 from vmarkovtsev/issue/1723 ... Fix 1723 quest crash on combined arts	2016-01-23 23:23:07 +03:00
AlexVinS	f9d0b20234	CGMine, CGArtifact, CGGarrison serialization	2016-01-23 19:53:02 +03:00
AlexVinS	b0c4ea5947	Fix.	2016-01-23 17:43:20 +03:00
Vadim Markovtsev	a266154b26	Fix 2014 cursor must disappear during movement and Magi's Eye	2016-01-23 00:35:41 +03:00
Vadim Markovtsev	11bce2908d	Fix 1723 quest crash on combined arts	2016-01-22 12:56:25 +03:00
Vadim Markovtsev	e8db456beb	Reset obelisks upon game end ... Otherwise, the static variables are preserved and lead to wrong values in next new game.	2016-01-20 13:02:52 +03:00
Vadim Markovtsev	1a2cd36df8	Initialize obelisks count to 0 ... Otherwise every time player starts with a random number.	2016-01-20 12:43:07 +03:00
Vadim Markovtsev	bb3a31f3ff	Mark obelisk visited for all players in the team	2016-01-20 11:14:03 +03:00
Vadim Markovtsev	10f888a483	Fix obelisks puzzle revealing ... Teams and players were messed up in lib; hardcoded constants were refactored.	2016-01-20 10:44:13 +03:00
Vadim Markovtsev	92e011429f	Fix crash on unknown map objects ... If getHandlerFor() fails to find the handler, it returns a nullptr shared pointer, which is later dereferenced unconditionally. How to reproduce: Download map "Happy time Dragons!!!" from http://heroesportal.net/maps.php?type=H3AB-XL&sort=r => Failed to find object of type 5:144 SIGSEGV	2016-01-18 21:16:55 +03:00
Arseniy Shestakov	575a68d78b	CRewardableObject: fix onVisited message duplication for Idol of Fortune	2016-01-17 15:16:35 +03:00
Arseniy Shestakov	18b2f866c9	CGPickable: add missing break for flotsam. Fix issue 1956	2016-01-16 09:45:30 +03:00
AlexVinS	a638d0cd51	Creature set serialization	2016-01-15 20:24:17 +03:00
Arseniy Shestakov	b84d7bd288	CGCreature: add reward granting. Fix issue 2372	2016-01-15 04:29:46 +03:00
DjWarmonger	676f078b2e	RMG will now multiply Monolith defs to ensure there are at least 100 pairs avaiable for connections.	2016-01-09 09:03:40 +01:00
AlexVinS	37d0dad70a	Merge branch 'develop' into feature/VCMIMapFormat1 ... Conflicts: lib/CArtHandler.cpp	2016-01-01 20:28:52 +03:00
Arseniy Shestakov	9fd1cff090	Refactoring: always use std prefix for shared_ptr, unique_ptr and make_shared ... Long time ago it's was used without prefix to make future switch from boost to std version easier. I discusses this with Ivan and decide to drop these using from Global.h now. This change wouldn't break anything because there was already code with prefix for each of three cases.	2015-12-29 05:43:33 +03:00
Arseniy Shestakov	6f5c52a229	Refactoring: use cleaner CCreatureSet::stacksCount everywhere	2015-12-24 21:30:57 +03:00
Arseniy Shestakov	62bab27e7e	CGArtifact: show yes/no dialog for guarded artifacts. Fix issue 2095 ... Also fix hover text for CGMine	2015-12-24 21:05:02 +03:00
DjWarmonger	be50d699fb	Compile fixes for MSVS	2015-12-23 15:23:56 +01:00
ArseniyShestakov	b6176649ec	CGMonolith: avoid crash when all exits are blocked by friendly heroes	2015-12-18 01:08:19 +03:00
ArseniyShestakov	9f565b81e9	CBankInfo: fix huge memory leak that appear in long run	2015-12-14 11:29:24 +03:00
ArseniyShestakov	59199ccdbd	Bonus system: add treeHasChanged call where bonus objects changed	2015-12-11 16:13:18 +03:00
ArseniyShestakov	1730a31471	HeroBonus: get rid of code that used getBonusList	2015-12-11 16:01:51 +03:00
ArseniyShestakov	1c0d4e3f6f	Fix filenames in file headers	2015-12-08 09:53:14 +03:00
ArseniyShestakov	07807fb044	Client: slience visibility error on shipyard in non-coastal town	2015-12-08 07:33:13 +03:00
ArseniyShestakov	e872b400b7	Comments save format backward compatability code as Ivan suggested ... Also we should always handle RumorState::TYPE_NONE in getTavernRumor properly anyway.	2015-12-06 02:51:54 +03:00
AlexVinS	f33bcee84c	post-merge fixes	2015-12-05 13:56:38 +03:00
AlexVinS	947edc0693	Merge branch 'develop' into feature/VCMIMapFormat1	2015-12-05 13:04:04 +03:00
AlexVinS	3f79d001c1	Fix subObject identification	2015-12-05 12:38:36 +03:00
AlexVinS	b56b7017ba	Added stubs for some Map objects serialization	2015-12-05 12:38:35 +03:00
AlexVinS	6977fc3a14	Move test filesystem creation to global fixture	2015-12-05 12:37:37 +03:00
AlexVinS	e7359c9a36	Serialize tempOwner	2015-12-05 12:37:35 +03:00
AlexVinS	8a979d016f	ObjectTemplate serialization ... (+) generated map displayed correctly in editor	2015-12-05 12:36:44 +03:00
AlexVinS	2d777ea676	Small (temp) fix. Prevent nulls from serialization.	2015-12-05 12:36:43 +03:00
AlexVinS	2d5a366e6c	Implemented (basic) object construction and placement ... * contain refactoring of RMG and class handling (will be more)	2015-12-05 12:36:42 +03:00
AlexVinS	9cc3dae5fe	Started working on objects serialization	2015-12-05 12:36:42 +03:00
ArseniyShestakov	0a5e9c0fbe	Merge pull request #144 from vcmi/fix/teleportMultiExitPoints ... Support for exit selection between multiple teleport exit points	2015-12-05 03:12:17 +03:00
ArseniyShestakov	9e7e5b81e4	Merge pull request #143 from vcmi/feature/patrolSupport ... Patrol support for AI heroes	2015-12-05 03:11:07 +03:00
ArseniyShestakov	01c5bc25e5	Move TTeleportExitsList to CObjectHandler.h ... Not a perfect solution, but this is the best location for now.	2015-12-05 01:14:03 +03:00
Ivan Savenko	90dfe3e782	reduced visibility for members of Mine and Dwellings	2015-12-02 22:34:13 +02:00
Ivan Savenko	7b5a7f43ad	Removed includes of CGameState from headers	2015-12-02 21:39:53 +02:00
Ivan Savenko	c3ce4b25df	Removed all #include's of CMap.h from headers. ... To all - please, avoid #include's in headers as much as possible This kills incremental build compile times	2015-12-02 21:05:10 +02:00
Ivan Savenko	bef7048460	minimized visibility of members of teleportation-related classes	2015-12-02 21:01:43 +02:00
ArseniyShestakov	b5100bee94	Teleport: rework code to support exit point selection for whirlpools	2015-12-02 17:56:26 +03:00
ArseniyShestakov	f55bfe41d6	Digging: implement digging status on right click. Fix issue 401 ... This is also fix possibility to dig on some non-blockable objects like event.	2015-11-29 12:34:23 +03:00
ArseniyShestakov	ce5b7c73be	CGEvent: avoid permanent event removal after visit. Fix issue 2339	2015-11-28 23:03:26 +03:00
ArseniyShestakov	56c6785bd0	Add backward compatability for patrol and bump save format version	2015-11-28 17:58:59 +03:00
ArseniyShestakov	f6de3f94ca	Teleports: use TTeleportExitsList typedef for exits list ... There is several ideas that teleportation code have to be shared between object/spells and this way we can avoid changing showTeleportDialog declaration every time.	2015-11-28 02:41:30 +03:00
ArseniyShestakov	5d2e47faba	CGHeroInstance::Patrol: add initialPos	2015-11-27 11:04:01 +03:00
ArseniyShestakov	c45cd1f4c2	CGHeroInstance::getOutOffsets: temporary fix for boat summoning ... Appropriate fix would require to get rid of convertPosition everywhere. Check issue 515 for more details.	2015-11-26 10:55:02 +03:00
ArseniyShestakov	64c6d3c950	CGCreature::takenAction: add neverFlee check. Fix issue 2242	2015-11-25 09:34:49 +03:00
ArseniyShestakov	a851062891	Merge pull request #133 from vcmi/feature/pathfinderLayers ... Pathfinder layers and related changes: fly and water walking implemented	2015-11-24 13:09:06 +03:00
ArseniyShestakov	438a444443	CGHeroInstance: move native terrain check into getNativeTerrain ... That make it easier to use that code independently in TurnInfo	2015-11-21 13:32:45 +03:00
ArseniyShestakov	a375c86ea2	movementPointsAfterEmbark: get max move points from TurnInfo ... Missed that when originally implemented TurnInfo. Not pretties code, but boost performance a lot.	2015-11-21 12:46:59 +03:00
ArseniyShestakov	abc4ea272f	TurnInfo: store all bonuses and use TileInfo for everything ... Currently this going to break ONE_WEEK bonuses because those don't work with CWillLastDays selector.	2015-11-12 14:30:29 +03:00
ArseniyShestakov	4e11d81673	CGWhirlpool: fix random exit chooser	2015-11-12 01:23:27 +03:00
ArseniyShestakov	9a63735c24	CPathfinderHelper: implement TurnInfo to avoid bonus re-checking ... TurnInfo contain information about what movement-related bonuses and MP hero going to have on certain turn. This way we can collect this information once for each turn so it's huge performance boost.	2015-11-10 14:26:45 +03:00
ArseniyShestakov	d3c8ca7c1c	Pathfinding: implement duration checking for fly and water walking ... Now pathfinder take into account different bonuses for different tuns. So if you only have FLYING_MOVEMENT bonus from Fly spell for one turn then pathfinder will only let you use air layer within one turn only. That work for cost calculations too. Let's say you have two bonuses: - FLYING_MOVEMENT with 20% penalty for next 2 turns - FLYING_MOVEMENT with 40% penalty for 5 turns Now pathfinder using correct penalty for each turn so movements in air layer going to be more expensive on 3-5 turns.	2015-11-09 19:57:26 +03:00
ArseniyShestakov	7eebcb9d60	Artifacts: replace few more ints by ArtifactID	2015-11-07 11:46:58 +03:00
DjWarmonger	621c62b44e	Don't crash when spell school level is higher than 3 (which is another bug)	2015-10-31 21:15:40 +01:00
DjWarmonger	17071c6ec8	Merge pull request #125 from ArseniyShestakov/newMovementSystem ... Okay, time to merge this.	2015-10-31 13:56:22 +01:00
DjWarmonger	8c9f8f22d9	Merge pull request #123 from ArseniyShestakov/mantis-1230 ... Okay, now we shouldn't get broken savegames. Merging.	2015-10-17 08:31:44 +02:00
ArseniyShestakov	3663b952ea	Fix issue 2276. Refugee Camp shouldn't be guarded	2015-10-16 06:45:06 +03:00
ArseniyShestakov	226650582d	Move base movement cost to GameConstants	2015-10-16 03:03:40 +03:00
ArseniyShestakov	3466e0fae7	getTileCost: one more pass over code and formatting fix	2015-10-15 15:17:21 +03:00
ArseniyShestakov	52a52dcfd9	Implement NO_TERRAIN_PENALTY bonus ... Penalty of specified terrain type is ignored if hero have this bonus	2015-10-15 01:09:02 +03:00
Alexander Shishkin	fca4deaad2	Merge pull request #122 from vmarkovtsev/feature/warnings ... Fix warnings produced by recent Clang build	2015-10-14 07:28:47 +03:00
Vadim Markovtsev	e4b1ef1405	Add "override" to virtual overriden methods	2015-10-13 21:05:36 +03:00
AlexVinS	b94432b4ba	Fixed http://bugs.vcmi.eu/view.php?id=2297 ... * allow banned spells by Tomes (XXX_SPELLS bonus), Spelbinders Hat (SPELLS_OF_LEVEL bonus) * allow banned spells by cheat-code (now also SPELLS_OF_LEVEL bonus)	2015-10-13 13:16:46 +03:00
ArseniyShestakov	41c4323818	CGHeroInstance: add canFly and update canWalkOnSea ... canWalkOnSea shouldn't check for FLYING_MOVEMENT because it's two separate mechanics that apply different limitations.	2015-10-12 18:52:23 +03:00
AlexVinS	fa06e05487	Merge branch 'develop' into SpellsRefactoring7	2015-10-05 00:45:57 +03:00
DjWarmonger	abe02247b5	Fixed bank randomization.	2015-10-02 17:28:33 +02:00
AlexVinS	660203b436	Tweak BattleSpellCastParameters	2015-09-29 17:26:41 +03:00
AlexVinS	2b434111bf	More hero|creature casting unification	2015-09-29 17:26:40 +03:00
AlexVinS	9e0fd70208	Move isCastableBy logic back to CGHeroInstance - it is Hero-specific ... * When and if canCastThisSpell will also be implmented for creatures common part may be moved to CSpell class.	2015-09-16 04:39:44 +03:00
AlexVinS	f2605e059c	Fix 2042	2015-09-16 02:20:57 +03:00
AlexVinS	080244f30e	MAXED_SPELL bonus should only affect spell effects ... * fixes 2146	2015-09-15 06:00:24 +03:00
AlexVinS	fb5903d610	Initial experiments on hero & creature casting unification	2015-09-12 21:09:44 +03:00
AlexVinS	8f2da66a18	fix mantiss 1967 + some refactoring ... * remove TModDescr and realted APIs - they were only used in one place	2015-09-04 22:29:20 +03:00
Sandy Carter	bdee647525	CastleInterface: Exclude previous building upgrade in reqs ... Hide CityHall from Capitol prerequisites in Capitol build window	2015-08-19 12:05:43 -04:00
DjWarmonger	9e7b459882	Partial solution to #2206 ... TODO: add serialized field that contains custom guard config	2015-06-05 11:28:14 +02:00
AlexVinS	fb707a6576	fix mantiss 2142	2015-04-01 00:28:21 +03:00
Ivan Savenko	eef45b5ae8	Fixed warnings	2015-03-31 00:55:37 +03:00
DjWarmonger	ed33d99ac7	Silenced some more logs.	2015-03-28 22:17:45 +01:00
DjWarmonger	a832b7efee	Fixed #2026	2015-03-12 10:08:10 +01:00
DjWarmonger	f894abe494	Unified interface for object template.	2015-03-12 08:31:30 +01:00
ArseniyShestakov	17f3f94ca6	CGSubterraneanGate: fix pairing and always assign all gates to channel ... Before gates on underground layer didn't had any channel assigned and of course any function that attempt to check -1 channel caused crash. Also I find out that at point postInit executed It's possible to get mutable gamestate via gameState() callback so we don't need to pass it there.	2015-03-11 17:17:21 +03:00
DjWarmonger	ec879046ca	Merge pull request #93 from ArseniyShestakov/feature/pathfindingTeleports ... Okay let's do this!	2015-03-10 09:04:25 +01:00
DjWarmonger	f32849a73e	Attempt to compile refactored spells in MSVS.	2015-03-09 19:24:45 +01:00
ArseniyShestakov	1801b5eaf4	CGTeleport: use vstd::erase_if_present in getAll functions	2015-03-09 15:44:48 +03:00
ArseniyShestakov	8f8d237d5d	Use isTeleportChannel callback functions to check teleport channel type	2015-03-09 02:13:40 +03:00
ArseniyShestakov	3b057e0408	CGMonolith: fix switch formatting	2015-03-09 01:27:40 +03:00
ArseniyShestakov	606013c535	CGSubterraneanGate::postInit put const back ... Originally I removed it when change this code to actually change object. Though this sorting can work with constant object just fine.	2015-03-08 21:16:30 +03:00
ArseniyShestakov	826a64b579	Pack of tiny code improvements for @alexvins request	2015-03-08 20:19:00 +03:00
ArseniyShestakov	6d77322d6a	CGMonolith: add text dialog when player visit one-way monolith exit	2015-03-08 18:07:06 +03:00
ArseniyShestakov	c9eba40fe6	Updated CGTeleport and new CGMonolith / CGSubterraneanGate / CGWhirlpool ... Now CGTeleport is not publicly available handler, but generic class for teleport channels usage. Teleport channels are stored as part of information about the map.	2015-03-08 16:11:23 +03:00
ArseniyShestakov	04a1df29ad	Add TeleportChannel / TeleportChannelID / ETeleportChannelType ... TeleportChannel is structure that contain two vectors of entrances and exits for certain teleport channel. It's also store passability state independently which almost only useful for Player and AI as they can't know if channel passible or not until enough entrances / exits are visible or server passed them information that certain channel is impassible when they visited entrance. ETeleportChannelType is determined by checking intersection between entrances and exit vectors or checking their size: - IMPASSABLE: one of vectors empty or only one entrance id is same as only one exit id. - BIDIRECTIONAL: contents of both vectors is exactly the same. - UNIDIRECTIONAL: contents of both vectors do not intersect. - MIXED: contents of vectors only partially intersect. Not currently used; added for future modding.	2015-03-08 15:18:53 +03:00
DjWarmonger	67ab90616d	Seer Huts with exp / gold rewards.	2015-03-01 09:46:09 +01:00
DjWarmonger	dd887eb929	Fixes for Seer Huts.	2015-03-01 09:07:43 +01:00
AlexVinS	b9bdc95a7e	Handle monster agressivness for VISIONS spell	2015-02-26 08:39:57 +03:00
AlexVinS	b846b717a1	implemented VISIONS spell (partially) ... (-) todo: agressivnes	2015-02-26 08:39:56 +03:00
AlexVinS	2156204306	Visions spell in case of monsters	2015-02-26 08:39:55 +03:00
AlexVinS	685deddac1	Start spell-relatet files reorganisation ... * moved existing files to separate directory -> todo: split mechanics	2015-02-26 08:39:48 +03:00
DjWarmonger	ef4e199f15	Implemented "Quantity does not grow" for monsters (#2094)	2015-02-22 20:54:09 +01:00
DjWarmonger	200bcd7da6	Merge pull request #88 from ArseniyShestakov/improvedQuestLog ... Awesome, thanks!	2015-02-17 06:44:38 +01:00
ArseniyShestakov	43f1e37546	Quest Log: fix text for quests with minimal level requirement ... This is needed because m13478val is ui32 while translation expect %s string.	2015-02-16 00:53:44 +03:00
ArseniyShestakov	789da96a81	Stables: give 400 movement points bonus instead of 600 ... Tested it and now VCMI work exactly as original game. This one fix issues 2077 / 2082	2015-02-15 07:55:59 +03:00
ArseniyShestakov	746914d219	Added missionType check to CQuest::getRolloverText ... This function shouldn't be called if quest type is MISSION_NONE as this type used for quest that don't have text yet. For example Keymaster`s border guards in H3 didn't add any entries to Quest Log so there is no text for them or at least it's not defined how to use it in VCMI.	2015-02-14 00:57:33 +03:00
DjWarmonger	9f05f53e65	Corrected monster agressiveness #2034	2015-01-10 10:23:58 +01:00
DjWarmonger	84b2510aa4	Merge pull request #62 from vcmi/SpellsRefactoring4 ... OK	2014-12-26 08:46:29 +01:00
DjWarmonger	5271ca156b	Merge pull request #70 from vcmi/StackSplitting ... Stack splitting	2014-12-25 19:59:02 +01:00
DjWarmonger	e46f03fabe	Upgrades, stack splitting. Results now are identical to OH3.	2014-12-25 10:21:39 +01:00
DjWarmonger	3c39ef477f	Implemented original stack splitting algorithms proposed by AlexSpl. Save format changed.	2014-12-24 23:53:56 +01:00
AlexVinS	eebf65e88f	Merge branch 'develop' into SpellsRefactoring4	2014-12-24 00:15:27 +03:00
ArseniyShestakov	5d59bbc0d4	Fix CGBonusingObject serialization ... Now state of adventure map objects that use this handler will be saved properly and they'll work as indended after save loaded. Affect following objects: Buoy, Swan Pond, Faerie Ring, etc.	2014-12-22 11:56:53 +03:00
DjWarmonger	a3a42ae144	Merge branch 'develop' of https://github.com/vcmi/vcmi into fuzzyFix	2014-12-19 14:21:44 +01:00
DjWarmonger	a1e42caddd	Banks won't use fuzzy engine at all, only center of mass.	2014-12-10 12:29:51 +01:00
ArseniyShestakov	6391f0f85a	Fix crash on Cartographer if there is no underground level ... Show "already visited" text for stalagmite cartographer if map don't have underground level. This one fixes bug #1985	2014-12-09 14:01:32 +03:00
AlexVinS	aa31625774	More flexible way of spell school access	2014-11-24 19:14:10 +03:00
AlexVinS	f7ff61ce4f	Merge remote-tracking branch 'remotes/origin/develop' into SpellsRefactoring4	2014-11-24 12:41:17 +03:00
KroArtem	e73c60740c	corrected text in vcmibuilder, corrected errors and warnings from cppcheck	2014-11-16 20:48:29 +03:00
AlexVinS	7af4f44237	rewrite CGHeroInstance::canCastThisSpell	2014-11-13 17:57:35 +03:00
AlexVinS	3fcb1254f7	Rewrite CGHeroInstance::getSpellSchoolLevel using SPELL_SCHOOL_CONFIG	2014-11-13 17:24:30 +03:00
Patrick Simmons	436272f00c	Fix pathfinding bug.	2014-10-25 21:15:40 -04:00
AlexVinS	54453aee73	get rid of boost::assign	2014-10-04 00:34:13 +04:00
DjWarmonger	8e1e8abe90	Default constructors for Scholar, Pandora and Event.	2014-09-23 09:46:31 +02:00
DjWarmonger	5cb6eaa252	Fixed major RMG bug.	2014-09-21 20:57:42 +02:00
Ivan Savenko	b551bdb725	Final part of the merge ... Merging VCMI Dirs refactoring + GUI refactoring with current develop	2014-09-04 20:59:07 +03:00
Ivan Savenko	de9c5b1af7	Merge branch 'develop' of github.com:karol57/vcmi into karol57-develop	2014-09-04 20:29:24 +03:00
Ivan Savenko	1647b3670c	Merge pull request #35 from rhn/rhn ... Fixes to sound handling.	2014-09-04 20:26:32 +03:00
Ivan Savenko	69c6a3fa79	Fixed crash on visiting multi-creature dwellings (1874)	2014-08-19 13:16:25 +03:00
Ivan Savenko	7e05945a6a	Swapped skills on level-up screen	2014-08-19 13:15:40 +03:00
Karol	c16e7d4bcf	VCMIDirs update #4 ... Added stderr color handling Updated logger to use boost::filesystem::path. Minor fixes. Some classes are now structs.	2014-08-11 20:17:17 +02:00
Ivan Savenko	b1285bc506	Merged GUI refactoring into develop, fixed conflicts	2014-08-09 15:01:55 +03:00
Ivan Savenko	c0e4591bc7	Added workaround for random objects on water, fixes 1828	2014-08-09 13:48:38 +03:00
Ivan Savenko	05d8fad314	Miscellaneous fixes to banks: ... - fixed evaluation of bank thread by AI (1850) - fixed crash on evaluating bank threat after loading from save (1830) - fixed typo in bank config. TODO: schema?	2014-08-09 12:31:43 +03:00
Ivan Savenko	f55d335e1c	Fixed visitable objects resetting on day 7 (1847)	2014-08-08 15:53:04 +03:00
Ivan Savenko	d1dd7eef48	Proper fix for #1712 - Building requirement tests are now fixed ... - added minimize() method in logical expressions that will remove excessive elements - replaced forEach() with morph() that allows replacing types in variant	2014-08-07 19:53:07 +03:00
rhn	e9534603c2	Fixed sound on object pickup with dialog	2014-08-06 17:19:53 +02:00
beegee1	c1ac95b288	- fixed Clang compiler warnings	2014-08-04 20:36:00 +02:00
Ivan Savenko	0882201b17	Miscellaneous fixes to toggle buttons	2014-08-03 16:19:16 +03:00
rhn	aba3421e0a	Fixed: 0001854: Rewarding objects loose their state after game is reloaded (breaks savegames)	2014-07-29 15:28:58 +02:00
DjWarmonger	fe292dfa1d	Fixed desync due to uninitialized objects. Added some logging. RMG maps don't work yet, though.	2014-07-27 19:30:17 +02:00
DjWarmonger	0763b9a758	- Implemented object per zone limit ... - Various tweaks for Travis & repo	2014-07-15 22:33:51 +02:00
DjWarmonger	173111955e	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-07-15 12:27:59 +02:00
DjWarmonger	6c0a396094	Corrected y-axis orientation, now object placement is correct.	2014-07-09 16:39:17 +02:00
DjWarmonger	492b866806	- Fixed crash caused by randomShuffle ... - Banned Magic Spring as it has 2 visitable positions	2014-07-09 14:27:12 +02:00
DjWarmonger	22d26db694	Correct placement of non-overlapping objects.	2014-07-08 20:13:51 +02:00
DjWarmonger	f65239b51f	- Added faction-specific dwellings ... - Fixed generation of terrain-specific objects	2014-07-06 22:14:37 +02:00
DjWarmonger	0782557814	- Place all standard visitable objects ... - Fixed some constructors	2014-07-05 19:36:12 +02:00
AlexVinS	195eae48ca	Merge branch 'develop' into SDL2 ... Conflicts: client/CPlayerInterface.cpp	2014-07-02 17:15:12 +04:00
Ivan Savenko	cc349fa64f	Fixed Faerie Ring bonus, removed unused code	2014-07-01 18:19:51 +03:00
Ivan Savenko	c956b3f02a	Fixed #1820, better detection of object below cursor that uses same logic as renderer	2014-07-01 17:19:08 +03:00
DjWarmonger	bae9f2083f	Workaround for hero & town issue. Game still crashes elsewhere, though.	2014-07-01 12:07:53 +02:00
DjWarmonger	54390ea81c	Merge branch 'develop' into RMG	2014-07-01 08:25:53 +02:00
DjWarmonger	bda71bed83	Uploading misc tweaks.	2014-07-01 07:07:40 +02:00
Ivan Savenko	db221829aa	Modding-related bugfixes: ... - hero classes will be loaded correctly - objects without index will have correctly assigned ID's	2014-06-30 17:13:01 +03:00
DjWarmonger	a556ef64e9	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-06-30 06:45:35 +02:00
Ivan Savenko	a1fff864e6	Fixed missing names for dwellings and creature banks	2014-06-30 00:16:45 +03:00
Ivan Savenko	f01ab0d48f	Fixed rest of reported on forums bugs in rewardables	2014-06-29 20:13:25 +03:00
Ivan Savenko	1157111fcf	More bugfixing: ... - Fixed compile in VCAI (precompiled headers should not include VCMI headers) - Fixed crash on visiting observatories, including shroud of darkness	2014-06-29 17:23:06 +03:00
DjWarmonger	7dbe2f5c40	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-06-28 16:31:06 +02:00
Ivan Savenko	917b1ffca8	Bugfixing: ... - Added missing types for serialization - Fixed possible crash in removable objects (campfire) - Fixed typo in bank config	2014-06-28 17:21:38 +03:00
DjWarmonger	920f56969b	Create random obstacles that match terrain.	2014-06-28 09:46:32 +02:00
DjWarmonger	383280f72a	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-06-27 18:26:43 +02:00
Ivan Savenko	f01e30a3b1	Added random objects to configs. For now as separate "random handlers", should be merged into main handlers later	2014-06-27 19:15:47 +03:00
DjWarmonger	57fa905a2b	Something that compiles.	2014-06-26 22:05:27 +02:00
DjWarmonger	e51e2190fd	Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG	2014-06-26 20:12:37 +02:00
Haryaalcar	ce6940e272	build fix for mac os: ... 1) type_info visibility for CatapultAttack 2) using IObjectInfo::CArmyStructure in min_element : operator< should be const	2014-06-26 01:24:48 +03:00
Ivan Savenko	955552488e	- H3M parser will create objects that don't have data in map file via ... object handler. - Added large number of missing objects to config	2014-06-25 20:26:47 +03:00
Ivan Savenko	32240da34e	Reduced number of #include's in headers. May break compilation on Win ... since some net packs now need DLL_LINKAGE	2014-06-25 17:11:07 +03:00
Ivan Savenko	a0689fa377	Refactoring of hoverText from objects: ... - removed hoverText field - split getHoverText() method into 3: - - getObjectName() for generic name - - getHoverText(Player) for player-specific text - - getHoverText(Hero) for hero-specific strings	2014-06-24 20:39:47 +03:00
Ivan Savenko	ad632d1e8a	Moved FoW management from CGObjectInstance to callback	2014-06-24 20:39:47 +03:00
Ivan Savenko	5ebc0e8614	First part of object instance API cleanup ... - removed passability() method in favour of passableFor(PlayerColor) - moved operator < code to map handler - updated class documentation	2014-06-24 20:39:47 +03:00
AlexVinS	4e4ba6654c	fix Eye of magi, also fix #1608 ... Conflicts: lib/CObjectHandler.cpp	2014-06-24 18:20:28 +04:00
Ivan Savenko	13bc4cb24f	Added -fvisibility=hidden parameter for gcc. ... Should help a bit with endless missing DLL_LINKAGE attributes and (according to gcc docs) help a bit with library loading times.	2014-06-24 00:05:53 +03:00
DjWarmonger	79036484dd	Trying to sort out project changes and compile issues.	2014-06-23 19:58:19 +02:00
Ivan Savenko	db49798b4d	Fixed random artifact selection	2014-06-23 20:47:09 +03:00
AlexVinS	46d92f11cb	Project update, fix build ... (!) register types as usual too huge	2014-06-23 10:24:49 +04:00
Ivan Savenko	c605e2d10c	Gcc compile & warning fixes	2014-06-22 17:26:08 +03:00
Ivan Savenko	ab475195ac	Banks now use new scheme as well ... - Implemented Bank Constructor object. - Merged Pyramid object into common Bank class. Banks can now grant spells as part of their reward. - Move bank config code to config/objects/creatureBanks.json. Note: WoG banks are not updated yet, should be moved to WoG mod. - Updated AI code so it can correctly evaluate bank danger (should be generic enough for use with other objects) - New files JsonRandom.* that contain routines for loading random objects from Json (still WiP but should be stable)	2014-06-22 13:39:40 +03:00
Ivan Savenko	0a71e89f58	Created large number of missing objects in configs ... Minor bugfixes in code	2014-06-17 14:57:47 +03:00
Ivan Savenko	09d595e385	- Implemented "mapObject" entry for hero classes ... - Updated schemas - Some bugfixing	2014-06-16 19:27:26 +03:00
Ivan Savenko	89b89ff85d	Bugfixing. Game seems to be working without major bugs.	2014-06-15 23:25:10 +03:00
Ivan Savenko	836c466f81	- Implementation of overrides for towns ... - Converted dwellings.json into new format - Implemented "mapObject" entry in town format - Removed capital/fort/village fields from town in favor of overrides	2014-06-15 19:43:01 +03:00
Ivan Savenko	7cfd9a0903	First part of implementation of some type-specific handlers. ... TODO: - merge dwellings.json into object configs - proper implementation of overrides for towns - fully connect new API to RMG/H3M	2014-06-14 18:42:13 +03:00
Ivan Savenko	44742814cd	More cleanup: ... - moved SoundBase.h to lib since it contains shared data - added RMG info to object format. Note that data is not yet imported in configs - slightly updated API of object handlers	2014-06-05 23:51:24 +03:00
Ivan Savenko	b2e8c92383	Cleanup: ... - removed commented-out #includ'es - renamed some files to match name of class	2014-06-05 20:26:50 +03:00
Ivan Savenko	76bf5351c6	Line endings are now unix-style	2014-06-05 19:57:43 +03:00
Ivan Savenko	652ceb2bde	Finally shattered CObjectHandler.cpp into tiny bits ... - This file is now split into multiple smaller files in mapObjects directory - CObjectHandler itself now contains only core classes (Handler itself, CGObject and interfaces) - Cleaned up excessive #include's through whole project	2014-06-05 19:52:14 +03:00
Ivan Savenko	0afdfa529c	Moved all object-related files to lib/mapObjects directory. ... Renamed some classes to more readable names	2014-06-05 14:19:47 +03:00