Materials - semi-finished

dfhack/include/DFTypes.h

@@ -89,7 +89,6 @@ struct t_vein
     uint32_t vtable;
     int32_t type;
     int16_t assignment[16];
-    //int16_t unknown;
     uint32_t flags;
     uint32_t address_of; // this is NOT part of the DF vein, but an address of the vein as seen by DFhack.
 };

dfhack/modules/Materials-proc.h

@@ -5,7 +5,9 @@
 */
 bool ReadInorganicMaterials (std::vector<t_matgloss> & output);
 bool ReadOrganicMaterials (std::vector<t_matgloss> & output);
+
 bool ReadWoodMaterials (std::vector<t_matgloss> & output);
 bool ReadPlantMaterials (std::vector<t_matgloss> & output);
-bool ReadPlantMaterials (std::vector<t_matglossPlant> & output);
+// bool ReadPlantMaterials (std::vector<t_matglossPlant> & output);
+
 bool ReadCreatureTypes (std::vector<t_matgloss> & output);

dfhack/modules/Materials.cpp

@@ -25,44 +25,105 @@ distribution.
 #include "DFCommonInternal.h"
 #include "../private/APIPrivate.h"
 using namespace DFHack;
-
-
-
-bool API::ReadWoodMaterials (vector<t_matgloss> & woods)
-{
 /*
-    int matgloss_address = d->offset_descriptor->getAddress ("matgloss");
-    int matgloss_wood_name_offset = d->offset_descriptor->getOffset("matgloss_wood_name");
-    // TODO: find flag for autumnal coloring?
-    DfVector p_matgloss(d->p, matgloss_address, 4);
-
-    woods.clear();
-
-    t_matgloss mat;
-    // TODO: use brown?
-    mat.fore = 7;
-    mat.back = 0;
-    mat.bright = 0;
-    uint32_t size = p_matgloss.getSize();
-    for (uint32_t i = 0; i < size ;i++)
     {
-        // read the matgloss pointer from the vector into temp
+LABEL_53:
-        uint32_t temp = * (uint32_t *) p_matgloss[i];
+      if ( a1
-        // read the string pointed at by
+        || (signed int)a2 < 0
-        d->p->readSTLString (temp, mat.id, 128);
+        || a2 >= (inorg_end - inorg_start) >> 2
-        d->p->readSTLString (temp+matgloss_wood_name_offset, mat.name, 128);
+        || (v13 = *(_DWORD *)(inorg_start + 4 * a2), !v13) )
-        woods.push_back (mat);
+      {
+        switch ( a1 )
+        {
+          case 1:
+            sub_40FDD0("AMBER");
+            break;
+          case 2:
+            sub_40FDD0("CORAL");
+            break;
+          case 3:
+            sub_40FDD0("GLASS_GREEN");
+            break;
+          case 4:
+            sub_40FDD0("GLASS_CLEAR");
+            break;
+          case 5:
+            sub_40FDD0("GLASS_CRYSTAL");
+            break;
+          case 6:
+            sub_40FDD0("WATER");
+            break;
+          case 7:
+            sub_40FDD0("COAL");
+            break;
+          case 8:
+            sub_40FDD0("POTASH");
+            break;
+          case 9:
+            sub_40FDD0("ASH");
+            break;
+          case 10:
+            sub_40FDD0("PEARLASH");
+            break;
+          case 11:
+            sub_40FDD0("LYE");
+            break;
+          case 12:
+            sub_40FDD0("MUD");
+            break;
+          case 13:
+            sub_40FDD0("VOMIT");
+            break;
+          case 14:
+            sub_40FDD0("SALT");
+            break;
+          case 15:
+            sub_40FDD0("FILTH_B");
+            break;
+          case 16:
+            sub_40FDD0("FILTH_Y");
+            break;
+          case 17:
+            sub_40FDD0("UNKNOWN_SUBSTANCE");
+            break;
+          case 18:
+            sub_40FDD0("GRIME");
+            break;
+          default:
+            sub_40A070("NONE", 4u);
+            break;
+        }
+        result = sub_40A070("NONE", 4u);
+        if ( a1 == 7 )
+        {
+          result = a2;
+          if ( a2 )
+          {
+            if ( a2 == 1 )
+              result = sub_40A070("CHARCOAL", 8u);
+          }
+          else
+          {
+            result = sub_40A070("COKE", 4u);
+          }
+        }
+      }
+      else
+      {
+        sub_40A070("INORGANIC", 9u);
+        result = sub_409CA0(v13, 0, -1);
+      }
     }
-    */
-    return true;
-}
 
+*/
+
+/*
 bool API::ReadInorganicMaterials (vector<t_matgloss> & inorganic)
 {
     memory_info * minfo = d->offset_descriptor;
     int matgloss_address = minfo->getAddress ("mat_inorganics");
-    //int matgloss_colors = minfo->getOffset ("material_color");
+    int matgloss_colors = minfo->getOffset ("material_color");
-    //int matgloss_stone_name_offset = minfo->getOffset("matgloss_stone_name");
+    int matgloss_stone_name_offset = minfo->getOffset("matgloss_stone_name");
 
     DfVector p_matgloss (d->p, matgloss_address, 4);
 
@@ -75,114 +136,61 @@ bool API::ReadInorganicMaterials (vector<t_matgloss> & inorganic)
         uint32_t temp = * (uint32_t *) p_matgloss[i];
         // read the string pointed at by
         t_matgloss mat;
+        //cout << temp << endl;
         //fill_char_buf(mat.id, d->p->readSTLString(temp)); // reads a C string given an address
         d->p->readSTLString (temp, mat.id, 128);
-        /*
+        
         d->p->readSTLString (temp+matgloss_stone_name_offset, mat.name, 128);
         mat.fore = (uint8_t) g_pProcess->readWord (temp + matgloss_colors);
         mat.back = (uint8_t) g_pProcess->readWord (temp + matgloss_colors + 2);
         mat.bright = (uint8_t) g_pProcess->readWord (temp + matgloss_colors + 4);
-        */
+        
         inorganic.push_back (mat);
     }
     return true;
-    
 }
+*/
 
-bool API::ReadPlantMaterials (vector<t_matgloss> & plants)
+
+
+// good for now
+inline bool ReadNamesOnly(Process* p, uint32_t address, vector<t_matgloss> & names)
 {
-    /*
+    DfVector p_matgloss (p, address, 4);
-    memory_info * minfo = d->offset_descriptor;
+    uint32_t size = p_matgloss.getSize();
-    int matgloss_address = minfo->getAddress ("matgloss");
+    names.clear();
-    int matgloss_offset = minfo->getHexValue ("matgloss_skip");
+    names.reserve (size);
-    int matgloss_plant_name_offset = minfo->getOffset("matgloss_plant_name");
+    for (uint32_t i = 0; i < size;i++)
-    DfVector p_matgloss(d->p, matgloss_address + matgloss_offset * 2, 4);
-
-    plants.clear();
-
-    // TODO: use green?
-    t_matgloss mat;
-    mat.fore = 7;
-    mat.back = 0;
-    mat.bright = 0;
-    for (uint32_t i = 0; i < p_matgloss.getSize();i++)
     {
-        // read the matgloss pointer from the vector into temp
+        t_matgloss mat;
-        uint32_t temp = * (uint32_t *) p_matgloss[i];
+        p->readSTLString (*(uint32_t *) p_matgloss[i], mat.id, 128);
-        // read the string pointed at by
+        names.push_back(mat);
-        //fill_char_buf(mat.id, d->p->readSTLString(temp)); // reads a C string given an address
-        d->p->readSTLString (temp, mat.id, 128);
-        d->p->readSTLString (temp+matgloss_plant_name_offset, mat.name, 128);
-        plants.push_back (mat);
     }
-    */
     return true;
 }
 
-bool API::ReadPlantMaterials (vector<t_matglossPlant> & plants)
+bool API::ReadInorganicMaterials (vector<t_matgloss> & inorganic)
 {
-    /*
+    return ReadNamesOnly(d->p, d->offset_descriptor->getAddress ("mat_inorganics"), inorganic );
-    memory_info * minfo = d->offset_descriptor;
+}
-    int matgloss_address = minfo->getAddress ("matgloss");
+
-    int matgloss_offset = minfo->getHexValue ("matgloss_skip");
+bool API::ReadOrganicMaterials (vector<t_matgloss> & organic)
-    int matgloss_plant_name_offset = minfo->getOffset("matgloss_plant_name");
+{
-    int matgloss_plant_drink_offset = minfo->getOffset("matgloss_plant_drink");
+    return ReadNamesOnly(d->p, d->offset_descriptor->getAddress ("mat_organics_all"), organic );
-    int matgloss_plant_food_offset = minfo->getOffset("matgloss_plant_food");
+}
-    int matgloss_plant_extract_offset = minfo->getOffset("matgloss_plant_extract");
+
-    DfVector p_matgloss(d->p, matgloss_address + matgloss_offset * 2, 4);
+bool API::ReadWoodMaterials (vector<t_matgloss> & trees)
-
+{
-    plants.clear();
+    return ReadNamesOnly(d->p, d->offset_descriptor->getAddress ("mat_organics_trees"), trees );
-
+}
-    // TODO: use green?
+
-    t_matglossPlant mat;
+bool API::ReadPlantMaterials (vector<t_matgloss> & plants)
-    mat.fore = 7;
+{
-    mat.back = 0;
+    return ReadNamesOnly(d->p, d->offset_descriptor->getAddress ("mat_organics_plants"), plants );
-    mat.bright = 0;
-    for (uint32_t i = 0; i < p_matgloss.getSize();i++)
-    {
-        // read the matgloss pointer from the vector into temp
-        uint32_t temp = * (uint32_t *) p_matgloss[i];
-        // read the string pointed at by
-        //fill_char_buf(mat.id, d->p->readSTLString(temp)); // reads a C string given an address
-        d->p->readSTLString (temp, mat.id, 128);
-        d->p->readSTLString (temp+matgloss_plant_name_offset, mat.name, 128);
-        d->p->readSTLString (temp+matgloss_plant_drink_offset, mat.drink_name, 128);
-        d->p->readSTLString (temp+matgloss_plant_food_offset, mat.food_name, 128);
-        d->p->readSTLString (temp+matgloss_plant_extract_offset, mat.extract_name, 128);
-        
-        //d->p->readSTLString (temp
-        plants.push_back (mat);
-    }
-    */
-    return true;
 }
 
 bool API::ReadCreatureTypes (vector<t_matgloss> & creatures)
 {
-    /*
+    return ReadNamesOnly(d->p, d->offset_descriptor->getAddress ("mat_creature_types"), creatures );
-    memory_info * minfo = d->offset_descriptor;
-    int matgloss_address = minfo->getAddress ("matgloss");
-    int matgloss_offset = minfo->getHexValue ("matgloss_skip");
-    int matgloss_creature_name_offset = minfo->getOffset("matgloss_creature_name");
-    DfVector p_matgloss (d->p, matgloss_address + matgloss_offset * 6, 4);
-
-    creatures.clear();
-
-    // TODO: use green?
-    t_matgloss mat;
-    mat.fore = 7;
-    mat.back = 0;
-    mat.bright = 0;
-    for (uint32_t i = 0; i < p_matgloss.getSize();i++)
-    {
-        // read the matgloss pointer from the vector into temp
-        uint32_t temp = * (uint32_t *) p_matgloss[i];
-        // read the string pointed at by
-        //fill_char_buf(mat.id, d->p->readSTLString(temp)); // reads a C string given an address
-        d->p->readSTLString (temp, mat.id, 128);
-        d->p->readSTLString (temp+matgloss_creature_name_offset, mat.name, 128);
-        creatures.push_back (mat);
-    }
-    */
     return true;
 }

examples/materialtest.cpp

@@ -63,7 +63,7 @@ int main (int numargs, const char ** args)
     DFHack::Process* p = DF.getProcess();
     DFHack::memory_info* mem = DF.getMemoryInfo();
     //const vector<string> * names = mem->getClassIDMapping();
-    
+    /*
     DumpObjStr0Vector("Material templates",p, mem->getAddress("mat_templates"));
     
     DumpObjStr0Vector("Inorganics",p, mem->getAddress("mat_inorganics"));
@@ -87,10 +87,30 @@ int main (int numargs, const char ** args)
     DumpObjStr0Vector("Bodygloss",p, mem->getAddress("mat_bodygloss"));
     
     DumpObjStr0Vector("Creature variations",p, mem->getAddress("mat_creature_variations"));
+    */
     
-    DumpObjStr0Vector("Creature types",p, mem->getAddress("mat_creature_types"));
+    cout << "----==== Inorganic ====----" << endl;
-    
+    vector<DFHack::t_matgloss> matgloss;
+    DF.ReadInorganicMaterials (matgloss);
+    for(int i = 0; i < matgloss.size();i++)
+    {
+        cout << matgloss[i].id << endl;
+    }
     
+    cout << endl << "----==== Organic ====----" << endl;
+    vector<DFHack::t_matgloss> organic;
+    DF.ReadOrganicMaterials (matgloss);
+    for(int i = 0; i < matgloss.size();i++)
+    {
+        cout << matgloss[i].id << endl;
+    }
+    cout << endl << "----==== Creature types ====----" << endl;
+    vector<DFHack::t_matgloss> creature;
+    DF.ReadCreatureTypes (matgloss);
+    for(int i = 0; i < matgloss.size();i++)
+    {
+        cout << matgloss[i].id << endl;
+    }
     #ifndef LINUX_BUILD
     cout << "Done. Press any key to continue" << endl;
     cin.ignore();

output/Memory.xml

@@ -3176,6 +3176,7 @@
         
         <!-- creature types -->
         <Address name="mat_creature_types">0x16AFE0C</Address>
+        <!--<Address name="mat_creature_types2">0x16AEE08</Address>-->
         
         <!-- 
         addresses from belal: vectors might need 8 subtracted from them