diff --git a/library/Console-linux.cpp b/library/Console-linux.cpp index c1bea16d6..f471d6a10 100644 --- a/library/Console-linux.cpp +++ b/library/Console-linux.cpp @@ -653,6 +653,7 @@ bool Console::init(bool sharing) FD_SET(STDIN_FILENO, &d->descriptor_set); FD_SET(d->exit_pipe[0], &d->descriptor_set); inited = true; + return true; } bool Console::shutdown(void) diff --git a/library/include/modules/Maps.h b/library/include/modules/Maps.h index 16f4e15c9..57c84248d 100644 --- a/library/include/modules/Maps.h +++ b/library/include/modules/Maps.h @@ -145,11 +145,13 @@ typedef int16_t t_blockmaterials [16][16]; * \ingroup grp_maps */ typedef df::tile_designation designations40d [16][16]; +typedef df::tile_designation t_designation; /** * 16x16 array of occupancy flags * \ingroup grp_maps */ typedef df::tile_occupancy occupancies40d [16][16]; +typedef df::tile_occupancy t_occupancy; /** * array of 16 biome indexes valid for the block * \ingroup grp_maps diff --git a/library/include/modules/Units.h b/library/include/modules/Units.h index eea3e6ecf..d0420eb57 100644 --- a/library/include/modules/Units.h +++ b/library/include/modules/Units.h @@ -169,6 +169,7 @@ DFHACK_EXPORT bool isValid(); /* Read Functions */ // Read creatures in a box, starting with index. Returns -1 if no more creatures // found. Call repeatedly do get all creatures in a specified box (uses tile coords) +DFHACK_EXPORT int32_t getNumCreatures(); DFHACK_EXPORT int32_t GetCreatureInBox(const int32_t index, df::unit ** furball, const uint16_t x1, const uint16_t y1,const uint16_t z1, const uint16_t x2, const uint16_t y2,const uint16_t z2); diff --git a/library/modules/Materials.cpp b/library/modules/Materials.cpp index 41cb1c18f..7967fe386 100644 --- a/library/modules/Materials.cpp +++ b/library/modules/Materials.cpp @@ -62,6 +62,7 @@ using namespace std; #include "df/physical_attribute_type.h" #include "df/mental_attribute_type.h" +#include using namespace DFHack; using namespace df::enums; @@ -746,32 +747,32 @@ bool Materials::ReadCreatureTypesEx (void) caste.singular = ca->caste_name[0]; caste.plural = ca->caste_name[1]; caste.adjective = ca->caste_name[2]; -/* + // color mod reading // Caste + offset > color mod vector - vector & p_colormod = *(vector *) (world->raws.creatures.all[i]->caste + caste_colormod_offset); - uint32_t sizecolormod = p_colormod.size(); + auto & colorings = ca->color_modifiers; + uint32_t sizecolormod = colorings.size(); caste.ColorModifier.resize(sizecolormod); for(uint32_t k = 0; k < sizecolormod;k++) { // color mod [0] -> color list - vector & p_colorlist = *(vector *) (p_colormod[k]); - uint32_t sizecolorlist = p_colorlist.size(); + auto & indexes = colorings[k]->color_indexes; + uint32_t sizecolorlist = indexes.size(); caste.ColorModifier[k].colorlist.resize(sizecolorlist); for(uint32_t l = 0; l < sizecolorlist; l++) - caste.ColorModifier[k].colorlist[l] = p_colorlist[l]; + caste.ColorModifier[k].colorlist[l] = indexes[l]; // color mod [color_modifier_part_offset] = string part - caste.ColorModifier[k].part = p->readSTLString( p_colormod[k] + color_modifier_part_offset); - caste.ColorModifier[k].startdate = p->readDWord( p_colormod[k] + color_modifier_startdate_offset ); - caste.ColorModifier[k].enddate = p->readDWord( p_colormod[k] + color_modifier_enddate_offset ); + caste.ColorModifier[k].part = colorings[k]->part; + caste.ColorModifier[k].startdate = colorings[k]->start_date; + caste.ColorModifier[k].enddate = colorings[k]->end_date; } -*/ + // body parts caste.bodypart.empty(); - uint32_t sizebp = ca->body_parts.size(); + uint32_t sizebp = ca->unknown1.body_parts.size(); for (uint32_t k = 0; k < sizebp; k++) { - df::body_part_raw *bp = ca->body_parts[k]; + df::body_part_raw *bp = ca->unknown1.body_parts[k]; t_bodypart part; part.id = bp->part_code; part.category = bp->part_name; diff --git a/library/modules/Units.cpp b/library/modules/Units.cpp index 9d48a5f3e..9c7c56fd1 100644 --- a/library/modules/Units.cpp +++ b/library/modules/Units.cpp @@ -59,6 +59,11 @@ bool Units::isValid() return (world->units.all.size() > 0); } +int32_t Units::getNumCreatures() +{ + return world->units.all.size(); +} + df::unit * Units::GetCreature (const int32_t index) { if (!isValid()) return NULL; diff --git a/library/xml b/library/xml index 7082ed13d..6359571fd 160000 --- a/library/xml +++ b/library/xml @@ -1 +1 @@ -Subproject commit 7082ed13d10fb7934486362390ae1959410ca696 +Subproject commit 6359571fd7d0a846b87709b55343a1a1d72f02fe diff --git a/plugins/devel/buildprobe.cpp b/plugins/devel/buildprobe.cpp index 9893705de..f933c3846 100644 --- a/plugins/devel/buildprobe.cpp +++ b/plugins/devel/buildprobe.cpp @@ -43,10 +43,9 @@ DFhackCExport DFHack::command_result readFlag (Core * c, vector & param { c->Suspend(); - DFHack::Maps * Maps = c->getMaps(); DFHack::Gui * Gui = c->getGui(); // init the map - if(!Maps->Start()) + if(!Maps::IsValid()) { c->con.printerr("Can't init map. Make sure you have a map loaded in DF.\n"); c->Resume(); @@ -64,7 +63,7 @@ DFhackCExport DFHack::command_result readFlag (Core * c, vector & param DFHack::DFCoord cursor = DFHack::DFCoord(cx,cy,cz); - MapExtras::MapCache * MCache = new MapExtras::MapCache(Maps); + MapExtras::MapCache * MCache = new MapExtras::MapCache(); DFHack::t_occupancy oc = MCache->occupancyAt(cursor); c->con.print("Current Value: %d\n", oc.bits.building); @@ -111,10 +110,9 @@ DFhackCExport DFHack::command_result writeFlag (Core * c, vector & para c->Suspend(); - DFHack::Maps * Maps = c->getMaps(); DFHack::Gui * Gui = c->getGui(); // init the map - if(!Maps->Start()) + if(!Maps::IsValid()) { c->con.printerr("Can't init map. Make sure you have a map loaded in DF.\n"); c->Resume(); @@ -132,7 +130,7 @@ DFhackCExport DFHack::command_result writeFlag (Core * c, vector & para DFHack::DFCoord cursor = DFHack::DFCoord(cx,cy,cz); - MapExtras::MapCache * MCache = new MapExtras::MapCache(Maps); + MapExtras::MapCache * MCache = new MapExtras::MapCache(); DFHack::t_occupancy oc = MCache->occupancyAt(cursor); oc.bits.building = value; diff --git a/plugins/devel/itemhacks.cpp b/plugins/devel/itemhacks.cpp index 0dbc94d58..208a146bd 100644 --- a/plugins/devel/itemhacks.cpp +++ b/plugins/devel/itemhacks.cpp @@ -15,11 +15,11 @@ using namespace DFHack; ////////////////////// // START item choosers ////////////////////// - +/* class item_chooser { public: - item_chooser(Core* _c, DFHack::Items* _Items) : c(_c), Items(_Items) + item_chooser(Core* _c) : c(_c) { } @@ -31,13 +31,12 @@ public: protected: Core *c; - DFHack::Items *Items; }; class choose_all : public item_chooser { public: - choose_all(Core* _c, ::Items* _Items) : item_chooser(_c, _Items) + choose_all(Core* _c) : item_chooser(_c) { } @@ -51,7 +50,7 @@ public: class choose_unknown : public item_chooser { public: - choose_unknown(Core* _c, ::Items* _Items) : item_chooser(_c, _Items) + choose_unknown(Core* _c) : item_chooser(_c) { } @@ -66,9 +65,8 @@ public: t_itemflags &f = itm->origin->flags; - return (f.unk1 || f.unk2 || f.unk3 || f.unk4 || /*f.unk5 ||*/ + return (f.unk1 || f.unk2 || f.unk3 || f.unk4 || f.unk6 || f.unk7 || - // f.unk8 || f.unk9 || /* Too common */ f.unk10 || f.unk11); } @@ -263,6 +261,7 @@ DFhackCExport command_result df_dumpitems (Core * c, vector & parameter } } */ +/* } c->Resume(); @@ -271,3 +270,4 @@ DFhackCExport command_result df_dumpitems (Core * c, vector & parameter return CR_OK; } +*/ \ No newline at end of file diff --git a/plugins/devel/kittens.cpp b/plugins/devel/kittens.cpp index c202331f3..93cdf2107 100644 --- a/plugins/devel/kittens.cpp +++ b/plugins/devel/kittens.cpp @@ -9,10 +9,13 @@ #include "modules/Items.h" #include #include +#include +#include using std::vector; using std::string; using namespace DFHack; +using namespace DFHack::Simple; //FIXME: possible race conditions with calling kittens from the IO thread and shutdown from Core. bool shutdown_flag = false; bool final_flag = true; @@ -26,12 +29,9 @@ uint64_t timeLast = 0; DFhackCExport command_result kittens (Core * c, vector & parameters); DFhackCExport command_result ktimer (Core * c, vector & parameters); -DFhackCExport command_result bflags (Core * c, vector & parameters); DFhackCExport command_result trackmenu (Core * c, vector & parameters); DFhackCExport command_result trackpos (Core * c, vector & parameters); -DFhackCExport command_result mapitems (Core * c, vector & parameters); -DFhackCExport command_result test_creature_offsets (Core * c, vector & parameters); -DFhackCExport command_result creat_job (Core * c, vector & parameters); +DFhackCExport command_result colormods (Core * c, vector & parameters); DFhackCExport const char * plugin_name ( void ) { @@ -43,12 +43,9 @@ DFhackCExport command_result plugin_init ( Core * c, std::vector commands.clear(); commands.push_back(PluginCommand("nyan","NYAN CAT INVASION!",kittens, true)); commands.push_back(PluginCommand("ktimer","Measure time between game updates and console lag (toggle).",ktimer)); - commands.push_back(PluginCommand("blockflags","Look up block flags",bflags)); commands.push_back(PluginCommand("trackmenu","Track menu ID changes (toggle).",trackmenu)); commands.push_back(PluginCommand("trackpos","Track mouse and designation coords (toggle).",trackpos)); - commands.push_back(PluginCommand("mapitems","Check item ids under cursor against item ids in map block.",mapitems)); - commands.push_back(PluginCommand("test_creature_offsets","Bleh.",test_creature_offsets)); - commands.push_back(PluginCommand("creat_job","Bleh.",creat_job)); + commands.push_back(PluginCommand("colormods","Dump colormod vectors.",colormods)); return CR_OK; } @@ -107,59 +104,6 @@ DFhackCExport command_result plugin_onupdate ( Core * c ) return CR_OK; } -DFhackCExport command_result mapitems (Core * c, vector & parameters) -{ - c->Suspend(); - vector vec_items; - Gui * g = c-> getGui(); - Maps* m = c->getMaps(); - Items* it = c->getItems(); - if(!m->Start()) - { - c->con.printerr("No map to probe\n"); - return CR_FAILURE; - } - if(!it->Start() || !it->readItemVector(vec_items)) - { - c->con.printerr("Failed to get items\n"); - return CR_FAILURE; - } - int32_t cx,cy,cz; - g->getCursorCoords(cx,cy,cz); - if(cx != -30000) - { - df_block * b = m->getBlock(cx/16,cy/16,cz); - if(b) - { - c->con.print("Item IDs present in block:\n"); - auto iter_b = b->items.begin(); - while (iter_b != b->items.end()) - { - df_item * itmz = it->findItemByID(*iter_b); - string s; - itmz->getItemDescription(&s); - c->con.print("%d = %s\n",*iter_b, s.c_str()); - iter_b++; - } - c->con.print("Items under cursor:\n"); - auto iter_it = vec_items.begin(); - while (iter_it != vec_items.end()) - { - df_item * itm = *iter_it; - if(itm->x == cx && itm->y == cy && itm->z == cz) - { - string s; - itm->getItemDescription(&s,0); - c->con.print("%d = %s\n",itm->id, s.c_str()); - } - iter_it ++; - } - } - } - c->Resume(); - return CR_OK; -} - DFhackCExport command_result trackmenu (Core * c, vector & parameters) { if(trackmenu_flg) @@ -189,53 +133,19 @@ DFhackCExport command_result trackpos (Core * c, vector & parameters) trackpos_flg = !trackpos_flg; return CR_OK; } -DFhackCExport command_result bflags (Core * c, vector & parameters) + +DFhackCExport command_result colormods (Core * c, vector & parameters) { c->Suspend(); - Gui * g = c-> getGui(); - Maps* m = c->getMaps(); - if(!m->Start()) - { - c->con.printerr("No map to probe\n"); - return CR_FAILURE; - } - int32_t cx,cy,cz; - g->getCursorCoords(cx,cy,cz); - if(cx == -30000) + auto & vec = df::global::world->raws.creatures.alphabetic; + for(int i = 0; i < vec.size();i++) { - // get map size in blocks - uint32_t sx,sy,sz; - m->getSize(sx,sy,sz); - std::map counts; - // for each block - for(size_t x = 0; x < sx; x++) - for(size_t y = 0; y < sx; y++) - for(size_t z = 0; z < sx; z++) - { - df_block * b = m->getBlock(x,y,z); - if(!b) continue; - auto iter = counts.find(b->flags.size); - if(iter == counts.end()) - { - counts[b->flags.bits[0]] = b; - } - } - for(auto iter = counts.begin(); iter != counts.end(); iter++) + df::creature_raw* rawlion = vec[i]; + df::caste_raw * caste = rawlion->caste[0]; + c->con.print("%s\nCaste addr 0x%x\n",rawlion->creature_id.c_str(), &caste->color_modifiers); + for(int j = 0; j < caste->color_modifiers.size();j++) { - c->con.print("%2x : 0x%x\n",iter->first, iter->second); - } - } - else - { - df_block * b = m->getBlock(cx/16,cy/16,cz); - if(b) - { - c->con << "Block flags:" << b->flags << std::endl; - } - else - { - c->con.printerr("No block here\n"); - return CR_FAILURE; + c->con.print("mod %d: 0x%x\n", j, caste->color_modifiers[j]); } } c->Resume(); @@ -328,71 +238,3 @@ DFhackCExport command_result kittens (Core * c, vector & parameters) color = Console::COLOR_BLUE; } } - -#include "modules/Units.h" -#include "VersionInfo.h" -#include - -command_result test_creature_offsets(Core* c, vector< string >& parameters) -{ - uint32_t off_vinfo = c->vinfo->getGroup("Creatures")->getGroup("creature")->/*getGroup("advanced")->*/getOffset("custom_profession"); - uint32_t off_struct = offsetof(df_unit,custom_profession); - c->con.print("Struct 0x%x, vinfo 0x%x\n", off_struct, off_vinfo); - return CR_OK; -}; - -command_result creat_job (Core * c, vector< string >& parameters) -{ - c->Suspend(); - Units * cr = c->getUnits(); - Gui * g = c-> getGui(); - uint32_t num_cr = 0; - int32_t cx,cy,cz; - g->getCursorCoords(cx,cy,cz); - if(cx == -30000) - { - c->con.printerr("No cursor.\n"); - c->Resume(); - return CR_FAILURE; - } - if(!cr->Start(num_cr) || num_cr == 0) - { - c->con.printerr("No creatures.\n"); - c->Resume(); - return CR_FAILURE; - } - auto iter = cr->creatures->begin(); - while (iter != cr->creatures->end()) - { - df_unit * unit = *iter; - if(cx == unit->x && cy == unit->y && cz == unit->z) - { - c->con.print("%d:%s - address 0x%x - job 0x%x\n" - "Soul: 0x%x, likes: 0x%x\n", - unit->id, - unit->name.first_name.c_str(), - unit, - uint32_t(unit) + offsetof(df_unit,current_job), - uint32_t(unit) + offsetof(df_unit,current_soul), - uint32_t(unit->current_soul) + offsetof(df_soul,likes) - ); - df_soul * s = unit->current_soul; - if(s) - { - c->con.print("LIKES:\n"); - int idx = 1; - auto iter = s->likes.begin(); - while(iter != s->likes.end()) - { - df_like * l = *iter; - c->con.print("%3d: %f\n", idx, float(l->mystery)); - iter++; - idx++; - } - } - } - iter++; - } - c->Resume(); - return CR_OK; -}; \ No newline at end of file diff --git a/plugins/devel/rawdump.cpp b/plugins/devel/rawdump.cpp index 2ad840b78..595eb0a98 100644 --- a/plugins/devel/rawdump.cpp +++ b/plugins/devel/rawdump.cpp @@ -6,7 +6,7 @@ #include #include #include - +/* using std::vector; using std::string; using namespace DFHack; @@ -136,4 +136,4 @@ DFhackCExport command_result rawdump_p (Core * c, vector & parameters) c->Resume(); return CR_OK; } - +*/ diff --git a/plugins/df2mc b/plugins/df2mc index c114ec5f9..23fbb78ed 160000 --- a/plugins/df2mc +++ b/plugins/df2mc @@ -1 +1 @@ -Subproject commit c114ec5f995aec69631187212254309464f82775 +Subproject commit 23fbb78edaff35a62887803e178a24f9148ffc84 diff --git a/plugins/mapexport/CMakeLists.txt b/plugins/mapexport/CMakeLists.txt index 6349b5ad1..68422f5bb 100644 --- a/plugins/mapexport/CMakeLists.txt +++ b/plugins/mapexport/CMakeLists.txt @@ -39,7 +39,7 @@ LIST(APPEND PROJECT_SRCS ${PROJECT_HDRS}) #Generate sources from our proto files and store them in the source tree ADD_CUSTOM_COMMAND( OUTPUT ${PROJECT_PROTO_SRCS} ${PROJECT_PROTO_HDRS} -COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto ${PROJECT_PROTOS} +COMMAND protoc-bin -I=${CMAKE_CURRENT_SOURCE_DIR}/proto/ --cpp_out=${CMAKE_CURRENT_SOURCE_DIR}/proto/ ${PROJECT_PROTOS} DEPENDS protoc-bin ${PROJECT_PROTOS} ) diff --git a/plugins/mapexport/mapexport.cpp b/plugins/mapexport/mapexport.cpp index 576a6f98c..2cca26b35 100644 --- a/plugins/mapexport/mapexport.cpp +++ b/plugins/mapexport/mapexport.cpp @@ -12,6 +12,8 @@ using namespace DFHack; #include "proto/Map.pb.h" +using namespace DFHack::Simple; + DFhackCExport command_result mapexport (Core * c, std::vector & parameters); DFhackCExport const char * plugin_name ( void ) @@ -67,8 +69,7 @@ DFhackCExport command_result mapexport (Core * c, std::vector & pa MapExtras::MapCache map; DFHack::Materials *mats = c->getMaterials(); - DFHack::Vegetation *veg = c->getVegetation(); - if (veg->Start()) + if (!Vegetation::isValid()) { c->con.printerr("Unable to read vegetation; plants won't be listed!\n" ); } diff --git a/plugins/stonesense b/plugins/stonesense index 92627e39c..661150708 160000 --- a/plugins/stonesense +++ b/plugins/stonesense @@ -1 +1 @@ -Subproject commit 92627e39cb3502812cd5a131716d3d1da8ef625a +Subproject commit 66115070844f3bc1ae3f9142e43f7c110aa18159