marko10_000
/
openclonk
forked from Mirrors/openclonk
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow definition of achievements in parent (.ocf) folders. 

Note that regular scenario parameters cannot be defined in folders because that would complicate savegames, records, etc.
issue1247
Sven Eberhardt 2014-10-03 12:06:08 +02:00
parent 005f484771
commit 05631742c8
3 changed files with 53 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/c4group/C4Components.h
View File

@ -177,7 +177,7 @@
#define C4FLS_Def "Particle.txt|DefCore.txt|*.material|SolidMask.png|Graphics.png|Overlay.png|Graphics*.png|Overlay*.png|*.png|*.jpg|Graphics.mesh|*.skeleton|StringTbl*.txt|Script.c|Script*.c|C4Script.c|Names*.txt|Title*.txt|ClonkNames.txt|Rank.txt|Rank*.txt|Rank.png|Desc*.txt|Author.txt|Version.txt|*.wav|*.ogg|*.ocd"
#define C4FLS_Player "Player.txt|*.oci"
#define C4FLS_Object "ObjectInfo.txt"
#define C4FLS_Folder "Folder.txt|Title*.txt|Info.txt|Desc*.rtf|Title.png|Title.jpg|Icon.png|Icon.bmp|Author.txt|Version.txt|*.ocs|Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|FolderMap.txt|FolderMap.png"
#define C4FLS_Folder "Folder.txt|Title*.txt|Info.txt|Desc*.rtf|Title.png|Title.jpg|Icon.png|Icon.bmp|Author.txt|Version.txt|StringTbl*.txt|ParameterDefs.txt|Achv*.png|*.ocs|Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|FolderMap.txt|FolderMap.png"
#define C4FLS_Material "TexMap.txt|*.bmp|*.png|*.ocm"
#define C4FLS_Graphics "Loader*.bmp|Loader*.png|Loader*.jpeg|Loader*.jpg|Font*.png"\
"|Control.png|Fire.png|Background.png|Flag.png|Crew.png|Wealth.png|Player.png|Rank.png|Captain.png|Cursor.png|SelectMark.png|MenuSymbol.png|Menu.png|Logo.png|Construction.png|Energy.png|Options.png|UpperBoard.png|Arrow.png|Exit.png|Hand.png|Gamepad.png|Build.png|Achv*.png"\

65
src/gui/C4StartupScenSelDlg.cpp
View File

@ -678,35 +678,49 @@ bool C4ScenarioListLoader::Scenario::LoadCustomPre(C4Group &rGrp)
C4LangStringTable ScenarioLangStringTable;
C4Language::LoadComponentHost(&ScenarioLangStringTable, rGrp, C4CFN_ScriptStringTbl, Config.General.LanguageEx);
ParameterDefs.Load(rGrp, &ScenarioLangStringTable);
// achievement images
const C4ScenarioParameterDef *def; size_t idx=0, aidx=0; nAchievements = 0;
while (def = ParameterDefs.GetParameterDefByIndex(idx++))
if (def->IsAchievement())
// achievement images: Loaded from this entry and parent folder
nAchievements = 0;
const C4ScenarioParameterDefs *deflists[] = { pParent ? pParent->GetAchievementDefs() : NULL, &ParameterDefs };
for (size_t def_list_idx=0; def_list_idx<2; ++def_list_idx)
{
const C4ScenarioParameterDefs *deflist = deflists[def_list_idx];
if (!deflist) continue;
const C4ScenarioParameterDef *def; size_t idx=0;
while (def = deflist->GetParameterDefByIndex(idx++))
{
int32_t val = pLoader->GetAchievements().GetValueByID(C4ScenarioParameters::AddFilename2ID(rGrp.GetFullName().getData(), def->GetID()).getData(), def->GetDefault());
if (val)
if (def->IsAchievement())
{
// player has this achievement - find graphics for it
const char *achievement_gfx = def->GetAchievement();
StdStrBuf sAchievementFilename(C4CFN_Achievements);
sAchievementFilename.Replace("*", achievement_gfx);
if (!fctAchievements[aidx].Load(rGrp, sAchievementFilename.getData(), C4FCT_Height, C4FCT_Full))
int32_t val = pLoader->GetAchievements().GetValueByID(C4ScenarioParameters::AddFilename2ID(rGrp.GetFullName().getData(), def->GetID()).getData(), def->GetDefault());
if (val)
{
const C4FacetSurface *fct = ::GraphicsResource.Achievements.FindByName(achievement_gfx);
if (!fct) continue; // achievement graphics not found :(
fctAchievements[aidx].Set((const C4Facet &)*fct);
// player has this achievement - find graphics for it
const char *achievement_gfx = def->GetAchievement();
StdStrBuf sAchievementFilename(C4CFN_Achievements);
sAchievementFilename.Replace("*", achievement_gfx);
// look in scenario
if (!fctAchievements[nAchievements].Load(rGrp, sAchievementFilename.getData(), C4FCT_Height, C4FCT_Full))
{
// look in parent folder
const C4FacetSurface *fct = NULL;
const C4AchievementGraphics *parent_achv_gfx;
if (pParent && (parent_achv_gfx = pParent->GetAchievementGfx())) fct = parent_achv_gfx->FindByName(achievement_gfx);
// look in main gfx group file
if (!fct) fct = ::GraphicsResource.Achievements.FindByName(achievement_gfx);
if (!fct) continue; // achievement graphics not found :(
fctAchievements[nAchievements].Set((const C4Facet &)*fct);
}
// section by achievement index (1-based, since zero means no achievement)
if (val>1) fctAchievements[nAchievements].X += fctAchievements[nAchievements].Wdt * (val-1);
// description for this achievement is taken from option
const C4ScenarioParameterDef::Option *opt = def->GetOptionByValue(val);
if (opt) sAchievementDescriptions[nAchievements] = opt->Description;
// keep track of achievement count
++nAchievements;
if (nAchievements == C4StartupScenSel_MaxAchievements) break;
}
// section by achievement index (1-based, since zero means no achievement)
if (val>1) fctAchievements[aidx].X += fctAchievements[aidx].Wdt * (val-1);
// description for this achievement is taken from option
const C4ScenarioParameterDef::Option *opt = def->GetOptionByValue(val);
if (opt) sAchievementDescriptions[aidx] = opt->Description;
// keep track of achievement count
++aidx; ++nAchievements;
if (aidx == C4StartupScenSel_MaxAchievements) break;
;
}
}
}
}
return true;
}
@ -999,6 +1013,11 @@ bool C4ScenarioListLoader::SubFolder::DoLoadContents(C4ScenarioListLoader *pLoad
else
// no parent group: Direct load from filename
if (!Group.Open(sFilename.getData())) return false;
// Load achievement data contained scenarios can fall back to
C4LangStringTable FolderLangStringTable;
C4Language::LoadComponentHost(&FolderLangStringTable, Group, C4CFN_ScriptStringTbl, Config.General.LanguageEx);
AchievementDefs.Load(Group, &FolderLangStringTable);
AchievementGfx.Init(Group);
// get number of entries, to estimate progress
const char *szC4CFN_ScenarioFiles = C4CFN_ScenarioFiles; // assign values for constant comparison
const char *szSearchMask; int32_t iEntryCount=0;

10
src/gui/C4StartupScenSelDlg.h
View File

@ -181,11 +181,18 @@ public:
virtual StdStrBuf GetOpenText(); // get open button text
virtual StdStrBuf GetOpenTooltip();
C4MapFolderData *GetMapData() const { return pMapData; }
virtual const C4ScenarioParameterDefs *GetAchievementDefs() const { return NULL; }
virtual const C4AchievementGraphics *GetAchievementGfx() const { return NULL; }
};
// .ocf subfolder: Read through by group
class SubFolder : public Folder
{
private:
C4ScenarioParameterDefs AchievementDefs;
C4AchievementGraphics AchievementGfx;
public:
SubFolder(class C4ScenarioListLoader *pLoader, Folder *pParent) : Folder(pLoader, pParent) {}
virtual ~SubFolder() {}
@ -194,6 +201,9 @@ public:
virtual StdStrBuf GetTypeName() { return StdCopyStrBuf(LoadResStr("IDS_TYPE_FOLDER"), true); }
virtual const C4ScenarioParameterDefs *GetAchievementDefs() const { return &AchievementDefs; }
virtual const C4AchievementGraphics *GetAchievementGfx() const { return &AchievementGfx; }
protected:
virtual bool LoadCustom(C4Group &rGrp, bool fNameLoaded, bool fIconLoaded); // load custom data for entry type - icon fallback to folder icon
virtual bool DoLoadContents(C4ScenarioListLoader *pLoader, C4Group *pFromGrp, const StdStrBuf &sFilename, bool fLoadEx); // load folder contents as child if pFromGrp, else directly from filename