Rtch/Unuk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Add] Levels and leveling up!

Browse Source
This commit is contained in:
Tamir Atias 2012-02-01 02:15:54 +02:00
parent 4bbf0002c9
commit dfa2d88008
8 changed files with 86 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Unuk-QT/Unuk-QT.pro.user
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by Qt Creator 2.4.0, 2012-01-30T01:06:01. -->
<!-- Written by Qt Creator 2.4.0, 2012-02-01T02:13:25. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>

32
src/Unuk/Game.cpp
View File

@ -21,6 +21,9 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
LoadSavegame(savegameIDArg);
// some weird bug. player->_exp is set to unreasonable number randomally after LoadSavegame returns.
_player->SetExpNeeded(Player::BASE_EXP_NEEDED);
int fps = 0;
int frame = 0;
int nextGameTick = SDL_GetTicks();
@ -34,18 +37,18 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
Timer renderTimer;
Timer updateTimer;
_gameRenderTime.SetXY(10, 50);
_gameRenderTime.SetXY(10, 70);
_gameRenderTime.SetTextBlended("Render - XX", vsmall, COLOUR_BLACK);
_gameUpdateTime.SetXY(10, 70);
_gameUpdateTime.SetXY(10, 90);
_gameUpdateTime.SetTextBlended("Update - XX", vsmall, COLOUR_BLACK);
stringstream playerXYString;
_playerXY.SetXY(10, 90);
_playerXY.SetXY(10, 110);
_playerXY.SetTextBlended("Player coords - XX XX", vsmall, COLOUR_BLACK);
stringstream npcHealth;
_npcHealth.SetXY(10, 110);
_npcHealth.SetXY(10, 130);
_npcHealth.SetTextBlended("NPC X Health - XX", vsmall, COLOUR_BLACK);
_playerHealthBar.SetBackgroundRGB(0, 0, 0);
@ -53,10 +56,20 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
_playerHealthBar.SetXY(10, 20);
_playerHealthBar.SetWidthHeight(200, 25);
_playerExpBar.SetBackgroundRGB(0, 0, 0);
_playerExpBar.SetForegroundRGB(0, 0, 255);
_playerExpBar.SetXY(10, 50);
_playerExpBar.SetWidthHeight(200, 25);
_playerExpBar.SetProgress(0.0f);
stringstream playerHealth;
_playerHealth.SetXY(15, 27);
_playerHealth.SetTextBlended("Player Health - XX", vsmall, COLOUR_WHITE);
stringstream playerExp;
_playerExp.SetXY(15, 57);
_playerExp.SetTextBlended("Player Level XX (XX/XX)", vsmall, COLOUR_WHITE);
_gameRunning = true;
while(_gameRunning) {
bool stillRunning = true;
@ -96,11 +109,17 @@ gameNavVal_t Game::Run(const string savegameIDArg) {
frame = 0;
playerHealth.str("");
playerHealth << "Player Health: " << _player->GetHealth();
playerHealth << "Player Health - " << _player->GetHealth();
_playerHealth.SetTextBlended(playerHealth.str(), vsmall, COLOUR_WHITE);
_playerHealthBar.SetProgress((float)_player->GetHealth() / 100.0f);
playerExp.str("");
playerExp << "Player Level " << _player->GetLevel() << " (" << _player->GetExp() << "/" << _player->GetExpNeeded() << ")";
_playerExp.SetTextBlended(playerExp.str(), vsmall, COLOUR_WHITE);
_playerExpBar.SetProgress((float)_player->GetExp() / (float)_player->GetExpNeeded());
// Check to see if we are allowed to display debug info.
if(debugEnabled) {
_gameUpdateTime.SetTextBlended("Update - " + updateTimer.GetTicksStr(), vsmall, COLOUR_BLACK);
@ -206,6 +225,9 @@ void Game::Render(void) {
_playerHealthBar.DrawLiteral();
_playerHealth.RenderLiteral();
_playerExpBar.DrawLiteral();
_playerExp.RenderLiteral();
if(debugEnabled) {
_gameRenderTime.RenderLiteral();
_gameUpdateTime.RenderLiteral();

2
src/Unuk/Game.h
View File

@ -59,7 +59,9 @@ private:
Player* _player;
Text _playerHealth;
Text _playerExp;
Bar _playerHealthBar;
Bar _playerExpBar;
EventHistory _eventHistory;
};

27
src/Unuk/Player.cpp
View File

@ -3,8 +3,13 @@
// Pixels * 60 / sec.
const float Player::PLAYER_SPEED = Character::CHARACTER_SPEED + 0.5f;
Player::Player(LevelGen *mapArg) : Character(mapArg) {
// Amount of Exp needed to level up from 1 to 2
const int Player::BASE_EXP_NEEDED = 10;
Player::Player(LevelGen *mapArg) : Character(mapArg) {
_level = 1;
_exp = 0;
_expNeeded = BASE_EXP_NEEDED;
}
Player::~Player(void) {
@ -101,3 +106,23 @@ void Player::Move() {
map->Load(map->GetMapTransitionName(tileX, tileY));
}
}
void Player::SetLevel(int level) {
_level = level;
_exp = _exp - _expNeeded;
if(_exp < 0) {
_exp = 0;
}
_expNeeded = pow(BASE_EXP_NEEDED, _level);
}
void Player::SetExp(int exp) {
_exp += exp;
if(_exp >= _expNeeded) {
SetLevel(_level + 1);
}
}
void Player::SetExpNeeded(int expNeeded) {
_expNeeded = expNeeded;
}

14
src/Unuk/Player.h
View File

@ -17,6 +17,17 @@ public:
void SetName(string nameArg);
string GetName(void) { return _name; }
void SetLevel(int level);
int GetLevel() { return _level; }
void SetExp(int exp);
int GetExp() { return _exp; }
int GetExpNeeded() { return _expNeeded; }
void SetExpNeeded(int expNeeded);
static const int BASE_EXP_NEEDED;
protected:
void Move(void);
void CheckTileCollisions(void);
@ -27,4 +38,7 @@ private:
string _name;
//int _health;
int _level;
int _exp;
int _expNeeded;
};

5
src/libUnuk/Engine/WorldManager.cpp
View File

@ -1,5 +1,6 @@
#include "WorldManager.h"
#include "NPC.h"
#include "../../Unuk/Player.h"
WorldManager::WorldManager(void) {
}
@ -53,7 +54,7 @@ NPC* WorldManager::GetNPC(int index) {
return NULL;
}
void WorldManager::OnPlayerAttack(Character* player) {
void WorldManager::OnPlayerAttack(Player* player) {
int playerX = (int)(player->GetX() / 32.0f);
int playerY = (int)(player->GetY() / 32.0f);
int playerDir = player->GetDirectionFacing();
@ -95,6 +96,8 @@ void WorldManager::OnPlayerAttack(Character* player) {
npc->OnAttack();
if(npc->GetHealth() <= 0) {
int expGain = 3 + (rand() % 2);
player->SetExp(player->GetExp() + expGain);
i = _npcs.erase(i);
delete npc;
}

4
src/libUnuk/Engine/WorldManager.h
View File

@ -2,7 +2,7 @@
#include <list>
class NPC;
class Character;
class Player;
class WorldManager {
public:
@ -18,7 +18,7 @@ public:
int GetNPCCount() { return _npcs.size(); }
void OnPlayerAttack(Character* player);
void OnPlayerAttack(Player* player);
private:
std::list<NPC*> _npcs;

10
src/libUnuk/LevelGen/LevelGen.cpp
View File

@ -143,6 +143,16 @@ void LevelGen::Load(const string filename) {
npc->SetXY(100, 250);
npc->LoadSprites("../Data/Media/Images/Characters/template.png", 40,45);
_world.AddNPC(npc);
npc = new NPC(this);
npc->SetXY(170, 250);
npc->LoadSprites("../Data/Media/Images/Characters/template.png", 40,45);
_world.AddNPC(npc);
npc = new NPC(this);
npc->SetXY(170, 230);
npc->LoadSprites("../Data/Media/Images/Characters/template.png", 40,45);
_world.AddNPC(npc);
}
void LevelGen::Update(void) {