Merge branch 'master' into feature/lapine_synthesis_and_upgrade

2020-10-31 21:29:10 +01:00 · 2020-10-31 21:29:10 +01:00 · 5e598936c1
commit 5e598936c1
parent 9dab8f91da d5ce552b84
4 changed files with 323 additions and 1255 deletions
--- a/db/re/item_combo_db.txt
+++ b/db/re/item_combo_db.txt
@ -1781,7 +1781,6 @@
 300122:300121,{ bonus2 bSubEle,Ele_Neutral,5; }
 300123:300121,{ bonus2 bSubEle,Ele_Neutral,5; }
 300125:300087:300114,{ bonus2 bSkillAtk,"SU_CN_METEOR",20; bonus2 bSkillAtk,"SU_PICKYPECK",20; .@r_weapon = getequiprefinerycnt(EQI_HAND_R); .@r_shoes = getequiprefinerycnt(EQI_SHOES); bonus2 bSkillAtk,"SU_CN_METEOR",5*(.@r_shoes/2); bonus2 bSkillAtk,"SU_PICKYPECK",5*(.@r_weapon/2); }
-
 310003:310000,{ bonus2 bSkillAtk,"RA_AIMEDBOLT",15; }
 310003:310001,{ bonus2 bSkillVariableCast,"RA_AIMEDBOLT",-1000; }
 310003:310002,{ bonus2 bSkillCooldown,"RA_UNLIMIT",-45000; }
--- a/db/re/item_db_equip.yml
+++ b/db/re/item_db_equip.yml
@ -60452,32 +60452,6 @@ Body:
    Refineable: true
    Script: |
      .@r = getrefine(); bonus bNoKnockback; bonus bUnbreakableArmor; bonus bDefEle,Ele_Water; if (.@r>8) .@a = 40; else if (.@r>6) .@a = 25; else if (.@r>=5) .@a = 10; bonus2 bAddEle,Ele_Fire,.@a; bonus2 bAddEle,Ele_Water,.@a; bonus2 bMagicAddEle,Ele_Fire,.@a; bonus2 bMagicAddEle,Ele_Water,.@a; bonus2 bAddRace,RC_Demihuman,.@a; bonus2 bAddRace,RC_Formless,.@a; bonus2 bMagicAddRace,RC_Demihuman,.@a; bonus2 bMagicAddRace,RC_Formless,.@a; bonus2 bAddRace,RC_Player_Human,.@a; bonus2 bMagicAddRace,RC_Player_Human,.@a;
-  - Id: 15388
-    AegisName: King_Schmidt_Suit
-    Name: King Schmidt's Suit
-    Type: Armor
-    Weight: 900
-    Defense: 150
-    Slots: 1
-    Locations:
-      Armor: true
-    EquipLevelMin: 130
-    Refineable: true
-    Script: |
-      .@r = getrefine(); bonus2 bAddSize,Size_Medium,10; bonus2 bAddSize,Size_Large,10; bonus2 bMagicAddSize,Size_Medium,10; bonus2 bMagicAddSize,Size_Large,10; if(.@r > 6){ bonus2 bAddEle,Ele_Fire,10; bonus2 bAddEle,Ele_Dark,10; bonus2 bMagicAddEle,Ele_Fire,10; bonus2 bMagicAddEle,Ele_Dark,10; } if(.@r > 8){ bonus2 bSubRace,RC_Dragon,15; bonus2 bSubRace,RC_Formless,15; } if(.@r > 10){ bonus2 bSubSize,Size_Medium,10; bonus2 bSubSize,Size_Large,10; }
-  - Id: 15389
-    AegisName: King_Schmidt_Manteau
-    Name: King Schmidt's Manteau
-    Type: Armor
-    Weight: 600
-    Defense: 70
-    Slots: 1
-    Locations:
-      Garment: true
-    EquipLevelMin: 130
-    Refineable: true
-    Script: |
-      .@r = getrefine(); bonus2 bAddEle,Ele_Fire,(.@r/3)*2; bonus2 bAddEle,Ele_Dark,(.@r/3)*2; bonus2 bMagicAddEle,Ele_Fire,(.@r/3)*2; bonus2 bMagicAddEle,Ele_Dark,(.@r/3)*2; if(.@r > 6){ bonus2 bSubRace,RC_Dragon,5; bonus2 bSubRace,RC_Formless,5; } if(.@r > 10){ bonus2 bAddRace,RC_Dragon,15; bonus2 bAddRace,RC_Formless,15; bonus2 bMagicAddRace,RC_Dragon,15; bonus2 bMagicAddRace,RC_Formless,15; }
  - Id: 16000
    AegisName: Erde
    Name: Erde
@ -71036,18 +71010,6 @@ Body:
    View: 4
    Script: |
      bonus bMatkRate,1; bonus bMatk,(2*getrefine());
-  - Id: 19246
-    AegisName: Royal_Guard_Necklace
-    Name: Royal Guard Necklace
-    Type: Armor
-    Buy: 20
-    Weight: 300
-    Locations:
-      Head_Low: true
-    EquipLevelMin: 80
-    View: 1629
-    Script: |
-      bonus bAspd,1;
  - Id: 19266
    AegisName: Survive_Circlet_
    Name: Survivor's Circlet
@ -71544,18 +71506,6 @@ Body:
    View: 1117
    Script: |
      .@r = getrefine(); .@a = 5*(getskilllv("AB_LAUDAAGNUS")+getskilllv("AB_LAUDARAMUS")); .@dmg = 20; .@aspd = 10; bonus bMdef,15; bonus2 bSkillUseSP,"AB_JUDEX",15; bonus2 bSkillUseSP,"AB_ADORAMUS",15; bonus2 bVariableCastrate,"AB_JUDEX",-5*getskilllv("AB_ORATIO"); bonus2 bVariableCastrate,"AB_ADORAMUS",-5*getskilllv("AB_ORATIO"); if (getskilllv("AB_CLEARANCE") >= 5) { bonus2 bMagicAddClass,Class_Boss,25; } bonus2 bMagicAddEle,Ele_Undead,.@a; bonus2 bMagicAddEle,Ele_Ghost,.@a; bonus2 bMagicAddEle,Ele_Earth,.@a; bonus2 bMagicAddEle,Ele_Neutral,.@a; bonus2 bMagicAddRace,RC_DemiHuman,2*.@r; bonus2 bMagicAddRace,RC_Player_Human,2*.@r; if (.@r >= 7) { .@dmg += 30; .@aspd += 5; if (.@r >= 9) { .@dmg += 50; .@aspd += 5; if (.@r >= 10) { bonus bNoGemStone; } } } bonus bAspdRate,.@aspd; bonus2 bSkillAtk,"AB_JUDEX",.@dmg; bonus2 bSkillAtk,"AB_ADORAMUS",.@dmg;
-  - Id: 19433
-    AegisName: C_Resonate_Taego
-    Name: Costume Resonate Taego
-    Type: Armor
-    Locations:
-      Costume_Head_Low: true
-    EquipLevelMin: 1
-    View: 1823
-    Script: |
-      hateffect(HAT_EF_RESONATETAEGO,true);
-    UnEquipScript: |
-      hateffect(HAT_EF_RESONATETAEGO,false);
  - Id: 19472
    AegisName: aegis_19472
    Name: Circlet of Costume Time    # !todo check english name
@ -74057,14 +74007,6 @@ Body:
      Costume_Head_Top: true
    EquipLevelMin: 1
    View: 318
-  - Id: 19694
-    AegisName: C_Vane_Hairpin
-    Name: Costume Vane Hairpin
-    Type: Armor
-    Buy: 20
-    Locations:
-      Costume_Head_Top: true
-    View: 313
  - Id: 19696
    AegisName: C_Friend_Mochiring_Hat
    Name: Costume Friend Mochiring Hat
@ -76215,6 +76157,14 @@ Body:
      Costume_Head_Low: true
    EquipLevelMin: 1
    View: 1189
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 19997
    AegisName: C_Bomb_Hat
    Name: Costume Bomb Hat
@ -76231,25 +76181,6 @@ Body:
      Costume_Head_Top: true
    EquipLevelMin: 1
    View: 1192
-  - Id: 19996
-    AegisName: Horse_King
-    Name: Horse King
-    Type: Armor
-    Buy: 10
-    Locations:
-      Costume_Head_Top: true
-      Costume_Head_Mid: true
-      Costume_Head_Low: true
-    EquipLevelMin: 1
-    View: 1189
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
  - Id: 19999
    AegisName: C_Mouse_Hat1
    Name: Costume Mouse Hat 1
@ -92199,6 +92130,14 @@ Body:
      Right_Accessory: true
      Left_Accessory: true
    EquipLevelMin: 145
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
    Script: |
      skill "AL_HEAL",1;
  - Id: 28311
@ -92211,6 +92150,14 @@ Body:
      Right_Accessory: true
      Left_Accessory: true
    EquipLevelMin: 145
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
    Script: |
      skill "AL_TELEPORT",1;
  - Id: 28315
@ -92263,46 +92210,6 @@ Body:
    EquipLevelMin: 1
    Script: |
      bonus2 bAddClass,Class_All,1;
-  - Id: 28310
-    AegisName: Earring_Of_Sarah_L
-    Name: Sarah's Left Earring
-    Type: Armor
-    Buy: 10
-    Weight: 100
-    Locations:
-      Right_Accessory: true
-      Left_Accessory: true
-    EquipLevelMin: 145
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      skill "AL_HEAL",1;
-  - Id: 28311
-    AegisName: Earring_Of_Sarah_R
-    Name: Sarah's Right Earring
-    Type: Armor
-    Buy: 10
-    Weight: 100
-    Locations:
-      Right_Accessory: true
-      Left_Accessory: true
-    EquipLevelMin: 145
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-    Script: |
-      skill "AL_TELEPORT",1;
  - Id: 28320
    AegisName: Assassin's_Despair
    Name: Assassin's Despair
@ -97966,14 +97873,6 @@ Body:
      Costume_Head_Top: true
    EquipLevelMin: 1
    View: 1412
-  - Id: 31372
-    AegisName: C_Binit_Doll_Hat
-    Name: "Costume: Binit Doll"
-    Type: Armor
-    Locations:
-      Costume_Head_Top: true
-    EquipLevelMin: 1
-    View: 358
  - Id: 31374
    AegisName: C_Explosion_gum
    Name: C Explosion gum
--- a/db/re/item_db_etc.yml
+++ b/db/re/item_db_etc.yml
@ -19225,18 +19225,54 @@ Body:
    AegisName: Needle_And_Thread
    Name: Needle And Thread
    Type: Etc
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6655
    AegisName: Firm_Pumpkin
    Name: Firm Pumpkin
    Type: Etc
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6656
    AegisName: Goast_Free_Charm
    Name: Goast Free Charm
    Type: Etc
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6657
    AegisName: Memory_Of_Jack
    Name: Memory Of Jack
    Type: Etc
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6658
    AegisName: Halloween_Coin
    Name: Halloween Coin
@ -19246,6 +19282,9 @@ Body:
    Name: RWC Inicializer
    Type: Etc
    Weight: 10
+    Trade:
+      Override: 100
+      NoDrop: true
  - Id: 6669
    AegisName: Jade_Leaf
    Name: Emerald Leaf
@ -19256,466 +19295,251 @@ Body:
    Name: Geffen Coin Magic Tournament
    Type: Etc
    Buy: 10
+    Flags:
+      BuyingStore: true
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6672
    AegisName: Shard_of_Gray
    Name: Shard of Gray
    Type: Etc
    Buy: 10
+    Flags:
+      BuyingStore: true
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6673
    AegisName: Bossnia_Tickets
    Name: Bossnia Tickets
    Type: Etc
    Buy: 10
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6674
    AegisName: GM_Coin
    Name: GM Coin
    Type: Etc
    Weight: 10
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6681
    AegisName: XMAS_Cookie
    Name: Christmas Cookie
    Type: Etc
    Buy: 20
    Weight: 10
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6682
    AegisName: Bag_Of_Selling_Goods
    Name: Bag Of Selling Goods
    Type: Etc
    Buy: 20
    Weight: 10
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6683
    AegisName: Dried_Flower
    Name: Dried Flower
    Type: Etc
    Buy: 10
    Weight: 10
+    Flags:
+      BuyingStore: true
  - Id: 6684
    AegisName: TokenOfHero
    Name: Token Of Hero
    Type: Etc
    Buy: 10
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6685
    AegisName: Morocc_Certification
    Name: Morocc Certification
    Type: Etc
    Buy: 10
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6686
    AegisName: Brick
    Name: Brick
    Type: Etc
    Buy: 10
    Weight: 2000
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6687
    AegisName: Rope__
    Name: Rope
    Type: Etc
    Buy: 10
    Weight: 2000
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6688
    AegisName: Wood_
    Name: Wood
    Type: Etc
    Buy: 10
    Weight: 2000
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoSell: true
+      NoCart: true
+      NoStorage: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6689
    AegisName: BurningSkin
    Name: Burning Bug Skin
    Type: Etc
    Buy: 10
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6690
    AegisName: YummyStem
    Name: Yummy Stem
    Type: Etc
    Buy: 10
+    Trade:
+      Override: 100
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoGuildStorage: true
+      NoMail: true
+      NoAuction: true
  - Id: 6691
    AegisName: BurningFeather
    Name: Burning Feather
    Type: Etc
    Buy: 10
+    Flags:
+      BuyingStore: true
  - Id: 6692
    AegisName: PatrolLog
    Name: Patrol Log
    Type: Etc
    Buy: 10
    Weight: 1
+    Flags:
+      BuyingStore: true
  - Id: 6693
    AegisName: Stone_Of_Blessing
    Name: Stone Of Blessing
    Type: Etc
    Buy: 10
    Weight: 10
+    Flags:
+      BuyingStore: true
  - Id: 6694
    AegisName: Monster_Blood
    Name: Monster Blood
    Type: Etc
    Buy: 10
    Weight: 10
+    Flags:
+      BuyingStore: true
  - Id: 6695
    AegisName: ToothOfFlameGolem
    Name: Golem's Fiery Stone Tooth
    Type: Etc
    Buy: 10
    Weight: 100
+    Flags:
+      BuyingStore: true
  - Id: 6696
    AegisName: ToothOfFlameFrilldora
    Name: Frilldora's Fiery Nape
    Type: Etc
    Buy: 10
    Weight: 10
+    Flags:
+      BuyingStore: true
  - Id: 6697
    AegisName: Costumes_Exchange_Coupons
    Name: Costumes Exchange Coupons
    Type: Etc
    Buy: 10
    Weight: 10
-  - Id: 6646
-    AegisName: Poring_Badge
-    Name: Poring Badge
-    Type: Etc
-  - Id: 6648
-    AegisName: Shabby_Crown
-    Name: Old Crown
-    Type: Etc
-    Buy: 10
-    Weight: 10
-  - Id: 6649
-    AegisName: Broken_Horn
-    Name: Broken Horn
-    Type: Etc
-    Buy: 10
-    Weight: 10
-  - Id: 6650
-    AegisName: Shabby_Ring
-    Name: Old Ring
-    Type: Etc
-    Buy: 10
-    Weight: 10
-  - Id: 6651
-    AegisName: Rusty_Bracelet
-    Name: Rusty Bracalet
-    Type: Etc
-    Buy: 10
-    Weight: 10
-  - Id: 6652
-    AegisName: Old_Photo_Album
-    Name: Old Photo Album
-    Type: Etc
-    Buy: 10
-    Weight: 10
-  - Id: 6653
-    AegisName: Shabby_Pill
-    Name: Old Pill
-    Type: Etc
-    Buy: 10
-    Weight: 10
-  - Id: 6654
-    AegisName: Needle_And_Thread
-    Name: Needle And Thread
-    Type: Etc
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6655
-    AegisName: Firm_Pumpkin
-    Name: Firm Pumpkin
-    Type: Etc
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6656
-    AegisName: Goast_Free_Charm
-    Name: Goast Free Charm
-    Type: Etc
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6657
-    AegisName: Memory_Of_Jack
-    Name: Memory Of Jack
-    Type: Etc
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6658
-    AegisName: Halloween_Coin
-    Name: Halloween Coin
-    Type: Etc
-  - Id: 6665
-    AegisName: RWC_Inicializer
-    Name: RWC Inicializer
-    Type: Etc
-    Weight: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-  - Id: 6671
-    AegisName: Geffen_Coin_Magic_Tournament
-    Name: Geffen Coin Magic Tournament
-    Type: Etc
-    Buy: 10
-    Flags:
-      BuyingStore: true
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6672
-    AegisName: Shard_of_Gray
-    Name: Shard of Gray
-    Type: Etc
-    Buy: 10
-    Flags:
-      BuyingStore: true
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6673
-    AegisName: Bossnia_Tickets
-    Name: Bossnia Tickets
-    Type: Etc
-    Buy: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6674
-    AegisName: GM_Coin
-    Name: GM Coin
-    Type: Etc
-    Weight: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6681
-    AegisName: XMAS_Cookie
-    Name: Christmas Cookie
-    Type: Etc
-    Buy: 20
-    Weight: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6682
-    AegisName: Bag_Of_Selling_Goods
-    Name: Bag Of Selling Goods
-    Type: Etc
-    Buy: 20
-    Weight: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6683
-    AegisName: Dried_Flower
-    Name: Dried Flower
-    Type: Etc
-    Buy: 10
-    Weight: 10
-    Flags:
-      BuyingStore: true
-  - Id: 6684
-    AegisName: TokenOfHero
-    Name: Token Of Hero
-    Type: Etc
-    Buy: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6685
-    AegisName: Morocc_Certification
-    Name: Morocc Certification
-    Type: Etc
-    Buy: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6686
-    AegisName: Brick
-    Name: Brick
-    Type: Etc
-    Buy: 10
-    Weight: 2000
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6687
-    AegisName: Rope__
-    Name: Rope
-    Type: Etc
-    Buy: 10
-    Weight: 2000
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6688
-    AegisName: Wood_
-    Name: Wood
-    Type: Etc
-    Buy: 10
-    Weight: 2000
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoSell: true
-      NoCart: true
-      NoStorage: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6689
-    AegisName: BurningSkin
-    Name: Burning Bug Skin
-    Type: Etc
-    Buy: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6690
-    AegisName: YummyStem
-    Name: Yummy Stem
-    Type: Etc
-    Buy: 10
-    Trade:
-      Override: 100
-      NoDrop: true
-      NoTrade: true
-      NoCart: true
-      NoGuildStorage: true
-      NoMail: true
-      NoAuction: true
-  - Id: 6691
-    AegisName: BurningFeather
-    Name: Burning Feather
-    Type: Etc
-    Buy: 10
-    Flags:
-      BuyingStore: true
-  - Id: 6692
-    AegisName: PatrolLog
-    Name: Patrol Log
-    Type: Etc
-    Buy: 10
-    Weight: 1
-    Flags:
-      BuyingStore: true
-  - Id: 6693
-    AegisName: Stone_Of_Blessing
-    Name: Stone Of Blessing
-    Type: Etc
-    Buy: 10
-    Weight: 10
-    Flags:
-      BuyingStore: true
-  - Id: 6694
-    AegisName: Monster_Blood
-    Name: Monster Blood
-    Type: Etc
-    Buy: 10
-    Weight: 10
-    Flags:
-      BuyingStore: true
-  - Id: 6695
-    AegisName: ToothOfFlameGolem
-    Name: Golem's Fiery Stone Tooth
-    Type: Etc
-    Buy: 10
-    Weight: 100
-    Flags:
-      BuyingStore: true
-  - Id: 6696
-    AegisName: ToothOfFlameFrilldora
-    Name: Frilldora's Fiery Nape
-    Type: Etc
-    Buy: 10
-    Weight: 10
-    Flags:
-      BuyingStore: true
  - Id: 6698
    AegisName: Wooden_Axe
    Name: Wooden Axe
--- a/db/re/item_db_usable.yml
+++ b/db/re/item_db_usable.yml