+// $Id$
//
-// SuperTux - A Jump'n Run
+// SuperTux (Statistics module)
// Copyright (C) 2004 Ricardo Cruz <rick2@aeiou.pt>
+// Copyright (C) 2006 Ondrej Hosek <white.timberwolf@aon.at>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
//
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
-// 02111-1307, USA.
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "utils/lispreader.h"
-#include "utils/lispwriter.h"
-#include "statistics.h"
-#include "video/drawing_context.h"
-#include "app/gettext.h"
-#include "app/globals.h"
-#include "resources.h"
+#include <config.h>
+
+#include "video/drawing_context.hpp"
+#include "gettext.hpp"
+#include "lisp/lisp.hpp"
+#include "resources.hpp"
+#include "main.hpp"
+#include "statistics.hpp"
Statistics global_stats;
{
switch(stat_enum)
{
- case SCORE_STAT:
- return "score";
- case BADGUYS_SQUISHED_STAT:
- return "badguys-squished";
- case SHOTS_STAT:
- return "shots";
+// case SCORE_STAT:
+// return "score";
+ case COINS_COLLECTED_STAT:
+ return "coins-collected";
+ case BADGUYS_KILLED_STAT:
+ return "badguys-killed";
case TIME_NEEDED_STAT:
- return "time-needed";
- case JUMPS_STAT:
- return "jumps";
+ return "time-needed";;
}
+ return "";
}
int
Statistics::Statistics()
{
- timer.init(true);
display_stat = 1;
for(int i = 0; i < NUM_STATS; i++)
- stats[i] = -1;
+ for(int j = 0; j < 2; j++)
+ stats[i][j] = -1;
}
Statistics::~Statistics()
}
void
-Statistics::parse(LispReader& reader)
+Statistics::parse(const lisp::Lisp& reader)
{
- for(int i = 0; i < NUM_STATS; i++)
- reader.read_int(stat_name_to_string(i).c_str(), stats[i]);
+ for(int i = 0; i < NUM_STATS; i++) {
+ reader.get(stat_name_to_string(i).c_str(), stats[i][SPLAYER]);
+ reader.get((stat_name_to_string(i) + "-total").c_str(), stats[i][STOTAL]);
+ }
}
void
-Statistics::write(LispWriter& writer)
+Statistics::write(lisp::Writer& writer)
{
- for(int i = 0; i < NUM_STATS; i++)
- writer.write_int(stat_name_to_string(i), stats[i]);
+ for(int i = 0; i < NUM_STATS; i++) {
+ writer.write_int(stat_name_to_string(i), stats[i][SPLAYER]);
+ writer.write_int(stat_name_to_string(i) + "-total", stats[i][STOTAL]);
+ }
}
-#define TOTAL_DISPLAY_TIME 3400
-#define FADING_TIME 600
+//define TOTAL_DISPLAY_TIME 3400
+//define FADING_TIME 600
+
+#define TOTAL_DISPLAY_TIME 5
+#define FADING_TIME 1
+
+#define WMAP_INFO_LEFT_X 520
+#define WMAP_INFO_RIGHT_X 740
void
Statistics::draw_worldmap_info(DrawingContext& context)
{
- if(stats[SCORE_STAT] == -1) // not initialized yet
+ if(stats[COINS_COLLECTED_STAT][SPLAYER] == -1) // not initialized yet
return;
- if(!timer.check())
- {
+// if(timer.check())
+ if (!timer.started())
+ {
timer.start(TOTAL_DISPLAY_TIME);
display_stat++;
if(display_stat >= NUM_STATS)
- display_stat = 1;
+ display_stat = 0;
+
+ if((display_stat == TIME_NEEDED_STAT) && (stats[TIME_NEEDED_STAT][STOTAL] == -1))
+ { // no timer in level
+ display_stat++;
+ if(display_stat >= NUM_STATS)
+ display_stat = 0;
}
+ }
- int alpha;
- if(timer.get_gone() < FADING_TIME)
- alpha = timer.get_gone() * 255 / FADING_TIME;
- else if(timer.get_left() < FADING_TIME)
- alpha = timer.get_left() * 255 / FADING_TIME;
+ char str[128];
+
+ context.draw_text(white_small_text, _("- Best Level Statistics -"),
+ Vector((WMAP_INFO_LEFT_X + WMAP_INFO_RIGHT_X) / 2, 470),
+ CENTER_ALLIGN, LAYER_GUI);
+
+ // Score has been removed
+ //sprintf(str, _("Max score:"));
+ //context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 490), LEFT_ALLIGN, LAYER_GUI);
+
+ //sprintf(str, "%d", stats[SCORE_STAT][SPLAYER]);
+ //context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 490), RIGHT_ALLIGN, LAYER_GUI);
+
+ float alpha;
+ if(timer.get_timegone() < FADING_TIME)
+ alpha = (timer.get_timegone() * 1.0f / FADING_TIME);
+ else if(timer.get_timeleft() < FADING_TIME)
+ alpha = (timer.get_timeleft() * 1.0f / FADING_TIME);
else
- alpha = 255;
+ alpha = 1.0f;
- char str[128];
+ context.push_transform();
+ context.set_alpha(alpha);
- context.draw_text(white_small_text, _("Level Statistics"), Vector(550, 490), LEFT_ALLIGN, LAYER_GUI);
+ if(display_stat == COINS_COLLECTED_STAT)
+ sprintf(str, _("Max coins collected:"));
+ else if(display_stat == BADGUYS_KILLED_STAT)
+ sprintf(str, _("Max fragging:"));
+ else// if(display_stat == TIME_NEEDED_STAT)
+ sprintf(str, _("Min time needed:"));
- sprintf(str, _("Max score: %d"), stats[SCORE_STAT]);
- context.draw_text(white_small_text, str, Vector(560, 506), LEFT_ALLIGN, LAYER_GUI);
+ // y == 508 before score was removed
+ context.draw_text(white_small_text, str, Vector(WMAP_INFO_LEFT_X, 490), LEFT_ALLIGN, LAYER_GUI);
- if(display_stat == BADGUYS_SQUISHED_STAT)
- sprintf(str, _("Max fragging: %d"), stats[BADGUYS_SQUISHED_STAT]);
- else if(display_stat == SHOTS_STAT)
- sprintf(str, _("Min shots: %d"), stats[SHOTS_STAT]);
- else if(display_stat == TIME_NEEDED_STAT)
- sprintf(str, _("Min time needed: %d"), stats[TIME_NEEDED_STAT]);
- else// if(display_stat == JUMPS_STAT)
- sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]);
+ if(display_stat == COINS_COLLECTED_STAT)
+ sprintf(str, "%d/%d", stats[COINS_COLLECTED_STAT][SPLAYER],
+ stats[COINS_COLLECTED_STAT][STOTAL]);
+ else if(display_stat == BADGUYS_KILLED_STAT)
+ sprintf(str, "%d/%d", stats[BADGUYS_KILLED_STAT][SPLAYER],
+ stats[BADGUYS_KILLED_STAT][STOTAL]);
+ else// if(display_stat == TIME_NEEDED_STAT)
+ sprintf(str, "%d/%d", stats[TIME_NEEDED_STAT][SPLAYER],
+ stats[TIME_NEEDED_STAT][STOTAL]);
- context.draw_text(white_small_text, str, Vector(560, 522), LAYER_GUI, LEFT_ALLIGN, NONE_EFFECT, alpha);
+ context.draw_text(white_small_text, str, Vector(WMAP_INFO_RIGHT_X, 490), RIGHT_ALLIGN, LAYER_GUI);
+
+ context.pop_transform();
}
void
Statistics::draw_message_info(DrawingContext& context, std::string title)
{
- if(stats[SCORE_STAT] == -1) // not initialized yet
+ if(stats[COINS_COLLECTED_STAT][SPLAYER] == -1) // not initialized yet
return;
- context.draw_text(gold_text, title, Vector(screen->w/2, 400), CENTER_ALLIGN, LAYER_GUI);
+ context.draw_text(gold_text, title, Vector(SCREEN_WIDTH/2, 410), CENTER_ALLIGN, LAYER_GUI);
char str[128];
+
+ //sprintf(str, _( "Max score: %d"), stats[SCORE_STAT][SPLAYER]);
+ //context.draw_text(white_text, str, Vector(SCREEN_WIDTH/2, 450), CENTER_ALLIGN, LAYER_GUI);
+
for(int i = 0; i < NUM_STATS; i++)
{
- if(i == SCORE_STAT)
- sprintf(str, _("Max score: %d"), stats[SCORE_STAT]);
- else if(i == BADGUYS_SQUISHED_STAT)
- sprintf(str, _("Max fragging: %d"), stats[BADGUYS_SQUISHED_STAT]);
- else if(i == SHOTS_STAT)
- sprintf(str, _("Min shots: %d"), stats[SHOTS_STAT]);
- else if(i == TIME_NEEDED_STAT)
- sprintf(str, _("Min time needed: %d"), stats[TIME_NEEDED_STAT]);
- else// if(i == JUMPS_STAT)
- sprintf(str, _("Min jumps: %d"), stats[JUMPS_STAT]);
-
- context.draw_text(white_text, str, Vector(screen->w/2, 430 + i*22), CENTER_ALLIGN, LAYER_GUI);
+ if(i == COINS_COLLECTED_STAT)
+ sprintf(str, _("Max coins collected: %d / %d"),
+ stats[COINS_COLLECTED_STAT][SPLAYER],
+ stats[COINS_COLLECTED_STAT][STOTAL]);
+ else if(i == BADGUYS_KILLED_STAT)
+ sprintf(str, _("Max fragging: %d / %d"),
+ stats[BADGUYS_KILLED_STAT][SPLAYER],
+ stats[BADGUYS_KILLED_STAT][STOTAL]);
+ else if((i == TIME_NEEDED_STAT) && (stats[TIME_NEEDED_STAT][STOTAL] != -1))
+ sprintf(str, _("Min time needed: %d / %d"),
+ stats[TIME_NEEDED_STAT][SPLAYER],
+ stats[TIME_NEEDED_STAT][STOTAL]);
+ else
+ continue;
+
+
+ // y == (462 + i*18) before score removal
+ context.draw_text(white_small_text, str, Vector(SCREEN_WIDTH/2, 450 + (i+1)*18), CENTER_ALLIGN, LAYER_GUI);
}
}
void
Statistics::add_points(int stat, int points)
{
- stats[stat] += points;
+ stats[stat][SPLAYER] += points;
}
int
Statistics::get_points(int stat)
{
- return stats[stat];
+ return stats[stat][SPLAYER];
}
void
Statistics::set_points(int stat, int points)
{
- stats[stat] = points;
+ stats[stat][SPLAYER] = points;
+}
+
+void
+Statistics::set_total_points(int stat, int points)
+{
+ stats[stat][STOTAL] = points;
}
void
Statistics::reset()
{
for(int i = 0; i < NUM_STATS; i++)
- stats[i] = 0;
+ stats[i][SPLAYER] = 0;
}
void
Statistics::merge(Statistics& stats_)
{
- stats[SCORE_STAT] = std::max(stats[SCORE_STAT], stats_.stats[SCORE_STAT]);
- if(stats[JUMPS_STAT] != -1)
- stats[JUMPS_STAT] = my_min(stats[JUMPS_STAT], stats_.stats[JUMPS_STAT]);
- stats[BADGUYS_SQUISHED_STAT] =
- std::max(stats[BADGUYS_SQUISHED_STAT], stats_.stats[BADGUYS_SQUISHED_STAT]);
- stats[SHOTS_STAT] = my_min(stats[SHOTS_STAT], stats_.stats[SHOTS_STAT]);
- stats[TIME_NEEDED_STAT] =
- my_min(stats[TIME_NEEDED_STAT], stats_.stats[TIME_NEEDED_STAT]);
+// stats[SCORE_STAT][SPLAYER] = std::max(stats[SCORE_STAT][SPLAYER], stats_.stats[SCORE_STAT][SPLAYER]);
+ stats[COINS_COLLECTED_STAT][SPLAYER] = std::max(stats[COINS_COLLECTED_STAT][SPLAYER], stats_.stats[COINS_COLLECTED_STAT][SPLAYER]);
+ stats[BADGUYS_KILLED_STAT][SPLAYER] =
+ std::max(stats[BADGUYS_KILLED_STAT][SPLAYER], stats_.stats[BADGUYS_KILLED_STAT][SPLAYER]);
+ stats[TIME_NEEDED_STAT][SPLAYER] =
+ my_min(stats[TIME_NEEDED_STAT][SPLAYER], stats_.stats[TIME_NEEDED_STAT][SPLAYER]);
+
+ stats[COINS_COLLECTED_STAT][STOTAL] = stats_.stats[COINS_COLLECTED_STAT][STOTAL];
+ stats[BADGUYS_KILLED_STAT][STOTAL] = stats_.stats[BADGUYS_KILLED_STAT][STOTAL];
+ stats[TIME_NEEDED_STAT][STOTAL] = stats_.stats[TIME_NEEDED_STAT][STOTAL];
}
void
Statistics::operator+=(const Statistics& stats_)
{
for(int i = 0; i < NUM_STATS; i++)
- stats[i] += stats_.stats[i];
+ {
+ if(stats_.stats[i][SPLAYER] == -1)
+ continue;
+ stats[i][SPLAYER] += stats_.stats[i][SPLAYER];
+ if(stats_.stats[i][STOTAL] != -1)
+ stats[i][STOTAL] += stats_.stats[i][STOTAL];
+ }
}
projects / supertux.git / blobdiff