games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity
9,654 Commits 19 Branches 62 Tags 111 MiB
a3846f1b31
Commit Graph

998 Commits

Author SHA1 Message Date
Alexander Shishkin
549d8c97df
Merge pull request #557 from dydzio0614/CrystalDragonAbility 
Fix crystal dragon ability to match H3
 2019-03-21 17:02:20 +03:00
Dydzio
53f4ba6464 Fix crystal dragon ability to match H3 2019-03-17 19:48:47 +01:00
Dydzio
36cb9f11c4 Hardcoded feature: no random week/month effects 2019-03-17 18:27:05 +01:00
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
AlexVinS
a313cc0127 Fixed https://bugs.vcmi.eu/view.php?id=3017 2018-11-07 10:02:27 +03:00
godric3
8650a8eea8 allow json schema references to use relative file path 2018-10-30 22:30:56 +01:00
Dydzio
7ed4abd12d Default hero AI value seems low - tweak it 2018-10-15 21:18:44 +02:00
Fior.in
cca46e311d Fixed schemas for battle animation overwritting an solo attribute instead images attribute dependant. Now working for replacing battle sprites on pre-existant heroes too (#490) 2018-09-13 02:33:34 +03:00
Fior.in
47ba3b2476 Hero scheme: allow each hero to have a unique battle animation (#480) 
* attribute for battle image added on hero class, allowing on hero schemes each hero have a unique battle .def in 'images' structures sided with portraits and specialties images
 2018-08-27 09:42:36 +03:00
AlexVinS
26fe5607ac Bonus icon fix №2 (posted by zeriss) 2018-08-27 01:07:40 +03:00
AlexVinS
6d1901c4f3 Bonus icon fix (posted by zeriss) 2018-08-27 00:42:32 +03:00
Dydzio
96494332a2 Fix ice and energy elemental vulnerabilities 2018-08-24 20:19:16 +03:00
Dydzio
09b7fb1fb2 Fix double-playing resource pickup sound 2018-08-24 19:20:01 +03:00
Dydzio
3e31e67653 Initial AI value labeling for map objects 2018-07-30 01:27:02 +02:00
Dydzio
b37ba8e046 Initial version of AI object value config 2018-07-28 00:43:56 +02:00
Henning Koehler
2ede3783dd Settings: savefrequency is now configurable in launcher 
* Client command-line can modify arbitrary settings now
* Only launcher auto-saves to settings.json
 2018-04-08 17:12:29 +07:00
Arseniy Shestakov
f04cbaf539 Settings: add lastMap, lastCampaign, lastSave to schema 
Nice to see last used save game after client restart
 2018-04-03 22:11:14 +07:00
Henning Koehler
82f334b503 Enable Limiter nesting with AllOf, AnyOf, NoneOf (#439) 
* Renamed LimiterList to AllOfLimiter and added AnyOfLimiter, NoneOfLimiter
* Updated bonus schema to new limiter format
 2018-04-01 18:17:34 +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
02b5a5e830 Make bonus stacking configurable + fix duplicate propagation/inheritance (#433) 
Addresses several related problems:
* Propagation / unpropagation of duplicate bonuses is inconsistent, causing bugs
* Duplicate bonuses never stack, which is not always intended behaviour (e.g. multiple copies of resource generating artifacts)
* Different bonuses always stack, which is not always intended behaviour (e.g. Angel + Archangel morale bonuses)

This is addressed as follows:
* Duplicate bonuses are never eliminated during propagation/inheritance.
* Unpropagation eliminates only a single copy of duplicated bonus
* Bonus receives a new field stacking that determines stacking behaviour:
* * empty string = no stacking with duplicates (default)
* * "ALWAYS" = stacks with duplicates & everything else
* * some other value = no stacking with bonuses with same stacking value
Also Morale/Luck window now hides non-stacking bonuses.
 2018-03-27 14:54:58 +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
Henning Koehler
7f76648a7c Extend Bonus.addInfo to integer vector (#427) 
* changed Bonus::additionalInfo to integer vector

* fixed deserialization for old savegames

* removed newline from JsonNode::toJson()

* updated bonus schema; SPELL_AFTER_ATTACK and SPELL_BEFORE_ATTACK use new addInfo format

* removed unnecessary init in Bonus constructor
 2018-03-12 08:20:18 +03:00
ArseniyShestakov
7fd090786c
Merge pull request #379 from henningkoehlernz/hero_specialty_scaling 
Hero specialty scaling
 2018-02-28 15:03:24 +08:00
Dydzio
e0982ce9a7 Fix mantis bugs: #2884. #2885, #2886 
Fixed creature abilities
 2018-02-24 08:18:25 +03:00
Henning Koehler
e683f0f74e fixed hero config indentation 2018-02-21 10:02:12 +13: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
Henning Koehler
e76efff0c3 added comment on Adrienne's specialty 2018-02-20 20:00:29 +13:00
Henning Koehler
9a70e82dc8 fixed catherine's specialty to swordsman 2018-02-20 11:51:15 +13:00
Henning Koehler
c3d8500cf9 fixed specialty format for ingham 2018-02-18 20:59:05 +13:00
Henning Koehler
2ca6eab543 updated config files to use one-line creature specialty format 2018-02-18 20:59:05 +13:00
Henning Koehler
6442842731 added one-line option for standard creature specialty; also fixes bug for creatures where upgrades have different attack/defense 2018-02-18 20:59:05 +13:00
Henning Koehler
af00c29858 converted updaters for secondary skill specialties to TIMES_HERO_LEVEL 2018-02-18 20:36:24 +13:00
Henning Koehler
552bad08b3 added TimesHeroLevelUpdater; renamed ScalingUpdater to GrowsWithLevelUpdater 2018-02-18 20:36:24 +13:00
Henning Koehler
2abbe5ab19 fixed specialty for Calh 2018-02-18 20:22:23 +13:00
Henning Koehler
be913cfa41 fixed specialty for Fiur 2018-02-18 20:22:23 +13:00
Henning Koehler
5543631c19 fixed bug with mysticism specialty 2018-02-18 20:22:23 +13:00
Henning Koehler
73f782aa39 fixed various specialty bugs retained during conversion 2018-02-18 20:22:23 +13:00
Henning Koehler
2b8f111a81 converted special.json; fixed bugs in specialty json construction 2018-02-18 20:22:23 +13:00
Henning Koehler
4f099393f7 converted conflux.json and fortress.json 2018-02-18 20:22:23 +13:00
Henning Koehler
62cb2f9063 converted dungeon.json and stronghold.json 2018-02-18 20:22:23 +13:00
Henning Koehler
0fe9211135 converted inferno.json and necropolis.json 2018-02-18 20:22:23 +13:00
Henning Koehler
78ed7cc0d6 converted rampart.json and tower.json 2018-02-18 20:22:23 +13:00
Henning Koehler
dc7132d8b7 converted castle.json; fixed bugs in Bonus::toJsonNode() 2018-02-18 20:22:23 +13:00
Henning Koehler
ba7709da50 middle-aged specialty format is converted properly and logged 2018-02-18 19:27:24 +13:00
Henning Koehler
16f59fb213 fixed base merging and limiter creation 2018-02-18 19:27:24 +13:00
Henning Koehler
6ae103dd63 print json in compact format 2018-02-18 19:27:24 +13:00
Henning Koehler
a002df399e updated json loading and schema to fit new specialty format 2018-02-18 19:27:24 +13:00
Henning Koehler
eb02ce0f31 changed specialty json format to struct with base (WIP) 2018-02-18 19:27:24 +13:00
Henning Koehler
d7942fd929 fixed typo in specialty log 2018-02-18 18:53:01 +13:00
Henning Koehler
2703b035a6 added updater to Bonus json format 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
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
759416ed88 Fixed https://bugs.vcmi.eu/view.php?id=2851 2018-01-13 05:05:28 +03:00
Dydzio
baaa1a0f13 Add magic resistance for crystal dragons 2018-01-12 13:36:17 +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
Arseniy Shestakov
e7fa9f8cd6 config: add ambient, visit and removal sounds to schemas / objects 2018-01-02 09:48:17 +01:00
DjWarmonger
c2a0b13332
Merge pull request #371 from dydzio0614/NewAbilities 
Tested and approved. Congrats!
 2017-12-29 14:19:05 +01:00
Dydzio
6df536bb31 Siege tower handling improvements (#392) 
* Fix bug #2581 - siege tower damage
* Improved siege tower damage calculation a bit
 2017-11-18 12:41:07 +03:00
Dydzio
da6d01b0c7 Ability rename + bugfix + changelog extend 2017-11-13 01:59:41 +01:00
AlexVinS
c39cd5f951 Town building build mode fixes 
* CGameHandler::buildStructure was using wrong requirements for buildings in auto mode.
* Build mode loading was wrong in case of omitted value
* Show town hall slot for not built building only if it have normal build mode
 2017-10-28 03:27:39 +03:00
AlexVinS
8027650f4a Hide Dungeon horde1Upgr in town hall 2017-10-28 00:22:14 +03:00
AlexVinS
4b24bea196 Fixed Dungeon horde1 was always shown upgraded 2017-10-27 13:30:23 +03:00
Henning Koehler
feba7e1979 tactics distance increased to 1 + bonus (#375) 2017-09-10 00:26:56 +03:00
Dydzio
14c07afd3c Merge branch 'develop' into NewAbilities 2017-09-09 21:04:40 +02:00
Dydzio
3eef689005 Add TERMINATOR ability support, small fixes 2017-09-09 21:01:12 +02:00
Dydzio
4cab76900f Add SYNERGY_TARGET and [wip]-SHOOTS_ALL_ADJACENT 2017-09-04 23:32:24 +02:00
Henning Koehler
31ca4db8bd fixed manual control for arrow towers 2017-09-05 00:30:43 +12:00
Henning Koehler
37df5c9d88 reworked mod loading to follow standard approach 2017-09-03 23:49:36 +12:00
Henning Koehler
233ead5671 fixed Estates description to match original format 2017-08-31 09:44:01 +12:00
Henning Koehler
abdca71828 skill names and descriptions are fully managed by CSkillHandler 2017-08-30 22:35:23 +12:00
Henning Koehler
dba5186a6f fixed skill schema definition 2017-08-30 20:01:09 +12:00
Henning Koehler
36d671b093 changed indentation from spaces to tabs 2017-08-30 16:23:03 +12:00
Henning Koehler
5e28202f94 dropped requirements for base in skill.json 2017-08-30 14:09:02 +12:00
Henning Koehler
899e8403f7 skills.json uses base and struct for effects 2017-08-30 10:25:36 +12:00
Henning Koehler
9b3c61616f made diplomacy join chance bonus-based 2017-08-28 23:33:19 +12:00
Henning Koehler
69a538a600 added bonus type MANUAL_CONTROL 2017-08-28 20:09:27 +12:00
Henning Koehler
03c18ff691 added remaining skills to skills.json 2017-08-28 10:41:32 +12:00
Henning Koehler
7e5c1ec7f8 made artillery bonus-based; supports multiple bonus shots 2017-08-27 21:05:17 +12:00
Henning Koehler
8bdb8f01ca made scholar skill bonus-based 2017-08-27 20:10:25 +12:00
Henning Koehler
0153d0fc78 made fire/air/water/earth magic skills bonus-based 2017-08-27 19:37:54 +12:00
Henning Koehler
25e6b5cc07 added bonus type SECONDARY_SKILL_VAL2; refactored CSkillHandler::defaultBonus; made eagleEye level bonus-based 2017-08-27 17:40:52 +12:00
Henning Koehler
06d2507371 log file loading 2017-08-27 12:59:09 +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
3cc84e5975 moved contains functions for multimap to Globals.h 2017-08-26 10:08:06 +12:00
Henning Koehler
c0740e3623 fixed crash when loading neutral faction; skills.json no longer requires index values 2017-08-26 10:08:06 +12:00
Henning Koehler
0357a4fe3b enabled config of skill descriptions 2017-08-26 10:08:06 +12:00
Henning Koehler
64e2db6a0f added sufficient debug to diagnose - problem is with lack of original data 2017-08-26 10:08:06 +12:00
Henning Koehler
05cf95400c loading secondary skill bonuses from config/skills.json works (kind of) 2017-08-26 09:33:08 +12:00
Dydzio
1df939bf70 Working FIRST_STRIKE ability 2017-08-19 20:39:24 +02:00
Dydzio
8cae811d11 Merge branch 'kuririn' into NewAbilities 2017-08-19 18:40:06 +02:00
misiokles
c5aa403197 Fixed http://bugs.vcmi.eu/view.php?id=2730 by Anubis (#361) 2017-08-03 09:03:55 +03:00
AlexVinS
980926a7bd Fixed https://bugs.vcmi.eu/view.php?id=2749 2017-07-27 11:58:51 +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
Dydzio
c377f594a5 Add optional real fullscreen mode support 2017-07-08 18:43:04 +02:00
misiokles
02eb4fbfb0 Zombies sholud cast Disease after attack (H3 ability). 2017-06-22 19:13:21 +02:00
AlexVinS
0f5202689e Cumulative spell effects 
* Added experimental support for cumulative effects for ENCHANTED bonus
* Updated and fixed SPECIAL_PECULIAR_ENCHANT processing
* Initial implementation of cumulative spell effects.
* Scheme for new spell feature - cumulative bonus.
 2017-06-13 21:50:50 +03:00
Fay
01bae590f1 Added swipe support for non-android platforms; 2017-06-07 22:42:41 +02:00
AlexVinS
0190c9804e formatting 2017-06-06 19:45:34 +03:00
AlexVinS
a31c28ec33 Unified war machine mechanics. 
* it is possible to define new war machines
* added warMachine field to artifact configuration
 2017-06-06 19:18:26 +03:00
Alexander Shishkin
7e1b0d71c5 Added option for saving generated maps on client side (#307) 
* new configuration option 'general.saveRandomMaps'
* maps being saved to 'userCachePath/RandomMaps'
* no deletion of old random maps
* map filename generated based on template name and random seed
 2017-06-04 20:33:28 +03: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
Fay
b5daa24982 Android support (#299) 
* AI libs registering shenanigans on android;
* Fixed resolution aspect + mouse event scaling;
* Proper server init/deinit (through android IPC);
Enabled threaded init in CMT;
* Prevented a deadlock in logger on some devices;
* Fixed frozen intro frame after interrupting the video;
Added android progressbar displaying during initial data loading;
* Hacky fix for choppy animations during heroes movement (should look better now, but it's definitely not a good solution);
* Changes/fixes for new android launcher building process;
* Fixed app hang after getting SDL_QUIT when activity was destroyed;
* Functioanal, configurable advmap swiping support;
* VCMI changes cleanup;
Added few missing VCMI_ANDROID guards on swipe mechanics;
* Removed unneeded sleep in server startup code for android;
* Removed android ioapi hack (fixed in newest ndk);
* Removed unused android's library loading logic;
* Added android's swipe option to settings schema;
* Moved NO_STD_TOSTRING to be defined in global.h instead of build files;
 2017-05-25 20:57:20 +03:00
DJWarmonger
58cca8e9df Fixed self-luck Icon (Thanks Zeryss). 2017-05-14 08:29:51 +02:00
dydzio
21f4a0ba60 Implement ranged counterattack 2017-02-04 10:33:45 +01:00
Dydzio
6c8ef79727 Merge branch 'develop' into MakeWOGGreatAgain 2017-02-01 23:14:36 +01:00
DjWarmonger
6d37c8bceb Merge pull request #272 from dydzio0614/bug2600 
Nice, thanks :)
 2017-02-01 17:57:58 +01:00
dydzio
4c4539b00e Rename ADVANCED_CATAPULT bonus to reflect the purpose better 2017-02-01 15:05:46 +01:00
dydzio
a8f04aede7 Extend creature siege support. Fix bug #2600 2017-02-01 11:25:57 +01:00
Dydzio
90d638179c Fix mantis #2642 
Add meteor shower vulnerability to magma elementals
 2017-02-01 10:25:25 +01:00
dydzio
330c0961b7 Add missing code fix 2017-01-29 12:52:18 +01:00
dydzio
f5b5fa149f Build #1 2017-01-28 12:28:30 +01:00
dydzio
f447e44427 Add missing skill description, handler refactoring 2017-01-26 21:24:01 +01:00
dydzio
daec6d933c Add "WoG werewolf"-like ability support 2017-01-22 20:28:08 +01:00
dydzio
c310138fc3 Add WoG ghost ability support 2017-01-20 15:48:45 +01:00
Michał Kalinowski
4d39f652bf Making more detailed options when choosing AI in launcher: http:// 
bugs.vcmi.eu/view.php?id=2369
 2017-01-17 12:34:28 +01:00
dydzio
b626f9a134 Fix CCommanderArtPlace localization + minor fixes 2016-11-08 17:26:24 +01:00
AlexVinS
aea281a9de Fixed Stronghold hero specialties 2016-11-02 18:52:35 +03:00
AlexVinS
6664731886 Fixed http://bugs.vcmi.eu/view.php?id=2551 2016-10-09 11:38:02 +03:00
Alexander Shishkin
7cef9529e2 Merge pull request #223 from dydzio0614/patch-1 
Fixing some wrong ingame sounds
 2016-09-30 03:25:01 +04:00
AlexVinS
245d17a9e9 Fixed typo bonus duration enum. Mod compatibility retained. 2016-09-30 01:57:33 +03:00
Dydzio
97bae58f47 Fixing magog shoot sound 
In H3 magog shooting sound is same as fireball spell sound.
 2016-09-30 00:46:14 +02:00
Dydzio
5a34cb69aa Correcting timed spell sounds 
Haste spell has wrong sound, rest seems to be fine.
 2016-09-30 00:37:44 +02:00
Dydzio
aa412a9812 Correcting offensive spell sounds 
Fireball and destroy undead sounds are incorrect, fixed them to be same as in original H3.
 2016-09-30 00:32:27 +02:00
AlexVinS
1c33bd42a9 Revert "Denied healing/resurrection of hypnotized creatures." 
This reverts commit db2663613c.

Resurrection of own stack is allowed even if control is lost.
 2016-09-29 23:16:19 +03:00
AlexVinS
db2663613c Denied healing/resurrection of hypnotized creatures. 2016-09-29 19:15:57 +03:00
AlexVinS
0bbdabcae3 Hypnotize and Berserk countering 2016-09-29 19:10:25 +03:00
AlexVinS
a2e75bf443 Fixed http://bugs.vcmi.eu/view.php?id=2266 2016-09-29 17:05:04 +03:00
AlexVinS
d5fb3b62e6 Fixed http://bugs.vcmi.eu/view.php?id=2270 2016-09-29 15:26:50 +03:00
AlexVinS
810d464d8f formatting 2016-09-29 15:20:27 +03:00
AlexVinS
34b8b2c91b Fixed Berserk spell effect aka Bonus::ATTACKS_NEAREST_CREATURE 
* issue http://bugs.vcmi.eu/view.php?id=2513
* fix is not retroactive
 2016-09-29 14:11:15 +03:00
Arseniy Shestakov
dba58e5eb1 Faerie Dragon: decrease Magic Mirror cast chance from 30 to 20 percent 
Povelitel find out it's work too often and FizMiG doc confirms this.
 2016-09-21 19:09:02 +03:00
AlexVinS
13aedac3f4 Fixed war machines spell immunity. 
* Should fix http://bugs.vcmi.eu/view.php?id=2407
 2016-09-05 05:21:13 +03:00
Krzesimir Nowak
32f5033a4d Add a displayIndex setting to the video settings 
This setting will control on which display the game window will be
shown.
 2016-08-31 11:12:59 +02:00
Arseniy Shestakov
25a68c3ca1 Add "citadel" and "fort" to all town templates. Lazy fix for issue 1911 
Without this capitol appearance tend to be used by default.
HotA mod have all templates and actual different DEFs so it's was never affected.
 2016-08-24 05:06:21 +03:00
AlexVinS
21fff9d827 Fixed old regression from 0cf969d5 2016-06-12 07:21:57 +03:00
AlexVinS
027d8765d5 Fixed 2437 2016-04-07 11:11:46 +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
ArseniyShestakov
54eb9bf81a Merge pull request #192 from vmarkovtsev/feature/petrified_damage 
Implement half damage to petrified units
 2016-02-08 02:33:44 +03:00
DjWarmonger
b98a83f743 Added string identifiers for terrain types. 2016-02-04 17:57:51 +01:00
Vadim Markovtsev
4a326e163b Implement blinded units attack penalties 2016-02-03 18:00:28 +03:00
Vadim Markovtsev
97bae518fc Fix 1376 turrets damage can decrease 2016-02-01 20:39:51 +03:00
Arseniy Shestakov
a7059fe681 Remove Ore primaryResource from towns that must get both Wood and Ore 
Currently default behaviour is to give both wood and ore for resource bonus when primaryResource not specified.
Though for some reason towns currently have ore specified so you only get 5-10 Ore.
 2016-01-29 20:25:57 +03:00
Arseniy Shestakov
8c39ecf538 moatHexes: add saves and mods compatability 2016-01-28 01:35:01 +03:00
Arseniy Shestakov
48aedaef47 Merge branch 'develop' into feature/moatHexesConfig 2016-01-28 01:15:08 +03:00
Vadim Markovtsev
36eaa399e7 Add hardcodedFeature to switch winner's retreating with no troops 2016-01-27 16:42:17 +03:00
Arseniy Shestakov
ffeb7f253b moatHexes: update faction schema and configuration files 2016-01-06 12:52:52 +03:00
ArseniyShestakov
e91d79414b PathfinderOptions: use settings and move all defaults into schema 2015-11-21 00:32:23 +03:00
ArseniyShestakov
a49950e958 Fix 2292. Fix chat on adventure map, increase maxOutputPerLine 2015-11-08 22:16:58 +03:00
DjWarmonger
17071c6ec8 Merge pull request #125 from ArseniyShestakov/newMovementSystem 
Okay, time to merge this.
 2015-10-31 13:56:22 +01:00
ArseniyShestakov
68bd37aa45 Store penalty in value of FLYING_MOVEMENT and WATER_WALKING 2015-10-26 18:30:11 +03:00
ArseniyShestakov
6ebe2abc1a Fix penalties for FLYING_MOVEMENT and WATER_WALKING 2015-10-23 20:50:52 +03:00
ArseniyShestakov
596e0d7b40 Fix issue 1230. Implement Nomads sandwalker bonus 2015-10-15 01:11:15 +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
AlexVinS
a112c2f7c8 Made Disrupting Ray effect permanent. 2015-10-06 00:26:04 +03:00
AlexVinS
fa06e05487 Merge branch 'develop' into SpellsRefactoring7 2015-10-05 00:45:57 +03:00
AlexVinS
1e2e40b9c0 Tweak bonus descriptions, fixes mantiss 2261 2015-09-29 18:11:43 +03:00
AlexVinS
3d7435c520 Introduced absolute specific spell immunity. 2015-09-29 17:26:44 +03:00
AlexVinS
253b850ac3 Partial fix for 1791 2015-09-29 17:26:43 +03:00
AlexVinS
e5b4b2341d Fix fortess heros specialities, issue 2131 2015-09-14 17:36:33 +03:00
AlexVinS
3ed3f1fa13 Use json configuration for special spell effect duration 2015-09-14 13:22:23 +03:00
AlexVinS
3c053e5dd5 Quick fix for 2245 & 2238 2015-09-14 12:35:58 +03:00
AlexVinS
d4ae63e7ef Expert FIRE_SHIELD should not be massive 2015-09-14 12:08:48 +03:00
AlexVinS
075b65b31b Use dummy animations 2015-09-12 21:09:53 +03:00
AlexVinS
98ea8bf314 Introduce dummy spell animation/ animation pause configuration 
* save format changed with backward compatibility, UNTESTED
 2015-09-12 21:09:52 +03:00
AlexVinS
83fdce473e Fix mod schema: RMG templates added. 2015-07-27 08:36:19 +03:00
AlexVinS
4e72978abd Add some missing object subtypes, (found on test map VCMI_Tests_2011b.h3m) 2015-06-10 23:59:13 +03:00
AlexVinS
478a1b8dfd Explicitly define garrison subtypes 
(!) named subtypes are required for future map format.
 2015-06-10 19:58:03 +03:00
AlexVinS
5f8ecc22d5 Introduce configuration option for editor animation of map object and setup it for hero classes. 2015-06-10 14:21:33 +03:00
DjWarmonger
9e7b459882 Partial solution to #2206 
TODO: add serialized field that contains custom guard config
 2015-06-05 11:28:14 +02:00
DjWarmonger
a68b58d969 - Use straight paths for some connections 
- More fixes for template schema
 2015-06-02 16:40:32 +02:00
DjWarmonger
d6225f50e1 Fixes for template schema. 2015-06-02 15:26:33 +02:00
DjWarmonger
6890ae9f02 - Fixed improper use of playersCount. Now RMG can generate maps up to 8 players, with CPU players only as well. 
- Fixes for template scheme
 2015-05-27 11:30:46 +02:00
DjWarmonger
2e70d8a084 - VCMI will now read templates from mods 
- Added partial schema for RMG template
 2015-05-26 18:19:41 +02:00
DjWarmonger
ff6638b9f9 Rogues now grant expert Vision effect. 2015-05-25 09:53:32 +02:00
AlexVinS
257a1b024d Fix scuttleBoat configuration 2015-04-13 04:42:28 +03:00
AlexVinS
368401ca07 Fix removeObstacle configuration 
* fixes 0002165
 2015-04-11 14:34:09 +03:00
AlexVinS
724baed55b fix typo 2015-04-11 10:19:35 +03:00
AlexVinS
0a391cd367 Tweak DISPELL config 
* make it positive and non-smart on adv and expert level,
  as it should work on ally creatures on basic level and on all for higher levels
 2015-04-11 10:19:30 +03:00
DjWarmonger
37f9d898ac Fixed terrain type to "subterra". Updated Object Format on WIki to list all possible terrain types. 2015-04-05 15:38:23 +02:00
DjWarmonger
df80c50106 Added missing Den of Thieves to RMG. Limit set to 1 per zone. 2015-04-05 12:35:26 +02:00
beegee1
e9b7044c9b Fix mantis #1859, unknown pattern in underground 2015-03-28 16:41:26 +01:00
AlexVinS
9600446cf9 +smart target, +hit animation 2015-03-18 17:48:32 +03: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
DjWarmonger
cf74969603 Fixes, logging for Seer Huts 2015-03-11 22:17:35 +01: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
1c2afc659f Config: replace teleport handler with monolith, subterraneanGate and whirlpool 2015-03-08 16:17:33 +03:00
DjWarmonger
607375a9bc Generate Seer Huts with creature rewards 2015-02-28 21:14:45 +01:00
AlexVinS
b6038240ab Implemented DISGUISE spell. Untested 2015-02-26 08:39:59 +03:00
AlexVinS
b846b717a1 implemented VISIONS spell (partially) 
(-) todo: agressivnes
 2015-02-26 08:39:56 +03:00
AlexVinS
36cdb2968b Refactoring 2015-02-26 08:39:54 +03:00
AlexVinS
666d7a4f45 Start implementing VISIONS and DISGUISE 2015-02-26 08:39:53 +03:00
AlexVinS
c6c7552efe fix scuttleBoat location type. it should be LOCATION 2015-02-26 08:39:44 +03:00
AlexVinS
08d4f7991e Extract adventure spell mechanics 2015-02-26 08:39:39 +03:00
DjWarmonger
2a082e6c21 Merge pull request #84 from Fayth/test/advMapFading 
If no one objects, I will try to merge this.
 2015-02-18 09:52:09 +01:00
ArseniyShestakov
ae20499854 Quest Log: implement option to hide complete quests 2015-02-17 05:47:49 +03:00
Fay
cbd3a19987 Merge branch 'develop' of https://github.com/vcmi/vcmi into test/advMapFading 
Conflicts:
	client/CPlayerInterface.cpp
 2015-02-09 16:09:27 +01:00
ArseniyShestakov
96d57fc954 War Machines: replace immunity with absoluteImmunity 
This commit replace SIEGE_WEAPON immunity with absoluteImmunity for following spells: Haste, Slow, Death Ripple, Clone, Teleport
 2015-02-07 16:02:15 +03:00
ArseniyShestakov
fbb84624f9 War Machines: add absoluteImmunity to Implosion spell 2015-02-07 16:00:06 +03:00
ArseniyShestakov
20387bd2da War Machines: add absoluteImmunity to some timed spells 
This commit add SIEGE_WEAPON to absoluteImmunity of following timed spells: Curse, Bloodlust, Mirth, Sorrow, Frenzy, Counterstrike, Berserk, Hypnotize, Forgetfulness, Blind
 2015-02-07 15:57:46 +03:00
Fay
3c3fb0e21d Added advmap config options to enable/disable fading; 2015-02-02 19:38:30 +01:00
Fay
4b248c2762 World view impl -- initial; 2015-01-13 20:57:41 +01:00
DjWarmonger
121c39a994 Fixed Jebus and CoD templates. 2014-12-26 15:14:22 +01:00
AlexVinS
8f84e24aa6 Get rid of mainEffectAnim 2014-11-28 01:03:25 +03:00
AlexVinS
d94f15bdf4 Added configurable animation for SPELL_LIKE_ATTACK 2014-11-28 00:36:14 +03:00
AlexVinS
75b93b070d Implemented configurable hit/affect animation 
* need more testing
 2014-11-27 16:51:16 +03:00
AlexVinS
16d08b062a First draft of spell animation configuration 2014-11-26 22:25:13 +03:00
AlexVinS
a71c452fc6 Merge branch 'develop' into SpellsRefactoring4 2014-11-24 12:45:34 +03:00
AlexVinS
bddf662178 Few tweaks to bonus descriptions 2014-11-24 12:44:46 +03:00
AlexVinS
752965ff69 Merge branch 'develop' into SpellsRefactoring4 
Conflicts:
	lib/CSpellHandler.cpp
 2014-11-14 05:28:23 +03:00
AlexVinS
8979de7960 Fix issue #1843 (teleport case) 2014-11-14 03:07:14 +03:00
AlexVinS
ce8fa33efc Introduced new spell configuration options (not used yet) 2014-11-13 13:37:42 +03:00
josch
b962e11bd7 Launcher: add setting allowing not to automatically check remote repositories 
- add a button to the launcher which allows manual downloading
 - add a configuration option autoCheckRepositories to launcher settings
 - add ui elements to settings dialog to change autoCheckRepositories
 2014-11-10 08:21:47 +01:00
DjWarmonger
530a3e69bf Option to allow / ban certain types of town in a template. 2014-10-30 10:00:29 +01:00
DjWarmonger
7289dbafa9 Fixed #1871 2014-10-29 16:40:52 +01:00
DjWarmonger
b518fd6ea6 Added graphics for GENERAL_DAMAGE_REDUCTION bonus. Files are now in vcmi mod. 2014-10-28 19:04:34 +01:00
Patrick Simmons
ec590b9428 Legion artifact bugfixes 2014-10-25 19:09:21 -04:00
Ivan Savenko
84e2f07c18 Disabled monthly reset of banks. Reasoning: 
- workaround for 1896 (still needs a fix)
- to match H3 behaviour
 2014-09-23 16:06:21 +03: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
ecc705c8b7 Fixed guardians of dragon hive, fixes 1871 2014-08-19 12:09:52 +03:00
Ivan Savenko
e692f3f520 Implemnted enemy turn speed selection: 
- implemented switch in settings screen
- implemented "0 speed", animation-free. *may* also work for player-owned heroes
- removed no longer used creature window switch
 2014-08-11 19:16:39 +03:00
Ivan Savenko
b1285bc506 Merged GUI refactoring into develop, fixed conflicts 2014-08-09 15:01:55 +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
33acdc51bb Fixes 1852 - fixed typo in tower config and added check to detect such cases 2014-08-04 14:47:42 +03:00
Ivan Savenko
68e9cbd3a6 Fixes 1856 - Griffin Bastion will be behind Town Hall 2014-08-04 14:47:34 +03:00
Ivan Savenko
00cda400a1 Miscellaneous improvements for Launcher UI: 
- Implemented "show intro" toggle in settings
- Install/Update/Enable buttons are now visible even when mod info is hidden
- Fixed behaviour of show mod info switch, added more obvious button to enable it
- Removed no longer used "Enable mods on install" switch
- Added buttons to open data, user data and temporary directories
 2014-08-04 14:03:57 +03:00
Ivan Savenko
9841600839 Moved all resolutions but 800x600 into a separate mod 2014-08-03 19:11:54 +03:00
Ivan Savenko
10fc1892a8 Large refactoring of button classes: 
- renamed CAdventureMapButton to more expectable CButton
- merged CButtonBase into CButton
- created more generic class for clickable elements
- created more generic class for selectable elements
- renamed CHighlightableButton to CToggleButton
- renamed CHighlightableButtonsGrous to CToggleGroup
- minimized differences between API of all these classes
- removed all but one contructors in buttons, with same parameters across all classes
 2014-08-03 14:16:19 +03:00
DjWarmonger
3712b9a48b - Fixed treasure zones touching each other, which sometimes resulted in unguarded paths. 
- Fixed some object amounts which seemed wrong.
 2014-07-29 16:58:08 +02:00
DjWarmonger
713912574a Fixed duplicated Redwood Observatory on snow and possibly other objects. 2014-07-27 07:37:56 +02:00
DjWarmonger
16aa230dd1 Enchanters, sharpshooters and dragons are not "special" and should normally spawn on the map. 2014-07-26 10:42:12 +02:00
DjWarmonger
9644314c8a Removed map limit cap for objects that probably don't need them and came from H3 engine limitations. 2014-07-23 18:18:06 +02:00
DjWarmonger
1cabc8f7f4 - Implemented map object limit which should also distribute the objects evenly 
- Fixed Magic Well limit of 1 per zone
 2014-07-23 18:02:17 +02:00
DjWarmonger
173111955e Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-07-15 12:27:59 +02:00
DjWarmonger
90dcad2db7 Fix typo 2014-07-15 11:17:10 +02:00
Ivan Savenko
92d22bae63 Merge branch 'feature/creatureWindow' into refactoring/guiClasses 2014-07-14 17:23:24 +03: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
cbd2d74292 Generate random Pandora boxes. 2014-07-06 07:15:52 +02:00
DjWarmonger
0782557814 - Place all standard visitable objects 
- Fixed some constructors
 2014-07-05 19:36:12 +02:00
DjWarmonger
22f811ea52 Integrated and fixed object RMG configs by Kantor. 2014-07-05 15:58:10 +02:00
DjWarmonger
a076277e2b Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 
Conflicts:
	Mods/WoG/mod.json
 2014-07-05 15:27:47 +02:00
Ivan Savenko
60e5815014 Implemented stack artifact handling, no tested yet 2014-07-05 01:22:56 +03:00
Ivan Savenko
e4e9d71143 Fixed texts: 
- added new texts to translate.json
- implemented texts for abilities

Remaining TODO's:
- handling of stack artifact
- handling of commander artifacts
- stack experience
 2014-07-03 21:09:17 +03:00
DjWarmonger
d118fbffe8 Correct placement of subterranean gates. 2014-07-03 17:24:28 +02:00
DjWarmonger
60a5c764b8 Correct zone placement & sizing for underground maps. 2014-07-03 12:28:51 +02:00
AlexVinS
9437bc52c1 Merge remote-tracking branch 'remotes/origin/develop' into SDL2 2014-07-02 22:42:10 +04:00