Backport features from k8IVAN

CMakeLists.txt

@@ -4,9 +4,9 @@ project(ivan CXX C)
 set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
 
 set(VERSION_MAJOR 0)
-set(VERSION_MINOR 59)
+set(VERSION_MINOR 60)
 set(PROJECT_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}")
-#set(VERSION_PATCH 0)
+#set(VERSION_PATCH dev)
 #set(PROJECT_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}")
 
 set(CMAKE_CXX_FLAGS "-std=c++11 ${CMAKE_CXX_FLAGS}")

Doc/HowTo/ConfigSyntax.txt

@@ -8,7 +8,7 @@
 
 {
   let S = "string", N = "number", T = "truth", C = "cycle";
-  let OPTIONS = new Map([["DefaultName",S],["FantasyNamePattern",S],["DefaultPetName",S],["AutoSaveInterval",N],["AltAdentureInfo",T],["BeNice",T],["HoldPosMaxDist",N],["MemorizeEquipmentMode",C],["WarnAboutVeryDangerousMonsters",T],["AutoDropLeftOvers",T],["SmartOpenCloseApply",T],["CenterOnPlayerAfterLook",T],["ShowGodInfo",T],["ShowMapAtDetectMaterial",T],["GoOnStopMode",C],["WaitNeutralsMoveAway",T],["Contrast",N],["WindowWidth",N],["WindowHeight",N],["GraphicsScale",C],["FullScreenMode",T],["ScalingQuality",C],["LookZoom",T],["XBRZScale",C],["XBRZSquaresAroundPlayer",N],["SilhouetteScale",C],["AltSilhouette",C],["AltSilhouettePreventColorGlitch",C],["AltListItemPos",C],["AltListItemWidth",N],["StackListPageLength",N],["DungeonGfxScale",C],["OutlinedGfx",T],["FrameSkip",N],["ShowItemsAtPlayerSquare",C],["RotateTimesPerSquare",C],["HitIndicator",C],["ShowMap",C],["PlaySounds",T],["Volume",N],["MIDIOutputDevice",C],["DirectionKeyMap",C],["SaveGameSortMode",C],["ShowTurn",T],["ShowFullDungeonName",T],["SelectedBkgColor",S],["AllowImportOldSavegame",T],["SavegameSafely",T],["HideWeirdHitAnimationsThatLookLikeMiss",T],["GenerateDefinesValidator",T]]);
+  let OPTIONS = new Map([["DefaultName",S],["FantasyNamePattern",S],["DefaultPetName",S],["AutoSaveInterval",N],["AltAdventureInfo",T],["BeNice",T],["HoldPosMaxDist",N],["MemorizeEquipmentMode",C],["WarnAboutVeryDangerousMonsters",T],["AutoDropLeftOvers",T],["SmartOpenCloseApply",T],["CenterOnPlayerAfterLook",T],["ShowGodInfo",T],["ShowMapAtDetectMaterial",T],["GoOnStopMode",C],["WaitNeutralsMoveAway",T],["Contrast",N],["WindowWidth",N],["WindowHeight",N],["GraphicsScale",C],["FullScreenMode",T],["ScalingQuality",C],["LookZoom",T],["XBRZScale",C],["XBRZSquaresAroundPlayer",N],["SilhouetteScale",C],["AltSilhouette",C],["AltSilhouettePreventColorGlitch",C],["AltListItemPos",C],["AltListItemWidth",N],["StackListPageLength",N],["DungeonGfxScale",C],["OutlinedGfx",T],["FrameSkip",N],["ShowItemsAtPlayerSquare",C],["RotateTimesPerSquare",C],["HitIndicator",C],["ShowMap",C],["PlaySounds",T],["Volume",N],["MIDIOutputDevice",C],["DirectionKeyMap",C],["SaveGameSortMode",C],["ShowTurn",T],["ShowFullDungeonName",T],["SelectedBkgColor",S],["AllowImportOldSavegame",T],["SavegameSafely",T],["HideWeirdHitAnimationsThatLookLikeMiss",T],["GenerateDefinesValidator",T]]);
   let VARIABLES = new Map([["XSize",30],["YSize",30]]);
 
   let isdigit = function (char) { return /[0-9]/.test(char); };

Doc/Lore/Fiction/Lantern.txt

@@ -0,0 +1,17 @@
+Many are the names in the common tongues for the great blessing which holy Legifer hath bestowed on us: "Lumes", "Glims", "Lanthorns", "Little-stars", "Twinkleboxes" and countless others in the tongue of Man alone. Many more exist in the languages of Dwarven-kind or the Elvish kindred and even the barbaric blabber of the Orcs, far more than could be mentioned.
+
+Yet how poor and pitiful is the gratitude returned to the lord of Order for these daily wonders despite the great benefit that they provide! Little do we seem to think of what should happen if His blessing were to be withdrawn across the world, leaving us all groping in the dark. So for the further enlightenment of the reader (in every meaning of the term) here is the known history of His generosity:
+
+In ages long past when cities had not begun and villages were but rudely built of straw-daubed walls with hide rooves, all except the highest of nobles lit torches for their homes within and without. Often naught else could be had: rushes burned but would only grow on the banks of warm rivers while coal mining scarce existed past tiny pits. Immeasurable was the amount of labor to keep the fickle fires of countless torches fed well enough to burn brightly but also guard them from catching aflame to everything else!
+
+Of all the torments of the forces of Chaos in those hard days, few were of greater delight in their loathesome eyes than to set a feeble spirit to flitter about a torch or luchina so that it leaned closely to a curtain to set it ablaze, or topple a poorly fixed oil lamp to the floor to spread flaming liquid all about. Such wicked conjurations gained the name chandl-wyghts (or "candle devils" in more modern speech). in time the more devious servants of darkness learnt to use the mere threat of the spirits for extortion that proved of greater effect than the wanton destructiveness of the spirits themselves. Sigils of protection began to be sold by such merchants who would trade in them that offered a tenday or a month or a season's worth of respite despite furious efforts to quell such round-about funding of evil. Even these sigils in turn became targets for a few bold charlatans, selling counterfeit sigils that held no magic protection at all. However, these forgeries were especially dangerous; risking fates far worse than death for the makers unfortunate enough to be caught by the 'true' salers.
+
+At length this ville traffic reached the household of a leader of an early guild of chandlers whose name has been lost to the ages. He apparently found one morning a threat scribbled upon a scrap of parchment to pay his tithe to the temple instead for 'insuring' the safety of his family and home. As his very life's work was the proper making of lights and fire-guarding, his rage was so kindled that he at once ran to the temple to shout with such a voice that half the village heard his oaths, demanding some means of the Lawful gods to stop his tormentors. Such had been his devotion to that no less than Iustitia herself appeared on the threshold of the temple. With a voice of thunder she proclaimed a call to holy war upon evil to last until the sun had set that day.
+
+Of what events transpired that day we know little, save that every man and strong boy for miles around grabbed such arms and armor that were at hand to answer Iustitia's summon to go forth putting a great many dens of evil to the sword. As the last flickers of daylight vanished over the horizon, the mighty archangel vanished to leave behind something most wondrous. A massive tablet stood where she had been, made of a material like glass yet far stronger that no man had ever seen the like of before. It would at some length be given the name "illithium" by learned men of the time. The lengthy canticle of holy words the tablet bore wove a spell that lit a brilliant white glow from within a vessel held by the one with the patience to complete the wearisome chant. As if this gift were not great enough, so amazing was Legifer's grace that even a simple-minded apprentice was able to complete it so long as his attention stayed unbroken.
+
+As quickly as they could be made, skilled smiths began fashioning more vessels for these blessed lights out of tin or brass with many piercings to let out the light from within. But the tradesman who had first begged Legifer's aid crafted the first true lantern encompassed with glass, knowing its affinity to the god. By the time the pious man went to his eternal reward he claimed to have fashioned at least a hundred-score lanterns with his own hands - and likely so!
+
+With the dispersal of these blessed lights all across the lands, not only were the ruinous powers sorely hurt but also many who would have perished in some firey tragedy hath lived full lives instead. Countless hearths and halls came to be lit without smoke or a pence's worth of tinder. To say nothing of the relief to forest-wardens when the common man needed far less wood throughout the year.
+
+Now let thy mind be enlightened by the full truth of Legifer's beneficence, that you may reflect upon his gift to the full measure.

FeLib/Include/festring.h

@@ -119,13 +119,17 @@ class festring
   void ExtractWord(festring&);
   long GetCheckSum() const;
   void EnsureOwnsData(bool = false);
+  inline bool IsUnique () const { return (OwnsData && Data && (REFS(Data) == 0)); }
+  void PutWeight (int w);  // Nicely formatted weight
  private:
   static void InstallIntegerMap();
   static void DeInstallIntegerMap();
   static void CheckNull(cchar*);
   void CreateNewData(sizetype);
   void CreateOwnData(cchar*, sizetype);
   festring& AppendInt(long);
+  festring& AppendIntr (cchar* CStr, sizetype clen);
+  festring& AppendStr (cchar* s);
   festring& Append(char);
   festring& Append(cchar*, sizetype);
   festring& Append(cfestring&);

FeLib/Source/festring.cpp

@@ -907,3 +907,66 @@ void festring::EnsureOwnsData(bool Unique)
     CreateOwnData(Data, Size);
   }
 }
+
+festring& festring::AppendIntr(cchar* CStr, sizetype N)
+{
+  if(N == 0)
+    return *this;
+
+  sizetype OldSize = Size;
+  sizetype NewSize = OldSize+N;
+  char* OldPtr = Data;
+
+  if(OwnsData && IsUnique() && NewSize <= Reserved) {
+    memmove(OldPtr + OldSize, CStr, N);
+    Size = NewSize;
+  } else {
+    SlowAppend(CStr, N);
+  }
+  return *this;
+}
+
+festring& festring::AppendStr(cchar* s)
+{
+  if(s && s[0]) {
+    return AppendIntr(s, (sizetype)strlen(s));
+  } else {
+    return *this;
+  }
+}
+
+void festring::PutWeight(int w) {
+  if(w < 1000) {
+    *this << w << "g";
+  } else {
+    int kg = w / 1000;
+    int g = w % 1000;
+
+    if(g != 0) {
+      if(g % 100 != 0) {
+        AppendStr("~");
+
+        if(g % 100 > 50)
+          g = g / 100 + 1;
+        else
+          g = g / 100;
+
+        if(g == 10) {
+          kg += 1;
+          g = 0;
+        }
+      } else {
+        g /= 100;
+      }
+    }
+
+    *this << kg;
+
+    if (g != 0) {
+      AppendStr(".");
+      (*this) << g;
+    }
+
+    AppendStr("kg");
+  }
+}

Main/Include/game.h

@@ -433,6 +433,7 @@ class game
   static long GetScore();
   static truth TweraifIsFree();
   static truth IsXMas();
+  static truth IsSamhain();
   static int AddToItemDrawVector(const itemvector&);
   static void ClearItemDrawVector();
   static void ItemEntryDrawer(bitmap*, v2, uint);
@@ -501,17 +502,18 @@ class game
   static void SetEnterImage(cbitmap* What) { EnterImage = What; }
   static void SetEnterTextDisplacement(v2 What){ EnterTextDisplacement = What; }
   static int getDefaultItemsListWidth(){ return iListWidth; }
-  static void AddDebugDrawOverlayFunction(dbgdrawoverlay ddo){vDbgDrawOverlayFunctions.push_back(ddo);}
+  static void AddDebugDrawOverlayFunction(dbgdrawoverlay ddo){ vDbgDrawOverlayFunctions.push_back(ddo); }
   static int GetCurrentDungeonTurnsCount(){return iCurrentDungeonTurn;}
   static int GetSaveFileVersionHardcoded();
-  static void ValidateCommandKeys(char Key1,char Key2,char Key3);
+  static void ValidateCommandKeys(char Key1, char Key2, char Key3);
   static truth ConfigureCustomKeys();
   static festring ToCharIfPossible(int i);
   static truth ValidateCustomCmdKey(int iNewKey, int iIgnoreIndex, bool bMoveKeys);
   static festring GetMoveKeyDesc(int i);
   static void LoadCustomCommandKeys();
   static int GetWorldShape() { return WorldShape; }
   static void SetWorldShape(int What) { WorldShape = What; }
+  static bool OpposedCheck(int first, int second, int cap = 5);
  private:
   static void UpdateCameraCoordinate(int&, int, int, int);
   static cchar* const Alignment[];

Main/Include/iconf.h

@@ -55,9 +55,9 @@ class ivanconfig
   static truth GetLookZoom() { return LookZoom.Value; }
   static truth IsXBRZScale() { return XBRZScale.Value; }
   static truth IsAutoPickupThrownItems() { return AutoPickupThrownItems.Value; }
-  static truth IsAltAdentureInfo() { return AltAdentureInfo.Value; }
+  static truth IsAltAdventureInfo() { return AltAdventureInfo.Value; }
   static truth UseDescriptiveHP() { return DescriptiveHP.Value; }
-  static truth GetNoPet() { return StartWithNoPet.Value; }
+  static truth GetPet() { return StartWithPet.Value; }
   static int GetXBRZSquaresAroundPlayer() { return XBRZSquaresAroundPlayer.Value; }
   static int GetStartingDungeonGfxScale() { return iStartingDungeonGfxScale; }
   static int GetStartingFontGfx() { return iStartingFontGfx; }
@@ -83,6 +83,7 @@ class ivanconfig
   static int GetWorldShapeConfig() { return WorldShapeConfig.Value; }
   static int GetWorldSeedConfig() { return WorldSeedConfig.Value; }
   static int GetWorldSizeNumber() { return WorldSizeConfig.Value; }
+  static truth IsCraftingEnabled() { return CraftingEnabled.Value; }
 
 #ifndef __DJGPP__
   static int GetGraphicsScale() { return GraphicsScale.Value; }
@@ -196,7 +197,7 @@ class ivanconfig
   static stringoption SelectedBkgColor;
   static stringoption AutoPickUpMatching;
   static numberoption AutoSaveInterval;
-  static truthoption AltAdentureInfo;
+  static truthoption AltAdventureInfo;
   static truthoption CenterOnPlayerAfterLook;
   static scrollbaroption Contrast;
   static truthoption ShowGodInfo;
@@ -231,7 +232,7 @@ class ivanconfig
   static truthoption XBRZScale;
   static truthoption AutoPickupThrownItems;
   static truthoption DescriptiveHP;
-  static truthoption StartWithNoPet;
+  static truthoption StartWithPet;
 
   static cycleoption SaveGameSortMode;
   static cycleoption DistLimitMagicMushrooms;
@@ -262,12 +263,14 @@ class ivanconfig
   static scrollbaroption Volume;
   static scrollbaroption SfxVolume;
   static cycleoption MIDIOutputDevice;
-  
+
   static cycleoption WorldSizeConfig;
   static cycleoption LandTypeConfig;
   static cycleoption WorldShapeConfig;
   static numberoption WorldSeedConfig;
 
+  static truthoption CraftingEnabled;
+
 #ifndef __DJGPP__
   static cycleoption GraphicsScale;
   static truthoption FullScreenMode;

Main/Source/bodypart.cpp

@@ -3564,17 +3564,21 @@ void head::SignalPossibleUsabilityChange()
         if(RAND_N(5))
         {
           ADD_MESSAGE("Your memory becomes blurred.");
-          GetLevel()->Amnesia(25 + RAND_N(50));
           Master->EditExperience(INTELLIGENCE, -80, 1 << 13);
-          game::SendLOSUpdateRequest();
+          if(!game::IsInWilderness()) {
+            GetLevel()->Amnesia(25 + RAND_N(50));
+            game::SendLOSUpdateRequest();
+          }
         }
         else
         {
           ADD_MESSAGE("A terrible concussion garbles your consciousness.");
           Master->BeginTemporaryState(CONFUSED, 5000 + RAND_N(5000));
           Master->EditExperience(INTELLIGENCE, -100, 1 << 14);
-          GetLevel()->BlurMemory();
-          game::SendLOSUpdateRequest();
+          if(!game::IsInWilderness()) {
+            GetLevel()->BlurMemory();
+            game::SendLOSUpdateRequest();
+          }
         }
       }
       else