[pull] master from rathena:master

db/re/item_db_equip.yml

@@ -115121,6 +115121,11 @@ Body:
     Defense: 12
     Locations:
       Garment: true
+    Trade:
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
     ArmorLevel: 1
     EquipLevelMin: 100
     Refineable: true
@@ -115144,8 +115149,8 @@ Body:
       }
       if (getskilllv("RA_CAMOUFLAGE") == 5) {
          bonus bDelayrate,-10;
+         bonus2 bSkillCooldown,"RA_ARROWSTORM",-200;
       }
-      bonus2 bSkillCooldown,"RA_ARROWSTORM",-200;
       bonus2 bSkillAtk,"RA_ARROWSTORM",getskilllv("RA_AIMEDBOLT");
     UnEquipScript: |
       sc_end SC_UNLIMIT;
@@ -180447,6 +180452,129 @@ Body:
       NoAuction: true
     ArmorLevel: 1
     View: 2805
+  - Id: 401239
+    AegisName: Hs_Sun_God
+    Name: Herosria Hat of Sun God
+    Type: Armor
+    Weight: 3000
+    Defense: 120
+    Locations:
+      Head_Top: true
+    Trade:
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+    ArmorLevel: 1
+    EquipLevelMin: 200
+    View: 138
+    Script: |
+      bonus bMdef,8;
+      bonus bNearAtkDef,5;
+      bonus bLongAtkDef,5;
+      bonus2 bMagicSubDefEle,Ele_All,5;
+      bonus bShortAtkRate,-10;
+      bonus bLongAtkRate,-10;
+      bonus2 bMagicAtkEle,Ele_All,-10;
+      bonus2 bSubRace,RC_Player_Human,10;
+      bonus2 bSubRace,RC_Player_Doram,10;
+      bonus2 bAddRace,RC_Player_Human,-10;
+      bonus2 bAddRace,RC_Player_Doram,-10;
+      bonus2 bMagicAddRace,RC_Player_Human,-10;
+      bonus2 bMagicAddRace,RC_Player_Doram,-10;
+  - Id: 401240
+    AegisName: Hs_Loard_Circlet
+    Name: Herosria Grand Circlet
+    Type: Armor
+    Weight: 2000
+    Defense: 90
+    Locations:
+      Head_Top: true
+    Trade:
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+    ArmorLevel: 1
+    EquipLevelMin: 200
+    View: 93
+    Script: |
+      bonus bMdef,2;
+      bonus bShortAtkRate,5;
+      bonus2 bMagicAtkEle,Ele_All,-10;
+      bonus2 bAddRace,RC_Player_Human,10;
+      bonus2 bAddRace,RC_Player_Doram,10;
+      bonus2 bSubRace,RC_Player_Human,-10;
+      bonus2 bSubRace,RC_Player_Doram,-10;
+  - Id: 401241
+    AegisName: Hs_Crown
+    Name: Herosria Crown
+    Type: Armor
+    Weight: 1000
+    Defense: 20
+    Locations:
+      Head_Top: true
+    Trade:
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+    ArmorLevel: 1
+    EquipLevelMin: 200
+    View: 45
+    Script: |
+      bonus bMdef,10;
+      bonus2 bMagicAtkEle,Ele_All,5;
+      bonus bShortAtkRate,-10;
+      bonus bLongAtkRate,-10;
+      bonus2 bMagicAddRace,RC_Player_Human,10;
+      bonus2 bMagicAddRace,RC_Player_Doram,10;
+      bonus2 bSubRace,RC_Player_Human,-5;
+      bonus2 bSubRace,RC_Player_Doram,-5;
+  - Id: 401242
+    AegisName: Hs_Magestic_Goat
+    Name: Herosria Majestic Goat
+    Type: Armor
+    Weight: 1000
+    Defense: 60
+    Locations:
+      Head_Top: true
+    Trade:
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+    ArmorLevel: 1
+    EquipLevelMin: 200
+    View: 41
+    Script: |
+      bonus bMdef,7;
+      bonus bHealPower,5;
+      bonus bUseSPrate,10;
+      bonus bDelayrate,-5;
+      bonus2 bAddRace,RC_Player_Human,-10;
+      bonus2 bAddRace,RC_Player_Doram,-10;
+      bonus2 bMagicAddRace,RC_Player_Human,-10;
+      bonus2 bMagicAddRace,RC_Player_Doram,-10;
+  - Id: 401243
+    AegisName: Hs_Corsair
+    Name: Herosria Corsair
+    Type: Armor
+    Weight: 1400
+    Defense: 40
+    Locations:
+      Head_Top: true
+    Trade:
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+    ArmorLevel: 1
+    EquipLevelMin: 200
+    View: 105
+    Script: |
+      bonus bMdef,5;
+      bonus bLongAtkRate,5;
+      bonus2 bMagicAtkEle,Ele_All,-10;
+      bonus2 bAddRace,RC_Player_Human,10;
+      bonus2 bAddRace,RC_Player_Doram,10;
+      bonus2 bSubRace,RC_Player_Human,-5;
+      bonus2 bSubRace,RC_Player_Doram,-5;
   - Id: 401246
     AegisName: aegis_401246
     Name: Costume Fafnir Helm

db/re/item_db_etc.yml

@@ -90542,6 +90542,45 @@ Body:
       hateffect FOOTPRINT_EF_DIVINE_BLUE,true;
     UnEquipScript: |
       hateffect FOOTPRINT_EF_DIVINE_BLUE,false;
+  - Id: 314889
+    AegisName: BP9_Snow_Melee
+    Name: Snow Flower of Melee
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus bAllStats,.@r/2;
+      if(.@r>=10){
+         bonus bShortAtkRate,5;
+         bonus2 bExpAddRace,RC_All,5;
+         bonus2 bDropAddRace,RC_All,5;
+      }
+  - Id: 314890
+    AegisName: BP9_Snow_Range
+    Name: Snow Flower of Range
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus bAllStats,.@r/2;
+      if(.@r>=10){
+         bonus bLongAtkRate,5;
+         bonus2 bExpAddRace,RC_All,5;
+         bonus2 bDropAddRace,RC_All,5;
+      }
+  - Id: 314891
+    AegisName: BP9_Snow_Magic
+    Name: Snow Flower of Magic
+    Type: Card
+    SubType: Enchant
+    Script: |
+      .@r = getrefine();
+      bonus bAllStats,.@r/2;
+      if(.@r>=10){
+         bonus bMatkRate,5;
+         bonus2 bExpAddRace,RC_All,5;
+         bonus2 bDropAddRace,RC_All,5;
+      }
   - Id: 1000000
     AegisName: IDTest_event
     Name: IDTest event
@@ -99545,6 +99584,16 @@ Body:
     Name: Spirit Handler Stone II (Garment)
     Type: Etc
     Weight: 100
+  - Id: 1001971
+    AegisName: DF_Wish_Coin
+    Name: Ding Ding Wish Coin
+    Type: Etc
+    Weight: 10
+    Trade:
+      NoDrop: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
   - Id: 1001972
     AegisName: Ch1_Root_Coin
     Name: Root Gold Coin    # !todo check english name
@@ -99965,6 +100014,18 @@ Body:
     Weight: 10
     Flags:
       BuyingStore: true
+  - Id: 1002022
+    AegisName: Extended_Test_Pass
+    Name: Extended Test Pass
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
   - Id: 1002034
     AegisName: Dimension_Energy_BL
     Name: Azure Dimensional Energy    # !todo check english name
@@ -100057,6 +100118,101 @@ Body:
     AegisName: aegis_1002069
     Name: Munch Coin    # !todo check english name
     Type: Etc
+  - Id: 1002051
+    AegisName: E_EP18_Enc_Acc_3
+    Name: "[Event] EP18 Enchant Selection Accessory Slot 3"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002052
+    AegisName: E_EP18_Enc_Armor_3
+    Name: "[Event] EP18 Enchant Selection Armor Slot 3"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002053
+    AegisName: E_Pray_Wish_Ticket
+    Name: "[Event] Prayer Wish Ticket"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoStorage: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002054
+    AegisName: H_Extended_Evt_Ticket
+    Name: Welcome 2nd High Extended Classes Ticket
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002055
+    AegisName: E_Amet_Fragment
+    Name: "[Event] Purified Amethyst Fragment"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002059
+    AegisName: Farmhouse_Coin
+    Name: "[Event] Farmhouse Coin"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002060
+    AegisName: E_Chicken_Egg
+    Name: "[Event] Chicken Egg"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002093
+    AegisName: E_H_Enchant_Ticket_TH2
+    Name: "[Event] High Enchant Ticket"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoStorage: true
+      NoCart: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
   - Id: 1002094
     AegisName: aegis_1002094
     Name: Fresh Meat    # !todo check english name
@@ -100248,6 +100404,42 @@ Body:
       NoGuildStorage: true
       NoMail: true
       NoAuction: true
+  - Id: 1002120
+    AegisName: 5th_Gem_Pick_Pass
+    Name: "[5th] Gem Pick Ticket"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002121
+    AegisName: 5th_Gem_Shop_Pass
+    Name: "[5th] Gem Pick Shop Ticket"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
+  - Id: 1002122
+    AegisName: 5th_Gem_Shop_S_Pass
+    Name: "[5th] Gem Pick Shop Special Ticket"
+    Type: Etc
+    Trade:
+      NoDrop: true
+      NoTrade: true
+      NoCart: true
+      NoSell: true
+      NoMail: true
+      NoAuction: true
+      NoGuildStorage: true
   - Id: 1002137
     AegisName: Pow_Meteor_Extract
     Name: Power Meteorite Extract    # !todo check english name