Merge StatusWindows

Also some other small merges

1 files changed, 383 insertions, 185 deletions

diff --git a/src/gui/statuswindow.cpp b/src/gui/statuswindow.cpp
index 4df474a7..ed073440 100644
--- a/src/gui/statuswindow.cpp
+++ b/src/gui/statuswindow.cpp
@@ -23,13 +23,62 @@
 
 #include "gui/widgets/button.h"
 #include "gui/widgets/label.h"
+#include "gui/widgets/layouthelper.h"
 #include "gui/widgets/progressbar.h"
+#include "gui/widgets/scrollarea.h"
+#include "gui/widgets/vertcontainer.h"
 #include "gui/widgets/windowcontainer.h"
 
 #include "localplayer.h"
+#include "units.h"
 
+#include "net/net.h"
+#include "net/playerhandler.h"
+
+#ifdef EATHENA_SUPPORT
+#include "net/ea/protocol.h"
+#endif
+
+#include "utils/gettext.h"
+#include "utils/mathutils.h"
 #include "utils/stringutils.h"
 
+class AttrDisplay : public Container {
+    public:
+        virtual std::string update();
+
+    protected:
+        AttrDisplay(int id, const std::string &name);
+
+        const int mId;
+        const std::string mName;
+
+        LayoutHelper *mLayout;
+        Label *mLabel;
+        Label *mValue;
+};
+
+class DerDisplay : public AttrDisplay {
+    public:
+        DerDisplay(int id, const std::string &name);
+};
+
+class ChangeDisplay : public AttrDisplay, gcn::ActionListener {
+    public:
+        ChangeDisplay(int id, const std::string &name);
+        std::string update();
+        void setPointsNeeded(int needed);
+
+    private:
+        void action(const gcn::ActionEvent &event);
+
+        int mNeeded;
+
+        Label *mPoints;
+        Button *mDec;
+        Button *mInc;
+};
+
 StatusWindow::StatusWindow():
     Window(player_node->getName())
 {
@@ -39,7 +88,6 @@ StatusWindow::StatusWindow():
     setSaveVisible(true);
     setDefaultSize((windowContainer->getWidth() - 365) / 2,
                    (windowContainer->getHeight() - 255) / 2, 365, 275);
-    loadWindowState();
 
     // ----------------------
     // Status Part
@@ -50,246 +98,396 @@ StatusWindow::StatusWindow():
 
     mHpLabel = new Label("HP:");
     mHpBar = new ProgressBar(0.0f, 80, 15, gcn::Color(0, 171, 34));
-    mHpValueLabel = new Label;
-
-    int y = 3;
-    int x = 5;
-
-    mLvlLabel->setPosition(x, y);
-    x += mLvlLabel->getWidth() + 40;
-    mMoneyLabel->setPosition(x, y);
 
-    y += mLvlLabel->getHeight() + 5; // Next Row
-    x = 5;
-
-    mHpLabel->setPosition(x, y);
-    x += mHpLabel->getWidth() + 5;
-    mHpBar->setPosition(x, y);
-    x += mHpBar->getWidth() + 5;
-    mHpValueLabel->setPosition(x, y);
-
-    y += mHpLabel->getHeight() + 5; // Next Row
-    x = 5;
-
-    add(mLvlLabel);
-    add(mMoneyLabel);
-    add(mHpLabel);
-    add(mHpValueLabel);
-    add(mHpBar);
+    mXpLabel = new Label(_("Exp:"));
+    mXpBar = new ProgressBar(0.0f, 80, 15, gcn::Color(143, 192, 211));
+
+    mMpLabel = new Label(_("MP:"));
+    mMpBar = new ProgressBar(0.0f, 80, 15, gcn::Color(26, 102, 230));
+
+    place(0, 0, mLvlLabel, 3);
+    // 5, 0 Job Level
+    place(8, 0, mMoneyLabel, 3);
+    place(0, 1, mHpLabel).setPadding(3);
+    place(1, 1, mHpBar, 4);
+    place(5, 1, mXpLabel).setPadding(3);
+    place(6, 1, mXpBar, 5);
+    place(0, 2, mMpLabel).setPadding(3);
+    // 5, 2 and 6, 2 Job Progress Bar
+    place(1, 2, mMpBar, 4);
+
+#ifdef EATHENA_SUPPORT
+    mJobLvlLabel = new Label(strprintf(_("Job: %d"), 0));
+    mJobLabel = new Label(_("Job:"));
+    mJobBar = new ProgressBar(0.0f, 80, 15, gcn::Color(220, 135, 203));
+
+    place(5, 0, mJobLvlLabel, 3);
+    place(5, 2, mJobLabel).setPadding(3);
+    place(6, 2, mJobBar, 5);
+#endif
 
     // ----------------------
     // Stats Part
     // ----------------------
 
-    // Static Labels
-    gcn::Label *mStatsTitleLabel = new Label("Stats");
-    gcn::Label *mStatsTotalLabel = new Label("Total");
+    mAttrCont = new VertContainer(32);
+    mAttrScroll = new ScrollArea(mAttrCont);
+    mAttrScroll->setOpaque(false);
+    mAttrScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+    mAttrScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO);
+    place(0, 3, mAttrScroll, 5, 3);
 
-    // New labels
-    for (int i = 0; i < 6; i++) {
-        mStatsLabel[i] = new Label;
-        mStatsDisplayLabel[i] = new Label;
-    }
-    mCharacterPointsLabel = new Label;
-    mCorrectionPointsLabel = new Label;
-
-    // Set button events Id
-    mStatsPlus[0] = new Button("+", "STR+", this);
-    mStatsPlus[1] = new Button("+", "AGI+", this);
-    mStatsPlus[2] = new Button("+", "DEX+", this);
-    mStatsPlus[3] = new Button("+", "VIT+", this);
-    mStatsPlus[4] = new Button("+", "INT+", this);
-    mStatsPlus[5] = new Button("+", "WIL+", this);
-
-    mStatsMinus[0] = new Button("-", "STR-", this);
-    mStatsMinus[1] = new Button("-", "AGI-", this);
-    mStatsMinus[2] = new Button("-", "DEX-", this);
-    mStatsMinus[3] = new Button("-", "VIT-", this);
-    mStatsMinus[4] = new Button("-", "INT-", this);
-    mStatsMinus[5] = new Button("-", "WIL-", this);
-
-    // Set position
-    mStatsTitleLabel->setPosition(mHpLabel->getX(), mHpLabel->getY() + 23 );
-    mStatsTotalLabel->setPosition(110, mStatsTitleLabel->getY() + 15);
-    int totalLabelY = mStatsTotalLabel->getY();
-
-    for (int i = 0; i < 6; i++)
-    {
-        mStatsLabel[i]->setPosition(5,
-                                    mStatsTotalLabel->getY() + (i * 23) + 15);
-        mStatsMinus[i]->setPosition(85, totalLabelY + (i * 23) + 15);
-        mStatsDisplayLabel[i]->setPosition(125,
-                                          totalLabelY + (i * 23) + 15);
-        mStatsPlus[i]->setPosition(185, totalLabelY + (i * 23) + 15);
-    }
+    mDAttrCont = new VertContainer(32);
+    mDAttrScroll = new ScrollArea(mDAttrCont);
+    mDAttrScroll->setOpaque(false);
+    mDAttrScroll->setHorizontalScrollPolicy(ScrollArea::SHOW_NEVER);
+    mDAttrScroll->setVerticalScrollPolicy(ScrollArea::SHOW_AUTO);
+    place(6, 3, mDAttrScroll, 5, 3);
 
-    mCharacterPointsLabel->setPosition(5, mStatsDisplayLabel[5]->getY() + 25);
-    mCorrectionPointsLabel->setPosition(5, mStatsDisplayLabel[5]->getY() + 35);
+    getLayout().setRowHeight(3, Layout::AUTO_SET);
 
-    // Assemble
-    add(mStatsTitleLabel);
-    add(mStatsTotalLabel);
-    for(int i = 0; i < 6; i++)
-    {
-        add(mStatsLabel[i]);
-        add(mStatsDisplayLabel[i]);
-        add(mStatsPlus[i]);
-        add(mStatsMinus[i]);
-    }
+    mCharacterPointsLabel = new Label("C");
+    mCorrectionPointsLabel = new Label("C");
+    place(0, 6, mCharacterPointsLabel, 5);
+    place(0, 7, mCorrectionPointsLabel, 5);
 
-    add(mCharacterPointsLabel);
-    add(mCorrectionPointsLabel);
+    loadWindowState();
+
+    update(HP);
+    update(MP);
+    update(EXP);
+    update(MONEY);
+    update(CHAR_POINTS); // This also updates all attributes (none atm)
+    update(LEVEL);
+#ifdef EATHENA_SUPPORT
+    update(JOB);
+#endif
 }
 
-void StatusWindow::update()
+std::string StatusWindow::update(int id)
 {
-    // Status Part
-    // -----------
-    mLvlLabel->setCaption(  "Level: " +
-                            toString(player_node->getLevel()) +
-                            " (" +
-                            toString(player_node->getLevelProgress()) +
-                            "%)");
-    mLvlLabel->adjustSize();
+    if (id == HP)
+    {
+        updateHPBar(mHpBar, true);
+
+        return _("HP");
+    }
+    else if (id == MP)
+    {
+        updateMPBar(mMpBar, true);
 
-    mMoneyLabel->setCaption("Money: " + toString(player_node->getMoney()) + " GP");
-    mMoneyLabel->adjustSize();
+        return _("MP");
+    }
+    else if (id == EXP)
+    {
+        updateXPBar(mXpBar, false);
 
-    updateHPBar(mHpBar, true);
+        return _("Exp");
+    }
+    else if (id == MONEY)
+    {
+        int money = player_node->getMoney();
+        mMoneyLabel->setCaption(strprintf(_("Money: %s"),
+                                        Units::formatCurrency(money).c_str()));
+        mMoneyLabel->adjustSize();
 
-    // Stats Part
-    // ----------
-    const std::string attrNames[6] = {
-        "Strength",
-        "Agility",
-        "Dexterity",
-        "Vitality",
-        "Intelligence",
-        "Willpower"
-    };
-    int characterPoints = player_node->getCharacterPoints();
-    int correctionPoints = player_node->getCorrectionPoints();
-    // Update labels
-    for (int i = 0; i < 6; i++)
+        return _("Money");
+    }
+#ifdef EATHENA_SUPPORT
+    else if (id == JOB)
     {
-        mStatsLabel[i]->setCaption(attrNames[i]);
-        mStatsDisplayLabel[i]->setCaption(
-            strprintf("%d / %d",
-                player_node->getAttributeEffective(CHAR_ATTR_BEGIN + i),
-                player_node->getAttributeBase(CHAR_ATTR_BEGIN + i)));
+        mJobLvlLabel->setCaption(strprintf(_("Job: %d"),
+                                        player_node->getAttributeBase(JOB)));
+        mJobLvlLabel->adjustSize();
 
-        mStatsLabel[i]->adjustSize();
-        mStatsDisplayLabel[i]->adjustSize();
+        updateProgressBar(mJobBar, JOB, false);
 
-        mStatsPlus[i]->setEnabled(characterPoints);
-        mStatsMinus[i]->setEnabled(correctionPoints);
+        return _("Job");
     }
-    mCharacterPointsLabel->setCaption("Character Points: " +
-            toString(characterPoints));
-    mCharacterPointsLabel->adjustSize();
+#endif
+    else if (id == CHAR_POINTS)
+    {
+        mCharacterPointsLabel->setCaption(strprintf(_("Character Points: %d"),
+                                        player_node->getCharacterPoints()));
+        mCharacterPointsLabel->adjustSize();
+
+        mCorrectionPointsLabel->setCaption(strprintf(_("Correction Points: %d"),
+                                        player_node->getCorrectionPoints()));
+        mCorrectionPointsLabel->adjustSize();
+
+        for (Attrs::iterator it = mAttrs.begin(); it != mAttrs.end(); it++)
+        {
+            it->second->update();
+        }
+    }
+    else if (id == LEVEL)
+    {
+        mLvlLabel->setCaption(strprintf(_("Level: %d"),
+                                        player_node->getLevel()));
+        mLvlLabel->adjustSize();
 
-    mCorrectionPointsLabel->setCaption("Correction Points: " +
-            toString(correctionPoints));
-    mCorrectionPointsLabel->adjustSize();
+        return _("Level");
+    }
+    else
+    {
+        Attrs::iterator it = mAttrs.find(id);
 
-    // Update Second column widgets position
-    mMoneyLabel->setPosition(mLvlLabel->getX() + mLvlLabel->getWidth() + 20,
-                         mLvlLabel->getY());
+        if (it != mAttrs.end())
+        {
+            return it->second->update();
+        }
+    }
 
-    update();
+    return "";
 }
 
-void StatusWindow::update(int id)
+void StatusWindow::setPointsNeeded(int id, int needed)
 {
-    // TODO: only update what changed
-    update();
+    Attrs::iterator it = mAttrs.find(id);
+
+    if (it != mAttrs.end())
+    {
+        ChangeDisplay *disp = dynamic_cast<ChangeDisplay*>(it->second);
+        if (disp)
+            disp->setPointsNeeded(needed);
+    }
 }
 
 void StatusWindow::addAttribute(int id, const std::string &name,
                                 bool modifiable)
 {
-    // future use
-}
-
-void StatusWindow::action(const gcn::ActionEvent &event)
-{
-    const std::string &eventId = event.getId();
+    AttrDisplay *disp;
 
-    // Stats Part
-    if (eventId == "STR+")
-    {
-        player_node->raiseAttribute(LocalPlayer::STR);
-    }
-    else if (eventId == "AGI+")
+    if (modifiable)
     {
-        player_node->raiseAttribute(LocalPlayer::AGI);
+        disp = new ChangeDisplay(id, name);
+        mAttrCont->add(disp);
     }
-    else if (eventId == "DEX+")
-    {
-        player_node->raiseAttribute(LocalPlayer::DEX);
-    }
-    else if (eventId == "VIT+")
-    {
-        player_node->raiseAttribute(LocalPlayer::VIT);
-    }
-    else if (eventId == "INT+")
-    {
-        player_node->raiseAttribute(LocalPlayer::INT);
-    }
-    else if (eventId == "WIL+")
+    else
     {
-        player_node->raiseAttribute(LocalPlayer::WIL);
+        disp = new DerDisplay(id, name);
+        mDAttrCont->add(disp);
     }
 
-    else if (eventId == "STR-")
+    mAttrs[id] = disp;
+}
+
+void StatusWindow::updateHPBar(ProgressBar *bar, bool showMax)
+{
+    if (showMax)
+        bar->setText(toString(player_node->getHp()) +
+                    "/" + toString(player_node->getMaxHp()));
+    else
+        bar->setText(toString(player_node->getHp()));
+
+    // HP Bar coloration
+    float r1 = 255;
+    float g1 = 255;
+    float b1 = 255;
+
+    float r2 = 255;
+    float g2 = 255;
+    float b2 = 255;
+
+    float weight = 1.0f;
+
+    int curHP = player_node->getHp();
+    int thresholdLevel = player_node->getMaxHp() / 4;
+    int thresholdProgress = curHP % thresholdLevel;
+    if (thresholdLevel)
+        weight = 1 - ((float)thresholdProgress) / ((float)thresholdLevel);
+    else
+        weight = 0;
+
+    if (curHP < (thresholdLevel))
     {
-        player_node->lowerAttribute(LocalPlayer::STR);
+        gcn::Color color1 = guiPalette->getColor(Palette::HPBAR_ONE_HALF);
+        gcn::Color color2 = guiPalette->getColor(Palette::HPBAR_ONE_QUARTER);
+        r1 = color1.r; r2 = color2.r;
+        g1 = color1.g; g2 = color2.g;
+        b1 = color1.b; b2 = color2.b;
     }
-    else if (eventId == "AGI-")
+    else if (curHP < (thresholdLevel*2))
     {
-        player_node->lowerAttribute(LocalPlayer::AGI);
+        gcn::Color color1 = guiPalette->getColor(Palette::HPBAR_THREE_QUARTERS);
+        gcn::Color color2 = guiPalette->getColor(Palette::HPBAR_ONE_HALF);
+        r1 = color1.r; r2 = color2.r;
+        g1 = color1.g; g2 = color2.g;
+        b1 = color1.b; b2 = color2.b;
     }
-    else if (eventId == "DEX-")
+    else if (curHP < thresholdLevel*3)
     {
-        player_node->lowerAttribute(LocalPlayer::DEX);
+        gcn::Color color1 = guiPalette->getColor(Palette::HPBAR_FULL);
+        gcn::Color color2 = guiPalette->getColor(Palette::HPBAR_THREE_QUARTERS);
+        r1 = color1.r; r2 = color2.r;
+        g1 = color1.g; g2 = color2.g;
+        b1 = color1.b; b2 = color2.b;
     }
-    else if (eventId == "VIT-")
+    else
     {
-        player_node->lowerAttribute(LocalPlayer::VIT);
+        gcn::Color color1 = guiPalette->getColor(Palette::HPBAR_FULL);
+        gcn::Color color2 = guiPalette->getColor(Palette::HPBAR_FULL);
+        r1 = color1.r; r2 = color2.r;
+        g1 = color1.g; g2 = color2.g;
+        b1 = color1.b; b2 = color2.b;
     }
-    else if (eventId == "INT-")
+
+    // Safety checks
+    if (weight > 1.0f) weight = 1.0f;
+    if (weight < 0.0f) weight = 0.0f;
+
+    // Do the color blend
+    r1 = (int) weightedAverage(r1, r2,weight);
+    g1 = (int) weightedAverage(g1, g2, weight);
+    b1 = (int) weightedAverage(b1, b2, weight);
+
+    // More safety checks
+    if (r1 > 255) r1 = 255;
+    if (g1 > 255) g1 = 255;
+    if (b1 > 255) b1 = 255;
+
+    bar->setColor(r1, g1, b1);
+
+    bar->setProgress((float) player_node->getHp() / (float) player_node->getMaxHp());
+}
+
+void StatusWindow::updateMPBar(ProgressBar *bar, bool showMax)
+{
+    if (showMax)
+        bar->setText(toString(player_node->getMP()) +
+                    "/" + toString(player_node->getMaxMP()));
+    else
+        bar->setText(toString(player_node->getMP()));
+
+#ifdef EATHENA_SUPPORT
+    if (player_node->getAttributeEffective(MATK) <= 0)
+        bar->setColor(100, 100, 100); // grey, to indicate that we lack magic
+    else
+#endif
+        bar->setColor(26, 102, 230); // blue, to indicate that we have magic
+
+    bar->setProgress((float) player_node->getMP() /
+                     (float) player_node->getMaxMP());
+}
+
+void StatusWindow::updateProgressBar(ProgressBar *bar, int value, int max,
+                              bool percent)
+{
+    if (max == 0)
     {
-        player_node->lowerAttribute(LocalPlayer::INT);
+        bar->setText(_("Max"));
+        bar->setProgress(1.0);
     }
-    else if (eventId == "WIL-")
+    else
     {
-        player_node->lowerAttribute(LocalPlayer::WIL);
+        float progress = (float) value / max;
+
+        if (percent)
+            bar->setText(strprintf("%2.2f", 100 * progress) + "%");
+        else
+            bar->setText(toString(value) + "/" + toString(max));
+
+        bar->setProgress(progress);
     }
 }
 
-// WARNING: Duplicated method!
+void StatusWindow::updateXPBar(ProgressBar *bar, bool percent)
+{
+    updateProgressBar(bar, player_node->getExp(), player_node->getExpNeeded(),
+                      percent);
+}
 
-void StatusWindow::updateHPBar(ProgressBar *bar, bool showMax)
+void StatusWindow::updateProgressBar(ProgressBar *bar, int id, bool percent)
 {
-    if (showMax)
-        bar->setText(toString(player_node->getHp()) +
-                    "/" + toString(player_node->getMaxHp()));
-    else
-        bar->setText(toString(player_node->getHp()));
+    std::pair<int, int> exp =  player_node->getExperience(id);
+    updateProgressBar(bar, exp.first, exp.second, percent);
+}
 
-    // HP Bar coloration
-    if (player_node->getHp() < player_node->getMaxHp() / 3)
-    {
-        bar->setColor(223, 32, 32); // Red
-    }
-    else if (player_node->getHp() < (player_node->getMaxHp() / 3) * 2)
+AttrDisplay::AttrDisplay(int id, const std::string &name):
+        mId(id),
+        mName(name)
+{
+    setSize(100, 32);
+    mLabel = new Label(name);
+    mValue = new Label("1");
+
+    mLabel->setAlignment(Graphics::CENTER);
+    mValue->setAlignment(Graphics::CENTER);
+
+    mLayout = new LayoutHelper(this);
+};
+
+std::string AttrDisplay::update()
+{
+    int base = player_node->getAttributeBase(mId);
+    int bonus = player_node->getAttributeEffective(mId) - base;
+    std::string value = toString(base);
+    if (bonus)
+        value += strprintf(" (%+d)", bonus);
+    mValue->setCaption(value);
+    mValue->adjustSize();
+
+    return mName;
+}
+
+DerDisplay::DerDisplay(int id, const std::string &name):
+        AttrDisplay(id, name)
+{
+    // Do the layout
+    LayoutHelper h(this);
+    ContainerPlacer place = mLayout->getPlacer(0, 0);
+
+    place(0, 0, mLabel, 3);
+    place(3, 0, mValue, 2);
+
+    update();
+};
+
+ChangeDisplay::ChangeDisplay(int id, const std::string &name):
+        AttrDisplay(id, name), mNeeded(1)
+{
+    mPoints = new Label("1");
+    mDec = new Button("-", "-", this);
+    mInc = new Button("+", "+", this);
+    mDec->setWidth(mInc->getWidth());
+
+    // Do the layout
+    ContainerPlacer place = mLayout->getPlacer(0, 0);
+
+    place(0, 0, mLabel, 3);
+    place(3, 0, mDec);
+    place(4, 0, mValue, 2);
+    place(6, 0, mInc);
+    place(7, 0, mPoints);
+
+    update();
+};
+
+std::string ChangeDisplay::update()
+{
+    mPoints->setCaption(toString(mNeeded));
+
+    mDec->setEnabled(player_node->getCorrectionPoints());
+    mInc->setEnabled(player_node->getCharacterPoints() >= mNeeded);
+
+    return AttrDisplay::update();
+}
+
+void ChangeDisplay::setPointsNeeded(int needed)
+{
+    mNeeded = needed;
+
+    update();
+}
+
+void ChangeDisplay::action(const gcn::ActionEvent &event)
+{
+    if (event.getSource() == mDec)
     {
-        bar->setColor(230, 171, 34); // Orange
+        Net::getPlayerHandler()->decreaseAttribute(mId);
     }
-    else
+    else if (event.getSource() == mInc)
     {
-        bar->setColor(0, 171, 34); // Green
+        Net::getPlayerHandler()->increaseAttribute(mId);
     }
-
-    bar->setProgress((float) player_node->getHp() / (float) player_node->getMaxHp());
 }