Commit Graph
64 Commits
Author SHA1 Message Date
DjWarmongerandGitHub 58a3abb643 Merge pull request #963 from vcmi/terrain-rewrite
Terrain rewrite
2022-09-29 18:24:05 +02: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 d38b6297f8 missing line 2022-09-27 07:53:21 +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 25f66097cc Handle RoadType by value / reference 2022-09-26 10:20:39 +02:00
Tomasz Zieliński f804f8a326 Store RiverType by value, handle by reference 2022-09-26 09:51:36 +02:00
Tomasz Zieliński 11dd71515a comment 2022-09-26 09:18:01 +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 cd3a1a02c2 More style tweaks 2022-09-25 21:47:44 +02:00
Tomasz Zieliński 64fd896978 Free memory at TerrainTypeHandler destruction 2022-09-25 20:52:51 +02:00
Tomasz Zieliński 4ea57ea7fc A variety of suggested style tweaks 2022-09-25 09:33:56 +02:00
Tomasz Zieliński fd63cb6109 and here 2022-09-25 08:07:22 +02:00
Tomasz Zieliński 97a94ce61e Handle Tile by reference instead of pointer 2022-09-25 08:04:15 +02:00
Tomasz Zieliński 0b56778e00 Fix for compatibility in rewrite 2022-09-23 20:01:54 +02: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 f883395710 A little refactoring 2022-09-23 19:26:38 +02:00
Tomasz Zieliński 09931b6c9d Moved roads and rivers to config files.
This also allows adding new ones via mods.
2022-09-23 18:57:16 +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 6aaf77812b Changed logic for zone placement.
Now every zone can be surface, underground, or both. This is separate from water <-> land distinction.

Iand type is now a combination of flags and can take multiple values: "type": ["LAND", "WATER", "SURFACE", "SUB", "ROCK"]. In nothing is specified, terrains get LAND | SURFACE flags by default.

Non-surface zones will default to DIRT, and non-underground zones will default to SUBTERRA.
2022-09-22 18:23:31 +02:00
Tomasz Zieliński e53613caa7 Fixed crash in pathfinder 2022-09-21 21:44:39 +02:00
Tomasz Zieliński fa31309eed Fixed minimap colors 2022-09-21 14:42:22 +02:00
Tomasz Zieliński 97c17c6294 - Terrain config
- Fix for underground terrains
2022-09-21 14:11:32 +02:00
Tomasz Zieliński c9c4603f75 Firts working version that launches original maps 2022-09-21 13:43:57 +02:00
Tomasz Zieliński 11e1bb44a2 Load sounds for new terrains later 2022-09-21 13:43:00 +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
DjWarmongerandGitHub 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
DjWarmongerandGitHub d34dd8676e Merge pull request #898 from vcmi/cache-pathfinding
Cache pathfinding
2022-09-14 20:32:54 +02:00
5e2d87abd7 Update AI/Nullkiller/Goals/ExecuteHeroChain.cpp
Co-authored-by: Andrey Filipenkov <decapitator@ukr.net>
2022-09-14 16:23:13 +02:00
Tomasz Zieliński 931f4af2df typo 2022-09-14 15:24:39 +02:00
Tomasz Zieliński 77e43cb36f Cache Pathfinding skill 2022-09-14 15:24:24 +02:00
DjWarmongerandGitHub 627b63ca56 Merge pull request #894 from vcmi/optimization_rebase
Bonus and string optimization
2022-09-14 13:03:30 +02:00
Tomasz Zieliński 55b142a8c9 Suggested tweaks 2022-09-14 11:37:12 +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
DjWarmongerandAndrii Danylchenko 3d2dc2335b Switch ObjectTemplate to shared_ptr<const> (#870) 2022-09-11 16:13:53 +03:00
Tomasz ZielińskiandAndrii Danylchenko 40585a66c0 Style, commend - requested 2022-09-11 11:31:28 +03:00
Tomasz ZielińskiandAndrii Danylchenko 22b4795f86 Well, we should have some sensible exception handling in VCMI 2022-09-11 11:31:28 +03:00
Tomasz ZielińskiandAndrii Danylchenko 1649cf2bb9 misc comments 2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko 6ae3b77d80 AI will not wait to conwuer fort if possible 2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko f0bb97b0d2 AI will actually attack all heroes when possible - and win the game eventually :) 2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko 6fb7301e8e Fixed issue with taking creatures from a Bank, Pandora or joiners 2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko b52faad4c7 + Stack speed is valuable
+ Hero movement is also very valuable
2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko efb6580958 Fix for mislaced hero rescued from Prison - https://bugs.vcmi.eu/view.php?id=3227 2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko a83753a7d2 AI will now pick Prisons if possible 2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko cbf2a1b7cc AI will consider Pandora Box as a valuable object - good for every occasion! 2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko faa6ca401e Fixed duplicated value 2022-09-11 11:31:27 +03:00
Tomasz ZielińskiandAndrii Danylchenko f4de5453c6 + AI will consider free slot (or lack of it) for creature reward from a bank
+ AI might use banks for resources other than gold
2022-09-11 11:31:27 +03:00
DjWarmongerandAndrii Danylchenko f81d869b4a Mine roads (#808)
* Create dirt roads to mines if there are no roads in a zone.
2022-09-11 11:31:27 +03:00
DjWarmongerandGitHub 3fd8faf41b Merge pull request #614 from vcmi/Launcher_GUI_fixes
Hmm.. it looks like it works for me.
2019-10-14 18:21:28 +02:00
DjWarmongerandGitHub 7e7c98852d Merge pull request #613 from vcmi/dydzio0614-patch-1
Lol, it's been in "TODO" for years now :P
2019-07-21 11:46:21 +02:00
DjWarmongerandGitHub efc53e8f8b Merge pull request #530 from dydzio0614/objRemovalFix
Extend objectRemoved callback to check parent goals and resource manager
2019-01-07 19:00:06 +01:00
DjWarmongerandGitHub 2b6bb0f4c6 Merge pull request #481 from vcmi/VCAI_fixes
Vcai fixes
2018-08-22 10:41:12 +02:00
DjWarmongerandGitHub 5f39e92eb4 Merge branch 'develop' into VCAI_fixes 2018-08-22 08:06:13 +02:00
DjWarmongerandGitHub f484baea9f Merge pull request #474 from vcmi/FuzzyHelperRework
FuzzyHelper refactoring + Ai Map Object Evaluation improvements
2018-08-22 07:33:09 +02:00
DjWarmongerandGitHub a0909468de Merge pull request #477 from vcmi/VCAI_Rework
VCAI main loop rework + lots of discovered bugs and caveats fixed
2018-08-08 22:19:17 +02:00
DjWarmongerandGitHub 2afe36ebf7 Merge pull request #476 from vcmi/SectorMapRefactor
Morning!
2018-08-05 06:56:24 +02:00
DjWarmongerandGitHub f2db64af94 Merge pull request #471 from vcmi/BuildingManager
Building manager
2018-08-04 21:07:40 +02:00
DjWarmongerandGitHub cde2d73982 Merge pull request #473 from dydzio0614/vspatch
Update VCAI VS file
2018-08-04 16:25:14 +02:00
DjWarmongerandGitHub b0e1b8c5ec Merge pull request #465 from vcmi/AIMapObjectEvaluation
Okay let's see where this gets us.
2018-08-04 15:07:08 +02:00
DjWarmongerandGitHub eddaedd13e Merge pull request #469 from nullkiller/ai-fix-movement-for-blockvis
AI: unexpected error in AI logic when take resource on adjasent tile
2018-08-02 17:57:31 +02:00
DjWarmongerandGitHub 3579651b3c Merge pull request #467 from vcmi/ResourceManager2
Okay let's get this done and move forward.
2018-07-29 17:37:50 +02:00
DjWarmongerandGitHub 7c8b74a806 Merge pull request #466 from dydzio0614/AiDoc
Add code comments for VCAI::makeTurnInternal
2018-07-24 16:06:22 +02:00
DjWarmongerandGitHub f8a9a0af2b Merge pull request #455 from nullkiller/deadend-exploration-improvement
After actually checking this branch, I absolutely approve it. AI advances quickly and steadily, and that's the point.
2018-07-19 16:37:56 +02:00