Misc. bugfixes

4 files changed, 60 insertions, 4 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 81ab49d5a..0258d6de6 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -14272,7 +14272,7 @@ item_db: (
 	Buy: 6
 	Sell: 1
 	Weight: 1
-	Atk: 10
+	Atk: 15
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
 },
@@ -14284,7 +14284,7 @@ item_db: (
 	Buy: 12
 	Sell: 2
 	Weight: 1
-	Atk: 10
+	Atk: 20
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
 	Script: <"
@@ -14299,7 +14299,7 @@ item_db: (
 	Buy: 12
 	Sell: 2
 	Weight: 1
-	Atk: 10
+	Atk: 20
 	Loc: "EQP_AMMO"
 	Subtype: "A_BULLET"
 	Script: <"
diff --git a/db/re/mob_skill_db.conf b/db/re/mob_skill_db.conf
index 66eef6b77..08d7f0420 100644
--- a/db/re/mob_skill_db.conf
+++ b/db/re/mob_skill_db.conf
@@ -1955,6 +1955,30 @@ SKILL_COND2 = {
 	}
 
 	/**********************************************************************/
+	Moubi: {
+		MG_NAPALMBEAT: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 5
+			Rate: 3000
+			CastTime: 200
+			Delay: 1600
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ALWAYS"
+		}
+		NPC_CURSEATTACK: {
+			SkillState: "MSS_BERSERK"
+			SkillLevel: 5
+			Rate: 3000
+			CastTime: 400
+			Delay: 30000
+			Cancelable: true
+			SkillTarget: "MST_TARGET"
+			CastCondition: "MSC_ALWAYS"
+		}
+	}
+
+	/**********************************************************************/
 	MobMoubootaur: {
 		NPC_TALK: {
 			SkillState: "MSS_RUSH"
diff --git a/npc/029-0/event.txt b/npc/029-0/event.txt
index 78937e025..b9d7376df 100644
--- a/npc/029-0/event.txt
+++ b/npc/029-0/event.txt
@@ -9,7 +9,7 @@
         disablenpc .name$;
         die(); end;
     }
-
+    compareandsetq TulimsharQuest_DarkInvocator, 0, 4;
     mesn;
     mesq l("Sooo, the police station of Moubootaur Legends went ablaze. Constable Perry is too busy to monitor illegal operation on this continent.");
     next;
@@ -62,6 +62,7 @@ OnInit:
     .distance=5;
     .sex=G_MALE;
 
+    sellitem LeatherPatch, -1, 45;
     sellitem RawLog, -1, 40;
     sellitem Coal, -1, 35;
     sellitem IronOre, -1, 30;
@@ -74,6 +75,7 @@ OnInit:
     sellitem IridiumOre, -1, 6;
     sellitem PlatinumOre, -1, 3;
     sellitem EarthPowder, -1, 3;
+    sellitem EverburnPowder, -1, 2;
 
     sellitem AncientBlueprint, -1, 4;
     sellitem RustyKnife, -1, 5;
@@ -100,6 +102,18 @@ OnInit:
     sellitem Cheese, -1, 400;
     sellitem Aquada, -1, 200;
 
+    sellitem WhiteFur, -1, rand2(50);
+    sellitem Piberries, -1, rand2(50);
+    sellitem CherryCake, -1, rand2(50);
+    sellitem LettuceLeaf, -1, rand2(50);
+    sellitem BugLeg, -1, rand2(50);
+    sellitem RoastedMaggot, -1, rand2(50);
+    sellitem Moss, -1, rand2(50);
+    sellitem AnimalBones, -1, rand2(40);
+    sellitem Milk, -1, rand2(50);
+    sellitem Mashmallow, -1, rand2(50);
+    sellitem Dragonfruit, -1, rand2(50);
+
     if (gettime(7) != 2021)
         disablenpc .name$;
 
@@ -116,15 +130,19 @@ OnInit:
         addmonsterdrop(Michel, DarkCrystal, 500);
         addmonsterdrop(CopperSkullSlime, DarkCrystal, 500);
         addmonsterdrop(MonsterGeneral, DarkCrystal, 10000);
+        setiteminfo(DarkCrystal, ITEMINFO_SELLPRICE, rand2(100, 200));
         $@FOS_MOBDROP=true;
     }
     end;
 
 OnClock0001:
+OnClock0601:
 OnClock1201:
+OnClock1801:
     .mobp=rand2(1000, 2500);
     .mobg=.mobp*rand2(100, 150)/10;
 
+    restoreshopitem LeatherPatch, 45;
     restoreshopitem RawLog, 40;
     restoreshopitem Coal, 35;
     restoreshopitem IronOre, 30;
@@ -137,6 +155,7 @@ OnClock1201:
     restoreshopitem IridiumOre, 6;
     restoreshopitem PlatinumOre, 3;
     restoreshopitem EarthPowder, 3;
+    restoreshopitem EverburnPowder, 2;
 
     restoreshopitem AncientBlueprint, 4;
     restoreshopitem RustyKnife, 5;
@@ -162,6 +181,18 @@ OnClock1201:
     restoreshopitem Bread,  750;
     restoreshopitem Cheese, 400;
     restoreshopitem Aquada, 200;
+
+    restoreshopitem WhiteFur, rand2(50);
+    restoreshopitem Piberries, rand2(50);
+    restoreshopitem CherryCake, rand2(50);
+    restoreshopitem LettuceLeaf, rand2(50);
+    restoreshopitem BugLeg, rand2(50);
+    restoreshopitem RoastedMaggot, rand2(50);
+    restoreshopitem Moss, rand2(50);
+    restoreshopitem AnimalBones, rand2(40);
+    restoreshopitem Milk, rand2(50);
+    restoreshopitem Mashmallow, rand2(50);
+    restoreshopitem Dragonfruit, rand2(50);
     end;
 
 OnMinute02:
diff --git a/npc/magic/transmigration.txt b/npc/magic/transmigration.txt
index 3bfe508c0..f16f85469 100644
--- a/npc/magic/transmigration.txt
+++ b/npc/magic/transmigration.txt
@@ -39,6 +39,7 @@ OnCall:
             l("Downgrade Ore"), IronOre;
 
         mes "";
+        .@itemid=(@menuret == 9901 ? Coal : @menuret);
         mesc l("Transmutating @@ will require:", getitemlink(@menuret));
 
         // Requeriments listing