X-Git-Url: http://git.localhorst.tv/?a=blobdiff_plain;f=src%2Fbattle%2FBattleState.cpp;h=9830e8c6a0b976f41f26642f024d34d2032e6e6e;hb=e1edc92c4fb834c8061118e89c0d7e239742b030;hp=3f28f5cc43e1f74a2f4b9d650a867d7b8aa63961;hpb=fde7b27297882a7f033641df92e732abd137b532;p=l2e.git diff --git a/src/battle/BattleState.cpp b/src/battle/BattleState.cpp index 3f28f5c..9830e8c 100644 --- a/src/battle/BattleState.cpp +++ b/src/battle/BattleState.cpp @@ -1,10 +1,3 @@ -/* - * BattleState.cpp - * - * Created on: Aug 5, 2012 - * Author: holy - */ - #include "BattleState.h" #include "PartyLayout.h" @@ -12,11 +5,11 @@ #include "states/PerformAttacks.h" #include "../app/Application.h" #include "../app/Input.h" +#include "../common/GameState.h" #include "../common/Ikari.h" #include "../common/Inventory.h" #include "../common/Item.h" #include "../common/Spell.h" -#include "../geometry/operators.h" #include "../graphics/Frame.h" #include "../graphics/Sprite.h" @@ -30,7 +23,7 @@ using app::Input; using common::Inventory; using common::Item; using common::Spell; -using geometry::Point; +using common::Stats; using geometry::Vector; using graphics::Menu; @@ -54,6 +47,10 @@ void BattleState::AddHero(const Hero &h) { ++numHeroes; } +void BattleState::SetCapsule(const Capsule &c) { + capsule = c; +} + void BattleState::NextHero() { ++activeHero; while (activeHero < numHeroes && heroes[activeHero].Health() == 0) { @@ -74,22 +71,24 @@ void BattleState::SwapHeroes(int lhs, int rhs) { } -void BattleState::Resize(int w, int h) { +void BattleState::OnResize(int w, int h) { } -void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) { +void BattleState::OnEnterState(SDL_Surface *screen) { for (int i(0); i < 4; ++i) { heroes[i].Position() = heroesLayout->CalculatePosition(i, background->w, background->h); - heroes[i].SpellMenu() = res->spellMenuPrototype; + heroes[i].SpellMenu() = *res->spellMenuProperties; heroes[i].UpdateSpellMenu(); - heroes[i].IkariMenu() = res->ikariMenuPrototype; + heroes[i].IkariMenu() = *res->ikariMenuProperties; heroes[i].UpdateIkariMenu(res); heroTags[i] = HeroTag(this, i); smallHeroTags[i] = SmallHeroTag(this, i); } + capsule.Position() = heroesLayout->CalculatePosition(4, background->w, background->h); + for (int i(0); i < int(monsters.size()); ++i) { monsters[i].Position() = monstersLayout->CalculatePosition(i, background->w, background->h); } @@ -97,26 +96,27 @@ void BattleState::EnterState(Application &ctrl, SDL_Surface *screen) { int tagHeight(attackTypeMenu.Height()); int tagWidth(attackTypeMenu.Width() * 2 + attackTypeMenu.Width() / 2); int xOffset((Width() - 2 * tagWidth) / 2); - heroTagPositions[0] = Point(xOffset, Height() - 2 * tagHeight); - heroTagPositions[1] = Point(xOffset + tagWidth, Height() - 2 * tagHeight); - heroTagPositions[2] = Point(xOffset, Height() - tagHeight); - heroTagPositions[3] = Point(xOffset + tagWidth, Height() - tagHeight); + heroTagPositions[0] = Vector(xOffset, Height() - 2 * tagHeight); + heroTagPositions[1] = Vector(xOffset + tagWidth, Height() - 2 * tagHeight); + heroTagPositions[2] = Vector(xOffset, Height() - tagHeight); + heroTagPositions[3] = Vector(xOffset + tagWidth, Height() - tagHeight); tagHeight = res->normalFont->CharHeight() * 4 + res->smallHeroTagFrame->BorderHeight() * 2; tagWidth = res->normalFont->CharWidth() * 6 + res->smallHeroTagFrame->BorderWidth() * 2; xOffset = (Width() - 4 * tagWidth) / 2; int yOffset(Height() - tagHeight); - smallHeroTagPositions[0] = Point(xOffset, yOffset); - smallHeroTagPositions[1] = Point(xOffset + 2 * tagWidth, yOffset); - smallHeroTagPositions[2] = Point(xOffset + tagWidth, yOffset); - smallHeroTagPositions[3] = Point(xOffset + 3 * tagWidth, yOffset); + smallHeroTagPositions[0] = Vector(xOffset, yOffset); + smallHeroTagPositions[1] = Vector(xOffset + 2 * tagWidth, yOffset); + smallHeroTagPositions[2] = Vector(xOffset + tagWidth, yOffset); + smallHeroTagPositions[3] = Vector(xOffset + 3 * tagWidth, yOffset); - itemMenu = res->itemMenuPrototype; + itemMenu = *res->itemMenuProperties; LoadInventory(); + ClearAllAttacks(); } void BattleState::LoadInventory() { - const Inventory &inv(*res->inventory); + const Inventory &inv(game->state->inventory); itemMenu.Clear(); itemMenu.Reserve(inv.MaxItems()); for (int i(0); i < inv.MaxItems(); ++i) { @@ -127,33 +127,30 @@ void BattleState::LoadInventory() { itemMenu.AddEmptyEntry(); } } - ClearAllAttacks(); } -void BattleState::ExitState(Application &ctrl, SDL_Surface *screen) { +void BattleState::OnExitState(SDL_Surface *screen) { } -void BattleState::ResumeState(Application &ctrl, SDL_Surface *screen) { +void BattleState::OnResumeState(SDL_Surface *screen) { if (ranAway) { - ctrl.PopState(); // quit the battle scene + Ctrl().PopState(); // quit the battle scene return; } if (Victory()) { - // TODO: push victory state - ctrl.PopState(); + Ctrl().PopState(); return; } if (Defeat()) { - // TODO: push defeat state - ctrl.PopState(); + Ctrl().PopState(); return; } // TODO: this should not push a state while quitting if (AttackSelectionDone()) { - ctrl.PushState(new PerformAttacks(this)); + Ctrl().PushState(new PerformAttacks(this)); } else { - ctrl.PushState(new SelectMoveAction(this)); + Ctrl().PushState(new SelectMoveAction(this)); } } @@ -171,7 +168,7 @@ bool BattleState::Defeat() const { return true; } -void BattleState::PauseState(Application &ctrl, SDL_Surface *screen) { +void BattleState::OnPauseState(SDL_Surface *screen) { } @@ -229,102 +226,79 @@ void BattleState::CalculateDamage() { if (ac.GetType() == AttackChoice::DEFEND) return; TargetSelection &ts(ac.Selection()); - // TODO: this only evaluates SWORD type attacks if (CurrentAttack().isMonster) { const Stats &attackerStats(MonsterAt(CurrentAttack().index).GetStats()); - if (ts.TargetsMonsters()) { - for (int i(0); i < MaxMonsters(); ++i) { - if (ts.IsSelected(i)) { - if (MonsterAt(i).Health() > 0) { - const Stats &defenderStats(MonsterAt(i).GetStats()); - Uint16 damage(CalculateDamage(attackerStats, defenderStats)); - ts.SetBad(i, damage); - } else { - ts.Unselect(i); - } - } - } - } else { - for (int i(0); i < NumHeroes(); ++i) { - if (ts.IsSelected(i)) { - if (HeroAt(i).Health() > 0) { - const Stats &defenderStats(HeroAt(i).GetStats()); - Uint16 damage(CalculateDamage(attackerStats, defenderStats)); - ts.SetBad(i, damage); - } else { - ts.Unselect(i); - } - } - } - } + CalculateDamage(attackerStats, ts); } else { const Stats &attackerStats(HeroAt(CurrentAttack().index).GetStats()); - bool hitSome(false); - if (ts.TargetsMonsters()) { - for (int i(0); i < MaxMonsters(); ++i) { - if (ts.IsSelected(i)) { - if (MonsterAt(i).Health() > 0) { - const Stats &defenderStats(MonsterAt(i).GetStats()); - Uint16 damage(CalculateDamage(attackerStats, defenderStats)); - ts.SetBad(i, damage); - hitSome = true; - } else { - ts.Unselect(i); - } - } - } - if (hitSome) return; - for (int i(0); i < MaxMonsters(); ++i) { + CalculateDamage(attackerStats, ts); + } +} + +void BattleState::DecideMonsterAttack(Monster &m) const { + AttackChoice &ac(m.GetAttackChoice()); + TargetSelection &ts(ac.Selection()); + ac.Reset(); + int target(rand() % NumHeroes()); + while (!HeroPositionOccupied(target)) { + target = rand() % NumHeroes(); + } + ac.SetType(AttackChoice::SWORD); + ts.SelectHeroes(); + ts.SetSingle(); + ts.Select(target); +} + +void BattleState::CalculateDamage(const Stats &attackerStats, TargetSelection &ts) const { + bool hitSome(false); + if (ts.TargetsMonsters()) { + for (int i(0); i < MaxMonsters(); ++i) { + if (ts.IsSelected(i)) { if (MonsterAt(i).Health() > 0) { const Stats &defenderStats(MonsterAt(i).GetStats()); Uint16 damage(CalculateDamage(attackerStats, defenderStats)); ts.SetBad(i, damage); - break; + hitSome = true; + } else { + ts.Unselect(i); } } - } else { - for (int i(0); i < NumHeroes(); ++i) { - if (ts.IsSelected(i)) { - if (HeroAt(i).Health() > 0) { - const Stats &defenderStats(HeroAt(i).GetStats()); - Uint16 damage(CalculateDamage(attackerStats, defenderStats)); - ts.SetBad(i, damage); - hitSome = true; - } else { - ts.Unselect(i); - } - } + } + if (hitSome) return; + for (int i(0); i < MaxMonsters(); ++i) { + if (MonsterAt(i).Health() > 0) { + const Stats &defenderStats(MonsterAt(i).GetStats()); + Uint16 damage(CalculateDamage(attackerStats, defenderStats)); + ts.SetBad(i, damage); + break; } - if (hitSome) return; - for (int i(0); i < NumHeroes(); ++i) { + } + } else { + for (int i(0); i < NumHeroes(); ++i) { + if (ts.IsSelected(i)) { if (HeroAt(i).Health() > 0) { const Stats &defenderStats(HeroAt(i).GetStats()); Uint16 damage(CalculateDamage(attackerStats, defenderStats)); ts.SetBad(i, damage); - break; + hitSome = true; + } else { + ts.Unselect(i); } } } + if (hitSome) return; + for (int i(0); i < NumHeroes(); ++i) { + if (HeroAt(i).Health() > 0) { + const Stats &defenderStats(HeroAt(i).GetStats()); + Uint16 damage(CalculateDamage(attackerStats, defenderStats)); + ts.SetBad(i, damage); + break; + } + } } } -void BattleState::DecideMonsterAttack(Monster &m) { - AttackChoice &ac(m.GetAttackChoice()); - TargetSelection &ts(ac.Selection()); - ac.Reset(); - // TODO: run monster's attack script - int target(rand() % NumHeroes()); - while (!HeroPositionOccupied(target)) { - target = rand() % NumHeroes(); - } - ac.SetType(AttackChoice::SWORD); - ts.SelectHeroes(); - ts.SetSingle(); - ts.Select(target); -} - Uint16 BattleState::CalculateDamage(const Stats &attacker, const Stats &defender) const { - // TODO: find out real formula and add some randomness return attacker.Attack() / 2 - defender.Defense() / 4; } @@ -426,6 +400,15 @@ void BattleState::RenderHeroes(SDL_Surface *screen, const Vector &offset) { } } +void BattleState::RenderCapsule(SDL_Surface *screen, const Vector &offset) { + if (capsule.Health() <= 0) return; + if (capsule.GetAnimation().Running()) { + capsule.GetAnimation().DrawCenter(screen, capsule.Position() + offset); + } else { + capsule.Sprite()->DrawCenter(screen, capsule.Position() + offset); + } +} + void BattleState::RenderHeroTags(SDL_Surface *screen, const Vector &offset) { assert(screen); int tagHeight(attackTypeMenu.Height()); @@ -449,7 +432,7 @@ void BattleState::RenderSmallHeroTags(SDL_Surface *screen, const Vector &of SDL_FillRect(screen, &rect, SDL_MapRGB(screen->format, 0, 0, 0)); rect.y += res->normalFont->CharHeight() / 8; rect.h -= res->normalFont->CharHeight() / 4; - SDL_FillRect(screen, &rect, res->heroesBgColor); + SDL_FillRect(screen, &rect, res->heroesBgColor.MapRGB(screen->format)); for (int i(0); i < numHeroes; ++i) { smallHeroTags[i].Render(screen, tagWidth, tagHeight, smallHeroTagPositions[i] + offset);