games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-13 19:54:17 +02:00
Code Issues Releases Activity

Accessibility tweaks + fix some compile errors

Browse Source
This commit is contained in:
Dydzio
2018-08-05 20:59:04 +02:00
parent b29d5bb001
commit 12d750a767
2 changed files with 7 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
AI/VCAI/AIUtility.cpp
View File

@@ -245,7 +245,7 @@ ui64 evaluateDanger(crint3 tile, const CGHeroInstance * visitor)
auto armedObj = dynamic_cast<const CArmedInstance *>(dangerousObject); auto armedObj = dynamic_cast<const CArmedInstance *>(dangerousObject);
if(armedObj) if(armedObj)
{ {
float tacticalAdvantage = fh->getTacticalAdvantage(visitor, armedObj); float tacticalAdvantage = fh->tacticalAdvantageEngine.getTacticalAdvantage(visitor, armedObj);
objectDanger *= tacticalAdvantage; //this line tends to go infinite for allied towns (?) objectDanger *= tacticalAdvantage; //this line tends to go infinite for allied towns (?)
} }
} }
@@ -258,7 +258,7 @@ ui64 evaluateDanger(crint3 tile, const CGHeroInstance * visitor)
auto guards = cb->getGuardingCreatures(it->second->visitablePos()); auto guards = cb->getGuardingCreatures(it->second->visitablePos());
for(auto cre : guards) for(auto cre : guards)
{ {
vstd::amax(guardDanger, evaluateDanger(cre) * fh->getTacticalAdvantage(visitor, dynamic_cast<const CArmedInstance *>(cre))); vstd::amax(guardDanger, evaluateDanger(cre) * fh->tacticalAdvantageEngine.getTacticalAdvantage(visitor, dynamic_cast<const CArmedInstance *>(cre)));
} }
} }
} }
@@ -267,7 +267,7 @@ ui64 evaluateDanger(crint3 tile, const CGHeroInstance * visitor)
auto guards = cb->getGuardingCreatures(tile); auto guards = cb->getGuardingCreatures(tile);
for(auto cre : guards) for(auto cre : guards)
{ {
vstd::amax(guardDanger, evaluateDanger(cre) * fh->getTacticalAdvantage(visitor, dynamic_cast<const CArmedInstance *>(cre))); //we are interested in strongest monster around vstd::amax(guardDanger, evaluateDanger(cre) * fh->tacticalAdvantageEngine.getTacticalAdvantage(visitor, dynamic_cast<const CArmedInstance *>(cre))); //we are interested in strongest monster around
} }
//TODO mozna odwiedzic blockvis nie ruszajac straznika //TODO mozna odwiedzic blockvis nie ruszajac straznika

10
AI/VCAI/Fuzzy.h
View File

@@ -18,13 +18,13 @@ struct SectorMap;
class engineBase class engineBase
{ {
public: protected:
fl::Engine engine; fl::Engine engine;
fl::RuleBlock rules; fl::RuleBlock rules;
engineBase();
virtual void configure(); virtual void configure();
void addRule(const std::string & txt); void addRule(const std::string & txt);
public:
engineBase();
}; };
class TacticalAdvantageEngine : public engineBase class TacticalAdvantageEngine : public engineBase
@@ -85,13 +85,11 @@ class FuzzyHelper
{ {
friend class VCAI; friend class VCAI;
public:
TacticalAdvantageEngine tacticalAdvantageEngine; TacticalAdvantageEngine tacticalAdvantageEngine;
VisitTileEngine visitTileEngine; VisitTileEngine visitTileEngine;
GetObjEngine getObjEngine; GetObjEngine getObjEngine;
public:
float evaluate(Goals::Explore & g); float evaluate(Goals::Explore & g);
float evaluate(Goals::RecruitHero & g); float evaluate(Goals::RecruitHero & g);
float evaluate(Goals::VisitTile & g); float evaluate(Goals::VisitTile & g);