games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-15 20:03:15 +02:00
Code Issues Releases Activity

fulfillsMe change revert, tweaks

Browse Source
This commit is contained in:
Dydzio
2018-08-10 13:42:15 +02:00
parent f91c85a900
commit 787f4032b4
2 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
AI/VCAI/Fuzzy.cpp
View File

@@ -343,7 +343,7 @@ HeroMovementGoalEngineBase::HeroMovementGoalEngineBase()
heroStrength->addTerm(new fl::Ramp("HIGH", 0.5, 1)); heroStrength->addTerm(new fl::Ramp("HIGH", 0.5, 1));
heroStrength->setRange(0.0, 1.0); heroStrength->setRange(0.0, 1.0);
turnDistance->addTerm(new fl::Ramp("SMALL", 0.5, 0)); turnDistance->addTerm(new fl::Ramp("SHORT", 0.5, 0));
turnDistance->addTerm(new fl::Triangle("MEDIUM", 0.1, 0.8)); turnDistance->addTerm(new fl::Triangle("MEDIUM", 0.1, 0.8));
turnDistance->addTerm(new fl::Ramp("LONG", 0.5, 3)); turnDistance->addTerm(new fl::Ramp("LONG", 0.5, 3));
turnDistance->setRange(0.0, 3.0); turnDistance->setRange(0.0, 3.0);
@@ -376,7 +376,7 @@ HeroMovementGoalEngineBase::HeroMovementGoalEngineBase()
addRule("if lockedMissionImportance is MEDIUM then Value is somewhat LOW"); addRule("if lockedMissionImportance is MEDIUM then Value is somewhat LOW");
addRule("if lockedMissionImportance is LOW then Value is HIGH"); addRule("if lockedMissionImportance is LOW then Value is HIGH");
//pick nearby objects if it's easy, avoid long walks //pick nearby objects if it's easy, avoid long walks
addRule("if turnDistance is SMALL then Value is HIGH"); addRule("if turnDistance is SHORT then Value is HIGH");
addRule("if turnDistance is MEDIUM then Value is MEDIUM"); addRule("if turnDistance is MEDIUM then Value is MEDIUM");
addRule("if turnDistance is LONG then Value is LOW"); addRule("if turnDistance is LONG then Value is LOW");
} }
@@ -510,17 +510,9 @@ GetObjEngine::GetObjEngine()
objectValue->addTerm(new fl::Ramp("HIGH", 5000, 20000)); objectValue->addTerm(new fl::Ramp("HIGH", 5000, 20000));
objectValue->setRange(0, 20000); //relic artifact value is border value by design, even better things are scaled down. objectValue->setRange(0, 20000); //relic artifact value is border value by design, even better things are scaled down.
addRule("if turnDistance is LONG and objectValue is HIGH then value is MEDIUM"); addRule("if objectValue is HIGH then value is HIGH");
addRule("if turnDistance is MEDIUM and objectValue is HIGH then value is somewhat HIGH"); addRule("if objectValue is MEDIUM then value is MEDIUM");
addRule("if turnDistance is SHORT and objectValue is HIGH then value is HIGH"); addRule("if objectValue is LOW then value is LOW");
addRule("if turnDistance is LONG and objectValue is MEDIUM then value is somewhat LOW");
addRule("if turnDistance is MEDIUM and objectValue is MEDIUM then value is MEDIUM");
addRule("if turnDistance is SHORT and objectValue is MEDIUM then value is somewhat HIGH");
addRule("if turnDistance is LONG and objectValue is LOW then value is very LOW");
addRule("if turnDistance is MEDIUM and objectValue is LOW then value is LOW");
addRule("if turnDistance is SHORT and objectValue is LOW then value is MEDIUM");
} }
catch(fl::Exception & fe) catch(fl::Exception & fe)
{ {

5
AI/VCAI/Goals.cpp
View File

@@ -518,8 +518,7 @@ TGoalVec GetObj::getAllPossibleSubgoals()
const CGObjectInstance * obj = cb->getObjInstance(ObjectInstanceID(objid)); const CGObjectInstance * obj = cb->getObjInstance(ObjectInstanceID(objid));
if(!obj) if(!obj)
{ {
goalList.push_back(sptr(Goals::Explore())); throw cannotFulfillGoalException("Object is missing - goal is invalid now!");
return goalList;
} }
int3 pos = obj->visitablePos(); int3 pos = obj->visitablePos();
@@ -583,7 +582,7 @@ bool Goals::GetObj::operator==(AbstractGoal & g)
bool GetObj::fulfillsMe(TSubgoal goal) bool GetObj::fulfillsMe(TSubgoal goal)
{ {
if(goal->goalType == Goals::GET_OBJ) if(goal->goalType == Goals::VISIT_TILE)
{ {
if (!hero || hero == goal->hero) if (!hero || hero == goal->hero)
{ {