From 1d513256fd701883216e65294c5c4b00c6d0b112 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Petr=20Mr=C3=A1zek?= <peterix@gmail.com>
Date: Sun, 4 Apr 2010 12:43:11 +0200
Subject: [PATCH] Processed profession list

---
 examples/creaturedump.cpp |   2 +-
 output/Memory.xml         | 402 ++++++++++----------------------------
 2 files changed, 101 insertions(+), 303 deletions(-)

diff --git a/examples/creaturedump.cpp b/examples/creaturedump.cpp
index 73d9afdcc..f9ec1cf18 100644
--- a/examples/creaturedump.cpp
+++ b/examples/creaturedump.cpp
@@ -186,7 +186,7 @@ void printCreature(DFHack::API & DF, const DFHack::t_creature & creature)
             cout << endl;
             addendl = false;
         }
-        cout << "profession: " /*<< mem->getProfession(creature.profession) <<*/ "(" << (int) creature.profession << ")";
+        cout << "profession: " << mem->getProfession(creature.profession) << "(" << (int) creature.profession << ")";
         /*
         if(creature.custom_profession[0])
         {
diff --git a/output/Memory.xml b/output/Memory.xml
index 227c66a0e..dc0382c20 100644
--- a/output/Memory.xml
+++ b/output/Memory.xml
@@ -1300,308 +1300,106 @@
             ====================================================================
             TODO: Parse this and turn it into Profession tags.
             Cross-reference with Memory-40d.xml
-            <!--
-            case 0:
-              result = sub_40FDD0("MINER");
-              break;
-            case 1:
-              result = sub_40FDD0("WOODWORKER");
-              break;
-            case 2:
-              result = sub_40FDD0("CARPENTER");
-              break;
-            case 3:
-              result = sub_40FDD0("BOWYER");
-              break;
-            case 4:
-              result = sub_40FDD0("WOODCUTTER");
-              break;
-            case 5:
-              result = sub_40FDD0("STONEWORKER");
-              break;
-            case 6:
-              result = sub_40FDD0("ENGRAVER");
-              break;
-            case 7:
-              result = sub_40FDD0("MASON");
-              break;
-            case 8:
-              result = sub_40FDD0("RANGER");
-              break;
-            case 9:
-              result = sub_40FDD0("ANIMAL_CARETAKER");
-              break;
-            case 10:
-              result = sub_40FDD0("ANIMAL_TRAINER");
-              break;
-            case 11:
-              result = sub_40FDD0("HUNTER");
-              break;
-            case 12:
-              result = sub_40FDD0("TRAPPER");
-              break;
-            case 13:
-              result = sub_40FDD0("ANIMAL_DISSECTOR");
-              break;
-            case 14:
-              result = sub_40FDD0("METALSMITH");
-              break;
-            case 15:
-              result = sub_40FDD0("FURNACE_OPERATOR");
-              break;
-            case 16:
-              result = sub_40FDD0("WEAPONSMITH");
-              break;
-            case 17:
-              result = sub_40FDD0("ARMORER");
-              break;
-            case 18:
-              result = sub_40FDD0("BLACKSMITH");
-              break;
-            case 19:
-              result = sub_40FDD0("METALCRAFTER");
-              break;
-            case 20:
-              result = sub_40FDD0("JEWELER");
-              break;
-            case 21:
-              result = sub_40FDD0("GEM_CUTTER");
-              break;
-            case 22:
-              result = sub_40FDD0("GEM_SETTER");
-              break;
-            case 23:
-              result = sub_40FDD0("CRAFTSMAN");
-              break;
-            case 24:
-              result = sub_40FDD0("WOODCRAFTER");
-              break;
-            case 25:
-              result = sub_40FDD0("STONECRAFTER");
-              break;
-            case 26:
-              result = sub_40FDD0("LEATHERWORKER");
-              break;
-            case 27:
-              result = sub_40FDD0("BONE_CARVER");
-              break;
-            case 28:
-              result = sub_40FDD0("WEAVER");
-              break;
-            case 29:
-              result = sub_40FDD0("CLOTHIER");
-              break;
-            case 30:
-              result = sub_40FDD0("GLASSMAKER");
-              break;
-            case 31:
-              result = sub_40FDD0("STRAND_EXTRACTOR");
-              break;
-            case 32:
-              result = sub_40FDD0("FISHERY_WORKER");
-              break;
-            case 33:
-              result = sub_40FDD0("FISHERMAN");
-              break;
-            case 34:
-              result = sub_40FDD0("FISH_DISSECTOR");
-              break;
-            case 35:
-              result = sub_40FDD0("FISH_CLEANER");
-              break;
-            case 36:
-              result = sub_40FDD0("FARMER");
-              break;
-            case 37:
-              result = sub_40FDD0("CHEESE_MAKER");
-              break;
-            case 38:
-              result = sub_40FDD0("MILKER");
-              break;
-            case 39:
-              result = sub_40FDD0("COOK");
-              break;
-            case 40:
-              result = sub_40FDD0("THRESHER");
-              break;
-            case 41:
-              result = sub_40FDD0("MILLER");
-              break;
-            case 42:
-              result = sub_40FDD0("BUTCHER");
-              break;
-            case 43:
-              result = sub_40FDD0("TANNER");
-              break;
-            case 44:
-              result = sub_40FDD0("DYER");
-              break;
-            case 45:
-              result = sub_40FDD0("PLANTER");
-              break;
-            case 46:
-              result = sub_40FDD0("HERBALIST");
-              break;
-            case 47:
-              result = sub_40FDD0("BREWER");
-              break;
-            case 48:
-              result = sub_40FDD0("SOAP_MAKER");
-              break;
-            case 49:
-              result = sub_40FDD0("POTASH_MAKER");
-              break;
-            case 50:
-              result = sub_40FDD0("LYE_MAKER");
-              break;
-            case 51:
-              result = sub_40FDD0("WOOD_BURNER");
-              break;
-            case 52:
-              result = sub_40FDD0("ENGINEER");
-              break;
-            case 53:
-              result = sub_40FDD0("MECHANIC");
-              break;
-            case 54:
-              result = sub_40FDD0("SIEGE_ENGINEER");
-              break;
-            case 55:
-              result = sub_40FDD0("SIEGE_OPERATOR");
-              break;
-            case 56:
-              result = sub_40FDD0("PUMP_OPERATOR");
-              break;
-            case 57:
-              result = sub_40FDD0("CLERK");
-              break;
-            case 60:
-              result = sub_40FDD0("ARCHITECT");
-              break;
-            case 62:
-              result = sub_40FDD0("DOCTOR");
-              break;
-            case 63:
-              result = sub_40FDD0("DIAGNOSER");
-              break;
-            case 64:
-              result = sub_40FDD0("BONE_SETTER");
-              break;
-            case 65:
-              result = sub_40FDD0("SUTURER");
-              break;
-            case 66:
-              result = sub_40FDD0("SURGEON");
-              break;
-            case 58:
-              result = sub_40FDD0("ADMINISTRATOR");
-              break;
-            case 59:
-              result = sub_40FDD0("TRADER");
-              break;
-            case 61:
-              result = sub_40FDD0("ALCHEMIST");
-              break;
-            case 67:
-              result = sub_40FDD0("MERCHANT");
-              break;
-            case 68:
-              result = sub_40FDD0("HAMMERMAN");
-              break;
-            case 69:
-              result = sub_40FDD0("MASTER_HAMMERMAN");
-              break;
-            case 70:
-              result = sub_40FDD0("SPEARMAN");
-              break;
-            case 71:
-              result = sub_40FDD0("MASTER_SPEARMAN");
-              break;
-            case 72:
-              result = sub_40FDD0("CROSSBOWMAN");
-              break;
-            case 73:
-              result = sub_40FDD0("MASTER_CROSSBOWMAN");
-              break;
-            case 74:
-              result = sub_40FDD0("WRESTLER");
-              break;
-            case 75:
-              result = sub_40FDD0("MASTER_WRESTLER");
-              break;
-            case 76:
-              result = sub_40FDD0("AXEMAN");
-              break;
-            case 77:
-              result = sub_40FDD0("MASTER_AXEMAN");
-              break;
-            case 78:
-              result = sub_40FDD0("SWORDSMAN");
-              break;
-            case 79:
-              result = sub_40FDD0("MASTER_SWORDSMAN");
-              break;
-            case 80:
-              result = sub_40FDD0("MACEMAN");
-              break;
-            case 81:
-              result = sub_40FDD0("MASTER_MACEMAN");
-              break;
-            case 82:
-              result = sub_40FDD0("PIKEMAN");
-              break;
-            case 83:
-              result = sub_40FDD0("MASTER_PIKEMAN");
-              break;
-            case 84:
-              result = sub_40FDD0("BOWMAN");
-              break;
-            case 85:
-              result = sub_40FDD0("MASTER_BOWMAN");
-              break;
-            case 86:
-              result = sub_40FDD0("BLOWGUNMAN");
-              break;
-            case 87:
-              result = sub_40FDD0("MASTER_BLOWGUNMAN");
-              break;
-            case 90:
-              result = sub_40FDD0("RECRUIT");
-              break;
-            case 91:
-              result = sub_40FDD0("TRAINED_HUNTER");
-              break;
-            case 92:
-              result = sub_40FDD0("TRAINED_WAR");
-              break;
-            case 93:
-              result = sub_40FDD0("MASTER_THIEF");
-              break;
-            case 94:
-              result = sub_40FDD0("THIEF");
-              break;
-            case 95:
-              result = sub_40FDD0("STANDARD");
-              break;
-            case 96:
-              result = sub_40FDD0("CHILD");
-              break;
-            case 97:
-              result = sub_40FDD0("BABY");
-              break;
-            case 98:
-              result = sub_40FDD0("DRUNK");
-              break;
-            case 88:
-              result = sub_40FDD0("LASHER");
-              break;
-            case 89:
-              result = sub_40FDD0("MASTER_LASHER");
-              break;
-            default:
-              result = sub_40A070("NONE", 4u);
-              break;
-              -->
+            <Profession can_assign_labors="true" is_military="false" name="MINER">0</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="WOODWORKER">1</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="CARPENTER">2</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="BOWYER">3</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="WOODCUTTER">4</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="STONEWORKER">5</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ENGRAVER">6</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="MASON">7</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="RANGER">8</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ANIMAL_CARETAKER">9</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ANIMAL_TRAINER">10</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="HUNTER">11</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="TRAPPER">12</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ANIMAL_DISSECTOR">13</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="METALSMITH">14</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="FURNACE_OPERATOR">15</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="WEAPONSMITH">16</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ARMORER">17</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="BLACKSMITH">18</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="METALCRAFTER">19</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="JEWELER">20</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="GEM_CUTTER">21</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="GEM_SETTER">22</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="CRAFTSMAN">23</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="WOODCRAFTER">24</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="STONECRAFTER">25</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="LEATHERWORKER">26</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="BONE_CARVER">27</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="WEAVER">28</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="CLOTHIER">29</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="GLASSMAKER">30</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="STRAND_EXTRACTOR">31</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="FISHERY_WORKER">32</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="FISHERMAN">33</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="FISH_DISSECTOR">34</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="FISH_CLEANER">35</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="FARMER">36</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="CHEESE_MAKER">37</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="MILKER">38</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="COOK">39</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="THRESHER">40</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="MILLER">41</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="BUTCHER">42</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="TANNER">43</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="DYER">44</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="PLANTER">45</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="HERBALIST">46</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="BREWER">47</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="SOAP_MAKER">48</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="POTASH_MAKER">49</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="LYE_MAKER">50</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="WOOD_BURNER">51</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ENGINEER">52</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="MECHANIC">53</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="SIEGE_ENGINEER">54</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="SIEGE_OPERATOR">55</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="PUMP_OPERATOR">56</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="CLERK">57</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ARCHITECT">60</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="DOCTOR">62</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="DIAGNOSER">63</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="BONE_SETTER">64</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="SUTURER">65</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="SURGEON">66</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ADMINISTRATOR">58</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="TRADER">59</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="ALCHEMIST">61</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="MERCHANT">67</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="HAMMERMAN">68</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_HAMMERMAN">69</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="SPEARMAN">70</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_SPEARMAN">71</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="CROSSBOWMAN">72</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_CROSSBOWMAN">73</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="WRESTLER">74</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_WRESTLER">75</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="AXEMAN">76</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_AXEMAN">77</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="SWORDSMAN">78</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_SWORDSMAN">79</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MACEMAN">80</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_MACEMAN">81</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="PIKEMAN">82</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_PIKEMAN">83</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="BOWMAN">84</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_BOWMAN">85</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="BLOWGUNMAN">86</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_BLOWGUNMAN">87</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="RECRUIT">90</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="TRAINED_HUNTER">91</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="TRAINED_WAR">92</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="MASTER_THIEF">93</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="THIEF">94</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="STANDARD">95</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="CHILD">96</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="BABY">97</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="DRUNK">98</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="LASHER">88</Profession>
+            <Profession can_assign_labors="true" is_military="true" name="MASTER_LASHER">89</Profession>
+            <Profession can_assign_labors="true" is_military="false" name="None">90</Profession>
             ====================================================================
                                           J O B S
             ====================================================================