add the requested merge compensation items

1 files changed, 894 insertions, 0 deletions

diff --git a/db/re/item_db.conf b/db/re/item_db.conf
index 0fd984c4..59a870b1 100644
--- a/db/re/item_db.conf
+++ b/db/re/item_db.conf
@@ -2056,6 +2056,32 @@ item_db: (
     ViewSprite: 1310
     BindOnEquip: false
 },
+{
+    Id: 1311
+    AegisName: "GoldenWarlordPlate"
+    Name: "Golden Warlord Plate"
+    Type: "IT_ARMOR"
+    Buy: 150000
+    Sell: 45000
+    Weight: 3500
+    Def: 65
+    Slots: 0
+    Loc: "EQP_HEAD_MID"
+    WeaponLv: 0
+    EquipLv: 50
+    Refine: false
+    ViewSprite: 1311
+    BindOnEquip: false
+    BuyingStore: true
+    Script: <"
+        bonus bStr, 4;
+        bonus bVit, 2;
+    ">
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
 // Boots
 {
     Id: 1800
@@ -2735,6 +2761,10 @@ item_db: (
     Refine: false
     ViewSprite: 2912
     BindOnEquip: false
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
 },
 {
     Id: 2913
@@ -2806,6 +2836,181 @@ item_db: (
     ViewSprite: 2916
     BindOnEquip: false
 },
+{
+    Id: 2917
+    AegisName: "BrownBowlerHat"
+    Name: "Brown Bowler Hat"
+    Type: "IT_ARMOR"
+    Buy: 17355
+    Sell: 4300
+    Weight: 30
+    Def: 3
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 15
+    Refine: false
+    ViewSprite: 2917
+    BindOnEquip: false
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
+{
+    Id: 2918
+    AegisName: "CatEars"
+    Name: "Cat Ears"
+    Type: "IT_ARMOR"
+    Buy: 37500
+    Sell: 12500
+    Weight: 10
+    Def: 3
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 35
+    Refine: false
+    ViewSprite: 2918
+    BindOnEquip: false
+    Script: <"
+        bonus bAgi, 3;
+    ">
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
+{
+    Id: 2919
+    AegisName: "SantaHat"
+    Name: "Santa Hat"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 28
+    Def: 1
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2919
+    BindOnEquip: false
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
+{
+    Id: 2920
+    AegisName: "MoonshroomHat"
+    Name: "Moonshroom Hat"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 50
+    Def: 7
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2920
+    BindOnEquip: false
+    Script: <"
+        bonus bInt, 3;
+        bonus bStr, -1;
+    ">
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
+{
+    Id: 2921
+    AegisName: "SantaBeardHat"
+    Name: "Santa Beard Hat"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 32
+    Def: 1
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2921
+    BindOnEquip: false
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
+{
+    Id: 2922
+    AegisName: "FunkyHat"
+    Name: "Funky Hat"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 50
+    Def: 2
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2922
+    BindOnEquip: false
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+    AllowCards: {
+        id5003: 1
+        id5004: 1
+        id5005: 1
+        id5006: 1
+        id5007: 1
+        id5008: 1
+        id5009: 1
+        id5010: 1
+        id5011: 1
+        id5012: 1
+        id5013: 1
+        id5014: 1
+        id5015: 1
+        id5016: 1
+        id5017: 1
+        id5018: 1
+        id5019: 1
+        id5020: 1
+        id5021: 1
+    }
+},
+{
+    Id: 2923
+    AegisName: "CashierShade"
+    Name: "Cashier Shade"
+    Type: "IT_ARMOR"
+    Buy: 950
+    Sell: 220
+    Weight: 28
+    Def: 1
+    Slots: 0
+    Loc: "EQP_HEAD_TOP"
+    WeaponLv: 0
+    EquipLv: 5
+    Refine: false
+    ViewSprite: 2923
+    BindOnEquip: false
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
 // Scarfs
 {
     Id: 3200
@@ -2837,6 +3042,25 @@ item_db: (
     ViewSprite: 3201
     BindOnEquip: false
 },
+{
+    Id: 3202
+    AegisName: "Eyepatch"
+    Name: "Eyepatch"
+    Type: "IT_ARMOR"
+    Buy: 1000
+    Sell: 250
+    Weight: 8
+    Def: 1
+    Loc: "EQP_ACC_R"
+    EquipLv: 16
+    Refine: false
+    ViewSprite: 3202
+    BindOnEquip: false
+	Trade: {
+		nodrop: true
+		noselltonpc: true
+	}
+},
 // Weapons
 {
     Id: 3500
@@ -3156,6 +3380,25 @@ item_db: (
     Subtype: "W_2HAXE"
     BindOnEquip: false
 },
+{
+    Id: 3515
+    AegisName: "SharpKnife"
+    Name: "Sharp Knife"
+    Type: "IT_WEAPON"
+    Buy: 180
+    Sell: 50
+    Weight: 15
+    Atk: 120
+    Matk: 0
+    Range: 0
+    Slots: 0
+    Loc: "EQP_HAND_R"
+    WeaponLv: 1
+    EquipLv: 1
+    Refine: false
+    Subtype: "W_DAGGER"
+    BindOnEquip: false
+},
 // Pet Eggs
 {
     Id: 4000
@@ -3587,4 +3830,655 @@ item_db: (
 	Sell: 0
 	Weight: 0
 },
+// LEGACY merge items, generic or usable
+{
+    Id: 8000
+    AegisName: "BlackPearl"
+    Name: "Black Pearl"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8001
+    AegisName: "Bloodstone"
+    Name: "Bloodstone"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8002
+    AegisName: "BottleOfSand"
+    Name: "Bottle of Sand"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 200
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8003
+    AegisName: "Brainstem"
+    Name: "Brainstem"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8004
+    AegisName: "ClosedChristmasBox"
+    Name: "Closed Christmas Box"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8005
+    AegisName: "OpenChristmasBox"
+    Name: "Open Christmas Box"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8006
+    AegisName: "RedChristmasOrnament"
+    Name: "Red Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8007
+    AegisName: "YellowChristmasOrnament"
+    Name: "Yellow Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8008
+    AegisName: "GreenChristmasOrnament"
+    Name: "Green Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8009
+    AegisName: "AquaChristmasOrnament"
+    Name: "Aqua Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8010
+    AegisName: "BlueChristmasOrnament"
+    Name: "Blue Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8011
+    AegisName: "PurpleChristmasOrnament"
+    Name: "Purple Christmas Ornament"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 20
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8012
+    AegisName: "Doll"
+    Name: "Doll"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 75
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8013
+    AegisName: "EasterBasket"
+    Name: "Easter Basket"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 2000
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8014
+    AegisName: "LegendaryEasterEgg"
+    Name: "Legendary Easter Egg"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8015
+    AegisName: "FakePlasticFangs"
+    Name: "Fake Plastic Fangs"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 25
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8016
+    AegisName: "FlawedLens"
+    Name: "Flawed Lens"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8017
+    AegisName: "DarkPetal"
+    Name: "Dark Petal"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 250
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8018
+    AegisName: "FlightTalisman"
+    Name: "Flight Talisman"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 500
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8019
+    AegisName: "Jellybeans"
+    Name: "Jellybeans"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8020
+    AegisName: "Leatherball"
+    Name: "Leatherball"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 750
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8021
+    AegisName: "BooberryBlueLollipop"
+    Name: "Booberry Blue Lollipop"
+    Type: "IT_USABLE"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+    Script: <"
+        @min = 1500;
+        @max = 2500;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8022
+    AegisName: "GhastlyGreenLollipop"
+    Name: "Ghastly Green Lollipop"
+    Type: "IT_USABLE"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+    Script: <"
+        @min = 1500;
+        @max = 2500;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8023
+    AegisName: "BloodRedLollipop"
+    Name: "Blood Red Lollipop"
+    Type: "IT_USABLE"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+    Script: <"
+        @min = 1500;
+        @max = 2500;
+        @delay = 3;
+        @type = 1;
+        doevent "rand_sc_heal::OnUse";
+    ">
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8024
+    AegisName: "PlushMouboo"
+    Name: "Plush Mouboo"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 250
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8025
+    AegisName: "RedStocking"
+    Name: "Red Stocking"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8026
+    AegisName: "StickReinboo"
+    Name: "Stick Reinboo"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8027
+    AegisName: "RubberBat" // add squeak sound with approx. 3 ~ 5s delay.
+    Name: "Rubber Bat"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 30
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8028
+    AegisName: "SantaCookie"
+    Name: "Santa Cookie"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 25
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8029
+    AegisName: "SantaGlobe"
+    Name: "Santa Globe"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 500
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8030
+    AegisName: "Scissors"
+    Name: "Scissors"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 150
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8031
+    AegisName: "SilverBell"
+    Name: "Silver Bell"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 250
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8032
+    AegisName: "SnowmanGlobe"
+    Name: "Snowman Globe"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 500
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8033
+    AegisName: "StrangeCoin"
+    Name: "Strange Coin"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 10
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8034
+    AegisName: "Tongue"
+    Name: "Tongue"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 100
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8035
+    AegisName: "WrappingPaperDotted"
+    Name: "Dotted Wrapping Paper"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
+{
+    Id: 8036
+    AegisName: "WrappingPaperStriped"
+    Name: "Striped Wrapping Paper"
+    Type: "IT_ETC"
+    Buy: 100
+    Sell: 5
+    Weight: 50
+	Trade: {
+		nodrop: true
+		notrade: true
+		noselltonpc: true
+		noauction: true
+		nomail: true
+		nogstorage: true
+	}
+},
 )