X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fmenu%2FStatusMenu.cpp;h=b0377033b50f1920258332595586325382a368c3;hb=b9448180c2cf0ecc75865e57d83db63d4fe3e8a5;hp=e46a1dd1fbc9d2f11d36d4399286af0cc6a8e200;hpb=243cb7d922fe888be8d18241de138ad5949de430;p=l2e.git

diff --git a/src/menu/StatusMenu.cpp b/src/menu/StatusMenu.cpp
index e46a1dd..b037703 100644
--- a/src/menu/StatusMenu.cpp
+++ b/src/menu/StatusMenu.cpp
@@ -16,11 +16,13 @@
 #include "../common/GameState.h"
 #include "../common/Hero.h"
 #include "../common/Item.h"
+#include "../common/Stats.h"
 #include "../graphics/Font.h"
 
 using app::Input;
 using common::Hero;
 using common::Item;
+using common::Stats;
 using geometry::Vector;
 using graphics::Font;
 
@@ -78,13 +80,29 @@ void StatusMenu::Render(SDL_Surface *screen) {
 			5 * parent->Res().statusFont->CharWidth(),
 			parent->Res().statusFont->CharHeight());
 	Vector<int> statsOffset(
+			4 * parent->Res().statusFont->CharWidth(),
+			8 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+	Vector<int> equipOffset(
 			17 * parent->Res().statusFont->CharWidth(),
 			4 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+	Vector<int> experienceOffset(
+			11 * parent->Res().statusFont->CharWidth(),
+			17 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+	Vector<int> nextLevelOffset(
+			11 * parent->Res().statusFont->CharWidth(),
+			19 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
+	Vector<int> ikariOffset(
+			17 * parent->Res().statusFont->CharWidth(),
+			17 * parent->Res().statusFont->CharHeight() - parent->Res().statusFont->CharHeight() / 8);
 
 	parent->RenderBackground(screen);
 	parent->Res().shoulderNav->Draw(screen, offset + shoulderNavOffset);
 	RenderStatus(screen, offset + parent->StatusOffset(0));
-	RenderEquipment(screen, offset + statsOffset);
+	RenderStats(screen, offset + statsOffset);
+	RenderEquipment(screen, offset + equipOffset);
+	RenderExperience(screen, experienceOffset);
+	RenderNextLevel(screen, nextLevelOffset);
+	RenderIkari(screen, ikariOffset);
 }
 
 int StatusMenu::Width() const {
@@ -99,8 +117,42 @@ void StatusMenu::RenderStatus(SDL_Surface *screen, const Vector<int> &offset) co
 	parent->GetHeroStatus(cursor).Render(screen, offset);
 }
 
-void StatusMenu::RenderEquipment(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
-	const Hero &hero(*parent->Game().state->party[cursor]);
+void StatusMenu::RenderStats(SDL_Surface *screen, const Vector<int> &offset) const {
+	const Stats &stats(GetHero().GetStats());
+	Vector<int> lineBreak(0, parent->Res().statusFont->CharHeight());
+
+	Vector<int> position(offset);
+	RenderStatsLine(parent->Res().atpLabel, stats.Attack(), screen, position);
+
+	position += lineBreak;
+	RenderStatsLine(parent->Res().dfpLabel, stats.Defense(), screen, position);
+
+	position += lineBreak;
+	RenderStatsLine(parent->Res().strLabel, stats.Strength(), screen, position);
+
+	position += lineBreak;
+	RenderStatsLine(parent->Res().aglLabel, stats.Agility(), screen, position);
+
+	position += lineBreak;
+	RenderStatsLine(parent->Res().intLabel, stats.Intelligence(), screen, position);
+
+	position += lineBreak;
+	RenderStatsLine(parent->Res().gutLabel, stats.Gut(), screen, position);
+
+	position += lineBreak;
+	RenderStatsLine(parent->Res().mgrLabel, stats.MagicResistance(), screen, position);
+}
+
+void StatusMenu::RenderStatsLine(const char *label, int number, SDL_Surface *screen, const Vector<int> &position) const {
+	const Font &font(*parent->Res().statusFont);
+	const Vector<int> numberOffset(4 * font.CharWidth(), 0);
+
+	font.DrawString(label, screen, position, 3);
+	font.DrawNumber(number, screen, position + numberOffset, 3);
+}
+
+void StatusMenu::RenderEquipment(SDL_Surface *screen, const Vector<int> &offset) const {
+	const Hero &hero(GetHero());
 	Vector<int> lineBreak(0, 2 * parent->Res().statusFont->CharHeight());
 
 	Vector<int> position(offset);
@@ -135,6 +187,33 @@ void StatusMenu::RenderEquipmentLine(const Item *item, SDL_Surface *screen, cons
 	}
 }
 
+void StatusMenu::RenderExperience(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+	const Font &font(*parent->Res().statusFont);
+	font.DrawStringRight(parent->Res().experienceLabel, screen, offset, 10);
+
+	Vector<int> numberOffset(offset.X(), offset.Y() + font.CharHeight());
+	font.DrawNumberRight(GetHero().Experience(), screen, numberOffset, 7);
+}
+
+void StatusMenu::RenderNextLevel(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+	const Font &font(*parent->Res().statusFont);
+	font.DrawStringRight(parent->Res().nextLevelLabel, screen, offset, 10);
+
+	Vector<int> numberOffset(offset.X(), offset.Y() + font.CharHeight());
+	font.DrawNumberRight(GetHero().NextLevel(), screen, numberOffset, 7);
+}
+
+void StatusMenu::RenderIkari(SDL_Surface *screen, const geometry::Vector<int> &offset) const {
+	const Font &font(*parent->Res().statusFont);
+	font.DrawString(parent->Res().ipLabel, screen, offset, 5);
+
+	Vector<int> numberOffset(offset.X() + 5 * font.CharWidth(), offset.Y());
+	font.DrawNumber(GetHero().RelativeIP(100), screen, numberOffset, 3);
+
+	Vector<int> percentOffset(offset.X() + 8 * font.CharWidth(), offset.Y());
+	font.DrawChar('%', screen, percentOffset);
+}
+
 
 void StatusMenu::NextHero() {
 	cursor = (cursor + 1) % parent->Game().state->partySize;
@@ -144,4 +223,8 @@ void StatusMenu::PreviousHero() {
 	cursor = (cursor + parent->Game().state->partySize - 1) % parent->Game().state->partySize;
 }
 
+const Hero &StatusMenu::GetHero() const {
+	return *parent->Game().state->party[cursor];
+}
+
 }