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

Temporary fix for vic/loss conditions string

Browse Source
This commit is contained in:
nordsoft
2023-09-11 14:01:32 +02:00
parent a89a8019ab
commit 94c6adb28c
4 changed files with 17 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
mapeditor/mapsettings/loseconditions.cpp
View File

@@ -137,7 +137,7 @@ void LoseConditions::update(CMap & map)
{
map.triggeredEvents.push_back(standardDefeat);
map.defeatIconIndex = 3;
map.defeatMessage.appendTextID("core.lcdesc.0");
map.defeatMessage = MetaString::createFromTextID("core.lcdesc.0");
}
else
{
@@ -162,7 +162,7 @@ void LoseConditions::update(CMap & map)
noneOf.expressions.push_back(cond);
specialDefeat.onFulfill.appendTextID("core.genrltxt.251");
specialDefeat.trigger = EventExpression(noneOf);
map.defeatMessage.appendTextID("core.lcdesc.1");
map.defeatMessage = MetaString::createFromTextID("core.lcdesc.1");
break;
}
@@ -176,7 +176,7 @@ void LoseConditions::update(CMap & map)
noneOf.expressions.push_back(cond);
specialDefeat.onFulfill.appendTextID("core.genrltxt.253");
specialDefeat.trigger = EventExpression(noneOf);
map.defeatMessage.appendTextID("core.lcdesc.2");
map.defeatMessage = MetaString::createFromTextID("core.lcdesc.2");
break;
}
@@ -186,7 +186,7 @@ void LoseConditions::update(CMap & map)
cond.value = expiredDate(loseValueWidget->text());
specialDefeat.onFulfill.appendTextID("core.genrltxt.254");
specialDefeat.trigger = EventExpression(cond);
map.defeatMessage.appendTextID("core.lcdesc.3");
map.defeatMessage = MetaString::createFromTextID("core.lcdesc.3");
break;
}

6
mapeditor/mapsettings/loseconditions.ui
View File

@@ -42,7 +42,11 @@
</widget>
</item>
<item>
<widget class="QLineEdit" name="defeatMessageEdit"/>
<widget class="QLineEdit" name="defeatMessageEdit">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>

6
mapeditor/mapsettings/victoryconditions.cpp
View File

@@ -186,7 +186,7 @@ void VictoryConditions::update(CMap & map)
{
map.triggeredEvents.push_back(standardVictory);
map.victoryIconIndex = 11;
map.victoryMessage.appendTextID(VLC->generaltexth->victoryConditions[0]);
map.victoryMessage = MetaString::createFromTextID("core.vcdesc.0");
}
else
{
@@ -198,7 +198,7 @@ void VictoryConditions::update(CMap & map)
specialVictory.description.clear(); // TODO: display in quest window
map.victoryIconIndex = vicCondition;
map.victoryMessage.appendTextID(VLC->generaltexth->victoryConditions[size_t(vicCondition) + 1]);
map.victoryMessage = MetaString::createFromTextID("core.vcdesc." + std::to_string(vicCondition + 1));
switch(vicCondition)
{
@@ -301,7 +301,7 @@ void VictoryConditions::update(CMap & map)
if(ui->standardVictoryCheck->isChecked())
{
map.victoryMessage.appendRawString(" / ");
map.victoryMessage.appendTextID(VLC->generaltexth->victoryConditions[0]);
map.victoryMessage.appendTextID("core.vcdesc.0");
map.triggeredEvents.push_back(standardVictory);
}
map.triggeredEvents.push_back(specialVictory);

6
mapeditor/mapsettings/victoryconditions.ui
View File

@@ -42,7 +42,11 @@
</widget>
</item>
<item>
<widget class="QLineEdit" name="victoryMessageEdit"/>
<widget class="QLineEdit" name="victoryMessageEdit">
<property name="readOnly">
<bool>true</bool>
</property>
</widget>
</item>
</layout>
</item>