Some minor adjustments I've been meaning to do for weeks.

6 files changed, 26 insertions, 12 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index c708e0db1..7ff2d35c3 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -1557,7 +1557,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, SnakeEgg, BronzeGift, Dagger, Wurtzite, RedPlushWine, MoubooSteak, IronOre, CelestiaTea, CursedAmmoBox, IronAmmoBox, SilverRing;
+		setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, StrangeCoin, SnakeEgg, StrengthPotion, HastePotion, Dagger, Wurtzite, RedPlushWine, MoubooSteak, IronOre, CelestiaTea, CursedAmmoBox, IronAmmoBox, SilverRing;
 		.@n=rand(getarraysize(.@r));
 
 		if (.@n > 4)
@@ -1583,7 +1583,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		setarray .@r, StrangeCoin, StrangeCoin, CasinoCoins, IronIngot, SaxsoKey, GoldenApple, GoldenRing, GoldOre, Graphene, PoisonAmmoBox, CursedAmmoBox, MercBoxA, AncientBlueprint, HeadHood, SilverGift;
+		setarray .@r, StrangeCoin, StrangeCoin, CasinoCoins, IronIngot, SaxsoKey, GoldenApple, GoldenRing, GoldOre, Graphene, PoisonAmmoBox, CursedAmmoBox, MercBoxA, AncientBlueprint, HeadHood, SacredLifePotion, SacredManaPotion;
 		.@n=rand(getarraysize(.@r));
 
 		if (.@n > 2)
@@ -1610,7 +1610,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		setarray .@r, StrangeCoin, StrangeCoin, IronIngot, CopperIngot, TinIngot, SilverIngot, GoldIngot, PlatinumOre, IridiumOre, TitaniumOre, LeadOre, FourLeafClover, MercBoxB, MercBoxC, ThornAmmoBox, PoisonAmmoBox, PolishedDiamond, PolishedRuby, PolishedEmerald, PolishedSapphire, PolishedAmethyst, PolishedTopaz, SacredLifePotion, SacredManaPotion, SacredImmortalityPotion, AncientBlueprint, ArcmageBoxset, MysteriousFruit, GoldenGift;
+		setarray .@r, StrangeCoin, StrangeCoin, IronIngot, CopperIngot, TinIngot, SilverIngot, GoldIngot, PlatinumOre, IridiumOre, TitaniumOre, LeadOre, FourLeafClover, MercBoxB, MercBoxC, ThornAmmoBox, PoisonAmmoBox, PolishedDiamond, PolishedRuby, PolishedEmerald, PolishedSapphire, PolishedAmethyst, PolishedTopaz, SacredLifePotion, SacredManaPotion, SacredImmortalityPotion, AncientBlueprint, ArcmageBoxset, MysteriousFruit, MercBoxD, MercBoxE;
 		.@n=rand(getarraysize(.@r));
 
 		if (.@n > 1)
@@ -1637,7 +1637,7 @@ item_db: (
 		noauction: true
 	}
 	Script: <"
-		setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, Googles, BlueManaPearl, BlackPearl, Bloodstone, LavaManaPearl, SaviorBlueprint, DivineApple, BowlerHat, Butterfly, BoneAmmoBox, CrystallizedMaggot, MylarinDust, MercBoxDD, MercBoxE, MysteriousFruit, PrismGift;
+		setarray .@r, StrangeCoin, StrangeCoin, StrangeCoin, Googles, BlueManaPearl, BlackPearl, Bloodstone, LavaManaPearl, SaviorBlueprint, DivineApple, BowlerHat, Butterfly, BoneAmmoBox, CrystallizedMaggot, MylarinDust, MercBoxDD, MercBoxE, MysteriousFruit, MercBoxEE;
 		.@n=rand(getarraysize(.@r));
 
 		if (.@n > 2)
diff --git a/logmaster.py b/logmaster.py
index ebd92ccc4..90d149ab0 100755
--- a/logmaster.py
+++ b/logmaster.py
@@ -126,11 +126,15 @@ def keep_alive_runner():
 def run_forever():
     global sqli, running
     while running:
+      try:
         bf = sys.stdin.readline()
         if bf is None or bf == "":
             continue
         #stdout("Buffer set: %s" % str(bf))
         sqli.append(str(bf).replace("\n","").replace("\r",""))
+      except:
+        traceback.print_exc()
+        time.sleep(SQL_FLUSH)
     return
 
 ## Handle term signals
diff --git a/npc/007-1/naem.txt b/npc/007-1/naem.txt
index 4a7414b25..7f8561b9f 100644
--- a/npc/007-1/naem.txt
+++ b/npc/007-1/naem.txt
@@ -41,6 +41,7 @@
     next;
     mesn;
     mesq l("You can collect croconuts by killing any tree with it. Then you can break it in half from the inventory screen.");
+    mesc l("Remember: Give it to my wife, %s!", b("Silvia")), 7;
     compareandsetq MineQuest_Naem, 0, 1;
     close;
 
diff --git a/npc/024-15/lilanna.txt b/npc/024-15/lilanna.txt
index bfedb40c1..37ea19ad9 100644
--- a/npc/024-15/lilanna.txt
+++ b/npc/024-15/lilanna.txt
@@ -38,6 +38,9 @@ L_Loop:
             mesn;
             mesq l("If you ever need to get quickly from one place to the other, count on us!");
             next;
+            mesn;
+            mesq l("And we can also recharge %s for a small fee, I guess.", getitemlink(BrokenWarpCrystal));
+            next;
             break;
         case 3:
             mesn;
@@ -101,10 +104,10 @@ function FixSelect {
         mesc l("Fixing Crystals have a price. You can only charge crystals to places you've already been.");
         mesc l("These are saved by walking in warp portals or touching Soul Menhirs.");
         mes l("You have: @@ Broken crystals", countitem(BrokenWarpCrystal));
-        .@cbase=750; // Candor Base
-        .@nbase=1250; // Normal Base
-        .@lbase=2500; // LoF Base
-        .@fbase=5000; // Faraway Base
+        .@cbase=600; // Candor Base
+        .@nbase=1000; // Normal Base
+        .@lbase=2000; // LoF Base
+        .@fbase=4000; // Faraway Base
         .@kbase=10000; // King Base (incl. Fortress Is.)
         select
             l("Don't fix."),
diff --git a/npc/functions/gmbot.txt b/npc/functions/gmbot.txt
index 5d11e5d1f..0c60fe847 100644
--- a/npc/functions/gmbot.txt
+++ b/npc/functions/gmbot.txt
@@ -60,6 +60,7 @@ boss,45,42,0	script	Lightbringer	NPC_LIGHTBRINGER,{
         goto L_Perma;
 
     rentitem Lightbringer, (.@btime*(@lbscore-60));
+    LB_WIELD += (.@btime*(@lbscore-60));
     dispbottom l("This live sword drafts itself to your hand. You can wield it for a while.");
     disablenpc .name$;
     .busy=gettimetick(2)+(.@btime*(@lbscore-60))+300;
@@ -96,6 +97,8 @@ L_Perma:
     mesc l("%s, you did your best to protect this world inhabitants. It is my wish that you continue protecting this world. Therefore, I bestow upon you, the legendary %s. Please use its powers to protect your friend and the world peace!", strcharinfo(0), getitemlink(Lightbringer)), 2;
     mesc l("WARNING: The %s is a %s. Besides being insanely powerful, no duplicate of them exist in the world. They can be tweaked freely and can hold multiple cards as well, and scale according to your level. Use its powers wisely. However, beware: This weapon cannot be traded except with \"@grantpower\" command, and if you abandon the world, the weapon will abandon you as well!", getitemlink(Lightbringer), b(l("legendary weapon"))), 1;
 
+    // Clean up global competition tracker
+    DelChrRegFromEveryPlayer("LB_WIELD");
     // Destroy the previous Lightbringer
     DelItemFromEveryPlayer(Lightbringer);
     getitembound Lightbringer, 1, 1; // Account bound or char bound? (1 or 4)
@@ -260,7 +263,10 @@ function matrixlb {
     if ($GAME_STORYLINE >=5)
         .@pts+=1; // Should never, ever, happen
 
-    // Max points: 101→104→114→117→124
+    // Interest (every 30 minutes rented is a point, up to 3 hours)
+    .@pts += limit(0, LB_WIELD / 1800, 6);
+
+    // Max points: 101→104→114→117→124→130
     return .@pts;
 }
 
diff --git a/npc/items/teleporter.txt b/npc/items/teleporter.txt
index b7e311b85..4ed8c27cb 100644
--- a/npc/items/teleporter.txt
+++ b/npc/items/teleporter.txt
@@ -33,12 +33,12 @@ OnUse:
 
     // The chance to break is always at least 20%
     // Begins at 100% and each second will subtract 0.01%
-    // It will never go below 15%, which happens after x seconds
+    // It will never go below 5%, which happens after x seconds
     .@timet=limit(0, gettimetick(2)-TELEPORTER_TIME, 3600);
     .@prop=.@timet*2777/1000; // Make it range from 0~10000
-    .@adj_breakrate=limit(1500, .@prop, 9500 );
+    .@adj_breakrate=limit( 500, .@prop, 9500 );
     //debugmes "Adjusted break ratio: %d", .@adj_breakrate;
-    if (rand(0,10000) > .@adj_breakrate)
+    if (rand(10000) > .@adj_breakrate)
         getitem @itemid, 1;
     else
         getitem BrokenWarpCrystal, 1;