Ufopaedia development

[panther]

Hi,

I have now refactored my code quite a bit so it fits better into the current schema. The attached patch lets you open the Ufopaedia featuring three buttons, list selection and (hold your breath) two articles

It is for the 267 SVN version, which should work. It would be great to apply the changes so I can work on without touching SavedGame, Ruleset etc. again.

Documentation is nearly complete and passes doxygen without warnings. Let me know what you think.

[SupSuper]

Thanks, I'll have a look sometime this week and post feedback, just figured I'd let you know I didn't miss your post.

[panther]

Great, thanks! It would be so nice if my basic Ufopaedia "attachments" could go into the master branch. So it would be easier for me to stay updated and develop further.

[SupSuper]

Ok I finally had a look, and it looks very impressive, very professional. It still seems overly elaborate, but it seems to integrate much better with the OpenXcom structure, and you'll probably improve it over-time. I'll revise it and put it in the codebase soon, though we've just moved to Git so it'll take a while.

As for staying updated easily, you can look into GitHub forks.

[panther]

Good to hear, thanks. I haven't been doing much lately, but soon I will have some more time to spend on programming again.
I can fork and send you a pull request for the changes, if you like, now that github is the tool of choice.
But if you put it in the codebase anytime soon, I will fork from there...

[SupSuper]

Committed. I revised and moved things around a bit, but I figure you know your code better than me. Seems to work well.

One thing I noticed is you seem to put all the Ufopaedia articles in the Ruleset, but then... copy them to the SavedGame for some reason? You also worry about things like using a "insertion sort", which I don't think is a concern at all.

[michal]

There is new git build with ufopaedia

https://openxcom.ninex.info/git_builds/

Unfortunately, there were problems building it, there is small error:

Code: [Select]

diff --git a/src/Ufopaedia/UfopaediaSelectState.cpp b/src/Ufopaedia/UfopaediaSelectState.cpp
index 6de0c03..673ac67 100644
--- a/src/Ufopaedia/UfopaediaSelectState.cpp
+++ b/src/Ufopaedia/UfopaediaSelectState.cpp
@@ -31,7 +31,7 @@
 #include "../Interface/TextButton.h"
 #include "../Interface/TextList.h"
 #include "../Resource/ResourcePack.h"
-#include "../SaveGame/SavedGame.h"
+#include "../Savegame/SavedGame.h"
 
 namespace OpenXcom
 {

Remember that linux is case sensitive.

[SupSuper]

Fixed.

[panther]

Committed. I revised and moved things around a bit, but I figure you know your code better than me. Seems to work well.

One thing I noticed is you seem to put all the Ufopaedia articles in the Ruleset, but then... copy them to the SavedGame for some reason? You also worry about things like using a "insertion sort", which I don't think is a concern at all.

Thank you! I'm currently rather busy at work but will soon continue OpenXCom development. The articles are necessary in both Ruleset and SavedGame. In Ruleset, I define how to display them, SavedGame stores what is available. This isn't obvious now, since there are only two articles implemented...

More to come soon.

[SupSuper]

Committed. I revised and moved things around a bit, but I figure you know your code better than me. Seems to work well.

One thing I noticed is you seem to put all the Ufopaedia articles in the Ruleset, but then... copy them to the SavedGame for some reason? You also worry about things like using a "insertion sort", which I don't think is a concern at all.

Thank you! I'm currently rather busy at work but will soon continue OpenXCom development. The articles are necessary in both Ruleset and SavedGame. In Ruleset, I define how to display them, SavedGame stores what is available. This isn't obvious now, since there are only two articles implemented...

More to come soon.

Ah ok. You were only creating the articles in the Ruleset when newSave was called, which is why I was confusesd... I moved them to the Ruleset constructor, makes more sense now (UfopediaSaved are still created in newSave).

[panther]

If anyone is interested, this is my fork of OpenXCom:
https://github.com/gpin/OpenXcom

Thanks again to marabus for providing the XCode project. I only had to modify some files to reflect the new directory structure (no trunk anymore).

Well, the craft articles are already in there now!
As you can see in the screenshot, I use a TextList to display the craft stats. This is not like the original, I know. It was just more convenient this way
I thought I could modify TextList with an option to "pull the columns together" instead of the tabular layout.

And then I noticed a subtle difference in the TextButton rendering, that I corrected. I'm attaching a little patch here.

[michal]

Nice

Now fill a pull request

[Volutar]

Craft parameters, I hope, are extracted online from actual craft data?
I mean, if anything about craft will be changed - will ufopaedia reflect these changes?
Because in original XCOM ufopaedia extracts craft data from actual craft data tables...

[michal]

Craft parameters, I hope, are extracted online from actual craft data?

Of course, hardcoding data in ufopaedia would be silly

OpenXcom contains ruleset, which is currently defined here:
https://github.com/gpin/OpenXcom/blob/master/src/Ruleset/XcomRuleset.cpp#L708

[panther]

And I'm far too lazy to copy all these values into Ufopaedia myself

@michal: I thought i'd wait with the pull request until there is more substantial things done, to save SupSuper some time.

I'm currently working on Craft weapons, but there I must make some changes to the TextList class.