Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Assets/Images/Game/Stages/WhompFortress/bg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Game/Stages/WhompFortress/fg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Game/Stages/WhompFortress/mg.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Game/Stages/WhompFortress/plat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Game/Stages/WhompFortress/plat2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Images/Menus/StageSelect/whompfortress.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Music/Mario 64/Whomp Fortress.ogg
Binary file not shown.
950 changes: 477 additions & 473 deletions Projects/VisualStudio/iSSB.vcxproj

Large diffs are not rendered by default.

1,892 changes: 949 additions & 943 deletions Projects/VisualStudio/iSSB.vcxproj.filters

Large diffs are not rendered by default.

148 changes: 148 additions & 0 deletions Source/SmashBros/Game/Stages/WhompFortress.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,148 @@

#include "WhompFortress.h"

namespace SmashBros
{
WhompFortress::WhompFortress(float x1, float y1) : Stage(x1, y1)
{
setSpawnPoint(0, 0,0);
setSpawnPoint(1, -110,-110);
setSpawnPoint(2, 110,-110);
setSpawnPoint(3, 50, -10);
setSpawnPoint(4, -50, -10);

bottomViewBorder = 295;
topViewBorder = -340;
leftViewBorder = -372;
rightViewBorder = 372;

leftBorder = -500;
topBorder = -430;
rightBorder = 500;
bottomBorder = 250;

setItemBoundaries(-350, -160, 350, 100);
//showItemBoundaries(true);

loadGameElements();
loadPlatforms();
loadHangPoints();
loadForeground();
loadGround();

setBackground("Images/Game/Stages/WhompFortress/bg.png");
setBackgroundScale(1.45);
setBackgroundType(BG_FIXED);

//setWireframeColor(Color.blue);
//showWireframes(true);

MusicManager::loadSong("Whomp Fortress");
}

WhompFortress::~WhompFortress()
{
//
}

void WhompFortress::loadGameElements()
{
GameElement* bg;

bg = new GameElement(-15, -100);
Animation* anim = new Animation("normal", 1, 1, 1);
anim->addFrame("Images/Game/Stages/WhompFortress/mg.png");
bg->addAnimation(anim);
bg->changeAnimation("normal", FORWARD);
addElement(bg);
}

void WhompFortress::loadPlatforms()
{
Platform* plat;

plat = new Platform(Platform::TYPE_GOTHROUGH, 1, 25);
plat->addAnimation(new Animation("normal", 1, "Images/Game/Stages/WhompFortress/floatplat.png"));
plat->changeAnimation("normal", FORWARD);
plat->setVisible(false);
addPlatform(plat);

plat = new Platform(Platform::TYPE_NORMAL, 0,100);
Animation*anim;
anim = new Animation("normal", 5, 38, 1);
anim->addFrame("Images/Game/Stages/WhompFortress/platform.png");
plat->addAnimation(anim);
plat->changeAnimation("normal", FORWARD);
plat->setVisible(false);
addPlatform(plat);

plat = new Platform(Platform::TYPE_NORMAL, 1, 25);
plat->addAnimation(new Animation("normal", 1, "Images/Game/Stages/WhompFortress/plat.png"));
plat->changeAnimation("normal", FORWARD);
plat->setVisible(false);
addPlatform(plat);

plat = new Platform(Platform::TYPE_NORMAL, -15, -83);
plat->addAnimation(new Animation("normal", 1, "Images/Game/Stages/WhompFortress/plat2.png"));
plat->changeAnimation("normal", FORWARD);
plat->setVisible(false);
addPlatform(plat);

plat = new Platform(Platform::TYPE_NORMAL, 0,-140);
plat->addAnimation(new Animation("normal",1,"Images/Game/Stages/WhompFortress/slides.png"));
plat->changeAnimation("normal", FORWARD);
plat->setVisible(false);
addPlatform(plat);

plat = new Platform(Platform::TYPE_NORMAL, -15, -240);
plat->addAnimation(new Animation("normal", 1, "Images/Game/Stages/WhompFortress/bumper.png"));
plat->changeAnimation("normal", FORWARD);
plat->setVisible(false);
addPlatform(plat);
}

void WhompFortress::loadForeground()
{
GameElement* foreground;

foreground = new GameElement(0, 180);
foreground->addAnimation(new Animation("normal", 4, "Images/Game/Stages/WhompFortress/bgplatform.png"));
foreground->changeAnimation("normal", FORWARD);
addForeground(foreground);

foreground = new GameElement(1, 25);
foreground->addAnimation(new Animation("normal", 4, "Images/Game/Stages/WhompFortress/fg.png"));
foreground->changeAnimation("normal", FORWARD);
addForeground(foreground);
}

void WhompFortress::loadHangPoints()
{
HangPoint*hp;

// left platform
hp = new HangPoint(HangPoint::LEFT,-140,25);
//hp->setVisible(true);
//hp->setFilled(true);
//hp->setColor(Color::GREEN);
addHangPoint(hp);

// right platform
hp = new HangPoint(HangPoint::RIGHT,105,25);
//hp->setVisible(true);
//hp->setFilled(true);
//hp->setColor(Color::GREEN);
addHangPoint(hp);
}

void WhompFortress::loadGround()
{
}

void WhompFortress::Draw(Graphics2D&g, long gameTime)
{
Stage::Draw(g, gameTime);
}


}
30 changes: 30 additions & 0 deletions Source/SmashBros/Game/Stages/WhompFortress.h
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@

#include "../../Stage.h"

#pragma once

namespace SmashBros
{
class WhompFortress : public Stage
{
private:
class RandomThing : public GameElement
{
public:
RandomThing();
RandomThing(boolean create);
virtual ~RandomThing();
};
void loadGameElements();
void loadPlatforms();
void loadForeground();
void loadHangPoints();
void loadGround();

public:
WhompFortress(float x1, float y1);
~WhompFortress();

virtual void Draw(Graphics2D&g, long gameTime);
};
}
3 changes: 2 additions & 1 deletion Source/SmashBros/Global.h
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ namespace SmashBros

static const int totalCharacters = 6;
static const int totalItems = 6;
static const int totalStages = 5;
static const int totalStages = 6;

//CHARACTER CONSTANTS
static const int CHAR_MARIO = 1;
Expand All @@ -101,6 +101,7 @@ namespace SmashBros
static const int STAGE_FINALDESTINATION = 3;
static const int STAGE_HYRULETEMPLE = 4;
static const int STAGE_CORNERIA = 5;
static const int STAGE_WHOMPFORTRESS = 6;

//ITEM CONSTANTS
static const int ITEM_CUSTOM = 0;
Expand Down
9 changes: 8 additions & 1 deletion Source/SmashBros/Loader.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include "Game/Stages/FinalDestinationBrawl.h"
#include "Game/Stages/HyruleTemple.h"
#include "Game/Stages/Corneria.h"
#include "Game/Stages/WhompFortress.h"

#ifndef SMASHBROS_SCRIPT_DISABLE
#include "../ScriptModule/ScriptManager.h"
Expand Down Expand Up @@ -134,6 +135,7 @@ namespace SmashBros
case Global::CHAR_LINK:
p = new Link(x1,y1,playerNo,team);
p->charNo = Global::CHAR_LINK;
break;
}
return p;
}
Expand Down Expand Up @@ -341,6 +343,9 @@ namespace SmashBros

case Global::STAGE_CORNERIA:
return "corneria.png";

case Global::STAGE_WHOMPFORTRESS:
return "whompfortress.png";
}
}

Expand Down Expand Up @@ -370,7 +375,9 @@ namespace SmashBros

case Global::STAGE_CORNERIA:
return new Corneria(x1,y1);


case Global::STAGE_WHOMPFORTRESS:
return new WhompFortress(x1,y1);
default:
#ifndef SMASHBROS_SCRIPT_DISABLE
if(stageNum > Global::totalStages)
Expand Down
2 changes: 2 additions & 0 deletions Source/SmashBros/Menus/Menus.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,8 @@ namespace SmashBros
MusicManager::addSong("Zelda Theme", "Music/Legend of Zelda/Main Theme.ogg");
MusicManager::addSong("Zelda Theme Remix", "Music/Legend of Zelda/Main Theme Remix.ogg");

MusicManager::addSong("Whomp Fortress", "Music/Mario 64/Whomp Fortress.ogg");

MusicManager::loadSong("Main Theme");

//Loading sounds
Expand Down