1
0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00

- found yet another missing victory condition, fixes 1684

This commit is contained in:
Ivan Savenko 2014-02-02 11:05:05 +00:00
parent fabbe1eae8
commit 94a6e02107
2 changed files with 41 additions and 2 deletions

View File

@ -68,7 +68,46 @@
"victoryIconIndex" : 11, "victoryIconIndex" : 11,
"victoryString" : "Defeat All Enemies" "victoryString" : "Defeat All Enemies"
}, },
"data/secret1:0" : { // The Grail
"defeatIconIndex" : 2,
"defeatString" : "Time Expires",
"triggeredEvents" : {
"specialDefeat" : {
"condition" : [
"allOf",
[ "isHuman", { "value" : 1 } ],
[ "daysPassed", { "value" : 56 } ]
],
"effect" : {
"messageToSend" : "%s has been vanquished!",
"type" : "defeat"
},
"message" : "Alas, time has run out on your quest. All is lost."
},
"specialVictory" : {
"condition" : [
"allOf",
[ "isHuman", { "value" : 1 } ],
[ "haveArtifact", { "type" : 2 } ]
],
"effect" : {
"messageToSend" : "The enemy has found the %s, and can claim victory!",
"type" : "victory"
},
"message" : "Congratulations! You have found the %s, and can claim victory!"
},
"standardDefeat" : {
"condition" : [ "daysWithoutTown", { "value" : 7 } ],
"effect" : {
"messageToSend" : "%s's heroes have abandoned him, and he is banished from this land.",
"type" : "defeat"
},
"message" : "%s, your heroes abandon you, and you are banished from this land."
}
},
"victoryIconIndex" : 0,
"victoryString" : "Acquire Artifact"
},
"data/ab:1" : { // Seeking Armageddon "data/ab:1" : { // Seeking Armageddon
"defeatIconIndex" : 1, "defeatIconIndex" : 1,
"defeatString" : "Lose Hero", "defeatString" : "Lose Hero",

View File

@ -141,7 +141,7 @@ boost::optional<si32> CIdentifierStorage::getIdentifier(const JsonNode & name, b
if (idList.size() == 1) if (idList.size() == 1)
return idList.front().id; return idList.front().id;
if (!silent) if (!silent)
logGlobal->errorStream() << "Failed to resolve identifier " << name.String() << " from mod " << pair2.first; logGlobal->errorStream() << "Failed to resolve identifier " << name.String() << " from mod " << name.meta;
return boost::optional<si32>(); return boost::optional<si32>();
} }