Commit Graph
100 Commits
Author SHA1 Message Date
DjWarmonger c470b9606b Obstacles won't be generated around unguarded objects. 2014-06-04 20:59:01 +02:00
DjWarmonger 464ffc4afa Implemented (hopefully) original treasure randomization algorithm. 2014-06-04 19:08:04 +02:00
DjWarmonger fe05de9aff Fixed copying zone settings. 2014-06-04 15:41:32 +02:00
DjWarmonger fdb81f4d5c Reading treasure values from config. 2014-06-04 15:16:23 +02:00
DjWarmonger 62e9f13b08 - Implemented guard generation formula following this post http://forum.vcmi.eu/viewtopic.php?p=12426&sid=09f5fac8992dc880eb6a720615787ca0#12426
- Some primitive way to randomize treasures
2014-06-04 10:16:08 +02:00
DjWarmonger 6221f4ac2c - Corrected guard types
- Corrected town positions
2014-06-03 08:57:20 +02:00
DjWarmonger 9972d233a6 Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG 2014-06-02 15:39:20 +02:00
DjWarmonger 2aa53e9568 Corrected guard calculation to match OH3. 2014-06-02 15:38:42 +02:00
DjWarmonger 252e78acc2 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-01 21:55:07 +02:00
DjWarmonger 7a1e12e1df Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-01 21:54:35 +02:00
DjWarmonger 7db06e6bd0 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-06-01 21:53:00 +02:00
DjWarmonger 37463a3e45 Zone position will be moved to its center of mass. 2014-06-01 21:01:18 +02:00
DjWarmonger 7f31b7dddb - Zone guards will now match template settings.
- Added guards for monoliths.
2014-06-01 16:31:49 +02:00
DjWarmonger 51fc3fbf83 - Zone guards will now match template settings.
- Added guards for monoliths.
2014-06-01 16:31:15 +02:00
DjWarmonger 3c5a65af3d - Random monsters will have proper strength.
- Fixed blocking of tiles under objects
2014-06-01 14:10:44 +02:00
DjWarmonger 11454ef4b3 Merge branch 'RMG' of https://github.com/vcmi/vcmi into RMG 2014-06-01 12:03:39 +02:00
DjWarmonger aee748d8d6 - Added monoliths between remote zones
- Fixed land connections between zones, now they're generated correctly.
2014-06-01 12:02:43 +02:00
DjWarmonger e97933035c Randomized connections placement (?) 2014-06-01 10:15:03 +02:00
DjWarmonger 3c6a1fb715 Large objects will not spawn at blocked tiles. 2014-05-31 12:26:59 +02:00
DjWarmonger 425d29ac90 Large objects will not spawn at blocked tiles. 2014-05-31 12:26:37 +02:00
DjWarmonger 8e8b27087a Ground connections between adjacent zones. 2014-05-31 10:56:14 +02:00
DjWarmonger 8ab2a8df86 Zone borders. 2014-05-30 21:23:41 +02:00
DjWarmonger 8c24ea0bfb Introduced 3-value logic for free, blocked and possibly occupied tiles. Refactoring. 2014-05-30 16:50:06 +02:00
DjWarmonger 8ea175ce95 Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-05-30 07:33:32 +02:00
DjWarmonger 690f4a650a Even better zone shapes. 2014-05-28 21:11:10 +02:00
DjWarmonger c627aa608a Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-05-28 19:34:12 +02:00
DjWarmonger 2304c33a38 Merge pull request #15 from karol57/develop
Updated int3 class and fixed small error.
2014-05-28 11:25:25 +02:00
DjWarmonger 8f033a7834 Golden ratio for smoother zone shapes. 2014-05-25 13:30:47 +02:00
DjWarmonger 69457dbd75 - Implemented some really nice gravity-based algorithm
- Fixed zones placed outside the map (causing various bugs)
2014-05-25 06:20:02 +02:00
DjWarmonger b9de3875d9 - Attempt to move zones away from map boundaries
- Tweaking algorithm parameters
- Refactorings
2014-05-24 18:39:58 +02:00
DjWarmonger 462514965c Merge branch 'develop' of https://github.com/vcmi/vcmi into RMG 2014-05-24 14:45:34 +02:00
DjWarmonger 021c6b9af3 All zones will be painted with terrain. Removed unused code. 2014-05-24 14:33:22 +02:00
DjWarmonger d2fd71d087 Zone shapes & terrains work nicely. 2014-05-24 14:06:08 +02:00
DjWarmonger 27dcf70b1a Randomized center positions of zones. 2014-05-24 12:42:06 +02:00
DjWarmonger 3a6f748fb5 Paint native terrain in zones. 2014-05-23 21:43:33 +02:00
DjWarmonger 75cea9206d - Fixed uninitialized guarding creature positions
- Fix for guard placement
2014-05-23 19:45:17 +02:00
DjWarmonger b63e00c1bc Merge pull request #14 from vcmi/RMG
Patch integration is now complete. Some simple map objects are placed around and in general it works without crashes.
2014-05-23 19:15:50 +02:00
DjWarmonger 35d6215b7b jfhs patch integration is now complete:
Lots of fixes for object placement.
Fixed blocked paths on generated maps.
2014-05-23 19:14:33 +02:00
DjWarmonger 4ea9810831 First version that works:
- Covered RMG with exceptions
- Fixes for object randomization & placement
2014-05-23 17:12:31 +02:00
DjWarmonger 342aec0700 More rollback. 2014-05-23 13:23:03 +02:00
DjWarmonger 5b0b152aa3 Trying to restore recent type of mapGenOptions. 2014-05-23 11:56:51 +02:00
DjWarmonger eae7e5c51f Rolled back some incorrect values. 2014-05-23 09:22:22 +02:00
DjWarmonger 67793a2db4 Some more. 2014-05-22 21:40:34 +02:00
DjWarmonger 2d8cd1c5b5 Some more. 2014-05-22 21:06:26 +02:00
DjWarmonger aead8da54f Fixed some obvious bugs with random map options. 2014-05-22 20:50:24 +02:00
DjWarmonger 1e1dce20a8 Something that compiles, but crashes when launching RMG map. 2014-05-22 19:25:17 +02:00
DjWarmonger 88f962d6d5 Taken jfhs code as it is.
http://forum.vcmi.eu/viewtopic.php?p=10040#10040
2014-05-22 16:27:13 +02:00
DjWarmonger 6658e173f1 - Possible fix for #1769
- Fixed all possible (even unexpected) crashes when AI looses active hero
2014-05-18 13:13:31 +02:00
DjWarmonger e074c9b310 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-05-18 09:00:32 +02:00
DjWarmonger e2d44f6ac6 Fixed #868 - wrong battlefield in ship-to-ship combat 2014-05-18 08:52:03 +02:00
DjWarmonger 9f28e4e4ca Merge pull request #10 from Macron1Robot/works
Bug 0001789 correction (incorrect battle field detection)
2014-05-18 08:26:36 +02:00
DjWarmonger 00c31b4b85 Fixed #1790 2014-05-17 21:30:55 +02:00
DjWarmonger 573293d425 Merge pull request #9 from alexvins/issue/1763
Try to fix #1763 and a small refactoring
2014-05-17 10:35:28 +02:00
DjWarmonger 1ea6723a32 Merge pull request #8 from xyzz/android-rolling
Android port.
2014-05-17 05:17:54 +02:00
DjWarmonger 52f92a0190 Merge branch 'develop' of https://github.com/vcmi/vcmi into develop 2014-05-16 19:33:09 +02:00
DjWarmonger 6ab0039053 Fixed #1600 - incorrect specialty of Saurug 2014-05-16 19:27:01 +02:00
DjWarmonger a9b3a03bdd Fixed #1670 - Mirth working on immune creatures 2014-05-16 12:47:09 +02:00
DjWarmonger eb337d7407 Fixed #1638 - spells banned in map settings appeared in town guild 2014-05-16 12:15:35 +02:00
DjWarmonger 1dbc0c7177 Compilation fix. This will be released as VCMI 0.95b. 2014-05-02 12:19:50 +02:00
DjWarmonger fb5152254d Merge branch 'develop' of git://github.com/Macron1Robot/vcmi into WarmysBackup
Conflicts:
	client/CKingdomInterface.cpp
2014-05-02 12:03:02 +02:00
DjWarmonger 9540f9e451 Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup 2014-05-01 14:27:32 +02:00
DjWarmonger 4a71442c80 Missing changes. 2014-04-27 14:38:20 +02:00
DjWarmonger f418b468c4 Merge branch 'develop' of https://github.com/vcmi/vcmi into WarmysBackup 2014-04-27 12:49:29 +02:00
DjWarmonger 18f2eafde5 Merge pull request #5 from janisozaur/develop
fixed possible nullptr dereference
2014-04-25 16:37:02 +02:00
DjWarmonger 92a62368b5 One more fix for MVS compilation 2014-04-24 21:09:27 +02:00
DjWarmonger 9e7013de77 Backup for my own MVS project configuration 2014-04-24 21:07:43 +02:00
DjWarmonger fe4704157c Merge pull request #3 from o01eg/my-diff
Fix for linking in MS VS and CodeBlocks.
2014-04-24 18:35:48 +02:00
DjWarmonger 2da3d7d7c3 Removed AI bottleneck on water-based maps. 2014-04-03 09:57:44 +00:00
DjWarmonger 30b79588db - Moved gameState::guardingCreaturePosition() to CMap so it doesn't need to be recalculated many times for every player.
- Some optimizations with local cb pinter in VCAI.
2014-04-01 11:53:28 +00:00
DjWarmonger ec54381b12 Some more optimization. 2014-03-31 15:26:47 +00:00
DjWarmonger a64df5718f Some nontrivial optimizations based on profiling results:
- Movement bonuses will be calculated ONCE per pathfinder loop
- Goals will be sorted by hero to reduce number of calculatePaths calls
2014-03-31 14:26:09 +00:00
DjWarmonger 8683c8c0eb - Added and improved some propagators, including Crystal Dragons ability (#1232)
- Minor refactoring in AI
2014-03-29 21:39:19 +00:00
DjWarmonger 441e4b2cb2 Improvements for AI speed (#1760)
AI heroes will be excluded from exploration if:
- There is no clear way to next exploration point or
- There is no possible exploration point at all
AI heroes will be erased from the list above if:
- FoW changes
- New object is added
- To prevent lock, primary hero will be erased at the start of each turn
2014-03-23 16:00:43 +00:00
DjWarmonger 1d6e265e34 - Fixed special spells spawning in Pyramid
- Allowed new spells to spawn in Pyramid
2014-03-09 12:33:26 +00:00
DjWarmonger 0347c61dd2 All new spells will be possible to spawn in town magic guilds. 2014-03-09 09:37:20 +00:00
DjWarmonger b8b809bd50 Fixed #1667, #1669 2014-02-28 17:49:56 +00:00
DjWarmonger d049abe644 Fixed typo #1732. 2014-02-26 17:29:21 +00:00
DjWarmonger 5284847ffe My part of changelog for 0.95. 2014-02-24 20:35:31 +00:00
DjWarmonger 8ce6659633 Important fix for unreserving objects. 2014-02-23 20:37:33 +00:00
DjWarmonger 94c8f01732 Commiting some minor tweaks before next dev version. 2014-02-23 16:55:42 +00:00
DjWarmonger 15edeb231b Fixed two heroes getting stuck on both sides of gate. 2014-02-21 09:32:24 +00:00
DjWarmonger 1196eb5d81 AI can finally clear Subterranean Gate with guard on the other side :) 2014-02-21 07:48:38 +00:00
DjWarmonger b0b0249524 - Implemented serialization of Goals. Loaded games work, at least.
- Attempts to add Subterranean Gates to SectorMap
- Extensive use of ClearWayTo goal.
2014-02-20 20:18:49 +00:00
DjWarmonger 8683b982c7 - A simple method to break loop in goal decomposition (which consumed time)
- Finally corrected canGetArmy conditions (which also consumed time)
- Removed some unused code, general cleaning
2014-02-19 16:23:47 +00:00
DjWarmonger a3cad2883f - Restored correct specialty serialization (#1599 and all its children)
- Fixed rare AI crash
- Fixed AI visiting some objects many times
- Some cleanup and refactoring
2014-02-17 17:28:39 +00:00
DjWarmonger 6ee823298a - Various improvements for exploration
* Heroes will try to use SectorMap if there are no accessible tiles
* Remove some loopholes and pitfalls when all the ways are blocked
* Fixed AI not conquering some (reserved) objects
Still missing: SectorMap does not use Subterranean Gates :(

- Improvements for army exchange
* Fixed exchange condition
* Bidirectional exchange is possible
2014-02-17 07:36:03 +00:00
DjWarmonger afacb40f5a - Fixed secondary heroes stalking main hero
- Fixed exotic crash when all nearby tiles are occupied
2014-02-15 21:32:49 +00:00
DjWarmonger b368e565ab - fixed #1714
- Performance improvements, refactoring
2014-02-15 19:39:03 +00:00
DjWarmonger d8933b5c36 - AI will now use SectorMap to find a way to guarded / covered objects.
- Improvements to SectorMap needed for use of multiple heroes
2014-02-15 16:38:51 +00:00
DjWarmonger e459984897 Cleanup in AI. 2014-02-15 08:10:06 +00:00
DjWarmonger d17b3a14bd - Significantly improved exploration algorithm
- Workaround to make AI gather army when exploration is not possible anymore
- Possibly fixed issue with AI not capturing guarded objects
2014-02-07 20:09:15 +00:00
DjWarmonger a9b10c8099 - Changed aggregation method so now fuzzy engine takes all the factors into consideration
- Heroes now will use real path cost and their movement, which has numerous advantages:
* Actual movement cost is taken into consideration
* Groups of heroes will keep order
* Fastest heroes will be used for exploration first
2014-02-07 08:23:31 +00:00
DjWarmonger 54fbdfec5e - Finally fixed wander crash
- Smoothed values of terms to improve differentiation and stability
2014-02-06 06:05:45 +00:00
DjWarmonger 486cd4b001 - Fixed (common) issue when AI found neutral stacks infinitely strong
- Fixed non-fuzzy performance of some functions. Now AI really considers all options and uses multiple heroes, who don't spend their time wandering a lot.
2014-02-05 18:45:51 +00:00
DjWarmonger 5e58027496 Fix for rare crash in previous commit. 2014-02-05 09:04:09 +00:00
DjWarmonger c708a631c1 - Improved AI logging messages
- Cut wandering time of AI
2014-02-04 21:49:04 +00:00
DjWarmonger 5377b163d2 Compile fix for Windows. 2014-01-21 17:03:21 +00:00
DjWarmonger c2cbd8da27 Un-abstracted AbstractGoal to allow serialization. 2014-01-06 14:17:56 +00:00
DjWarmonger 51e6961d08 Compile fix for MVS. 2013-12-29 15:48:56 +00:00
DjWarmonger d2d1a2f544 Restored code from previous commit. 2013-12-28 19:37:35 +00:00