(See the other PRs first!) This is the merge of all my other PRs + some fixes and adjustments.

.devsPrefs/AquariusPower/nbproject/configurations.xml

@@ -2,12 +2,27 @@
 <configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="audio" name="0">
+      <in>MIDICodes.h</in>
+      <in>MIDIDebug.cpp</in>
+      <in>MIDIDebug.h</in>
+      <in>MIDIUtils.cpp</in>
+      <in>MIDIUtils.h</in>
+      <in>RtMidi.cpp</in>
+      <in>audio.cpp</in>
+      <in>audio_stack.cpp</in>
+      <in>linkedlist.cpp</in>
+      <in>midiparser.cpp</in>
+      <in>midiplayback.cpp</in>
     </df>
     <df root="fantasyname" name="1">
+      <in>example.cc</in>
+      <in>namegen.cc</in>
     </df>
     <df root="Main/Include" name="2">
+      <in>dungeon.h</in>
     </df>
     <df root="FeLib/Include" name="3">
+      <in>bitmap.h</in>
       <in>felist.h</in>
       <in>feloops.h</in>
       <in>femath.h</in>
@@ -94,6 +109,13 @@
       <in>wterras.cpp</in>
     </df>
     <df root="xbrzscale" name="6">
+      <df name="xbrz">
+        <in>config.h</in>
+        <in>xbrz.cpp</in>
+        <in>xbrz.h</in>
+      </df>
+      <in>libxbrzscale.cpp</in>
+      <in>libxbrzscale.h</in>
     </df>
     <logicalFolder name="ExternalFiles"
                    displayName="Important Files"
@@ -167,6 +189,8 @@
           <preBuildCommand>${CMAKE} -G "Unix Makefiles" -DCMAKE_BUILD_TYPE=Debug -DCMAKE_C_COMPILER=${IDE_CC} -DCMAKE_CXX_COMPILER=${IDE_CXX} -DCMAKE_C_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_CXX_FLAGS_DEBUG="-g3 -gdwarf-2" -DCMAKE_EXPORT_COMPILE_COMMANDS=ON .</preBuildCommand>
         </preBuild>
       </makefileType>
+      <item path="FeLib/Include/bitmap.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="FeLib/Include/felist.h" ex="false" tool="3" flavor2="0">
       </item>
       <item path="FeLib/Include/feloops.h" ex="false" tool="3" flavor2="0">
@@ -213,6 +237,8 @@
       </item>
       <item path="FeLib/Source/whandler.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <item path="Main/Include/dungeon.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="Main/Source/action.cpp" ex="false" tool="1" flavor2="0">
       </item>
       <item path="Main/Source/actions.cpp" ex="false" tool="1" flavor2="0">
@@ -327,6 +353,42 @@
       </item>
       <item path="Main/Source/wterras.cpp" ex="false" tool="1" flavor2="0">
       </item>
+      <item path="audio/MIDICodes.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="audio/MIDIDebug.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="audio/MIDIDebug.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="audio/MIDIUtils.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="audio/MIDIUtils.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="audio/RtMidi.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="audio/audio.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="audio/audio_stack.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="audio/linkedlist.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="audio/midiparser.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="audio/midiplayback.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="fantasyname/example.cc" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="fantasyname/namegen.cc" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="xbrzscale/libxbrzscale.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="xbrzscale/libxbrzscale.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="xbrzscale/xbrz/config.h" ex="false" tool="3" flavor2="0">
+      </item>
+      <item path="xbrzscale/xbrz/xbrz.cpp" ex="false" tool="1" flavor2="0">
+      </item>
+      <item path="xbrzscale/xbrz/xbrz.h" ex="false" tool="3" flavor2="0">
+      </item>
     </conf>
   </confs>
 </configurationDescriptor>

Doc/HowTo/DefinesValidator.txt

@@ -16,3 +16,7 @@ or when someone changes a value only at `define.dat` or at some c++ .h file, so
 in case c++ has no such define, it will be ignored ex.: the check will be performed only `#ifdef EMISSARY` (currently not used in c++ .h files)
 
 7) run any game, go to the console ctrl+` and run the validator, it will abort complaining about TORSO value with this message: "Defined TORSO with value 2 from .dat file mismatches hardcoded c++ define value of 1!"
+
+Ps.: alternatively (instead of using developer console), you can run this command line commands:
+./ivan --defgen # that creates definesvalidator.h
+./ivan --defval # to validate it

FeLib/Source/bitmap.cpp

@@ -865,6 +865,11 @@ void bitmap::DrawLine(int FromX, int FromY, v2 To, col16 Color, truth Wide)
 void bitmap::DrawLine(v2 From, v2 To, col16 Color, truth Wide)
 { DrawLine(From.X, From.Y, To.X, To.Y, Color, Wide); }
 
+/**
+ * TODO this needs a fix:
+ *  If a line is drawn from x,1 to anywhere and it is WIDE, the game will SEGFAULT.
+ *  Every drawn dot must be checked if is inside the bitmap boundaries...
+ */
 void bitmap::DrawLine(int OrigFromX, int OrigFromY, int OrigToX, int OrigToY, col16 Color, truth Wide)
 {
   if(OrigFromY == OrigToY)

FeLib/Source/felist.cpp

@@ -652,7 +652,7 @@ uint felist::DrawFiltered(bool& bJustExitTheList)
       break;
     }
 
-    if((Flags & SELECTABLE) && Pressed == UpKey)
+    if((Flags & SELECTABLE) && (Pressed == UpKey || Pressed == KEY_UP))
     {DBGLN;
       if(Selected)
       {
@@ -677,7 +677,7 @@ uint felist::DrawFiltered(bool& bJustExitTheList)
       continue;
     }
 
-    if((Flags & SELECTABLE) && Pressed == DownKey)
+    if((Flags & SELECTABLE) && (Pressed == DownKey || Pressed == KEY_DOWN))
     {DBGLN;
       if(!LastEntryVisible || Selected != Selectables - 1)
       {

Main/Include/bugworkaround.h

@@ -26,7 +26,7 @@ class bugfixdp{
 
   private:
     static character* BugWorkaroundDupPlayer();
-    static void DevConsCmd(std::string strCmdParams);
+    static void DevConsCmd(festring fsCmdParams);
 
     static void GatherAllItemInLevel();
     static bool ItemWork(character* Char, item* it, bool bFix, const char* cInfo, std::vector<item*>* pvItem,bool bSendToHell);

Main/Include/command.h

@@ -26,12 +26,14 @@ class command
   char GetKey() const;
   truth IsUsableInWilderness() const { return UsableInWilderness; }
   truth IsWizardModeFunction() const { return WizardModeFunction; }
+  int SetCustomKey(int iKey){ int iKeyBkp=Key4; Key4 = iKey; return iKeyBkp; }
  private:
   truth (*LinkedFunction)(character*);
   cchar* Description;
   char Key1;
   char Key2;
   char Key3;
+  int Key4; // custom keys can be more than 1 char long as ex.: KEY_HOME is 0x147 or 0x0147
   truth UsableInWilderness;
   truth WizardModeFunction;
 };
@@ -72,6 +74,7 @@ class commandsystem
   static truth Open(character*);
   static truth PickUp(character*);
   static truth Pray(character*);
+  static truth AskFavour(character*);
   static truth Craft(character*);
   static truth Quit(character*);
   static truth Read(character*);

Main/Include/confdef.h

@@ -763,6 +763,7 @@
 #define FORGE 26
 #define FURNACE 27
 #define WORK_BENCH 32
+#define TAILORING_BENCH 39
 
 #define SNOW_BOULDER 4
 

Main/Include/craft.h

@@ -129,6 +129,7 @@ class recipedata {
   friend struct srpForge;
   friend struct srpJoinLumps;
   friend struct srpWorkBench;
+  friend struct srpTWorkBench;
   friend struct srpResistanceVS;
   friend struct srpCutWeb;
 
@@ -214,6 +215,8 @@ class recipedata {
     v2 v2WorkbenchLocation;
     int iRemainingTurnsToFinish;
     bool bGradativeCraftOverride;
+    bool bTailoringMode;
+    v2 v2TailoringWorkbenchLocation;
 
   public:
     recipedata(humanoid* H=NULL,uint sel=FELIST_ERROR_BIT);
@@ -269,7 +272,8 @@ class craftcore {
     static bool IsWooden(material* mat);
     static bool IsBone(material* mat);
 
-    static item* PrepareRemains(recipedata&,material*,int ForceType=CIT_NONE);
+    static item* PrepareRemains(recipedata&,material*,int ForceType=CIT_NONE, long volume = 0);
+    static void FinishSpawning(recipedata& rpd,item* itSpawn);
 
     static void AddSuspended(const recipedata& rpd);
     static void RemoveIfSuspended(const recipedata&rpd);
@@ -285,6 +289,7 @@ class craftcore {
 
     static int CitType(item* it);
     static bool CheckFumble(recipedata& rpd, bool& bCriticalFumble,int& iFumblePower);
+    static void CraftSkillAdvance(recipedata&);
 };
 
 class crafthandle {

Main/Include/database.h

@@ -34,6 +34,7 @@ template <class type> class databasecreator
   typedef std::map<festring, databasememberbase<database>*> databasemembermap;
   static void ReadFrom(inputfile&);
   static void FindDataBase(const database*&, const prototype*, int);
+  static truth InstallDataBaseIfPossible(type*, int, int);
   static void InstallDataBase(type*, int);
   static void CreateDataBaseMemberMap();
   static int CreateDivineConfigurations(const prototype*, database**, int);