games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

fixed regions in campaigneditor

Browse Source
This commit is contained in:
heroesiiifan
2025-09-20 14:48:41 +02:00
committed by GitHub
parent b93249bba2
commit 57ac87c038
2 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/modders/Campaign_Format.md
View File

@@ -188,7 +188,7 @@ If `startOptions` is `hero`, hero can be chosen as a starting bonus. Bonus forma
### Regions description ### Regions description
Predefined campaign regions are located in file `campaign_regions.json` Predefined campaign regions are located in file `campaignRegions.json`
```json ```json
{ {

15
mapeditor/campaigneditor/campaignproperties.cpp
View File

@@ -38,13 +38,18 @@ CampaignProperties::CampaignProperties(std::shared_ptr<CampaignState> campaignSt
ui->lineEditMusic->setText(QString::fromStdString(campaignState->music.getName())); ui->lineEditMusic->setText(QString::fromStdString(campaignState->music.getName()));
ui->checkBoxScenarioDifficulty->setChecked(campaignState->difficultyChosenByPlayer); ui->checkBoxScenarioDifficulty->setChecked(campaignState->difficultyChosenByPlayer);
const JsonNode legacyRegionConfig(JsonPath::builtin("config/campaign_regions.json")); const JsonNode legacyRegionConfig(JsonPath::builtin("config/campaignRegions.json"));
int legacyRegionNumber = legacyRegionConfig["campaign_regions"].Vector().size(); auto legacyRegions = legacyRegionConfig.Struct();
int legacyRegionNumber = legacyRegions.size();
for (int i = 0; i < legacyRegionNumber; i++) for (int i = 0; i < legacyRegionNumber; i++)
ui->comboBoxRegionPreset->insertItem(i, QString::fromStdString(LIBRARY->generaltexth->translate("core.camptext.names", i))); {
auto it = legacyRegions.begin();
std::advance(it, i);
ui->comboBoxRegionPreset->insertItem(i, QString::fromStdString(it->first));
}
ui->comboBoxRegionPreset->insertItem(legacyRegionNumber, tr("Custom")); ui->comboBoxRegionPreset->insertItem(legacyRegionNumber, tr("Custom"));
ui->comboBoxRegionPreset->setCurrentIndex(20); ui->comboBoxRegionPreset->setCurrentIndex(ui->comboBoxRegionPreset->count() - 1);
loadRegion(); loadRegion();
@@ -89,7 +94,7 @@ void CampaignProperties::on_buttonBox_clicked(QAbstractButton * button)
void CampaignProperties::on_comboBoxRegionPreset_currentIndexChanged(int index) void CampaignProperties::on_comboBoxRegionPreset_currentIndexChanged(int index)
{ {
if(ui->comboBoxRegionPreset->count() == 21 && ui->comboBoxRegionPreset->currentIndex() != 20) if(ui->comboBoxRegionPreset->currentIndex() != ui->comboBoxRegionPreset->count() - 1)
regions = *LIBRARY->campaignRegions->getByIndex(index); regions = *LIBRARY->campaignRegions->getByIndex(index);
loadRegion(); loadRegion();