Experimental

kod/include/blakston.khd

@@ -825,6 +825,16 @@
    RID_DESERTRIVER1 = 1510
    RID_DESERTRIVER2 = 1511
    RID_DESERTBRIDGE = 1512
+   RID_DESERTCAVERAFT = 1513
+   RID_ELEMENTAL_DUNGEON1 = 1520
+   RID_ELEMENTAL_DUNGEON2 = 1521
+   RID_ELEMENTAL_DUNGEON3 = 1522
+   RID_DESERTSANDBAR = 1523
+   RID_DESERTALDUNES = 1524
+   RID_DESERTALDUNES2E = 1525
+   RID_DESERTALDUNES3E = 1526
+   RID_DESERTALDUNES4E = 1527
+   RID_DESERT_END = 1550
 
    % Settlement and Island 2000-2499
    % Needs to be seperate so it counts as a different 'zone'
@@ -2215,6 +2225,13 @@
    SID_MEDITATE = 187
    SID_UNHOLY_TOUCH = 188
 
+   SID_ACID_STORM_BUFF = 220
+   SID_SHOCK_STORM_BUFF = 221
+   SID_HEAT_STORM_BUFF = 222
+   SID_COLD_STORM_BUFF = 223
+
+   SID_GREY_GHOST = 300
+
    % Depreciated spell IDs
    SID_LIGHTNING = 1                   % use SID_LIGHTNING_BOLT
    SID_HEAL = 2                        % use SID_MINOR_HEAL
@@ -2291,6 +2308,12 @@
    SS_RIIJA = 5
    SS_JALA = 6
    SS_DM_COMMAND = 7
+   SS_WITCHERY = 8
+
+   % Subschools
+   SS_WITCHERY_XAERDUN = 1
+   SS_WITCHERY_NEQUZON = 2
+   SS_WITCHERY_IWODACH = 3
 
    % We may use skill an spell schools in the same routines, thus no overlap.
    SKS_FENCING = 10

kod/object.kod

@@ -1011,6 +1011,18 @@ messages:
       return viObject_flags | piDrawEffectFlag;
    }
 
+   RemoveDrawingEffects(value=0)
+   {
+      piDrawfx = piDrawfx & ~value;
+      return;
+   }
+
+   AddDrawingEffects(value=0)
+   {
+      piDrawfx = piDrawfx | value;
+      return;
+   }
+
    GetDrawingEffects()
    "This returns any special drawing effect the object has. Default is "
    "no drawing effect."
@@ -1316,6 +1328,36 @@ messages:
    {
       return plObject_attributes;
    }
+
+   HasObjectAttribute(cClass=&ShockStorm)
+   {
+      local i;
+
+      foreach i in plObject_attributes
+      {
+         if IsClass(i,cClass)
+         {
+            return TRUE;
+         }
+      }
+
+      return FALSE;
+   }
+
+   GetObjectAttribute(cClass=&ShockStorm)
+   {
+      local i;
+
+      foreach i in plObject_attributes
+      {
+         if IsClass(i,cClass)
+         {
+            return i;
+         }
+      }
+
+      return $;
+   }
 
 end
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

kod/object/active/holder/nomoveon/battler/monster.kod

@@ -354,6 +354,7 @@ classvars:
    vrTeach_quest_needed = monster_teach_quest_needed
    vrNothing_for_sale = Lm_nothing_for_sale
    vrMrcnt_too_costly = Lm_mrcnt_too_costly
+   vrMrcntCannotGive = Lm_mrcnt_cant_give
    vrMonster_healing = Lm_monster_healing
    vrMinion_trouble = minion_trouble
 
@@ -4701,7 +4702,7 @@ messages:
                else
                {
                   % Buyer can't accept the item for some reason.
-                  Post(poOwner,@SomeoneSaid,#what=self,#string=Lm_mrcnt_cant_give,
+                  Post(poOwner,@SomeoneSaid,#what=self,#string=vrMrcntCannotGive,
                         #type=SAY_RESOURCE,#parm1=Send(oBuy,@GetDef),
                         #parm2=Send(oBuy,@GetName));
                   Send(oBuy,@Delete);