Correction of items, prices, and some NPCs (#9056)

db/re/item_db_equip.yml

@@ -29756,8 +29756,7 @@ Body:
     Script: |
       bonus bFlee,5;
       bonus bAgi,1;
-      /* skill "ALL_CATCRY",1;
-      */
+      skill "ALL_CATCRY",1;
   - Id: 2439
     AegisName: Refresh_Shoes
     Name: Refresh Shoes
@@ -93449,7 +93448,7 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      /* skill "ALL_CATCRY",1; */
+      skill "ALL_CATCRY",1;
       .@r = getrefine();
       bonus2 bHPDrainRate,40,5+.@r/3;
       bonus2 bSPDrainRate,10,2+.@r/5;
@@ -93509,7 +93508,7 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      /* skill "ALL_CATCRY",1; */
+      skill "ALL_CATCRY",1;
       .@r = getrefine();
       bonus bAllStats,3;
       bonus2 bAddEff,Eff_Stun,500+(.@r*100);
@@ -119198,6 +119197,7 @@ Body:
     Refineable: true
     Script: |
       skill "ALL_CATCRY",1;
+      autobonus3 "{ }",1000,7000,"ALL_CATCRY","{ active_transform 1505,7000; }";
   - Id: 22068
     AegisName: Santa's_Shoes
     Name: Louise's Red Boots

db/re/item_db_etc.yml

@@ -211,7 +211,7 @@ Body:
     AegisName: Flower
     Name: Flower
     Type: Etc
-    Buy: 2
+    Buy: 1
     Weight: 10
     Flags:
       BuyingStore: true
@@ -251,7 +251,7 @@ Body:
     AegisName: Blue_Gemstone
     Name: Blue Gemstone
     Type: Etc
-    Buy: 1500
+    Buy: 450
     Weight: 1
     Flags:
       BuyingStore: true
@@ -387,7 +387,7 @@ Body:
     AegisName: Red_Frame
     Name: Red Frame
     Type: Etc
-    Buy: 3000
+    Buy: 2250
     Weight: 200
     Flags:
       BuyingStore: true
@@ -395,7 +395,7 @@ Body:
     AegisName: Blue_Porcelain
     Name: Chung Jah
     Type: Etc
-    Buy: 5000
+    Buy: 3750
     Weight: 500
     Flags:
       BuyingStore: true
@@ -403,7 +403,7 @@ Body:
     AegisName: White_Platter
     Name: China
     Type: Etc
-    Buy: 1000
+    Buy: 750
     Weight: 300
     Flags:
       BuyingStore: true
@@ -411,7 +411,7 @@ Body:
     AegisName: Black_Ladle
     Name: Black Ladle
     Type: Etc
-    Buy: 400
+    Buy: 300
     Weight: 50
     Flags:
       BuyingStore: true
@@ -467,7 +467,7 @@ Body:
     AegisName: Bunch_Of_Flowers
     Name: Bouquet
     Type: Etc
-    Buy: 2000
+    Buy: 1500
     Weight: 50
     Flags:
       BuyingStore: true
@@ -477,7 +477,7 @@ Body:
     AegisName: Wedding_Bouquet
     Name: Wedding Bouquet
     Type: Etc
-    Buy: 12000
+    Buy: 9000
     Weight: 50
     Flags:
       BuyingStore: true
@@ -487,7 +487,7 @@ Body:
     AegisName: Glass_Bead
     Name: Glass Bead
     Type: Etc
-    Buy: 1400
+    Buy: 1050
     Weight: 50
     Flags:
       BuyingStore: true
@@ -687,7 +687,7 @@ Body:
     AegisName: Garlet
     Name: Garlet
     Type: Etc
-    Buy: 40
+    Buy: 30
     Weight: 10
     Flags:
       BuyingStore: true
@@ -703,7 +703,7 @@ Body:
     AegisName: Zargon
     Name: Zargon
     Type: Etc
-    Buy: 480
+    Buy: 360
     Weight: 10
     Flags:
       BuyingStore: true
@@ -1905,7 +1905,7 @@ Body:
     AegisName: Booby_Trap
     Name: Trap
     Type: Etc
-    Buy: 75
+    Buy: 50
     Sell: 0
     Weight: 2
     Flags:
@@ -20208,7 +20208,8 @@ Body:
     AegisName: Charm_Fire
     Name: Fire Amulet
     Type: Etc
-    Buy: 100
+    Buy: 50
+    Sell: 0
     Weight: 1
     Flags:
       BuyingStore: true
@@ -20216,7 +20217,8 @@ Body:
     AegisName: Charm_Ice
     Name: Ice Amulet
     Type: Etc
-    Buy: 100
+    Buy: 50
+    Sell: 0
     Weight: 1
     Flags:
       BuyingStore: true
@@ -20224,7 +20226,8 @@ Body:
     AegisName: Charm_Wind
     Name: Wind Amulet
     Type: Etc
-    Buy: 100
+    Buy: 50
+    Sell: 0
     Weight: 1
     Flags:
       BuyingStore: true
@@ -20232,7 +20235,8 @@ Body:
     AegisName: Charm_Earth
     Name: Earth Amulet
     Type: Etc
-    Buy: 100
+    Buy: 50
+    Sell: 0
     Weight: 1
     Flags:
       BuyingStore: true
@@ -28055,7 +28059,8 @@ Body:
     AegisName: Flame_Stone
     Name: Flame Stone
     Type: Etc
-    Buy: 112
+    Buy: 50
+    Sell: 0
     Weight: 1
     Flags:
       BuyingStore: true
@@ -28063,7 +28068,8 @@ Body:
     AegisName: Ice_Stone
     Name: Ice Stone
     Type: Etc
-    Buy: 112
+    Buy: 50
+    Sell: 0
     Weight: 1
     Flags:
       BuyingStore: true
@@ -28071,7 +28077,8 @@ Body:
     AegisName: Wind_Stone
     Name: Wind Stone
     Type: Etc
-    Buy: 112
+    Buy: 50
+    Sell: 0
     Weight: 1
     Flags:
       BuyingStore: true
@@ -28079,7 +28086,8 @@ Body:
     AegisName: Shadow_Orb
     Name: Shadow Orb
     Type: Etc
-    Buy: 225
+    Buy: 200
+    Sell: 0
     Weight: 1
     Flags:
       BuyingStore: true
@@ -29170,7 +29178,7 @@ Body:
     AegisName: Full_Metal_Jacket
     Name: Full Metal Jacket
     Type: Etc
-    Buy: 5
+    Buy: 15
     Weight: 1
   - Id: 7664
     AegisName: Shooting_Mine
@@ -31390,7 +31398,7 @@ Body:
     AegisName: Special_Alloy_Trap
     Name: Special Alloy Trap
     Type: Etc
-    Buy: 300
+    Buy: 100
     Sell: 0
     Weight: 2
     Flags:
@@ -32633,7 +32641,7 @@ Body:
     Name: Bloody Shell
     Type: Ammo
     SubType: Bullet
-    Buy: 10
+    Buy: 5
     Weight: 1
     Attack: 30
     Jobs:
@@ -32801,7 +32809,8 @@ Body:
     Name: Shuriken
     Type: Ammo
     SubType: Shuriken
-    Buy: 4
+    Buy: 2
+    Sell: 0
     Weight: 1
     Attack: 10
     Jobs:
@@ -32815,7 +32824,8 @@ Body:
     Name: Nimbus Shuriken
     Type: Ammo
     SubType: Shuriken
-    Buy: 10
+    Buy: 4
+    Sell: 0
     Weight: 1
     Attack: 30
     Jobs:
@@ -32829,7 +32839,8 @@ Body:
     Name: Flash Shuriken
     Type: Ammo
     SubType: Shuriken
-    Buy: 20
+    Buy: 6
+    Sell: 0
     Weight: 1
     Attack: 45
     Jobs:
@@ -32843,7 +32854,8 @@ Body:
     Name: Sharp Leaf Shuriken
     Type: Ammo
     SubType: Shuriken
-    Buy: 40
+    Buy: 12
+    Sell: 0
     Weight: 1
     Attack: 70
     Jobs:
@@ -32857,7 +32869,8 @@ Body:
     Name: Thorn Needle Shuriken
     Type: Ammo
     SubType: Shuriken
-    Buy: 100
+    Buy: 20
+    Sell: 0
     Weight: 1
     Attack: 100
     Jobs:
@@ -33585,7 +33598,7 @@ Body:
     Name: Cannon Ball
     Type: Ammo
     SubType: Cannonball
-    Buy: 100
+    Buy: 30
     Weight: 1
     Attack: 100
     Jobs:
@@ -33602,7 +33615,7 @@ Body:
     Name: Holy Cannon Ball
     Type: Ammo
     SubType: Cannonball
-    Buy: 200
+    Buy: 50
     Weight: 1
     Attack: 120
     Jobs:
@@ -33621,7 +33634,7 @@ Body:
     Name: Dark Cannon Ball
     Type: Ammo
     SubType: Cannonball
-    Buy: 200
+    Buy: 50
     Weight: 1
     Attack: 120
     Jobs:
@@ -33640,7 +33653,7 @@ Body:
     Name: Soul Cannon Ball
     Type: Ammo
     SubType: Cannonball
-    Buy: 200
+    Buy: 50
     Weight: 1
     Attack: 120
     Jobs:
@@ -33659,7 +33672,7 @@ Body:
     Name: Iron Cannon Ball
     Type: Ammo
     SubType: Cannonball
-    Buy: 500
+    Buy: 80
     Weight: 1
     Attack: 250
     Jobs:

db/re/item_db_usable.yml

@@ -9288,7 +9288,7 @@ Body:
     AegisName: RepairA
     Name: Repair A
     Type: Usable
-    Buy: 275
+    Buy: 200
     Weight: 1
     Jobs:
       Blacksmith: true
@@ -9305,7 +9305,7 @@ Body:
     AegisName: RepairB
     Name: Repair B
     Type: Usable
-    Buy: 625
+    Buy: 500
     Weight: 1
     Jobs:
       Blacksmith: true

db/re/skill_db.yml

@@ -16706,10 +16706,13 @@ Body:
   - Id: 692
     Name: ALL_CATCRY
     Description: Cat Cry
-    MaxLevel: 9
+    MaxLevel: 1
+    TargetType: Self
     Flags:
       IsNpc: true
     AfterCastActDelay: 5000
+    Requires:
+      SpCost: 50
   - Id: 693
     Name: ALL_PARTYFLEE
     Description: Party Flee

npc/other/mercenary_rent.txt

@@ -224,7 +224,7 @@ pay_arche,99,167,4	duplicate(Mercenary Manager#main)	Mercenary Manager#Bow	4_M_J
 	mes "you're looking for?";
 	next;
 	setarray .@item, 12184,	12185,	12241,	12242,	12243;
-	setarray .@cost, 1750,	3000,	560,	1050,	2100;
+	setarray .@cost, 2500,	5000,	800,	1500,	3000;
 	for (.@size = getarraysize(.@item); .@i < .@size; .@i++)
 		.@menu$ = .@menu$ + getitemname(.@item[.@i]) + ":";
 	.@m = select(.@menu$)-1;

npc/re/merchants/3rd_trader.txt

@@ -113,7 +113,7 @@ job3_guil01,91,93,3	script	Rare Herb Collector	1_M_03,{
 
 // Point Merchants (Sorcerer) :: point_3rd_trader
 //============================================================
--	shop	Shard_Seller	HIDDEN_NPC,no,6360:200,6363:200,6361:200,6362:200
+-	shop	Shard_Seller	HIDDEN_NPC,no,6360:200,6363:200,6361:200,6362:200,1000291:-1,1000292:-1,1000293:-1,1000294:-1,1000295:-1
 
 -	script	::pss	HIDDEN_NPC,{
 	npctalk "Do you have an element for each property?", "", bc_self;

npc/re/merchants/Extended_Ammunition.txt

@@ -15,17 +15,14 @@
 	next;
 	switch ( select( "Buy Arrows", "Quiver Exchange", "Sell Items", "Cancel" )) {
 	case 1:
-		close2;
 		callshop "Arrow_Archer", 1;
-		break;
+		close;
 	case 2:
-		close2;
 		callshop "Quiver_Archer", 1;
-		break;
+		close;
 	case 3:
-		close2;
 		callshop "Selling_Items", 2;
-		break;
+		close;
 	case 4:
 		mes "[Arrow Merchant]";
 		mes "You can take a look at other things more calmly.";
@@ -90,17 +87,14 @@ OnInit:
 	next;
 	switch ( select( "Buy Ninjutsu Tool", "Parchment Exchange", "Sell Items", "Cancel" )) {
 	case 1:
-		close2;
 		callshop "Weapons_Ninja", 1;
-		break;
+		close;
 	case 2:
-		close2;	
 		callshop "Box_Exchange_Ninja", 1;
-		break;
+		close;
 	case 3:
-		close2;	
 		callshop "Selling_Items", 2;
-		break;
+		close;
 	case 4:
 		break;
 	}
@@ -199,7 +193,7 @@ OnInit:
 -	marketshop	Ammunition_Gunslinger	HIDDEN_NPC,13200:-1:-1,13221:-1:-1,13228:-1:-1,13229:-1:-1,13230:-1:-1,13231:-1:-1,13232:-1:-1,13222:-1:-1,13215:-1:-1,13216:-1:-1,13217:-1:-1,13218:-1:-1,13219:-1:-1,13220:-1:-1,7663:-1:-1,7665:15:-1,7664:-1:-1,25187:-1:-1,1000564:-1:-1
 
 //= Ninja
--	marketshop	Weapons_Ninja	HIDDEN_NPC,1220001:-1:-1,1220002:-1:-1,1220003:30:-1,1220004:-1:-1,13258:-1:-1,13257:-1:-1,13255:-1:-1,13256:-1:-1,13259:-1:-1,13294:-1:-1,6512:-1:-1,6513:-1:-1,6514:-1:-1,13250:-1:-1,13251:-1:-1,13252:-1:-1,13253:-1:-1,13254:-1:-1,7521:-1:-1,7522:-1:-1,7523:-1:-1,7524:-1:-1,1000565:-1:-1,1000566:-1:-1,1000567:-1:-1,1000568:-1:-1,1000569:-1:-1
+-	marketshop	Weapons_Ninja	HIDDEN_NPC,1220001:-1:-1,1220002:-1:-1,1220003:30:-1,1220004:-1:-1,13258:-1:-1,13257:-1:-1,13255:-1:-1,13256:-1:-1,13259:-1:-1,13294:-1:-1,6512:-1:-1,6515:-1:-1,6513:-1:-1,6514:-1:-1,13250:-1:-1,13251:-1:-1,13252:-1:-1,13253:-1:-1,13254:-1:-1,7521:-1:-1,7522:-1:-1,7523:-1:-1,7524:-1:-1,1000565:-1:-1,1000566:-1:-1,1000567:-1:-1,1000568:-1:-1,1000569:-1:-1
 
 //= Merchant
 -	shop	Weapons_Mechanic	-1,2139:-1,2800:-1,2801:-1,2802:-1,2803:-1,2805:-1,2806:-1,6186:-1,2808:-1,2807:-1

npc/re/merchants/barters/Extended_Ammunition.yml

@@ -400,13 +400,13 @@ Body:
             Item: Shadow_Orb
             Amount: 500
       - Index: 18
-        Item: Shadow_Orb_Bundle
+        Item: SS_Charm_Box
         RequiredItems:
           - Index: 0
-            Item: Shadow_Orb
+            Item: SS_Charm
             Amount: 500
       - Index: 19
-        Item: SS_Charm_Box
+        Item: SS_Charm_F_Box
         RequiredItems:
           - Index: 0
             Item: SS_Charm_F

npc/re/merchants/shops.txt

@@ -58,7 +58,6 @@ que_ng,180,79,3	shop	Johnny Waiker	900,13200:-1,13221:-1,13222:-1
 // El Dicastes
 //=======================================================
 dic_in01,238,107,5	shop	Peddler#dic	900,601:-1,602:-1,611:-1,610:-1
-dicastes01,207,200,6	shop	Points Merchant#dic	66,6360:-1,6361:-1,6362:-1,6363:-1
 
 //=======================================================
 // Geffen