aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--config/items.xml39
-rw-r--r--include/inventory.hpp171
-rw-r--r--include/quest.hpp4
-rw-r--r--include/texture.hpp11
-rw-r--r--main.cpp15
-rw-r--r--src/entities.cpp24
-rw-r--r--src/inventory.cpp458
-rw-r--r--src/items.cpp124
-rw-r--r--src/texture.cpp15
-rw-r--r--src/ui.cpp2
-rw-r--r--xml/playerSpawnHill1_Building1.xml38
11 files changed, 547 insertions, 354 deletions
diff --git a/config/items.xml b/config/items.xml
index abf522c..a70dd9a 100644
--- a/config/items.xml
+++ b/config/items.xml
@@ -10,42 +10,3 @@
<item name="Flashlight" type="Tool" value="1" maxStackSize="1" width="4" height="8" sprite="assets/items/flashlight_off.png" />
<item name="Wood Sword" type="Sword" value="69" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
<item name="Fried Chicken" type="Cooked Food" value="10" maxStackSize="6" width="4" height="6" sprite="assets/items/FOOD_CHICKEN_FRIED.png" />
-
-<item name="Wood Sword2" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword3" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword4" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword5" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword6" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword7" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword8" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword9" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword10" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword11" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword12" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword13" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword14" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword15" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword16" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword17" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword18" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword19" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword20" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword21" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword22" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword23" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword24" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword25" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword26" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword27" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword28" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword29" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword30" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword31" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword32" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword33" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword34" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword35" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword36" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword37" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword38" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
-<item name="Wood Sword39" type="Sword" maxStackSize="1" width="4" height="10" sprite="assets/items/SWORD_WOOD.png" />
diff --git a/include/inventory.hpp b/include/inventory.hpp
index ce887c3..a41d4d4 100644
--- a/include/inventory.hpp
+++ b/include/inventory.hpp
@@ -8,50 +8,173 @@
#define DEBUG
-class Item{
+/**
+ * The base item class
+ * This stores the name, width, height, and texture(s)
+ */
+class Item {
public:
- std::string name, type;
- std::string texloc;
+ // what we want to call each item
+ std::string name;
+
+ // how many pixel tall and white each thing is
+ dim2 dim;
+
+ // the total amount of this item each slot can have
+ uint maxStackSize;
+ // the array of textures for each frame of animation
Texturec *tex;
- float width;
- float height;
- int maxStackSize;
- float attribValue;
+ // how much the item is rotated in the hand
+ float rotation = 0.0f;
+
+ /**
+ * The function we use to call the child classes ability
+ * Note: Since this function is abstract, we HAVE to create one for each
+ * child class/type of item.
+ */
+ virtual int useItem()=0;
+
+ virtual Item* clone()=0;
+ // destructor
+ virtual ~Item();
+ // return the first texture for the item
+ GLuint rtex();
+
+ // return the nth texture for the item
+ GLuint rtex(int n);
};
-class Currency{
+/**
+ * Class for blank items, we use this for items that do not have an ability
+ * Like Quest or Debug items
+ */
+class BaseItem : public Item {
public:
- std::string name;
+ // since the items don't have a use, we don't make one for it
+ int useItem();
- float width;
- float height;
+ BaseItem* clone();
- std::string texloc;
- Texturec *tex;
+ //~BaseItem(){}
+};
- float value;
+/**
+ * Sword class. This is for swords, y'know. Pretty basic stuff
+ */
+class Sword : public Item {
+// can't touch this
+private:
+ /**
+ * How much damage our sword will do
+ * notice that it's private to avoid a change
+ */
+ float damage;
- GLuint rtex()
- {
- return tex->image[0];
- }
+//can touch this
+public:
+ /**
+ * Lets us return the amount of damage the sword has
+ * TODO takes into account enchants and/or buffs/nerfs
+ */
+ //TODO move
+ float getDamage();
+
+ /**
+ * handles the swinging of the sword
+ */
+ //TODO move
+ int useItem();
+
+ Sword* clone();
};
-struct item_t {
- uint count;
- uint id;
-} __attribute__((packed));
+/**
+ * Bow class. We use this for shooting bow and arrows
+ */
+class Bow : public Item {
+private:
+ // same as sword
+ float damage;
+public:
+ // returns the amount of damage, see sword
+ float getDamage();
+ // handles shooting and arrow curving
+ int useItem();
+
+ Bow* clone();
+};
+
+/**
+ * Raw food class, this will be used for uncooked meats...
+ * TODO Eating this may cause health loss, salmonela, mad cow diese
+ */
+class RawFood : public Item {
+private:
+ // the amount of the health the food heals
+ float health;
+
+public:
+ // since the health is private, we get how much it is here
+ float getHealth();
+
+ // TODO chance to hurt
+ virtual int useItem();
+
+ RawFood* clone();
+};
+
+/**
+ * Cooked/Naturale food class
+ * When this food is consumed, higher stats are gained than Raw Food and
+ * there is no chance of damage/de-buffs
+ */
+class Food : public RawFood {
+private:
+public:
+
+ // consume food in hand, no chance for de-buff;
+ int useItem();
+
+ Food* clone();
+};
+
+/**
+ * Currency class. Well, it's used for currency
+ */
+class NewCurrency : public Item {
+private:
+ // how much the coin is "worth" so to say
+ int value;
+public:
+ // get the value of the coin
+ int getValue();
+
+ // TODO maybe play a jingling noise
+ // probably won't have a use
+ int useItem();
+
+ NewCurrency(){}
+ ~NewCurrency(){}
+};
+
+/***********************************************************************************
+ * OLD STUFF THAT NEEDS TO BURN *
+ **********************************************************************************/
+
+/***********************************************************************************
+ * OLD STUFF THAT NEEDS TO GET UPDATED *
+ **********************************************************************************/
class Inventory {
private:
unsigned int size; //how many slots our inventory has
unsigned int sel; //what item is currently selected
int os = 0;
public:
- std::vector<item_t> items;
+ std::vector<std::pair<Item*, uint>> Items;
bool invOpen = false; //is the inventory open
bool invOpening = false; //is the opening animation playing
@@ -63,6 +186,8 @@ public:
Inventory(unsigned int s); // Creates an inventory of size 's'
~Inventory(void); // Free's allocated memory
+ int useCurrent();
+
int addItem(std::string name,uint count);
int takeItem(std::string name,uint count);
int hasItem(std::string name);
diff --git a/include/quest.hpp b/include/quest.hpp
index 311aade..2db65a2 100644
--- a/include/quest.hpp
+++ b/include/quest.hpp
@@ -22,8 +22,8 @@
typedef struct {
std::string title;
std::string desc;
- struct item_t reward;
- std::vector<std::pair<std::string,int>> need;
+ std::pair<std::string, uint> reward;
+ std::vector<std::pair<std::string, int>> need;
} Quest;
/**
diff --git a/include/texture.hpp b/include/texture.hpp
index 0611ded..99d2d84 100644
--- a/include/texture.hpp
+++ b/include/texture.hpp
@@ -61,6 +61,17 @@ public:
std::vector<GLuint> image;
/**
+ * Contains the dimensions of each texture in the vector
+ */
+ //TODO
+ //std::vector<vec2> imageDim;
+
+ /**
+ * Stores the location of all the images
+ */
+ std::vector<std::string> texLoc;
+
+ /**
* Populates the image array from a list of strings, with each string as a
* separate argument.
*/
diff --git a/main.cpp b/main.cpp
index c92c3e6..c56871b 100644
--- a/main.cpp
+++ b/main.cpp
@@ -176,6 +176,15 @@ int main(int argc, char *argv[]){
glEnable(GL_MULTISAMPLE);
+ /*
+ * Load sprites used in the inventory menu. See src/inventory.cpp
+ */
+
+ initInventorySprites();
+ // load mouse texture, and other inventory textures
+ mouseTex = Texture::loadTexture("assets/mouse.png");
+
+
// read in all XML file names in the folder
std::vector<std::string> xmlFiles;
if (xmlFolder.empty())
@@ -206,9 +215,9 @@ int main(int argc, char *argv[]){
if (currentWorld == NULL)
UserError("Plot twist: The world never existed...?");
- // load mouse texture, and other inventory textures
- mouseTex = Texture::loadTexture("assets/mouse.png");
- initInventorySprites();
+ /**************************
+ **** GAMELOOP ****
+ **************************/
// the main loop, in all of its gloriousness..
gameRunning = true;
diff --git a/src/entities.cpp b/src/entities.cpp
index 3fa24a0..b9c1d0d 100644
--- a/src/entities.cpp
+++ b/src/entities.cpp
@@ -172,6 +172,7 @@ Player::Player(){ //sets all of the player specific traits on object creation
"assets/player/playerk6.png",
"assets/player/playerk7.png",
"assets/player/playerk8.png");
+
inv = new Inventory(PLAYER_INV_SIZE);
}
Player::~Player() {
@@ -832,9 +833,13 @@ void Player::save(void) {
data.append(std::to_string((int)maxHealth) + "\n");
data.append(std::to_string((int)game::time::getTickCount()) + "\n");
- data.append(std::to_string((int)inv->items.size()) + "\n");
- for(auto &i : inv->items)
- data.append(std::to_string((int)i.count) + "\n" + std::to_string((int)i.id) + "\n");
+ data.append("qwer\n");
+ data.append(std::to_string((int)inv->Items.size()) + "\n");
+ for(auto &i : inv->Items) {
+ if(i.second)
+ data.append(std::to_string(uint(i.second)) + "\n" + i.first->name + "\n");
+ }
+ data.append("qwer\n");
data.append(std::string(currentXML.data() + 4) + "\n");
@@ -845,7 +850,7 @@ void Player::save(void) {
void Player::sspawn(float x,float y) {
unsigned int i;
- uint count;
+ int count;
std::ifstream in (std::string(xmlFolder + "main.dat"),std::ios::in | std::ios::binary);
spawn(x,y);
@@ -875,11 +880,18 @@ void Player::sspawn(float x,float y) {
game::time::tick(std::stoi(ddata));
std::getline(data,ddata);
- for(i = std::stoi(ddata);i;i--) {
+ std::getline(data,ddata);
+
+ for (i = std::stoi(ddata);i;i--) {
std::getline(data,ddata);
+ if (ddata == "qwer")
+ break;
count = std::stoi(ddata);
+
std::getline(data,ddata);
- inv->items.push_back(item_t{count,(uint)std::stoi(ddata)});
+ if (ddata == "qwer")
+ break;
+ inv->addItem(ddata, (uint)count);
}
std::getline(data,ddata);
diff --git a/src/inventory.cpp b/src/inventory.cpp
index 07ce377..78502a7 100644
--- a/src/inventory.cpp
+++ b/src/inventory.cpp
@@ -1,6 +1,4 @@
#include <inventory.hpp>
-
-#include <common.hpp>
#include <entities.hpp>
#include <ui.hpp>
#include <gametime.hpp>
@@ -10,177 +8,233 @@ using namespace tinyxml2;
extern Player *player;
extern GLuint invUI;
-static float hangle = 0.0f;
-static bool swing = false;
static vec2 itemLoc;
static const unsigned char numSlot = 7;
Mix_Chunk* swordSwing;
-static std::vector<Item *> itemMap;
-static std::vector<Currency *> currencyMap;
-void itemDraw(Player *p,uint id);
+static std::vector<NewCurrency *> currencyMap;
+static std::vector<Item *> ItemMap;
-void initInventorySprites(void) {
+
+void itemDraw(Player *p, Item* d);
+
+bool strCaseCmp(std::string one, std::string two)
+{
+ for (auto &s : one) {
+ s = std::tolower(s);
+ }
+ for (auto &t : two) {
+ t = std::tolower(t);
+ }
+
+ if (one == two) return true;
+ return false;
+}
+
+void items(void)
+{
XMLDocument xml;
xml.LoadFile("config/items.xml");
XMLElement *exml = xml.FirstChildElement("item");
XMLElement *cxml = xml.FirstChildElement("currency");
while (cxml) {
- currencyMap.push_back(new Currency());
- currencyMap.back()->width = HLINES(7);
- currencyMap.back()->height = HLINES(7);
- currencyMap.back()->name = cxml->StrAttribute("name");
- currencyMap.back()->value = cxml->FloatAttribute("value");
+ // NEWEWEWEWEWEWEWEW
+ // TODO
+
cxml = cxml->NextSiblingElement();
}
-
while (exml) {
- itemMap.push_back(new Item());
- itemMap.back()->name = exml->StrAttribute("name");
- itemMap.back()->type = exml->StrAttribute("type");
- itemMap.back()->texloc = exml->StrAttribute("sprite");
- itemMap.back()->width = HLINES(exml->FloatAttribute("width"));
- itemMap.back()->height = HLINES(exml->FloatAttribute("height"));
- itemMap.back()->maxStackSize = exml->UnsignedAttribute("maxstack");
- itemMap.back()->attribValue = exml->FloatAttribute("value");
- itemMap.back()->tex = new Texturec({ itemMap.back()->texloc });
+ std::string name = exml->Attribute("type");
+ // if the type is blank
+ if (strCaseCmp(name, "blank")) {
- exml = exml->NextSiblingElement();
- }
+ ItemMap.push_back(new BaseItem());
- swordSwing = Mix_LoadWAV("assets/sounds/shortSwing.wav");
- Mix_Volume(2, 100);
-}
+ // if the type is a sword
+ } else if (strCaseCmp(name, "sword")) {
-void destroyInventory(void) {
+ ItemMap.push_back(new Sword());
- while(!itemMap.empty()) {
- delete itemMap.front();
- itemMap.erase(itemMap.begin());
- }
+ // if the type is a bow
+ } else if (strCaseCmp(name, "bow")) {
- Mix_FreeChunk(swordSwing);
-}
+ ItemMap.push_back(new Bow());
+ // uncooked / raw food
+ } else if (strCaseCmp(name, "rawfood")) {
-const char *getItemTexturePath(std::string name){
- for (auto &i : itemMap) {
- if (i->name == name)
- return i->texloc.c_str();
- }
- return NULL;
-}
+ ItemMap.push_back(new RawFood());
-GLuint getItemTexture(std::string name) {
- for (auto &i : itemMap) {
- if (i->name == name)
- return i->tex->image[0];
- }
+ // cooked food or natural food
+ } else if (strCaseCmp(name, "food") || strCaseCmp(name, "cooked food")) {
- return 0;
-}
+ ItemMap.push_back(new Food());
-float getItemWidth(std::string name) {
- for(auto &i : itemMap) {
- if (i->name == name)
- return i->width;
- }
- return 0;
-}
+ // if type was not specified make it a base item
+ } else {
-float getItemHeight(std::string name) {
- for(auto &i : itemMap) {
- if (i->name == name)
- return i->height;
- }
- return 0;
-}
+ ItemMap.push_back(new BaseItem());
+ }
-Inventory::Inventory(unsigned int s) {
- sel=0;
- size=s;
-}
+ // set how much of the item we can stack
+ ItemMap.back()->maxStackSize = exml->UnsignedAttribute("maxStackSize");
-Inventory::~Inventory(void) {
+ // set all of the texture frames we can use
+ ItemMap.back()->tex = new Texturec(1, exml->Attribute("sprite"));
+
+ // get the width and height of the object based off of its sprite
+ ItemMap.back()->dim = Texture::imageDim(exml->Attribute("sprite"));
+
+ ItemMap.back()->name = exml->Attribute("name");
+
+ exml = exml->NextSiblingElement();
+ }
+ for (auto &i : ItemMap) {
+ std::cout << i->name << ", " << i->maxStackSize << ", " << i->dim.x << ", " << i->dim.y << std::endl;
+ }
}
-int Inventory::addItem(std::string name,uint count) {
- for(unsigned int i=0;i<itemMap.size();i++) {
- if (itemMap[i]->name == name) {
- for(auto &in : items) {
- if (in.id == i) {
- in.count += count;
- return 0;
+int Inventory::addItem(std::string name, uint count)
+{
+ std::cout << "Adding: " << count << name << "\'s" << std::endl;
+ for (uint i = 0; i < ItemMap.size(); i++) {
+ if (strCaseCmp(ItemMap[i]->name, name)) {
+ for (auto &it : Items) {
+ if (it.second && strCaseCmp(it.first->name, name)) {
+ if ((it.second + count) < it.first->maxStackSize) {
+ it.second += count;
+ return 0;
+ }
}
}
- items.push_back(item_t { count, i });
+ Items[os] = std::make_pair(ItemMap[i]->clone(), count);
+ if (!Items[os+1].second) {
+ os++;
+ }
return 0;
}
}
return -1;
}
-int Inventory::takeItem(std::string name,uint count) {
- unsigned int id = 999999;
+int Inventory::takeItem(std::string name, uint count)
+{
- /*
- * Name to ID lookup
- */
+ // returns
+ // 0 = good
+ // -1 = no such item exists
+ // -2 = if item doesnt exist in inventory
+ // postive items = number returned is how many more the item needs
+
+ std::string iden;
- for(unsigned int i=0;i<itemMap.size();i++) {
- if (itemMap[i]->name == name) {
- id = i;
+ for (uint i = 0; i < ItemMap.size(); i++) {
+ if (ItemMap[i]->name == name) {
+ iden = name;
break;
}
}
- if (id == 999999)
- return -1; //if no such item exists
+ if (iden.empty()) {
+ return -1;
+ }
- /*
- * Inventory lookup
- */
+ for (auto &i : Items) {
+ if (i.second && i.first->name == iden) {
+ if (count > i.second) {
+ return (count - i.second);
+ } else {
+ i.second -= count;
- for(unsigned int i=0;i<items.size();i++) {
- if (items[i].id == id) {
- if (count > items[i].count)
- return -(items[i].count - count);
- else{
- items[i].count -= count;
- if (!items[i].count)
- items.erase(items.begin()+i);
}
return 0;
}
}
+
return -2;
}
int Inventory::hasItem(std::string name) {
- unsigned int id = 999999;
- for(unsigned int i=0;i<itemMap.size();i++) {
- if (itemMap[i]->name == name) {
- id = i;
- break;
+ for (auto &i : Items) {
+ if (i.first->name == name) {
+ return i.second;
}
}
- if (id == 999999)
- return 0;
+ return 0;
+}
+void initInventorySprites(void) {
+
+ items();
+
+ // keep
+ swordSwing = Mix_LoadWAV("assets/sounds/shortSwing.wav");
+ Mix_Volume(2,100);
+}
+
+void destroyInventory(void) {
+
+ // NEWEWEWEWEWEWEWEW
+ while (!ItemMap.empty()) {
+ delete ItemMap.front();
+ ItemMap.erase(std::begin(ItemMap));
+ }
+
+ Mix_FreeChunk(swordSwing);
+}
+
+
+const char *getItemTexturePath(std::string name){
+ for (auto &i : ItemMap) {
+ if (i->name == name)
+ return i->tex->texLoc[0].c_str();
+ }
+ return NULL;
+}
+
+GLuint getItemTexture(std::string name) {
+ for (auto &i : ItemMap) {
+ if (i->name == name) {
+ return i->tex->image[0];
+ }
+ }
+ return 0;
+}
- for(auto &i : items) {
- if (i.id == id)
- return i.count;
+float getItemWidth(std::string name) {
+ for (auto &i : ItemMap) {
+ if (i->name == name)
+ return i->dim.x;
}
+ return 0;
+}
+float getItemHeight(std::string name) {
+ for (auto &i : ItemMap) {
+ if (i->name == name)
+ return i->dim.y;
+ }
return 0;
}
+Inventory::Inventory(unsigned int s) {
+ sel=0;
+ size=s;
+
+ Items.resize(size);
+ for (auto &i : Items) {
+ i = std::make_pair(nullptr, 0);
+ }
+}
+
+Inventory::~Inventory(void) {
+}
+
void Inventory::setSelection(unsigned int s) {
sel=s;
}
@@ -216,10 +270,12 @@ void Inventory::draw(void) {
float angleB = (float)180/(float)numSlot;
float angle = float(angleB/2.0f);
unsigned int a = 0;
- static vec2 mouseStart = {0,0};
+ //static vec2 mouseStart = {0,0};
C("End define");
auto deltaTime = game::time::getDeltaTime();
+ auto SCREEN_WIDTH = game::SCREEN_WIDTH;
+ auto SCREEN_HEIGHT = game::SCREEN_HEIGHT;
for (auto &r : iray) {
r.start.x = player->loc.x + (player->width / 2);
@@ -228,16 +284,15 @@ void Inventory::draw(void) {
} a = 0;
for (auto &cr : curRay) {
- cr.start.x = (offset.x + game::SCREEN_WIDTH / 2);
+ cr.start.x = (offset.x + SCREEN_WIDTH / 2);
cr.start.y = offset.y - (a * itemWide * 1.5f);
curCurCoord[a++] = cr.start;
} a = 0;
for (int r = 0; r < 4; r++) {
for (int c = 0; c < 8; c++) {
- massRay[a].x = ((offset.x - game::SCREEN_WIDTH / 2) + itemWide) + c * itemWide * 1.5f;
- massRay[a].y = ((offset.y + game::SCREEN_HEIGHT / 2) - itemWide * 1.5f) - r * itemWide * 1.5f;
- a++;
+ massRay[a ].x = ((offset.x - SCREEN_WIDTH / 2) + itemWide) + c * itemWide * 1.5f;
+ massRay[a++].y = ((offset.y + SCREEN_HEIGHT / 2) - itemWide * 1.5f) - r * itemWide * 1.5f;
}
} a = 0;
@@ -317,33 +372,30 @@ void Inventory::draw(void) {
glVertex2i(mr.x-(itemWide/2)+itemWide,mr.y-(itemWide/2)+itemWide);
glVertex2i(mr.x-(itemWide/2), mr.y-(itemWide/2)+itemWide);
glEnd();
- if (!items.empty() && a+numSlot < items.size() && items[a+numSlot].count) {
+ if (!Items.empty() && a+numSlot < Items.size() && Items[a+numSlot].second) {
glEnable(GL_TEXTURE_2D);
- itemMap[items[a + numSlot].id]->tex->bind(0);
+ glBindTexture(GL_TEXTURE_2D, Items[a+numSlot].first->tex->image[0]);//itemtex[items[a+numSlot].id]);
glColor4f(1.0f, 1.0f, 1.0f, ((float)massDfp[a]/(float)(massRange?massRange:1))*0.8f);
glBegin(GL_QUADS);
- ivec2 q = {(int)(itemWide / 2 * itemMap[items[a + numSlot].id]->width / itemMap[items[a + numSlot].id]->height), itemWide / 2};
- if (itemMap[items[a + numSlot].id]->height > itemMap[items[a + numSlot].id]->width) {
- glTexCoord2i(0, 1);glVertex2i(mr.x - q.x, mr.y - q.y);
- glTexCoord2i(1, 1);glVertex2i(mr.x + q.x, mr.y - q.y);
- glTexCoord2i(1, 0);glVertex2i(mr.x + q.x, mr.y + q.y);
- glTexCoord2i(0, 0);glVertex2i(mr.x - q.x, mr.y + q.y);
- } else {
- q.x = itemWide / 2 * itemMap[items[a + numSlot].id]->height / itemMap[items[a+numSlot].id]->width;
- glTexCoord2i(0, 1);glVertex2i(mr.x - q.y, mr.y - q.x);
- glTexCoord2i(1, 1);glVertex2i(mr.x + q.y, mr.y - q.x);
- glTexCoord2i(1, 0);glVertex2i(mr.x + q.y, mr.y + q.x);
- glTexCoord2i(0, 0);glVertex2i(mr.x - q.y, mr.y + q.x);
+ if (Items[a+numSlot].first->dim.y > Items[a+numSlot].first->dim.x) {
+ glTexCoord2i(0,1);glVertex2i(mr.x-((itemWide/2)*((float)Items[a+numSlot].first->dim.x/(float)Items[a+numSlot].first->dim.y)), mr.y-(itemWide/2));
+ glTexCoord2i(1,1);glVertex2i(mr.x+((itemWide/2)*((float)Items[a+numSlot].first->dim.x/(float)Items[a+numSlot].first->dim.y)), mr.y-(itemWide/2));
+ glTexCoord2i(1,0);glVertex2i(mr.x+((itemWide/2)*((float)Items[a+numSlot].first->dim.x/(float)Items[a+numSlot].first->dim.y)), mr.y+(itemWide/2));
+ glTexCoord2i(0,0);glVertex2i(mr.x-((itemWide/2)*((float)Items[a+numSlot].first->dim.x/(float)Items[a+numSlot].first->dim.y)), mr.y+(itemWide/2));
+ }else{
+ glTexCoord2i(0,1);glVertex2i(mr.x-(itemWide/2),mr.y-(itemWide/2)*((float)Items[a+numSlot].first->dim.y/(float)Items[a+numSlot].first->dim.x));
+ glTexCoord2i(1,1);glVertex2i(mr.x+(itemWide/2),mr.y-(itemWide/2)*((float)Items[a+numSlot].first->dim.y/(float)Items[a+numSlot].first->dim.x));
+ glTexCoord2i(1,0);glVertex2i(mr.x+(itemWide/2),mr.y+(itemWide/2)*((float)Items[a+numSlot].first->dim.y/(float)Items[a+numSlot].first->dim.x));
+ glTexCoord2i(0,0);glVertex2i(mr.x-(itemWide/2),mr.y+(itemWide/2)*((float)Items[a+numSlot].first->dim.y/(float)Items[a+numSlot].first->dim.x));
}
glEnd();
glDisable(GL_TEXTURE_2D);
-
- ui::setFontColor(255, 255, 255, (float)massDfp[a] / (float)(massRange ? massRange : 1) * 255);
- ui::putText(mr.x - itemWide / 2 + itemWide * 0.85f, mr.y - itemWide / 2, "%d", items[a + numSlot].count);
- ui::setFontColor(255, 255, 255, 255);
+ ui::setFontColor(255,255,255,((float)massDfp[a]/(float)(massRange?massRange:1))*255);
+ ui::putText(mr.x-(itemWide/2)+(itemWide*.85),mr.y-(itemWide/2),"%d",Items[a+numSlot].second);
+ ui::setFontColor(255,255,255,255);
}
a++;
- } a = 0;
+ }a=0;
for(auto &cr : curRay) {
curCurCoord[a].x -= float((curdfp[a]) * cos(-1));
@@ -360,7 +412,6 @@ void Inventory::draw(void) {
a++;
}a=0;
- bool done = false;
for(auto &r : iray) {
angle = 180 - (angleB * a) - angleB / 2.0f;
curCoord[a].x += float((dfp[a]) * cos(angle*PI/180));
@@ -375,30 +426,28 @@ void Inventory::draw(void) {
glVertex2i(r.end.x-(itemWide/2), r.end.y-(itemWide/2)+itemWide);
glEnd();
- if (!done && !items.empty() && a < numSlot && items[a].count) {
+ if (!Items.empty() && a < numSlot && Items[a].second) {
glEnable(GL_TEXTURE_2D);
- itemMap[items[a].id]->tex->bind(0);
+ glBindTexture(GL_TEXTURE_2D, Items[a].first->tex->image[0]);//itemtex[items[a].id]);
glColor4f(1.0f, 1.0f, 1.0f, ((float)dfp[a]/(float)(range?range:1))*0.8f);
glBegin(GL_QUADS);
- if (itemMap[items[a].id]->height > itemMap[items[a].id]->width) {
- glTexCoord2i(0,1);glVertex2i(r.end.x-((itemWide/2)*((float)itemMap[items[a].id]->width/(float)itemMap[items[a].id]->height)), r.end.y-(itemWide/2));
- glTexCoord2i(1,1);glVertex2i(r.end.x+((itemWide/2)*((float)itemMap[items[a].id]->width/(float)itemMap[items[a].id]->height)), r.end.y-(itemWide/2));
- glTexCoord2i(1,0);glVertex2i(r.end.x+((itemWide/2)*((float)itemMap[items[a].id]->width/(float)itemMap[items[a].id]->height)), r.end.y+(itemWide/2));
- glTexCoord2i(0,0);glVertex2i(r.end.x-((itemWide/2)*((float)itemMap[items[a].id]->width/(float)itemMap[items[a].id]->height)), r.end.y+(itemWide/2));
- }else{
- glTexCoord2i(0,1);glVertex2i(r.end.x-(itemWide/2),r.end.y-(itemWide/2)*((float)itemMap[items[a].id]->height/(float)itemMap[items[a].id]->width));
- glTexCoord2i(1,1);glVertex2i(r.end.x+(itemWide/2),r.end.y-(itemWide/2)*((float)itemMap[items[a].id]->height/(float)itemMap[items[a].id]->width));
- glTexCoord2i(1,0);glVertex2i(r.end.x+(itemWide/2),r.end.y+(itemWide/2)*((float)itemMap[items[a].id]->height/(float)itemMap[items[a].id]->width));
- glTexCoord2i(0,0);glVertex2i(r.end.x-(itemWide/2),r.end.y+(itemWide/2)*((float)itemMap[items[a].id]->height/(float)itemMap[items[a].id]->width));
- }
+ if (Items[a].first->dim.y > Items[a].first->dim.x) {
+ glTexCoord2i(0,1);glVertex2i(r.end.x-((itemWide/2)*((float)Items[a].first->dim.x/(float)Items[a].first->dim.y)), r.end.y-(itemWide/2));
+ glTexCoord2i(1,1);glVertex2i(r.end.x+((itemWide/2)*((float)Items[a].first->dim.x/(float)Items[a].first->dim.y)), r.end.y-(itemWide/2));
+ glTexCoord2i(1,0);glVertex2i(r.end.x+((itemWide/2)*((float)Items[a].first->dim.x/(float)Items[a].first->dim.y)), r.end.y+(itemWide/2));
+ glTexCoord2i(0,0);glVertex2i(r.end.x-((itemWide/2)*((float)Items[a].first->dim.x/(float)Items[a].first->dim.y)), r.end.y+(itemWide/2));
+ }else{
+ glTexCoord2i(0,1);glVertex2i(r.end.x-(itemWide/2),r.end.y-(itemWide/2)*((float)Items[a].first->dim.y/(float)Items[a].first->dim.x));
+ glTexCoord2i(1,1);glVertex2i(r.end.x+(itemWide/2),r.end.y-(itemWide/2)*((float)Items[a].first->dim.y/(float)Items[a].first->dim.x));
+ glTexCoord2i(1,0);glVertex2i(r.end.x+(itemWide/2),r.end.y+(itemWide/2)*((float)Items[a].first->dim.y/(float)Items[a].first->dim.x));
+ glTexCoord2i(0,0);glVertex2i(r.end.x-(itemWide/2),r.end.y+(itemWide/2)*((float)Items[a].first->dim.y/(float)Items[a].first->dim.x));
+ }
glEnd();
glDisable(GL_TEXTURE_2D);
ui::setFontColor(255,255,255,((float)dfp[a]/(float)(range?range:1))*255);
- ui::putStringCentered(r.end.x,r.end.y-(itemWide*.9),itemMap[items[a].id]->name);
- ui::putText(r.end.x-(itemWide/2)+(itemWide*.85),r.end.y-(itemWide/2),"%d",items[a].count);
+ ui::putStringCentered(r.end.x,r.end.y-(itemWide*.9),Items[a].first->name);//itemMap[items[a].id]->name);
+ ui::putText(r.end.x-(itemWide/2)+(itemWide*.85),r.end.y-(itemWide/2),"%d",Items[a].second);
ui::setFontColor(255,255,255,255);
- } else {
- done = true;
}
if (sel == a) {
@@ -439,7 +488,7 @@ void Inventory::draw(void) {
a++;
}
C("Done drawing standard inv");
- } else if (invHover) {
+ } /*else if (invHover) {
static unsigned int highlight = 0;
static unsigned int thing = 0;
@@ -494,7 +543,7 @@ void Inventory::draw(void) {
if (a < items.size() && items[a].count) {
glEnable(GL_TEXTURE_2D);
- itemMap[items[a + numSlot].id]->tex->bind(0);
+ glBindTexture(GL_TEXTURE_2D, itemtex[items[a].id]);
glColor4f(1.0f, 1.0f, 1.0f, a == highlight ? 0.8f : 0.2f);
glBegin(GL_QUADS);
if(itemMap[items[a].id]->height > itemMap[items[a].id]->width){
@@ -520,58 +569,32 @@ void Inventory::draw(void) {
itemMap[items[highlight].id]->name
);
}
- }
- if (!items.empty() && items.size() > sel && items[sel].count)
- itemDraw(player,items[sel].id);
+ }*/
+ /*if (!items.empty() && items.size() > sel && items[sel].count)
+ itemDraw(player,items[sel].id);*/
+ if (!Items.empty() && Items.size() > sel && Items[sel].second)
+ itemDraw(player, Items[sel].first);
}
-void itemDraw(Player *p,uint id) {
- static unsigned char inc = 0;
+void itemDraw(Player *p, Item *d) {
itemLoc.y = p->loc.y+(p->height/3);
itemLoc.x = p->left?p->loc.x:p->loc.x+p->width;
glPushMatrix();
- if (!id)return;
-
- if (itemMap[id]->type == "Sword") {
- if (p->left) {
- if (hangle < 15) {
- hangle=15.0f;
- p->inv->usingi = false;
- }
- }else{
- if (hangle > -15) {
- hangle=-15.0f;
- p->inv->usingi = false;
- }
- }
- } else
- hangle = 0;
-
- if (p->inv->usingi)
- inc = 10;
-
- if (inc) {
- inc--;
- p->inv->useItem();
- }
-
glUseProgram(shaderProgram);
glUniform1i(glGetUniformLocation(shaderProgram, "sampler"), 0);
glTranslatef(itemLoc.x,itemLoc.y,0);
- glRotatef(hangle, 0.0f, 0.0f, 1.0f);
+ glRotatef(d->rotation, 0.0f, 0.0f, 1.0f);
glTranslatef(-itemLoc.x,-itemLoc.y,0);
glEnable(GL_TEXTURE_2D);
-
- itemMap[id]->tex->bind(0);
-
+ glBindTexture(GL_TEXTURE_2D,d->tex->image[0]);
glColor4ub(255,255,255,255);
glBegin(GL_QUADS);
glTexCoord2i(0,1);glVertex2f(itemLoc.x, itemLoc.y);
- glTexCoord2i(1,1);glVertex2f(itemLoc.x+itemMap[id]->width,itemLoc.y);
- glTexCoord2i(1,0);glVertex2f(itemLoc.x+itemMap[id]->width,itemLoc.y+itemMap[id]->height);
- glTexCoord2i(0,0);glVertex2f(itemLoc.x, itemLoc.y+itemMap[id]->height);
+ glTexCoord2i(1,1);glVertex2f(itemLoc.x+d->dim.x,itemLoc.y);
+ glTexCoord2i(1,0);glVertex2f(itemLoc.x+d->dim.x,itemLoc.y+d->dim.y);
+ glTexCoord2i(0,0);glVertex2f(itemLoc.x, itemLoc.y+d->dim.y);
glEnd();
glDisable(GL_TEXTURE_2D);
glTranslatef(player->loc.x*2,0,0);
@@ -579,62 +602,23 @@ void itemDraw(Player *p,uint id) {
glUseProgram(0);
}
+/*
+ * This function is used to trigger the player's item's ability.
+ */
int Inventory::useItem(void)
{
- static bool up = false;
-
- if (!invHover) {
- if (itemMap[items[sel].id]->type == "Sword") {
- if (swing) {
- int dir = player->left ? 1 : -1;
-
- if (hangle == 15 * dir) {
- up = true;
- Mix_PlayChannel(2, swordSwing, 0);
- }
-
- if (up)
- hangle += 0.325f * dir * game::time::getDeltaTime();
-
- if (!player->left) {
- if (hangle <= -90)
- hangle = -14;
- } else if (hangle >= 90)
- hangle = 14;
- } else {
- swing = true;
- Mix_PlayChannel(2, swordSwing, 0);
- }
- }else if (itemMap[items[sel].id]->type == "Cooked Food") {
- player->health += itemMap[items[sel].id]->attribValue;
- usingi = false;
- }
- }
return 0;
}
+int Inventory::useCurrent()
+{
+ if(Items[sel].second)
+ return Items[sel].first->useItem();
+ return -1;
+}
+
bool Inventory::detectCollision(vec2 one, vec2 two) {
(void)one;
(void)two;
- float xc, yc;
- float i = 0.0f;
-
- if (items.empty() || !items[sel].count)
- return false;
- if (itemMap[items[sel].id]->type == "Sword") {
- while(i<itemMap[items[sel].id]->height) {
- xc = itemLoc.x; yc = itemLoc.y;
- xc += float(i) * cos((hangle+90)*PI/180);
- yc += float(i) * sin((hangle+90)*PI/180);
-
- if (xc >= one.x && xc <= two.x) {
- if (yc >= one.y && yc <= two.y) {
- return true;
- }
- }
-
- i += game::HLINE;
- }
- }
return false;
}
diff --git a/src/items.cpp b/src/items.cpp
new file mode 100644
index 0000000..403c49e
--- /dev/null
+++ b/src/items.cpp
@@ -0,0 +1,124 @@
+#include <inventory.hpp>
+#include <entities.hpp>
+
+extern Player *player;
+
+/************************************************************************************
+* GLOBAL *
+************************************************************************************/
+
+/**************************************************
+* USE ITEM *
+**************************************************/
+
+int BaseItem::useItem()
+{
+ return 0;
+}
+
+int Sword::useItem()
+{
+ std::cout << "Swing!" << std::endl;
+ if (player->left)
+ rotation += 10.0f;
+ else
+ rotation -= 10.0f;
+ return 0;
+}
+
+int Bow::useItem()
+{
+ return 0;
+}
+
+// TODO chance to hurt
+int RawFood::useItem()
+{
+ return 0;
+}
+
+int Food::useItem()
+{
+ std::cout << "Yum!" << std::endl;
+ return 0;
+}
+
+
+/**************************************************
+* CLONE *
+**************************************************/
+
+BaseItem* BaseItem::clone()
+{
+ return new BaseItem(*this);
+}
+
+Sword* Sword::clone()
+{
+ return new Sword(*this);
+}
+
+Bow* Bow::clone()
+{
+ return new Bow(*this);
+}
+
+Food* Food::clone()
+{
+ return new Food(*this);
+}
+
+RawFood* RawFood::clone()
+{
+ return new RawFood(*this);
+}
+
+/************************************************************************************
+* ITEM SPECIFIC *
+************************************************************************************/
+
+/**************************************************
+* ITEM *
+**************************************************/
+
+Item::~Item()
+{
+ delete tex;
+}
+
+GLuint Item::rtex()
+{
+ return tex->image[0];
+}
+
+GLuint Item::rtex(int n)
+{
+ return tex->image[n];
+}
+
+/**************************************************
+* SWORD *
+**************************************************/
+
+float Sword::getDamage()
+{
+ return damage;
+}
+
+/**************************************************
+* BOW *
+**************************************************/
+
+float Bow::getDamage()
+{
+ return damage;
+}
+
+/**************************************************
+* FOODS *
+**************************************************/
+
+float RawFood::getHealth()
+{
+ return health;
+}
diff --git a/src/texture.cpp b/src/texture.cpp
index 86038e2..d457831 100644
--- a/src/texture.cpp
+++ b/src/texture.cpp
@@ -170,26 +170,31 @@ Texturec::Texturec(uint amt, ...) {
va_list fNames;
texState = 0;
va_start(fNames, amt);
- for(unsigned int i = 0; i < amt; i++)
- image.push_back(Texture::loadTexture(va_arg(fNames, char *)));
+ for (unsigned int i = 0; i < amt; i++) {
+ std::string l = va_arg(fNames, char *);
+ image.push_back(Texture::loadTexture(l));
+ texLoc.push_back(l);
+ }
va_end(fNames);
}
Texturec::Texturec(std::initializer_list<std::string> l)
{
texState = 0;
- std::for_each(l.begin(), l.end(), [&](std::string s) { image.push_back(Texture::loadTexture(s)); });
+ std::for_each(l.begin(), l.end(), [&](std::string s) { image.push_back(Texture::loadTexture(s)); texLoc.push_back(s);});
}
Texturec::Texturec(std::vector<std::string>v) {
texState = 0;
- std::for_each(v.begin(), v.end(), [&](std::string s) { image.push_back(Texture::loadTexture(s)); });
+ std::for_each(v.begin(), v.end(), [&](std::string s) { image.push_back(Texture::loadTexture(s)); texLoc.push_back(s);});
}
Texturec::Texturec(uint amt,const char **paths) {
texState = 0;
- for(unsigned int i = 0; i < amt; i++)
+ for (unsigned int i = 0; i < amt; i++) {
image.push_back(Texture::loadTexture(paths[i]));
+ texLoc.push_back(paths[i]);
+ }
}
Texturec::~Texturec() {
diff --git a/src/ui.cpp b/src/ui.cpp
index 316bcbb..6e8dbf1 100644
--- a/src/ui.cpp
+++ b/src/ui.cpp
@@ -964,7 +964,7 @@ EXIT:
} else {
// left click uses item
if (e.button.button & SDL_BUTTON_LEFT)
- player->inv->usingi = true;
+ player->inv->useCurrent();
}
if(mouse.x > player->loc.x && mouse.x < player->loc.x + player->width &&
diff --git a/xml/playerSpawnHill1_Building1.xml b/xml/playerSpawnHill1_Building1.xml
index 381f160..0cf04c1 100644
--- a/xml/playerSpawnHill1_Building1.xml
+++ b/xml/playerSpawnHill1_Building1.xml
@@ -32,44 +32,6 @@
<text id="4">
Have a sword though.
<give id="Wood Sword" count="1"/>
- <give id="Wood Sword2" count="1"/>
- <give id="Wood Sword3" count="1"/>
- <give id="Wood Sword4" count="1"/>
- <give id="Wood Sword5" count="1"/>
- <give id="Wood Sword6" count="1"/>
- <give id="Wood Sword7" count="1"/>
- <give id="Wood Sword8" count="1"/>
- <give id="Wood Sword9" count="1"/>
- <give id="Wood Sword10" count="1"/>
- <give id="Wood Sword11" count="1"/>
- <give id="Wood Sword12" count="1"/>
- <give id="Wood Sword13" count="1"/>
- <give id="Wood Sword14" count="1"/>
- <give id="Wood Sword15" count="1"/>
- <give id="Wood Sword16" count="1"/>
- <give id="Wood Sword17" count="1"/>
- <give id="Wood Sword18" count="1"/>
- <give id="Wood Sword19" count="1"/>
- <give id="Wood Sword20" count="1"/>
- <give id="Wood Sword21" count="1"/>
- <give id="Wood Sword22" count="1"/>
- <give id="Wood Sword23" count="1"/>
- <give id="Wood Sword24" count="1"/>
- <give id="Wood Sword25" count="6"/>
- <give id="Wood Sword26" count="1"/>
- <give id="Wood Sword27" count="1"/>
- <give id="Wood Sword28" count="1"/>
- <give id="Wood Sword29" count="1"/>
- <give id="Wood Sword30" count="1"/>
- <give id="Wood Sword31" count="1"/>
- <give id="Wood Sword32" count="1"/>
- <give id="Wood Sword33" count="1"/>
- <give id="Wood Sword34" count="1"/>
- <give id="Wood Sword35" count="1"/>
- <give id="Wood Sword36" count="1"/>
- <give id="Wood Sword37" count="1"/>
- <give id="Wood Sword38" count="1"/>
- <give id="Wood Sword39" count="1"/>
</text>
</Dialog>
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-06 23:19:32 +0000