oerkki/voxelands
oerkki
/
voxelands
2
1
Fork 1
Code Issues 19 Pull Requests Releases Activity

mob spawners pt2

This commit is contained in:
darkrose 2015-09-28 18:34:50 +10:00
parent 75b4d03c99
commit 07de3e3a4c
5 changed files with 73 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/content_craft.cpp
View File

@ -876,7 +876,7 @@ FoundReverseRecipe getReverseRecipe(InventoryItem *iitem, int index)
//how to update an ingredient list given a range of new craft items
template <typename It>
void addToIngredientList(It results_begin, It results_end, std::vector<content_t>& ingredient_list)
void addToIngredientList(It results_begin, It results_end, std::vector<lists::ListData>& ingredient_list)
{
using namespace std;
@ -926,7 +926,7 @@ std::vector<content_t>& getCraftGuideIngredientList()
static unsigned last_craftguide_count = 0;
//get the craftguide list
const vector<content_t>& craft_list = lists::get("craftguide");
const vector<lists::ListData>& craft_list = lists::get("craftguide");
//check if more items need to be added
if (craft_list.size() > last_craftguide_count) {
@ -944,7 +944,7 @@ std::vector<content_t>& getCraftGuideIngredientList()
void giveCreative(Player *player)
{
std::vector<content_t> &creativeinv = lists::get("player-creative");
std::vector<lists::ListData> &creativeinv = lists::get("player-creative");
InventoryList *l = player->inventory.getList("main");
@ -957,13 +957,7 @@ void giveCreative(Player *player)
player->resetInventory();
for(u8 i=0; i<creativeinv.size(); i++) {
if ((creativeinv[(int)i]&CONTENT_CRAFTITEM_MASK) == CONTENT_CRAFTITEM_MASK) {
assert(player->inventory.addItem("main", new CraftItem(creativeinv[i], 1,0)) == NULL) ;
}else if ((creativeinv.at(i)&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK) {
assert(player->inventory.addItem("main", new ToolItem(creativeinv[i], 0,0)) == NULL) ;
}else{
assert(player->inventory.addItem("main", new MaterialItem(creativeinv[i], 1,0)) == NULL) ;
}
player->inventory.addItem("main",InventoryItem::create(creativeinv[i].content,creativeinv[i].count,0,creativeinv[i].data);
}
}

17
src/content_list.cpp
View File

@ -26,15 +26,22 @@
namespace lists {
std::map< std::string , std::vector<content_t> > c_lists;
std::map< std::string , std::vector<ListData> > c_lists;
void add(std::string name, content_t c)
void add(std::string name, content_t c, uint16_t count, uint16_t data)
{
if (std::find(c_lists[name].begin(),c_lists[name].end(),c) == c_lists[name].end())
c_lists[name].push_back(c);
for (std::vector<ListData>::iterator i = c_lists[name].begin(); i != c_lists[name].end(); ++i) {
ListData d = *i;
if (d.content == c && d.data == data) {
i->count = count;
return;
}
}
c_lists[name].push_back(ListData(c,count,data));
}
std::vector<content_t> &get(std::string name)
std::vector<ListData> &get(std::string name)
{
return c_lists[name];
}

20
src/content_list.h
View File

@ -2,11 +2,27 @@
#define _CONTENT_LIST_H
#include <vector>
#include <stdint.h>
namespace lists {
void add(std::string name, content_t c);
std::vector<content_t> &get(std::string name);
struct ListData {
content_t content;
uint16_t count;
uint16_t data;
ListData()
{}
ListData(content_t c, uint16_t cc, uint16_t cd):
content(c),
count(cc),
data(cd)
{}
};
void add(std::string name, content_t c, uint16_t count=1, uint16_t data=0);
std::vector<ListData> &get(std::string name);
};

1
src/content_mob.cpp
View File

@ -28,6 +28,7 @@
#include "environment.h"
#include "map.h"
#include "profiler.h"
#include "intl.h"
MobFeatures g_content_mob_features[CONTENT_MOB_COUNT];

76
src/content_nodemeta.cpp
View File

@ -487,9 +487,9 @@ NodeMetadata* CreativeChestNodeMetadata::clone()
InventoryList *l = d->m_inventory->getList("0");
InventoryItem *t;
l->clearItems();
std::vector<content_t> &list = lists::get("creative");
std::vector<lists::ListData> &list = lists::get("creative");
for (u16 i=0; i<list.size() && i < 32; i++) {
t = InventoryItem::create(list[i],1);
t = InventoryItem::create(list[i].content,list[i].count,0,list[i].data);
l->addItem(t);
}
return d;
@ -511,7 +511,7 @@ bool CreativeChestNodeMetadata::receiveFields(std::string formname, std::map<std
{
if (fields["prev"] == "" && fields["next"] == "")
return false;
std::vector<content_t> &list = lists::get("creative");
std::vector<lists::ListData> &list = lists::get("creative");
if (fields["prev"] != "") {
if (m_page > 0) {
m_page--;
@ -533,7 +533,7 @@ bool CreativeChestNodeMetadata::receiveFields(std::string formname, std::map<std
if (end > list.size())
end = list.size();
for (u16 i=start; i<end; i++) {
t = InventoryItem::create(list[i],1);
t = InventoryItem::create(list[i].content,list[i].count,0,list[i].data);
l->addItem(t);
}
return true;
@ -541,7 +541,7 @@ bool CreativeChestNodeMetadata::receiveFields(std::string formname, std::map<std
std::string CreativeChestNodeMetadata::getDrawSpecString()
{
char buff[256];
std::vector<content_t> &list = lists::get("creative");
std::vector<lists::ListData> &list = lists::get("creative");
snprintf(buff,256,gettext("Page %d of %d"),(int)(m_page+1),(int)((list.size()/32)+1));
std::string spec("size[8,10]");
spec += "list[current_name;0;0,0.5;8,4;]";
@ -1433,13 +1433,13 @@ NodeMetadata* CraftGuideNodeMetadata::clone()
InventoryItem *t;
content_t *r;
l->clearItems();
std::vector<content_t> &list = lists::get("craftguide");
std::vector<lists::ListData> &list = lists::get("craftguide");
u16 start = m_page*40;
u16 end = start+40;
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
t = InventoryItem::create(list[i],1);
t = InventoryItem::create(list[i].content,list[i].count,0,list[i].data);
r = crafting::getRecipe(t);
if (!r) {
delete t;
@ -1509,7 +1509,7 @@ bool CraftGuideNodeMetadata::import(NodeMetadata *meta)
if (m_page < 0)
m_page = 0;
std::vector<content_t> &list = lists::get("craftguide");
std::vector<lists::ListData> &list = lists::get("craftguide");
if (m_page > (list.size()/40))
m_page = list.size()/40;
InventoryList *l = m_inventory->getList("list");
@ -1521,7 +1521,7 @@ bool CraftGuideNodeMetadata::import(NodeMetadata *meta)
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
t = InventoryItem::create(list[i],1);
t = InventoryItem::create(list[i].content,list[i].count,0,list[i].data);
r = crafting::getRecipe(t);
if (!r) {
delete t;
@ -1554,7 +1554,7 @@ bool CraftGuideNodeMetadata::receiveFields(std::string formname, std::map<std::s
}
if (fields["prev"] == "" && fields["next"] == "")
return false;
std::vector<content_t> &list = lists::get("craftguide");
std::vector<lists::ListData> &list = lists::get("craftguide");
if (fields["prev"] != "") {
if (m_page > 0) {
m_page--;
@ -1573,7 +1573,7 @@ bool CraftGuideNodeMetadata::receiveFields(std::string formname, std::map<std::s
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
t = InventoryItem::create(list[i],1);
t = InventoryItem::create(list[i].content,list[i].count,0,list[i].data);
r = crafting::getRecipe(t);
if (!r) {
delete t;
@ -1589,7 +1589,7 @@ std::string CraftGuideNodeMetadata::getDrawSpecString()
InventoryItem *q = l->getItem(0);
int tr = 0;
int rc = 0;
std::vector<content_t> &list = lists::get("craftguide");
std::vector<lists::ListData> &list = lists::get("craftguide");
if (q && q->getContent() != CONTENT_IGNORE) {
tr = crafting::getResultCount(q);
rc = crafting::getRecipeCount(q);
@ -1949,13 +1949,13 @@ NodeMetadata* CookBookNodeMetadata::clone()
InventoryList *l = d->m_inventory->getList("list");
InventoryItem *t;
l->clearItems();
std::vector<content_t> &list = lists::get("cooking");
std::vector<lists::ListData> &list = lists::get("cooking");
u16 start = m_page*40;
u16 end = start+40;
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
t = InventoryItem::create(list[i],1);
t = InventoryItem::create(list[i].content,list[i].count,0,list[i].data);
InventoryItem *cookresult = t->createCookResult();
if (!cookresult || cookresult->getContent() == CONTENT_IGNORE) {
delete t;
@ -2011,7 +2011,7 @@ bool CookBookNodeMetadata::import(NodeMetadata *meta)
if (m_page < 0)
m_page = 0;
std::vector<content_t> &list = lists::get("cooking");
std::vector<lists::ListData> &list = lists::get("cooking");
if (m_page > (list.size()/40))
m_page = list.size()/40;
InventoryList *l = m_inventory->getList("list");
@ -2022,7 +2022,7 @@ bool CookBookNodeMetadata::import(NodeMetadata *meta)
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
t = InventoryItem::create(list[i],1);
t = InventoryItem::create(list[i].content,list[i].count,0,list[i].data);
InventoryItem *cookresult = t->createCookResult();
if (!cookresult || cookresult->getContent() == CONTENT_IGNORE) {
delete t;
@ -2038,7 +2038,7 @@ bool CookBookNodeMetadata::receiveFields(std::string formname, std::map<std::str
{
if (fields["prev"] == "" && fields["next"] == "")
return false;
std::vector<content_t> &list = lists::get("cooking");
std::vector<lists::ListData> &list = lists::get("cooking");
if (fields["prev"] != "") {
if (m_page > 0) {
m_page--;
@ -2058,7 +2058,7 @@ bool CookBookNodeMetadata::receiveFields(std::string formname, std::map<std::str
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
t = InventoryItem::create(list[i],1);
t = InventoryItem::create(list[i].content,list[i].count,0,list[i].data);
InventoryItem *cookresult = t->createCookResult();
if (!cookresult || cookresult->getContent() == CONTENT_IGNORE) {
delete t;
@ -2072,7 +2072,7 @@ bool CookBookNodeMetadata::receiveFields(std::string formname, std::map<std::str
}
std::string CookBookNodeMetadata::getDrawSpecString()
{
std::vector<content_t> &list = lists::get("cooking");
std::vector<lists::ListData> &list = lists::get("cooking");
char buff[256];
snprintf(buff,256,gettext("Page %d of %d"),(int)(m_page+1),(int)((list.size()/40)+1));
@ -2131,22 +2131,22 @@ NodeMetadata* DeCraftNodeMetadata::clone()
InventoryList *l = d->m_inventory->getList("list");
InventoryItem *t;
l->clearItems();
std::vector<content_t> &list = lists::get("decrafting");
std::vector<lists::ListData> &list = lists::get("decrafting");
u16 start = m_page*40;
u16 end = start+40;
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
if ((list[i]&CONTENT_CRAFTITEM_MASK) == CONTENT_CRAFTITEM_MASK)
if ((list[i].content&CONTENT_CRAFTITEM_MASK) == CONTENT_CRAFTITEM_MASK)
continue;
if ((list[i]&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK)
if ((list[i].content&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK)
continue;
if ((list[i]&CONTENT_CLOTHESITEM_MASK) == CONTENT_CLOTHESITEM_MASK)
if ((list[i].content&CONTENT_CLOTHESITEM_MASK) == CONTENT_CLOTHESITEM_MASK)
continue;
if (content_features(list[i]).dug_item == "" && content_features(list[i]).extra_dug_item == "")
if (content_features(list[i].content).dug_item == "" && content_features(list[i].content).extra_dug_item == "")
continue;
t = new MaterialItem(list[i],1,0);
t = new MaterialItem(list[i].content,1,list[i].data);
l->addItem(t);
}
return d;
@ -2222,7 +2222,7 @@ bool DeCraftNodeMetadata::import(NodeMetadata *meta)
if (m_page < 0)
m_page = 0;
std::vector<content_t> &list = lists::get("decrafting");
std::vector<lists::ListData> &list = lists::get("decrafting");
if (m_page > (list.size()/40))
m_page = list.size()/40;
InventoryList *l = m_inventory->getList("list");
@ -2233,16 +2233,16 @@ bool DeCraftNodeMetadata::import(NodeMetadata *meta)
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
if ((list[i]&CONTENT_CRAFTITEM_MASK) == CONTENT_CRAFTITEM_MASK)
if ((list[i].content&CONTENT_CRAFTITEM_MASK) == CONTENT_CRAFTITEM_MASK)
continue;
if ((list[i]&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK)
if ((list[i].content&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK)
continue;
if ((list[i]&CONTENT_CLOTHESITEM_MASK) == CONTENT_CLOTHESITEM_MASK)
if ((list[i].content&CONTENT_CLOTHESITEM_MASK) == CONTENT_CLOTHESITEM_MASK)
continue;
if (content_features(list[i]).dug_item == "" && content_features(list[i]).extra_dug_item == "")
if (content_features(list[i].content).dug_item == "" && content_features(list[i].content).extra_dug_item == "")
continue;
t = new MaterialItem(list[i],1,0);
t = new MaterialItem(list[i].content,1,list[i].data);
l->addItem(t);
}
return true;
@ -2251,7 +2251,7 @@ bool DeCraftNodeMetadata::receiveFields(std::string formname, std::map<std::stri
{
if (fields["prev"] == "" && fields["next"] == "")
return false;
std::vector<content_t> &list = lists::get("decrafting");
std::vector<lists::ListData> &list = lists::get("decrafting");
if (fields["prev"] != "") {
if (m_page > 0) {
m_page--;
@ -2271,23 +2271,23 @@ bool DeCraftNodeMetadata::receiveFields(std::string formname, std::map<std::stri
if (end > list.size())
end = list.size();
for (int i=start; i<end; i++) {
if ((list[i]&CONTENT_CRAFTITEM_MASK) == CONTENT_CRAFTITEM_MASK)
if ((list[i].content&CONTENT_CRAFTITEM_MASK) == CONTENT_CRAFTITEM_MASK)
continue;
if ((list[i]&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK)
if ((list[i].content&CONTENT_TOOLITEM_MASK) == CONTENT_TOOLITEM_MASK)
continue;
if ((list[i]&CONTENT_CLOTHESITEM_MASK) == CONTENT_CLOTHESITEM_MASK)
if ((list[i].content&CONTENT_CLOTHESITEM_MASK) == CONTENT_CLOTHESITEM_MASK)
continue;
if (content_features(list[i]).dug_item == "" && content_features(list[i]).extra_dug_item == "")
if (content_features(list[i].content).dug_item == "" && content_features(list[i].content).extra_dug_item == "")
continue;
t = new MaterialItem(list[i],1,0);
t = new MaterialItem(list[i].content,1,list[i].data);
l->addItem(t);
}
return true;
}
std::string DeCraftNodeMetadata::getDrawSpecString()
{
std::vector<content_t> &list = lists::get("decrafting");
std::vector<lists::ListData> &list = lists::get("decrafting");
char buff[256];
snprintf(buff,256,gettext("Page %d of %d"),(int)(m_page+1),(int)((list.size()/40)+1));