mergeHEADmaster

1 files changed, 130 insertions, 29 deletions

diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index 466b9526..56d61dd2 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -1234,9 +1234,9 @@ item_db: (
 	AegisName: "BoneArrows"
 	Name: "BoneArrows"
 	Type: "IT_AMMO"
-	Buy: 50
-	Sell: 20
-	Weight: 0
+	Buy: 8
+	Sell: 4
+	Weight: 1
 	Atk: 55
 	Slots: 0
 	Loc: "EQP_AMMO"
@@ -1611,7 +1611,12 @@ item_db: (
 	Loc: "EQP_HAND_R"
 	Refine: false
 	ViewSprite: 910
+	DontUseAmmo: true
 	Subtype: "W_BOW"
+	Script: <"
+		//set @LauncherType, AMMO_DONT_USE; // @TMWA
+		//callfunc "CheckLauncher"; // @TMWA
+	">
 },
 {
 	Id: 1227
@@ -1976,15 +1981,15 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 8000
 	Sell: 500
-	Weight: 30
-	Matk: -2
-	Def: 1
+	Weight: 250
+	Matk: -14
+	Def: 4
 	Slots: 0
 	Loc: "EQP_SHOES"
 	Refine: false
 	ViewSprite: 792
 	Script: <"
-		bonus bMatkRate, -2; // @EVOL2
+		bonus bMatkRate, -14; // @EVOL2
 	">
 },
 {
@@ -5855,6 +5860,50 @@ item_db: (
 	Refine: false
 	ViewSprite: 5378
 },
+{
+	Id: 5380
+	AegisName: "Stone"
+	Name: "Stone"
+	Type: "IT_ETC"
+	Buy: 1000
+	Sell: 500
+	Weight: 60
+	Refine: false
+	ViewSprite: 5380
+},
+{
+	Id: 5381
+	AegisName: "Brick"
+	Name: "Brick"
+	Type: "IT_ETC"
+	Buy: 2000
+	Sell: 1000
+	Weight: 40
+	Refine: false
+	ViewSprite: 5381
+},
+{
+	Id: 5384
+	AegisName: "MountainCrystal"
+	Name: "MountainCrystal"
+	Type: "IT_ETC"
+	Buy: 20000
+	Sell: 5000
+	Weight: 20
+	Refine: false
+	ViewSprite: 5384
+},
+{
+	Id: 5385
+	AegisName: "BlackQuartz"
+	Name: "BlackQuartz"
+	Type: "IT_ETC"
+	Buy: 20000
+	Sell: 5000
+	Weight: 20
+	Refine: false
+	ViewSprite: 5385
+},
 /* Chest Armor */
 {
 	Id: 523
@@ -6290,14 +6339,14 @@ item_db: (
 	Buy: 100000
 	Sell: 3000
 	Weight: 2000
-	Matk: -170
+	Matk: -150
 	Def: 25
 	Slots: 0
 	Loc: "EQP_HEAD_MID"
 	Refine: false
 	ViewSprite: 793
 	Script: <"
-		bonus bMatkRate, -170; // @EVOL2
+		bonus bMatkRate, -150; // @EVOL2
 	">
 },
 {
@@ -11281,7 +11330,7 @@ item_db: (
 	Sell: 1500
 	Weight: 400
 	Matk: -30
-	Def: 15
+	Def: 16
 	Slots: 0
 	Loc: "EQP_HEAD_TOP"
 	Refine: false
@@ -16141,8 +16190,8 @@ item_db: (
 	AegisName: "Tomato"
 	Name: "Tomato"
 	Type: "IT_USABLE"
-	Buy: 40
-	Sell: 10
+	Buy: 100
+	Sell: 50
 	Weight: 7
 	Def: 0
 	Slots: 0
@@ -16170,10 +16219,10 @@ item_db: (
 		callfunc("SC_Bonus", 60, SC_PLUSATTACKPOWER, 50);
 		callfunc("SC_Bonus", 60, SC_ATTHASTE_POTION1, 45);
 		//callfunc("SC_Bonus", 60, SC_PHYS_SHIELD, 40); //@EVOL2
-		//callfunc("SC_Bonus", 60000, SC_PHYS_SHIELD, 40); //@TMWA
+		//callfunc("SC_Bonus", 60000, SC_PHYS_SHIELD_ITEM, 40); //@TMWA
+		//sc_end SC_PHYS_SHIELD; //@TMWA
 		//misceffect FX_MAGIC_SHIELD, strcharinfo(0); //@TMWA
 	">
-	// TODO: betsanc of Crazy Rum can be chanceled with detsanc so add SC_PHYS_SHIELD_ITEM to prevent this
 },
 {
 	Id: 5309
@@ -16237,9 +16286,8 @@ item_db: (
 		} else { //@EVOL2
 			doevent "Shovel::OnDig"; //@EVOL2
 		} //@EVOL2
-		//getitem IronShovel, 1; // @TMWA
+		//callfunc "useShovel"; // @TMWA
 	">
-	// TODO: add keep after use flag to evolved.py and tmwa and replicate the 5 lines above
 },
 {
 	Id: 5330
@@ -16469,8 +16517,8 @@ item_db: (
 },
 {
 	Id: 5347
-	AegisName: "Pumpkin"
-	Name: "Pumpkin"
+	AegisName: "RipePumpkin"
+	Name: "RipePumpkin"
 	Type: "IT_USABLE"
 	Buy: 170
 	Sell: 85
@@ -16542,7 +16590,8 @@ item_db: (
 		noauction: true
 		noselltonpc: true
 	Script: <"
-		getitem PirateTreasureMap, 1;
+		set @MapName$, "PirateTreasureMap";
+		callfunc "readMap";
 	">
 	}
 },
@@ -16565,7 +16614,8 @@ item_db: (
 		noauction: true
 		noselltonpc: true
 	Script: <"
-		getitem DungeonMap, 1;
+		set @MapName$, "DungeonMap";
+		callfunc "readMap";
 	">
 	}
 },
@@ -16588,7 +16638,8 @@ item_db: (
 		noauction: true
 		noselltonpc: true
 	Script: <"
-		getitem TreasureMap, 1;
+		set @MapName$, "TreasureMap";
+		callfunc "readMap";
 	">
 	}
 },
@@ -16663,6 +16714,56 @@ item_db: (
 		callfunc "itheal", 500, 0;
 	">
 },
+{
+	Id: 5382
+	AegisName: "AnchorStone"
+	Name: "AnchorStone"
+	Type: "IT_USABLE"
+	Buy: 90000
+	Sell: 45000
+	Weight: 40
+	Refine: false
+	ViewSprite: 5382
+	KeepAfterUse: true
+	Trade: {
+		notrade: true
+		nodrop: true
+		nocart: true
+		nomail: true
+		noauction: true
+		noselltonpc: true
+	Script: <"
+		set @StoneName$, "AnchorStone";
+		callfunc "useAnchorStone";
+	">
+	}
+},
+{
+	Id: 5383
+	AegisName: "AnchoredAnchorStone"
+	Name: "AnchoredAnchorStone"
+	Type: "IT_USABLE"
+	Buy: 0
+	Sell: 0
+	Weight: 40
+	Refine: false
+	ViewSprite: 5383
+	KeepAfterUse: true
+	Trade: {
+		notrade: true
+		nodrop: true
+		nocart: true
+		nomail: true
+		noauction: true
+		noselltonpc: true
+		nostorage: true
+		nogstorage: true
+	Script: <"
+		set @StoneName$, "AnchoredAnchorStone";
+		callfunc "useAnchorStone";
+	">
+	}
+},
 /* Legs Armor */
 {
 	Id: 586
@@ -16825,7 +16926,7 @@ item_db: (
 	Sell: 1000
 	Weight: 150
 	Matk: -12
-	Def: 6
+	Def: 7
 	Slots: 0
 	Loc: "EQP_HEAD_LOW"
 	Refine: false
@@ -17747,14 +17848,14 @@ item_db: (
 	Buy: 6000
 	Sell: 2000
 	Weight: 40
-	Matk: -20
-	Def: 4
+	Matk: -25
+	Def: 5
 	Slots: 0
 	Loc: "EQP_GARMENT"
 	Refine: false
 	ViewSprite: 794
 	Script: <"
-		bonus bMatkRate, -20; // @EVOL2
+		bonus bMatkRate, -25; // @EVOL2
 	">
 },
 {
@@ -18033,15 +18134,15 @@ item_db: (
 	Type: "IT_ARMOR"
 	Buy: 40000
 	Sell: 3000
-	Weight: 2500
-	Matk: -200
-	Def: 20
+	Weight: 2000
+	Matk: -160
+	Def: 18
 	Slots: 0
 	Loc: "EQP_HAND_L"
 	Refine: false
 	ViewSprite: 797
 	Script: <"
-		bonus bMatkRate, -200; // @EVOL2
+		bonus bMatkRate, -160; // @EVOL2
 	">
 	//Disabled: true // @TMWA
 },