Ticket #4256: 4256_atlas_settings_v1.patch

binaries/data/mods/_test.sim/simulation/data/settings/map_sizes.json

@@ +1 @@
+{
+    "TranslatedKeys": ["Name"],
+    "Data":
+    [
+        {
+            "Name": "Tiny",
+            "Tiles": 128
+        },
+        {
+            "Name": "Small",
+            "Tiles": 192
+        },
+        {
+            "Name": "Medium",
+            "Tiles": 256,
+            "Default": true
+        },
+        {
+            "Name": "Normal",
+            "Tiles": 320
+        },
+        {
+            "Name": "Large",
+            "Tiles": 384
+        },
+        {
+            "Name": "Very Large",
+            "Tiles": 448
+        },
+        {
+            "Name": "Giant",
+            "Tiles": 512
+        }
+    ]
+}

binaries/data/mods/_test.sim/simulation/data/settings/wonder_times.json

@@ +1 @@
+{
+    "Times": [0, 1, 3, 5, 10, 15, 20, 25, 30, 35, 40, 45, 50, 55, 60, 75, 90, 105, 120],
+    "Default": 20
+}

source/simulation2/Simulation2.cpp

@@ -1 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -946 +946 @@
     return ReadJSON(L"simulation/data/settings/map_sizes.json");
 }
 
+std::string CSimulation2::GetWonderDurations()
+{
+    return ReadJSON(L"simulation/data/settings/wonder_times.json");
+}
+
 std::string CSimulation2::GetAIData()
 {
     ScriptInterface& scriptInterface = GetScriptInterface();

source/simulation2/Simulation2.h

@@ -1 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -263 +263 @@
     std::string GetMapSizes();
 
     /**
+    * Get wonder duration data
+    *
+    * @return string containing JSON format data
+    */
+    std::string GetWonderDurations();
+
+    /**
      * Get AI data
      *
      * @return string containing JSON format data

source/simulation2/tests/test_Simulation2.h

@@ -1 @@
-/* Copyright (C) 2010 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -164 +164 @@
 
         TS_ASSERT_OK(sim.ReloadChangedFile(L"simulation/components/hotload/hotload.js"));
     }
+
+    void test_read_JSON()
+    {
+        CSimulation2 sim(NULL, g_ScriptRuntime, &m_Terrain);
+
+        std::string wonderDurations = sim.GetWonderDurations();
+
+        TS_ASSERT(!wonderDurations.empty());
+        TS_ASSERT(wonderDurations.c_str()[0] == '{');
+        TS_ASSERT(wonderDurations.find("Times") != std::string::npos);
+        TS_ASSERT(wonderDurations.find("55") != std::string::npos);
+        TS_ASSERT(wonderDurations.find("Default") != std::string::npos);
+
+        std::string mapSizes = sim.GetMapSizes();
+
+        TS_ASSERT(!mapSizes.empty());
+        TS_ASSERT(mapSizes.c_str()[0] == '{');
+        TS_ASSERT(mapSizes.find("Data") != std::string::npos);
+        TS_ASSERT(mapSizes.find("384") != std::string::npos);
+        TS_ASSERT(mapSizes.find("Default") != std::string::npos);
+    }
 };

source/tools/atlas/AtlasUI/ScenarioEditor/Sections/Map/Map.cpp

@@ -1 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -21 +21 @@
 
 #include "AtlasObject/AtlasObject.h"
 #include "GameInterface/Messages.h"
+#include "General/Datafile.h"
 #include "ScenarioEditor/ScenarioEditor.h"
 #include "ScenarioEditor/Tools/Common/Tools.h"
 
@@ -33 +34 @@
     ID_MapDescription,
     ID_MapReveal,
     ID_MapType,
+    ID_WonderVictoryTimes,
     ID_MapPreview,
-    ID_MapTeams,
+    ID_MapLockTeams,
+    ID_MapLastManStanding,
     ID_MapKW_Demo,
     ID_MapKW_Naval,
     ID_RandomScript,
@@ -141 +144 @@
 
     sizer->AddSpacer(5);
 
-    // TODO: replace by filenames in binaries/data/mods/public/simulation/data/settings/victory_conditions/
-    wxArrayString gameTypes;
-    gameTypes.Add(_T("conquest"));
-    gameTypes.Add(_T("conquest_structures"));
-    gameTypes.Add(_T("conquest_units"));
-    gameTypes.Add(_T("wonder"));
-    gameTypes.Add(_T("endless"));
-    gameTypes.Add(_T("regicide"));
+    wxArrayString gameTypes = Datafile::EnumerateDataFiles(_T("mods/public/simulation/data/settings/victory_conditions/"), _T("*.json"));
+    // discard path and extension of game types
+    for (size_t i = 0; i < gameTypes.Count(); ++i)
+        gameTypes[i] = wxFileName(gameTypes[i]).GetName();
 
+    wxArrayString wonderDurations;
+    AtlasMessage::qGetWonderDurations qrySizes;
+    qrySizes.Post();
+    AtObj sizes = AtlasObject::LoadFromJSON(*qrySizes.data);
+
     wxFlexGridSizer* gridSizer = new wxFlexGridSizer(2, 5, 5);
     gridSizer->AddGrowableCol(1);
     // TODO: have preview selector tool?
@@ -162 +166 @@
     gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Game type")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
     gridSizer->Add(Tooltipped(new wxChoice(this, ID_MapType, wxDefaultPosition, wxDefaultSize, gameTypes),
         _("Select the game type (or victory condition)")), wxSizerFlags().Expand());
+    gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Wonder Victory")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
+    gridSizer->Add(Tooltipped(new wxChoice(this, ID_WonderVictoryTimes, wxDefaultPosition, wxDefaultSize, wonderDurations),
+        _("Number of minutes that the player has to keep the wonder in order to win.")), wxSizerFlags().Expand());
+
+    // get wonder victory times
+    wxChoice* durationChoice = wxDynamicCast(FindWindow(ID_WonderVictoryTimes), wxChoice);
+    for (AtIter s = sizes["Times"]["item"]; s.defined(); ++s)
+    {
+        long time = 0;
+        wxString(s).ToLong(&time);
+        durationChoice->Append(wxString(s), (void*)(intptr_t)time);
+    }
+    durationChoice->SetSelection(0);
+
     gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Lock teams")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
-    gridSizer->Add(Tooltipped(new wxCheckBox(this, ID_MapTeams, wxEmptyString),
+    gridSizer->Add(Tooltipped(new wxCheckBox(this, ID_MapLockTeams, wxEmptyString),
         _("If checked, teams will be locked")));
+    gridSizer->Add(new wxStaticText(this, wxID_ANY, _("Last Man Standing")), wxSizerFlags().Align(wxALIGN_CENTER_VERTICAL | wxALIGN_RIGHT));
+    gridSizer->Add(Tooltipped(new wxCheckBox(this, ID_MapLastManStanding, wxEmptyString),
+        _("If checked, the last remaining player will win (not the last remaining set of allies)")));
     sizer->Add(gridSizer, wxSizerFlags().Expand());
 
     sizer->AddSpacer(5);
@@ -209 +230 @@
     else
         wxDynamicCast(FindWindow(ID_MapType), wxChoice)->SetSelection(0);
 
+    if (wxString(m_MapSettings["GameType"]) == L"wonder")
+        wxDynamicCast(FindWindow(ID_WonderVictoryTimes), wxChoice)->SetStringSelection(wxString(m_MapSettings["WonderDuration"]));
+    else
+        wxDynamicCast(FindWindow(ID_WonderVictoryTimes), wxChoice)->SetSelection(0);
+
+    wxDynamicCast(FindWindow(ID_WonderVictoryTimes), wxChoice)->Enable(wxDynamicCast(FindWindow(ID_MapType), wxChoice)->GetStringSelection() == L"wonder");
+
     // lock teams
-    wxDynamicCast(FindWindow(ID_MapTeams), wxCheckBox)->SetValue(wxString(m_MapSettings["LockTeams"]) == L"true");
+    wxDynamicCast(FindWindow(ID_MapLockTeams), wxCheckBox)->SetValue(wxString(m_MapSettings["LockTeams"]) == L"true");
 
+    // Last Man Standing
+    wxDynamicCast(FindWindow(ID_MapLastManStanding), wxCheckBox)->SetValue(wxString(m_MapSettings["LastManStanding"]) == L"true" &&
+        wxString(m_MapSettings["LockTeams"]) != L"true");
+    wxDynamicCast(FindWindow(ID_MapLastManStanding), wxCheckBox)->Enable(!wxDynamicCast(FindWindow(ID_MapLockTeams), wxCheckBox)->GetValue());
+
     // keywords
     {
         m_MapSettingsKeywords.clear();
@@ -248 +281 @@
     // game type / victory conditions
     m_MapSettings.set("GameType", wxDynamicCast(FindWindow(ID_MapType), wxChoice)->GetStringSelection());
 
+    if (wxDynamicCast(FindWindow(ID_MapType), wxChoice)->GetStringSelection() == L"wonder")
+        m_MapSettings.setInt("WonderDuration", wxAtoi(wxDynamicCast(FindWindow(ID_WonderVictoryTimes), wxChoice)->GetStringSelection()));
+    else
+        wxDynamicCast(FindWindow(ID_WonderVictoryTimes), wxChoice)->SetSelection(0);
+
+    wxDynamicCast(FindWindow(ID_WonderVictoryTimes), wxChoice)->Enable(wxDynamicCast(FindWindow(ID_MapType), wxChoice)->GetStringSelection() == L"wonder");
+
     // keywords
     {
         if (wxDynamicCast(FindWindow(ID_MapKW_Demo), wxCheckBox)->GetValue())
@@ -268 +308 @@
     }
 
     // teams locked
-    m_MapSettings.setBool("LockTeams", wxDynamicCast(FindWindow(ID_MapTeams), wxCheckBox)->GetValue());
+    m_MapSettings.setBool("LockTeams", wxDynamicCast(FindWindow(ID_MapLockTeams), wxCheckBox)->GetValue());
 
+    // Last Man Standing (can't be enabled if teams are locked)
+    if (wxDynamicCast(FindWindow(ID_MapLockTeams), wxCheckBox)->GetValue())
+        wxDynamicCast(FindWindow(ID_MapLastManStanding), wxCheckBox)->SetValue(false);
+
+    wxDynamicCast(FindWindow(ID_MapLastManStanding), wxCheckBox)->Enable(!wxDynamicCast(FindWindow(ID_MapLockTeams), wxCheckBox)->GetValue());
+    m_MapSettings.setBool("LastManStanding", wxDynamicCast(FindWindow(ID_MapLastManStanding), wxCheckBox)->GetValue());
+
     return m_MapSettings;
 }
 

source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp

@@ -1 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -312 +312 @@
     msg->data = g_Game->GetSimulation2()->GetRMSData();
 }
 
+QUERYHANDLER(GetWonderDurations)
+{
+    msg->data = g_Game->GetSimulation2()->GetWonderDurations();
+}
+
 BEGIN_COMMAND(ResizeMap)
 {
     int m_OldTiles, m_NewTiles;

source/tools/atlas/GameInterface/Messages.h

@@ -1 @@
-/* Copyright (C) 2016 Wildfire Games.
+/* Copyright (C) 2017 Wildfire Games.
  * This file is part of 0 A.D.
  *
  * 0 A.D. is free software: you can redistribute it and/or modify
@@ -198 +198 @@
         ((std::vector<std::string>, data))
         );
 
+QUERY(GetWonderDurations,
+        ,
+        ((std::string, data))
+        );
+
 COMMAND(ResizeMap, NOMERGE,
         ((int, tiles))
         );