Merge branch 'master' of https://github.com/polserver/ClassicDistro

Author: Hope-Lives

config/itemdesc.cfg

@@ -581,16 +581,6 @@ Item    0x1011
     VendorBuysFor       4
 }
 
-Item    0x14FB
-{
-	Name                lockpick
-	desc                lockpick%s%
-	Script              pickLock
-	VendorSellsFor      12
-	VendorBuysFor       4
-	stackable		1
-}
-
 Item    0xF78
 {
     Name                BatWing

pkg/items/treasuremap/decodeMap.src

@@ -83,6 +83,9 @@ function SetTreasureCoords( map );
   endif
   map.xeast := x+265;
   map.ysouth := y+260;
+  if(map.ysouth >= 4096)
+    map.ysouth := 4095;
+  endif
   map.gumpwidth := 200;
   map.gumpheight := 200;
   map.AppendPin(x,y);

pkg/items/treasuremap/destroyTimer.src

@@ -0,0 +1,15 @@
+use uo;
+use os;
+
+program destroyTimer(chest)
+    var at := CInt(GetObjProperty(chest,"DestroyAt"));
+    Detach();
+
+    while(1)
+        if(ReadGameClock() > at)
+            DestroyItem(chest);
+        endif
+        sleep(1);
+    endwhile
+
+endprogram

pkg/mobiles/damage/include/damage.inc

@@ -274,7 +274,7 @@ function DisplayDamage(damaged, amount, source:=0)
 
 	dmg_packet.SetInt32(0x01, damaged.serial);
 
-	if ( source.acctname )
+	if ( source.acctname != damaged.acctname )
 		dmg_packet.SendPacket(source);
 	endif
 

pkg/skills/cartography/cartography.src

@@ -48,7 +48,7 @@ program go_go_gadget_map(who)
 	   	 DestroyItem(blank);
 	   endif
 	3: if(SkillCheck(who, CARTOGRAPHY, 80, 150))
-	   	 props := array("world", 0, 0, 5119, 4095, 500, 400);
+	   	 props := array("world", 0, 0, 5119, 4095, 500, 500);
 		 makemap(who, props, blank);
 	   else
 		 SendSysMessage(who, "You are not familiar enough with the area to draw the map");

pkg/skills/lockpicking/config/itemdesc.cfg

@@ -0,0 +1,9 @@
+Item    0x14FB
+{
+	Name                lockpick
+	desc                lockpick%s%
+	Script              :lockpicking:use/pickLock
+	VendorSellsFor      12
+	VendorBuysFor       4
+	stackable		    1
+}

pkg/skills/lockpicking/lockpicking.src

@@ -47,7 +47,8 @@ program pick( me, lockpick )
 endprogram
 
 function PickTreasureChest(me, lockpick, chest)
-  var lvl := GetObjProperty(chest,"level" );
+    var lvl := GetObjProperty(chest,"level" );
+
   if (!lvl)
 	DestroyItem(chest);
   endif

scripts/items/pickLock.src pkg/skills/lockpicking/use/pickLock.srcscripts/items/pickLock.src renamed to pkg/skills/lockpicking/use/pickLock.src

@@ -99,6 +99,17 @@ endfunction
 
 function PickTreasureChest(me, lockpick, chest)
   var lvl := GetObjProperty(chest,"level");
+
+    var guardians := GetObjProperty(chest,"#guardianList" );
+    foreach guard in guardians
+      if(SystemFindObjectBySerial(guard))
+        SendSysMessage(me,"You need to kill all the guards");
+        return;
+      endif
+    endforeach
+    EraseObjProperty(chest, "#guardianList");
+
+
   if(!lvl)
     SendSysMessage(me, "You cannot pick that.");
     return;
@@ -114,6 +125,9 @@ function PickTreasureChest(me, lockpick, chest)
     PlaySoundEffect(chest,SFX_200);
     PrintTextAbovePrivate(chest,"*Unlocked!*",me);
     chest.locked := 0;
+    SetObjProperty(chest,"DestroyAt", (ReadGameClock() + DESTROY_TREASURE_CHEST));
+    start_script(":treasuremap:destroyTimer", chest);
+    PrintTextAbove(chest,"The chest will collapse after "+(DESTROY_TREASURE_CHEST / 60)+" minutes");
   else
     PrintTextAbovePrivate(chest,"You fail to pick the lock.",me);
     if(diff < 10)

pkg/skills/mining/mining.src

@@ -261,14 +261,20 @@ program use_picktool(who, tool)
       var rand;
       var template;
       i := 1;
+      var guardianList := {};
       for( i := 1; i <= limit; i := i + 1 )
         rand := RandomInt( num ) + 1;
         template := GetConfigString( elem, ("creature" + rand) );
-        CreateGuardian( chest, template );
+        var npc := CreateGuardian( chest, template );
+        if(npc)
+            guardianList.append(npc.serial);
+        endif
       endfor
+      SetObjProperty(chest, "#guardianList", guardianList);
       UnloadConfigFile(":treasuremap:guardians");
       SendSysMessage( who, "You unleash the treasure's guardians!" );
       ReleaseItem(tool);
+      ReleaseItem(map);
       Detach();
       sleep(1800);
       DestroyItem(chest);
@@ -319,6 +325,7 @@ function CreateGuardian( chest, template )
   if( nasty == "<error>" )
     CreateGuardian( chest, template );
   endif
+  return nasty;
 endfunction
 
 function is_minable(theobj, othertype)

pkg/skills/musicianship/entice.src

@@ -29,7 +29,7 @@ program enticement(who)
     SendSysMessage(who, "You don't have an instrument to play!");
     return;
   endif
-  var success := play(who, diff, instrument, SKILLID_DISCORDANCE);
+  var success := play(who, diff, instrument, DISCORDANCE);
   if(success)
     var ev := struct;
     ev.+type := EVID_ALL_FOLLOW_CMD;