Переглянути джерело

Changed the way gender restrictions work (#5460)

Removed the ignore_items_gender config.
Fixed some existing items.
Moved some restrictions that were removed on official servers into the import folder.

Fixes #5458

Thanks to @HenryAlvarez12, @aleos89, @Atemo and @Daegaladh
Lemongrass3110 4 роки тому
батько
коміт
f350de1e31

+ 0 - 4
conf/battle/items.conf

@@ -52,10 +52,6 @@ dead_branch_active: yes
 // Change to 'yes' to only summon monsters less than or equal to the player's base level.
 random_monster_checklv: no
 
-// Can any player equip any item regardless of the gender restrictions
-// NOTE: Wedding Rings and Whips/Musical Instruments will check gender regardless of setting.
-ignore_items_gender: yes
-
 // On map change it will check for items not tagged as "available" and
 // auto-delete them from inventory/cart/storage.
 // NOTE: An item is not available if it was not loaded from the item_db.

+ 52 - 0
db/import-tmpl/item_db.yml

@@ -457,6 +457,7 @@ Header:
 #    Jobs:
 #      All: true
 #      Novice: false
+#    Gender: Female
 #    Locations:
 #      Armor: true
 #    Refineable: true
@@ -490,3 +491,54 @@ Header:
 #    Type: Delayconsume
 #    Script: |
 #      unitskilluseid getcharid(3),"AL_TELEPORT",3;
+
+# Gender restrictions that were removed on official servers
+#=============================================================
+#  - Id: 2206
+#    Gender: Female
+#  - Id: 2208
+#    Gender: Female
+#  - Id: 2209
+#    Gender: Female
+#  - Id: 2234
+#    Gender: Female
+#  - Id: 2235
+#    Gender: Male
+#  - Id: 2407
+#    Gender: Female
+#  - Id: 2415
+#    Gender: Female
+#  - Id: 2494
+#    Gender: Female
+#  - Id: 5143
+#    Gender: Male
+#  - Id: 5164
+#    Gender: Female
+#  - Id: 5165
+#    Gender: Male
+#  - Id: 5191
+#    Gender: Female
+#  - Id: 5192
+#    Gender: Female
+#  - Id: 5193
+#    Gender: Female
+#  - Id: 5194
+#    Gender: Female
+#  - Id: 5195
+#    Gender: Female
+#  - Id: 5196
+#    Gender: Female
+#  - Id: 5197
+#    Gender: Female
+#  - Id: 5221
+#    Gender: Female
+#  - Id: 5354
+#    Gender: Male
+#  - Id: 5355
+#    Gender: Female
+#  - Id: 5400
+#    Gender: Female
+#  - Id: 5681
+#    Gender: Female
+#  - Id: 5735
+#    Gender: Female

+ 0 - 22
db/pre-re/item_db_equip.yml

@@ -15364,7 +15364,6 @@ Body:
     Type: Armor
     Buy: 23000
     Weight: 100
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -15389,7 +15388,6 @@ Body:
     Buy: 800
     Weight: 100
     Defense: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -15404,7 +15402,6 @@ Body:
     Weight: 100
     Defense: 1
     Slots: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -15813,7 +15810,6 @@ Body:
       All: true
       Novice: false
       SuperNovice: false
-    Gender: Female
     Locations:
       Head_Top: true
     EquipLevelMin: 45
@@ -15832,7 +15828,6 @@ Body:
       All: true
       Novice: false
       SuperNovice: false
-    Gender: Male
     Locations:
       Head_Top: true
     EquipLevelMin: 45
@@ -18743,7 +18738,6 @@ Body:
       All: true
       Novice: false
       SuperNovice: false
-    Gender: Female
     Locations:
       Shoes: true
     Refineable: true
@@ -18859,7 +18853,6 @@ Body:
       All: true
       Novice: false
       SuperNovice: false
-    Gender: Female
     Locations:
       Shoes: true
     EquipLevelMin: 30
@@ -26654,7 +26647,6 @@ Body:
       All: true
       Novice: false
       SuperNovice: false
-    Gender: Male
     Locations:
       Head_Low: true
       Head_Mid: true
@@ -27012,7 +27004,6 @@ Body:
       All: true
       Novice: false
       SuperNovice: false
-    Gender: Female
     Locations:
       Head_Top: true
     EquipLevelMin: 45
@@ -27032,7 +27023,6 @@ Body:
       All: true
       Novice: false
       SuperNovice: false
-    Gender: Male
     Locations:
       Head_Top: true
     EquipLevelMin: 45
@@ -27449,7 +27439,6 @@ Body:
     Weight: 100
     Defense: 1
     Slots: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -27465,7 +27454,6 @@ Body:
     Weight: 100
     Defense: 1
     Slots: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -27480,7 +27468,6 @@ Body:
     Weight: 100
     Defense: 1
     Slots: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -27495,7 +27482,6 @@ Body:
     Weight: 100
     Defense: 1
     Slots: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -27510,7 +27496,6 @@ Body:
     Weight: 100
     Defense: 1
     Slots: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -27525,7 +27510,6 @@ Body:
     Weight: 100
     Defense: 1
     Slots: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -27540,7 +27524,6 @@ Body:
     Weight: 100
     Defense: 1
     Slots: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -27958,7 +27941,6 @@ Body:
     Buy: 20
     Weight: 100
     Defense: 1
-    Gender: Female
     Locations:
       Head_Mid: true
     EquipLevelMin: 45
@@ -30467,7 +30449,6 @@ Body:
     Type: Armor
     Weight: 100
     Defense: 2
-    Gender: Male
     Locations:
       Head_Top: true
     View: 362
@@ -30479,7 +30460,6 @@ Body:
     Type: Armor
     Weight: 100
     Defense: 2
-    Gender: Female
     Locations:
       Head_Top: true
     View: 363
@@ -31352,7 +31332,6 @@ Body:
     Type: Armor
     Buy: 20
     Weight: 200
-    Gender: Female
     Locations:
       Head_Low: true
       Head_Mid: true
@@ -34834,7 +34813,6 @@ Body:
     Buy: 800
     Weight: 100
     Defense: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true

+ 4 - 3
db/re/item_db_equip.yml

@@ -18325,6 +18325,7 @@ Body:
       BardDancer: true
     Classes:
       All_Third: true
+    Gender: Male
     Locations:
       Right_Hand: true
     WeaponLevel: 3
@@ -19444,6 +19445,7 @@ Body:
       BardDancer: true
     Classes:
       All_Third: true
+    Gender: Female
     Locations:
       Right_Hand: true
     WeaponLevel: 3
@@ -28014,7 +28016,6 @@ Body:
       All: true
       Novice: false
       SuperNovice: false
-    Gender: Female
     Locations:
       Shoes: true
     Refineable: true
@@ -49211,7 +49212,6 @@ Body:
     Buy: 800
     Weight: 100
     Defense: 1
-    Gender: Female
     Locations:
       Head_Top: true
     Refineable: true
@@ -51996,6 +51996,7 @@ Body:
       BardDancer: true
     Classes:
       All_Third: true
+    Gender: Female
     Locations:
       Head_Top: true
     EquipLevelMin: 100
@@ -119564,7 +119565,7 @@ Body:
     AegisName: Black_Circle
     Name: Black Circle
     Type: Weapon
-    SubType: Whip
+    SubType: Musical
     Weight: 1200
     Attack: 100
     MagicAttack: 190

+ 0 - 15
db/re/item_db_etc.yml

@@ -32607,7 +32607,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32622,7 +32621,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32637,7 +32635,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32653,7 +32650,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32669,7 +32665,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32708,7 +32703,6 @@ Body:
     Attack: 30
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
   - Id: 13211
@@ -32721,7 +32715,6 @@ Body:
     Attack: 30
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
   - Id: 13212
@@ -32734,7 +32727,6 @@ Body:
     Attack: 30
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
   - Id: 13213
@@ -32747,7 +32739,6 @@ Body:
     Attack: 30
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
   - Id: 13214
@@ -32760,7 +32751,6 @@ Body:
     Attack: 30
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
   - Id: 13215
@@ -32901,7 +32891,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32916,7 +32905,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32931,7 +32919,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32946,7 +32933,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |
@@ -32961,7 +32947,6 @@ Body:
     Attack: 50
     Classes:
       All: false
-    Gender: Female
     Locations:
       Ammo: true
     Script: |

+ 6 - 12
db/re/item_db_usable.yml

@@ -2195,7 +2195,6 @@ Body:
     Buy: 100
     Classes:
       All: false
-    Gender: Female
     Trade:
       Override: 100
       NoDrop: true
@@ -41948,7 +41947,6 @@ Body:
     Weight: 10
     Classes:
       All: false
-    Gender: Female
     Trade:
       Override: 100
       NoDrop: true
@@ -44328,7 +44326,6 @@ Body:
     Weight: 20
     Classes:
       All: false
-    Gender: Female
     Trade:
       Override: 100
       NoDrop: true
@@ -44765,22 +44762,23 @@ Body:
   - Id: 22567
     AegisName: Squad_Prize
     Name: Expedition Award Box
-    Type: Healing
+    Type: Usable
     Buy: 20
     Weight: 100
     Trade:
       Override: 100
       NoMail: true
       NoAuction: true
+    Script: |
+      /* TODO */
   - Id: 22568
     AegisName: Nyd_Summon_Scroll
     Name: Nidhoggur Summon Scroll
-    Type: Healing
+    Type: Usable
     Buy: 20
     Weight: 100
-    Gender: Female
-    Locations:
-      Right_Hand: true
+    Script: |
+      /* TODO */
   - Id: 22569
     AegisName: Gift_New_start
     Name: Gift New start
@@ -46049,7 +46047,6 @@ Body:
     Weight: 100
     Classes:
       All: false
-    Gender: Female
     Trade:
       Override: 100
       NoDrop: true
@@ -46111,7 +46108,6 @@ Body:
     Weight: 10
     Classes:
       All: false
-    Gender: Female
     Trade:
       Override: 100
       NoDrop: true
@@ -46140,7 +46136,6 @@ Body:
     Weight: 10
     Classes:
       All: false
-    Gender: Female
     Script: |
       /*No Info*/
   - Id: 22828
@@ -46241,7 +46236,6 @@ Body:
     Weight: 10
     Classes:
       All: false
-    Gender: Female
     Trade:
       Override: 100
       NoDrop: true

+ 25 - 0
sql-files/item_db2.sql

@@ -173,3 +173,28 @@ REPLACE INTO `item_db2` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`we
 # Non-kRO Eden Group Mark effect
 #=============================================================
 REPLACE INTO `item_db2` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (22508,'Para_Team_Mark_','Eden Group Mark','Delayconsume','unitskilluseid getcharid(3),"AL_TELEPORT",3;');
+
+# Gender restrictions that were removed on official servers
+#=============================================================
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (2206,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (2208,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (2209,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (2234,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (2235,'Male');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (2407,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (2415,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5143,'Male');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5164,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5165,'Male');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5191,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5192,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5193,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5194,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5195,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5196,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5197,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5221,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5354,'Male');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5355,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5400,'Female');
+REPLACE INTO `item_db2` (`id`,`gender`) VALUES (5681,'Female');

+ 27 - 0
sql-files/item_db2_re.sql

@@ -180,3 +180,30 @@ REPLACE INTO `item_db2_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,
 # Non-kRO Eden Group Mark effect
 #=============================================================
 REPLACE INTO `item_db2_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (22508,'Para_Team_Mark_','Eden Group Mark','Delayconsume','unitskilluseid getcharid(3),"AL_TELEPORT",3;');
+
+# Gender restrictions that were removed on official servers
+#=============================================================
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (2206,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (2208,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (2209,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (2234,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (2235,'Male');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (2407,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (2415,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (2494,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5143,'Male');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5164,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5165,'Male');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5191,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5192,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5193,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5194,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5195,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5196,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5197,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5221,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5354,'Male');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5355,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5400,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5681,'Female');
+REPLACE INTO `item_db2_re` (`id`,`gender`) VALUES (5735,'Female');

+ 22 - 22
sql-files/item_db_equip.sql

@@ -621,10 +621,10 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_mid`,`view`) VALUES (2203,'Glasses','Glasses','Armor',4000,100,true,3);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`slots`,`location_head_mid`,`view`) VALUES (2204,'Glasses_','Glasses','Armor',4000,100,1,true,3);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_mid`,`view`) VALUES (2205,'Diver\'s_Goggles','Diver Goggles','Armor',3500,100,true,10);
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2206,'Wedding_Veil','Wedding Veil','Armor',23000,100,'Female',true,true,44,'bonus bMdef,5;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2206,'Wedding_Veil','Wedding Veil','Armor',23000,100,true,true,44,'bonus bMdef,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`view`,`script`) VALUES (2207,'Fancy_Flower','Fancy Flower','Armor',20,100,true,4,'bonus2 bSubRace,RC_Plant,10;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2208,'Ribbon','Ribbon','Armor',800,100,1,'Female',true,true,17,'bonus bMdef,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2209,'Ribbon_','Ribbon','Armor',800,100,1,1,'Female',true,true,17,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2208,'Ribbon','Ribbon','Armor',800,100,1,true,true,17,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2209,'Ribbon_','Ribbon','Armor',800,100,1,1,true,true,17,'bonus bMdef,3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`view`) VALUES (2210,'Hair_Band','Hair Band','Armor',500,100,1,true,9);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`) VALUES (2211,'Bandana','Bandana','Armor',400,100,1,true,true,6);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_mid`,`view`) VALUES (2212,'Eye_Bandage','Eye Patch','Armor',1000,100,true,13);
@@ -649,8 +649,8 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_alchemist`,`job_assassin`,`job_blacksmith`,`job_crusader`,`job_knight`,`job_merchant`,`job_rogue`,`job_swordman`,`job_thief`,`location_head_top`,`refineable`,`script`) VALUES (2231,'Gemmed_Sallet_','Gemmed Sallet','Armor',50000,500,4,1,true,true,true,true,true,true,true,true,true,true,true,'bonus bMdef,3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_acolyte`,`job_mage`,`job_monk`,`job_priest`,`job_sage`,`job_soullinker`,`job_wizard`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2232,'Circlet','Circlet','Armor',7500,300,3,true,true,true,true,true,true,true,true,true,18,'bonus bMdef,3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_acolyte`,`job_mage`,`job_monk`,`job_priest`,`job_sage`,`job_soullinker`,`job_wizard`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2233,'Circlet_','Circlet','Armor',7500,300,3,1,true,true,true,true,true,true,true,true,true,18,'bonus bMdef,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`gender`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (2234,'Tiara','Tiara','Armor',20,400,4,true,false,false,'Female',true,45,true,19,'bonus bInt,2;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`gender`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (2235,'Crown','Crown','Armor',20,400,4,true,false,false,'Male',true,45,true,45,'bonus bInt,2;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (2234,'Tiara','Tiara','Armor',20,400,4,true,false,false,true,45,true,19,'bonus bInt,2;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (2235,'Crown','Crown','Armor',20,400,4,true,false,false,true,45,true,45,'bonus bInt,2;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`script`) VALUES (2236,'Santa\'s_Hat','Santa Hat','Armor',20,100,1,true,true,20,'bonus bMdef,1;\nbonus bLuk,1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_low`,`view`) VALUES (2237,'Weird_Goatee','Bandit Beard','Armor',2,100,true,21);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_mid`,`view`) VALUES (2239,'One_Eyed_Glass','Monocle','Armor',10000,100,true,23);
@@ -816,7 +816,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_shoes`,`refineable`) VALUES (2404,'Shoes_','Shoes','Armor',3500,400,2,1,true,false,false,true,true);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_alchemist`,`job_archer`,`job_assassin`,`job_barddancer`,`job_blacksmith`,`job_crusader`,`job_gunslinger`,`job_hunter`,`job_knight`,`job_merchant`,`job_rogue`,`job_stargladiator`,`job_swordman`,`job_taekwon`,`job_thief`,`location_shoes`,`refineable`) VALUES (2405,'Boots','Boots','Armor',18000,600,4,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_alchemist`,`job_archer`,`job_assassin`,`job_barddancer`,`job_blacksmith`,`job_crusader`,`job_gunslinger`,`job_hunter`,`job_knight`,`job_merchant`,`job_rogue`,`job_stargladiator`,`job_swordman`,`job_taekwon`,`job_thief`,`location_shoes`,`refineable`) VALUES (2406,'Boots_','Boots','Armor',18000,600,4,1,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true);
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`job_all`,`job_novice`,`job_supernovice`,`gender`,`location_shoes`,`refineable`,`script`) VALUES (2407,'Chrystal_Pumps','Crystal Pumps','Armor',20,100,true,false,false,'Female',true,true,'bonus bMdef,10;\nbonus bLuk,5;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`job_all`,`job_novice`,`job_supernovice`,`location_shoes`,`refineable`,`script`) VALUES (2407,'Chrystal_Pumps','Crystal Pumps','Armor',20,100,true,false,false,true,true,'bonus bMdef,10;\nbonus bLuk,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_shoes`,`refineable`) VALUES (2408,'Cuffs','Shackles','Armor',5000,3000,3,true,true);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_shoes`,`refineable`,`script`) VALUES (2409,'Spiky_Heel','High Heels','Armor',8500,600,2,true,false,false,true,true,'bonus bMdef,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_shoes`,`equip_level_min`,`script`) VALUES (2410,'Sleipnir','Sleipnir','Armor',20,3500,5,true,94,'bonus bMdef,10;\nbonus bMaxHPrate,20;\nbonus bMaxSPrate,20;\nbonus bSPrecovRate,15;\nbonus bSpeedRate,25;');
@@ -824,7 +824,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_crusader`,`job_knight`,`location_shoes`,`equip_level_min`,`refineable`) VALUES (2412,'Grave_','Greaves','Armor',54000,750,5,1,true,true,true,65,true);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_crusader`,`job_knight`,`job_swordman`,`location_shoes`,`equip_level_min`) VALUES (2413,'Safty_Boots','Safety Boots','Armor',34000,350,6,true,true,true,true,30);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_novice`,`job_supernovice`,`location_shoes`) VALUES (2414,'Novice_Boots','Novice Slippers','Armor',1,1,2,true,true,true);
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`gender`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2415,'Slipper','Bunny Slipper','Armor',34000,300,3,1,true,false,false,'Female',true,30,true,'bonus bLuk,3;\nbonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2415,'Slipper','Bunny Slipper','Armor',34000,300,3,1,true,false,false,true,30,true,'bonus bLuk,3;\nbonus bMdef,3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_novice`,`job_supernovice`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2416,'Novice_Shoes','Novice Shoes','Armor',35000,500,2,1,true,true,true,40,true,'bonus bMaxHPrate,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2417,'Fricco_Shoes','Fricco\'s Shoes','Armor',30000,500,3,true,false,false,true,65,true,'bonus bAgi,2;\nbonus2 bAddItemGroupHealRate,IG_Potion,20;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2418,'Vidar\'s_Boots','Vidar\'s Boots','Armor',30000,650,4,true,false,false,true,65,true,'bonus bMaxHPrate,9;\nbonus bMaxSPrate,9;');
@@ -1264,7 +1264,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5140,'Charming_Ribbon','Charming Ribbon','Armor',20,400,1,1,true,10,true,211,'bonus2 bSubRace,RC_Undead,5;\nbonus2 bSubRace,RC_Demon,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5141,'Marionette_Doll','Marionette Doll','Armor',20,400,1,true,false,false,true,30,true,212,'bonus bStr,1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_alchemist`,`job_blacksmith`,`job_crusader`,`job_knight`,`job_merchant`,`job_swordman`,`location_head_top`,`location_head_mid`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5142,'Crescent_Helm','Crescent Helm','Armor',20,3000,8,true,true,true,true,true,true,true,true,50,true,213,'bonus bVit,1;\nbonus2 bSubRace,RC_DemiHuman,5;\nbonus2 bSubRace,RC_Player_Human,5;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`gender`,`location_head_top`,`location_head_mid`,`location_head_low`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5143,'Kabuki_Mask','Kabuki Mask','Armor',20,1000,5,1,true,false,false,'Male',true,true,true,30,true,214,'bonus2 bResEff,Eff_Silence,3000;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`location_head_mid`,`location_head_low`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5143,'Kabuki_Mask','Kabuki Mask','Armor',20,1000,5,1,true,false,false,true,true,true,30,true,214,'bonus2 bResEff,Eff_Silence,3000;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5144,'Gambler_Hat','Gambler Hat','Armor',20,200,2,true,true,16,'bonus bLuk,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`refineable`,`view`) VALUES (5145,'Carnival_Joker_Jester','Carnival Joker Jester','Armor',10,100,true,true,89);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5146,'Elephant_Hat','Elephant Hat','Armor',500,true,true,215,'bonus bVit,1;\nbonus2 bSubRace,RC_Brute,7;\nskill "WZ_WATERBALL",1;');
@@ -1285,8 +1285,8 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_acolyte`,`job_alchemist`,`job_assassin`,`job_blacksmith`,`job_crusader`,`job_knight`,`job_merchant`,`job_monk`,`job_priest`,`job_rogue`,`job_stargladiator`,`job_swordman`,`job_taekwon`,`job_thief`,`location_head_top`,`equip_level_min`,`refineable`,`view`) VALUES (5161,'Sharp_Gear_','Spiky Band','Armor',20,1000,6,1,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,50,true,43);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_alchemist`,`job_blacksmith`,`job_crusader`,`job_knight`,`job_merchant`,`job_swordman`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5162,'Bone_Helm_','Bone Helm','Armor',20,800,7,1,true,true,true,true,true,true,true,70,true,103,'bonus2 bSubEle,Ele_Dark,-15;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5163,'Corsair_','Corsair','Armor',20,500,5,1,true,false,false,true,true,105,'bonus bVit,1;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`gender`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5164,'Tiara_','Tiara','Armor',20,400,4,1,true,false,false,'Female',true,45,true,19,'bonus bInt,1;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`gender`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5165,'Crown_','Crown','Armor',20,400,4,1,true,false,false,'Male',true,45,true,45,'bonus bInt,1;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5164,'Tiara_','Tiara','Armor',20,400,4,1,true,false,false,true,45,true,19,'bonus bInt,1;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5165,'Crown_','Crown','Armor',20,400,4,1,true,false,false,true,45,true,45,'bonus bInt,1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_crusader`,`job_knight`,`job_swordman`,`location_head_top`,`location_head_low`,`equip_level_min`,`view`,`script`) VALUES (5166,'Spinx_Helm_','Sphinx Hat','Armor',20,3000,5,1,true,true,true,true,true,65,137,'bonus bStr,2;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`location_head_mid`,`location_head_low`,`view`,`script`) VALUES (5167,'Munak_Turban_','Munak Hat','Armor',20,300,5,1,true,true,true,51,'bonus2 bSubRace,RC_Undead,10;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`location_head_mid`,`location_head_low`,`view`) VALUES (5168,'Bongun_Hat_','Bongun Hat','Armor',20,300,5,1,true,true,true,139);
@@ -1312,13 +1312,13 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5188,'Minstrel_Hat','Wandering Minstrel Hat','Armor',20,500,2,true,50,true,240,'bonus bInt,1;\nbonus bDex,1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5189,'Fallen_Leaves','Autumn Leaves','Armor',20,100,true,true,241,'bonus bMaxHP,40;\nbonus bMaxSP,40;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`) VALUES (5190,'Baseball_Cap_','Independence Memorial Hat','Armor',20,20,3,1,true,true,216);
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5191,'Ribbon_Black','Black Ribbon','Armor',800,100,1,1,'Female',true,true,242,'bonus bInt,1;\nbonus bMdef,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5192,'Ribbon_Yellow','Yellow Ribbon','Armor',800,100,1,1,'Female',true,true,243,'bonus bMdef,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5193,'Ribbon_Green','Green Ribbon','Armor',800,100,1,1,'Female',true,true,244,'bonus bMdef,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5194,'Ribbon_Pink','Pink Ribbon','Armor',800,100,1,1,'Female',true,true,245,'bonus bMdef,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5195,'Ribbon_Red','Red Ribbon','Armor',800,100,1,1,'Female',true,true,246,'bonus bMdef,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5196,'Ribbon_Orange','Orange Ribbon','Armor',800,100,1,1,'Female',true,true,247,'bonus bMdef,3;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5197,'Ribbon_White','White Ribbon','Armor',800,100,1,1,'Female',true,true,248,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5191,'Ribbon_Black','Black Ribbon','Armor',800,100,1,1,true,true,242,'bonus bInt,1;\nbonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5192,'Ribbon_Yellow','Yellow Ribbon','Armor',800,100,1,1,true,true,243,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5193,'Ribbon_Green','Green Ribbon','Armor',800,100,1,1,true,true,244,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5194,'Ribbon_Pink','Pink Ribbon','Armor',800,100,1,1,true,true,245,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5195,'Ribbon_Red','Red Ribbon','Armor',800,100,1,1,true,true,246,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5196,'Ribbon_Orange','Orange Ribbon','Armor',800,100,1,1,true,true,247,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5197,'Ribbon_White','White Ribbon','Armor',800,100,1,1,true,true,248,'bonus bMdef,3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5198,'Drooping_Bunny','Drooping Bunny','Armor',10,100,1,true,true,249,'bonus bDex,1;\nbonus bFlee,2;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`location_head_top`,`refineable`,`view`) VALUES (5199,'Baseball_Cap_I','Baseball Cap','Armor',200,3,true,true,216);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`refineable`,`view`) VALUES (5200,'Coppola','Coppola','Armor',10,300,true,true,252);
@@ -1342,7 +1342,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5218,'Bunny_Band_','Evolved Bunny Band','Armor',20,100,2,true,true,15,100,true,true,true,'bonus bInt,2;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5219,'Drooping_Kitty_','Evolved Drooping Cat','Armor',250000,500,1,true,false,false,true,true,142,100,true,true,true,'bonus bMdef,18;\nbonus bFlee,3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`job_all`,`job_novice`,`job_supernovice`,`location_head_low`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5220,'Smoking_Pipe_','Evolved Pipe','Armor',20,100,true,false,false,true,55,100,true,true,true,'bonus bVit,1;\nbonus2 bSubRace,RC_Brute,5;\nbonus2 bSubRace,RC_Player_Doram,5;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`gender`,`location_head_mid`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5221,'Pair_Of_Red_Ribbon_','Evolved Pair of Red Ribbon','Armor',20,100,1,'Female',true,45,169,100,true,true,true,'bonus bFlee,5;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_mid`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5221,'Pair_Of_Red_Ribbon_','Evolved Pair of Red Ribbon','Armor',20,100,1,true,45,169,100,true,true,true,'bonus bFlee,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5222,'Fish_On_Head_','Evolved Blue Fish','Armor',20,500,2,true,50,true,149,100,true,true,true,'bonus bAgi,1;\nbonus bDex,1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`location_head_mid`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5223,'Big_Golden_Bell_','Evolved Big Golden Bell','Armor',20,200,2,true,false,false,true,true,35,true,175,100,true,true,true,'bonus bAgi,2;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`location_head_mid`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5224,'Orc_Hero_Helm_TW','Evolved Orc Hero Helm','Armor',500000,900,5,true,false,false,true,true,55,true,178,100,true,true,true,'bonus bStr,2;\nbonus bVit,1;\nbonus bMaxHPrate,10;');
@@ -1475,8 +1475,8 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`view`,`script`) VALUES (5351,'Sunflower_','Sunflower','Armor',20,100,1,1,true,37,'bonus2 bSubRace,RC_Insect,10;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`) VALUES (5352,'Poporing_Cap','Poporing Cap','Armor',20,700,2,true,false,false,true,38,true,361,100,true,true,true);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_alchemist`,`job_assassin`,`job_barddancer`,`job_blacksmith`,`job_crusader`,`job_hunter`,`job_knight`,`job_monk`,`job_priest`,`job_rogue`,`job_sage`,`job_soullinker`,`job_stargladiator`,`job_wizard`,`location_head_top`,`location_head_mid`,`refineable`,`view`,`script`) VALUES (5353,'Helm_Of_Sun_','Hat of the Sun God','Armor',20,2400,4,1,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,138,'bonus bStr,3;\nbonus bInt,2;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`gender`,`location_head_top`,`view`,`script`) VALUES (5354,'Muslim_Hat_M','Muslim Hat M','Armor',100,2,'Male',true,362,'bonus bCastrate,-5;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`gender`,`location_head_top`,`view`,`script`) VALUES (5355,'Muslim_Hat_F','Selendang','Armor',100,2,'Female',true,363,'bonus bCastrate,-5;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`location_head_top`,`view`,`script`) VALUES (5354,'Muslim_Hat_M','Muslim Hat M','Armor',100,2,true,362,'bonus bCastrate,-5;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`location_head_top`,`view`,`script`) VALUES (5355,'Muslim_Hat_F','Selendang','Armor',100,2,true,363,'bonus bCastrate,-5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`trade_override`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5356,'Pumpkin_Hat_H','Festival Pumpkin Hat','Armor',20,200,2,true,true,206,100,true,true,'bonus2 bSubRace,RC_Demon,5;\nbonus2 bAddRace,RC_Demon,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`location_head_mid`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5357,'Wings_Of_Victory','Wings Of Victory','Armor',20,200,10,true,true,365,100,true,true,true,true,true,true,true,'bonus bMdef,10;\nbonus bUnbreakableHelm;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_mid`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5358,'Pecopeco_Wing_Ears','Peco Ears','Armor',20,100,1,true,70,366,100,true,true,true,'bonus bAgi,1;\nbonus bMdef,2;\nbonus bUnbreakableHelm;');
@@ -1521,7 +1521,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_mid`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5397,'Scuba_Mask','Scuba Gear','Armor',20,100,true,400,100,true,true,true,'bonus2 bSubEle,Ele_Water, 10;\nbonus bUnbreakableHelm, 0;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_alchemist`,`job_blacksmith`,`job_crusader`,`job_knight`,`job_merchant`,`job_swordman`,`class_upper`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5398,'Bone_Head','Bone Head','Armor',20,1200,5,1,true,true,true,true,true,true,true,true,85,true,401,'bonus bStr,2;\nbonus bMdef,5;\nbonus2 bResEff,Eff_Stun,500;\nbonus2 bResEff,Eff_Bleeding,500;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_alchemist`,`job_assassin`,`job_barddancer`,`job_blacksmith`,`job_crusader`,`job_hunter`,`job_knight`,`job_monk`,`job_priest`,`job_rogue`,`job_sage`,`job_soullinker`,`job_stargladiator`,`job_wizard`,`class_upper`,`location_head_top`,`equip_level_min`,`view`,`script`) VALUES (5399,'Mandragora_Cap','Mandragora Cap','Armor',20,300,1,1,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,85,402,'bonus bVit,3;\nbonus3 bAutoSpellWhenHit,"DC_SCREAM",5,30;');
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`gender`,`location_head_top`,`location_head_mid`,`location_head_low`,`view`,`script`) VALUES (5400,'Fox_Hat','Fox Hat','Armor',20,200,'Female',true,true,true,403,'bonus bLuk,1;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_top`,`location_head_mid`,`location_head_low`,`view`,`script`) VALUES (5400,'Fox_Hat','Fox Hat','Armor',20,200,true,true,true,403,'bonus bLuk,1;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_mid`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5401,'Black_Glasses','Black Frame Glasses','Armor',20,200,1,true,70,404,100,true,true,true,'bonus bInt,1;\nbonus bMdef,2;\nbonus bUnbreakableHelm, 0;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_mid`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5402,'Mischievous_Fairy','Mischievous Fairy','Armor',10,200,1,true,70,405,100,true,true,true,'bonus bUnbreakableHelm, 0;\nbonus bFlee2, 3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_head_low`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`,`script`) VALUES (5403,'Fish_In_Mouth','Fish In Mouth','Armor',10,200,true,30,406,100,true,true,true,'bonus2 bAddMonsterDropItem,579,500;\nbonus2 bAddItemHealRate,579,25;');
@@ -1711,7 +1711,7 @@ REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`wei
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`location_head_mid`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_nosell`,`trade_noguildstorage`) VALUES (5667,'Skull_Hood','Skull Hood','Armor',20,100,1,1,true,true,30,true,598,100,true,true,true);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5668,'Weird_Pumpkin_Hat','Weird Pumpkin Hat','Armor',20,5,true,1,true,206,100,true,true,true,true,true,true,true,'bonus bMdef,5;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`slots`,`location_head_top`,`equip_level_min`,`view`) VALUES (5671,'Drooping_Morocc_Minion','Drooping Morocc Minion','Armor',20,300,1,true,70,600);
-REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5681,'F_Ribbon_Green','Green Ribbon','Armor',800,100,1,'Female',true,true,244,'bonus bMdef,3;');
+REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5681,'F_Ribbon_Green','Green Ribbon','Armor',800,100,1,true,true,244,'bonus bMdef,3;');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5682,'Triangle_Rune_Cap','Triangle Rune Cap','Armor',20,300,5,1,true,1,true,610,'bonus bHealPower,2;\nif (getrefine() > 6) {\n   bonus bMatk,10;\n   bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",8,150,BF_MAGIC,0;\n}\nelse {\n   bonus5 bAutoSpellWhenHit,"NPC_MAGICMIRROR",7,150,BF_MAGIC,0;\n}');
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`) VALUES (5683,'Majestic_Goat_Repl','Baphomet Horns','Armor',20,100,5,true,1,true,41);
 REPLACE INTO `item_db` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`) VALUES (5684,'Jewel_Crown_Repl','Ornate Crown','Armor',20,100,5,true,1,true,88);

+ 6 - 6
sql-files/item_db_re_equip.sql

@@ -707,7 +707,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`pr
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`magic_attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1934,'Contabass','Contrabass','Weapon','Musical',20,250,180,120,1,2,true,true,true,true,'Male',true,3,130,true,'bonus2 bSkillCooldown,"WM_RANDOMIZESPELL",-20;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1935,'Ukulele_Of_Newoz','Oz\'s New Ukulele','Weapon','Musical',20,2000,160,1,2,true,true,true,true,'Male',true,4,130,true,'bonus2 bSkillUseSP,"MI_RUSH_WINDMILL",20;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1936,'Ru_Blue_Violin','Blue Violin','Weapon','Musical',10,1500,180,2,1,true,'Male',true,3,100,true,'bonus bDex,5;\nbonus bVit,5;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1937,'Ru_Gold_Violin','Ru Gold Violin','Weapon','Musical',1500,180,1,2,true,true,true,true,true,3,120,true,'bonus bDex,8;\nbonus bVit,8;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1937,'Ru_Gold_Violin','Ru Gold Violin','Weapon','Musical',1500,180,1,2,true,true,true,true,'Male',true,3,120,true,'bonus bDex,8;\nbonus bVit,8;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (1938,'Infinity_Violin','Infinity Violin','Weapon','Musical',10,500,150,2,1,true,true,true,true,'Male',true,4,100,true,100,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1939,'Crimson_Violin','Crimson Violin','Weapon','Musical',20,800,80,2,2,true,'Male',true,3,70,true,'.@r = getrefine();\nbonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1940,'Trumpet_Shell','Trumpet Shell','Weapon','Musical',600,125,1,1,true,true,true,true,'Male',true,4,130,true,'.@r = getrefine();\nbonus bDex,.@r;\nbonus bInt,.@r;\n.@per = ((.@r > 9) ? 40 : ((.@r > 7) ? 20 : ((.@r > 5) ? 10 : 0)));\nbonus2 bSkillAtk,"WM_REVERBERATION",.@per;\nbonus2 bVariableCastrate,"WM_REVERBERATION",-.@per;');
@@ -756,7 +756,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`pr
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`magic_attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1989,'Gymnastics_Ribbon','Rhythmic Gymnastics Ribbon','Weapon','Whip',20,300,150,120,2,2,true,true,true,true,'Female',true,3,130,true,'bonus bAspdRate,20;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1990,'Floral_Mic_Of_Igu','Bloody Floral Decoration Microphone','Weapon','Whip',20,1000,160,2,2,true,true,true,true,'Female',true,4,130,true,'bonus2 bSkillUseSP,"CG_MOONLIT",20;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1991,'Ru_Blue_Whip','Blue Whip','Weapon','Whip',10,1500,180,2,1,true,'Female',true,3,100,true,'bonus bDex,5;\nbonus bVit,5;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1992,'Ru_Gold_Whip','Ru Gold Whip','Weapon','Whip',1500,180,2,2,true,true,true,true,true,3,120,true,'bonus bDex,8;\nbonus bVit,8;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1992,'Ru_Gold_Whip','Ru Gold Whip','Weapon','Whip',1500,180,2,2,true,true,true,true,'Female',true,3,120,true,'bonus bDex,8;\nbonus bVit,8;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (1994,'Infinity_Whip','Infinity Whip','Weapon','Whip',10,500,150,2,1,true,'Female',true,4,100,true,100,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1995,'Crimson_Whip','Crimson Whip','Weapon','Whip',20,800,80,2,2,true,'Female',true,3,70,true,'.@r = getrefine();\nbonus bBaseAtk,((BaseLevel/10)*5)+(.@r<=15?pow(.@r,2):225);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`magic_attack`,`range`,`slots`,`job_barddancer`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (1996,'Wire_of_Vicious_Mind','Wire of Vicious Mind','Weapon','Whip',20,1300,130,50,2,1,true,'Female',true,4,160,true,'bonus bAtk,pow(min(getrefine(),15),2);\nbonus bMatk,pow(min(getrefine(),15),2)/2;');
@@ -1189,7 +1189,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2491,'Bangungot_Boots','Bangungot Boots of Nightmare','Armor',20,600,10,true,1,true,'.@r = getrefine();\nbonus bMdef,.@r;\nif (.@r>=14) {\n   bonus bSpeedRate,25;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2492,'Bayani_Bangungot_Boots','Bayani Bangungot Boots of Nightmare','Armor',20,600,10,1,true,1,true,'.@r = getrefine();\nbonus bMdef,.@r;\nif (.@r>=12) {\n   bonus bSpeedRate,25;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2493,'Goibne\'s_Combat_Boots_','Goibne\'s Greaves','Armor',30000,700,13,1,true,false,false,true,54,true,'bonus bMdef,3;\nbonus bMaxHPrate,5;\nbonus bMaxSPrate,5;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`gender`,`location_shoes`,`refineable`,`script`) VALUES (2494,'Chrystal_Pumps_','Crystal Pumps','Armor',20,100,5,1,true,false,false,'Female',true,true,'bonus bMdef,10;\nbonus bLuk,5;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`job_supernovice`,`location_shoes`,`refineable`,`script`) VALUES (2494,'Chrystal_Pumps_','Crystal Pumps','Armor',20,100,5,1,true,false,false,true,true,'bonus bMdef,10;\nbonus bLuk,5;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_shoes`,`equip_level_min`,`refineable`,`script`) VALUES (2495,'Egir_Shoes','Egir Shoes','Armor',200000,300,13,1,true,110,true,'if (BaseClass == Job_Mage || BaseClass == Job_Archer || BaseClass == Job_Acolyte)\n   bonus bMaxHP,BaseLevel*5;\nelse if (BaseClass == Job_Swordman || BaseClass == Job_Merchant || BaseClass == Job_Thief)\n   bonus bMaxSP,JobLevel*2;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`defense`,`location_shoes`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (2496,'TE_Woe_Shoes','TE Woe Shoes','Armor',5,true,40,true,100,true,true,true,true,true,true,true,'bonus bMdef,5;\nbonus bMaxHP,150;\nbonus bMaxSP,150;\nbonus2 bAddRace,RC_Player_Human,5;\nbonus2 bAddRace,RC_Player_Doram,5;\nbonus2 bMagicAddRace,RC_Player_Human,5;\nbonus2 bMagicAddRace,RC_Player_Doram,5;\nbonus2 bResEff,Eff_Freeze,25;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`defense`,`job_alchemist`,`job_blacksmith`,`job_crusader`,`job_knight`,`job_merchant`,`job_swordman`,`location_shoes`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (2497,'TE_Woe_Boots','TE Woe Boots','Armor',10,true,true,true,true,true,true,true,40,true,100,true,true,true,true,true,true,true,'bonus bMaxHP,200;\nbonus bMaxSP,100;\nbonus2 bAddRace,RC_Player_Human,10;\nbonus2 bAddRace,RC_Player_Doram,10;\nbonus2 bResEff,Eff_Freeze,25;');
@@ -2405,7 +2405,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_mid`,`equip_level_min`,`view`,`script`) VALUES (5732,'E_Elven_Ears_C','E Elven Ears C','Armor',1,2,true,false,false,true,1,73,'bonus bInt,1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`job_all`,`job_novice`,`job_supernovice`,`location_right_accessory`,`location_left_accessory`,`equip_level_min`,`script`) VALUES (5733,'E_Brooch_C','E Brooch C','Armor',1,true,false,false,true,true,1,'bonus bAgi,4;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`defense`,`job_all`,`job_novice`,`job_supernovice`,`location_head_top`,`view`,`script`) VALUES (5734,'E_Magestic_Goat_C','E Magestic Goat C','Armor',2,5,true,false,false,true,41,'bonus bStr,1;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`gender`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5735,'E_Ribbon_Green','Green Ribbon','Armor',800,100,1,'Female',true,true,244,'bonus bMdef,3;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`refineable`,`view`,`script`) VALUES (5735,'E_Ribbon_Green','Green Ribbon','Armor',800,100,1,true,true,244,'bonus bMdef,3;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`location_head_top`,`location_head_mid`,`location_head_low`,`view`,`script`) VALUES (5736,'EF_Whisper_Mask','Whisper Mask','Armor',20,true,true,true,321,'bonus bAgi,3;\nbonus2 bSubEle,Ele_Ghost,-10;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`view`,`script`) VALUES (5737,'Cactus_Hat','Cactus Hat','Armor',20,300,1,true,1,615,'bonus3 bAddMonsterDropItem,952,RC_Plant,500;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (5738,'Snowman_Hat','Snowman Hat','Armor',20,300,4,1,true,1,true,616,100,true,'bonus bStr,1;\nbonus bInt,1;\nbonus bMdef,3;\nbonus2 bSubEle,Ele_Water,7;\nbonus2 bAddMonsterDropItem,12354,100;\nbonus2 bAddMonsterDropItem,530,300;\nbonus5 bAutoSpellwhenhit,"BA_FROSTJOKER",(getrefine()>7?5:1),20,BF_WEAPON|BF_MAGIC,0;');
@@ -2553,7 +2553,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`def
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`job_alchemist`,`class_third`,`class_third_upper`,`class_third_baby`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5902,'Harvester_Hat','Harvester Hat','Armor',200,10,1,true,true,true,true,true,100,true,1123,100,true,true,true,true,true,true,'.@r = getrefine();\nbonus2 bAddMonsterDropItem,6211,100;\nbonus2 bAddMonsterDropItem,6212,100;\nif (.@r>=7) {\n   bonus2 bAddMonsterDropItem,6210,50;\n}\nif (.@r>=9) {\n   bonus2 bSkillAtk,"GN_CARTCANNON",15;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`job_mage`,`job_sage`,`job_soullinker`,`job_wizard`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5903,'Deadman_Bandana','Deadman Bandana','Armor',200,15,1,true,true,true,true,true,99,true,1124,100,true,true,true,true,true,true,'.@r = getrefine();\n.@rate = 1;\nbonus bCritical,.@r*2;\nbonus bFixedCastrate,-2;\nif (.@r>=7) {\n   bonus bMatk,20;\n   .@rate += 3;\n}\nif (.@r>=9) {\n   bonus bVariableCastrate,-20;\n   bonus2 bSkillUseSP,"SL_STUN",5;\n   bonus2 bSkillUseSP,"SL_SMA",5;\n}\nbonus3 bAutoSpellWhenHit,"SL_SWOO",getskilllv("SL_SWOO"),(.@rate*10);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`job_rogue`,`class_third`,`class_third_upper`,`class_third_baby`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5904,'Inconspicuous_Hat','Inconspicuous Hat','Armor',200,10,1,true,true,true,true,true,100,true,1125,100,true,true,true,true,true,true,'.@r = getrefine();\nif (.@r>=9) {\n   .@matk = 5;\n}\nbonus bMatkRate,(7+.@matk);\nif (.@r>=7) {\n   bonus bMatk,(readparam(bInt)/5)*2;\n}');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5905,'Lyrica_Hat','Lyrica Hat','Armor',200,10,1,true,true,true,true,true,100,true,1126,100,true,true,true,true,true,true,'.@r = getrefine();\nbonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15;\nif (.@r>=7) {\n   bonus bFixedCastrate,4*(getskilllv("WM_LESSON"));\n}\nif (.@r>=9) {\n   bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",10;\n}');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5905,'Lyrica_Hat','Lyrica Hat','Armor',200,10,1,true,true,true,true,'Female',true,100,true,1126,100,true,true,true,true,true,true,'.@r = getrefine();\nbonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15;\nif (.@r>=7) {\n   bonus bFixedCastrate,4*(getskilllv("WM_LESSON"));\n}\nif (.@r>=9) {\n   bonus2 bSkillUseSP,"WM_SEVERE_RAINSTORM",10;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`job_assassin`,`class_third`,`class_third_upper`,`class_third_baby`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5906,'Oni_Horns_','Oni Horns','Armor',20,10,1,true,true,true,true,true,100,true,1127,100,true,true,true,true,true,true,'bonus2 bSkillAtk,"GC_COUNTERSLASH",(10*getskilllv("GC_WEAPONBLOCKING"));\n.@r = getrefine();\nif (.@r > 6) {\n   bonus bAtk,20;\n   bonus bHit,5;\n}\nif (.@r > 9) {\n   bonus3 bAutoSpell,"GC_CROSSIMPACT",1,10;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`job_blacksmith`,`class_third`,`class_third_upper`,`class_third_baby`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5907,'Sea_Captain_Hat','Sea Captain Hat','Armor',200,20,1,true,true,true,true,true,100,true,1128,100,true,true,true,true,true,true,'bonus2 bSkillAtk,"NC_AXEBOOMERANG",20;\n.@dmg = 20;\n.@r = getrefine();\nif (.@r>=7) {\n   .@dmg += getskilllv("BS_WEAPONRESEARCH");\n}\nif (.@r>=9) {\n   .@dmg += getskilllv("NC_TRAININGAXE");\n}\nbonus2 bSkillAtk,"NC_AXETORNADO",.@dmg;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_top`,`equip_level_min`,`view`) VALUES (5909,'C_Valkyrie_Circlet','C Valkyrie Circlet','Armor',true,1,940);
@@ -6842,7 +6842,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`pr
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_crusader`,`class_third`,`class_third_upper`,`class_third_baby`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32025,'Fortridge','Fortridge','Weapon','1hSpear',20,1700,205,3,2,true,true,true,true,true,4,170,true,'.@r = getrefine();\nbonus bDelayrate,-.@r;\nbonus2 bAddClass,Class_All,5;\nif (.@r>=9)\n   bonus2 bSkillAtk,"LG_CANNONSPEAR",20;\nif (.@r>=11)\n   bonus2 bSkillAtk,"LG_OVERBRAND",20;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_crusader`,`class_third`,`class_third_upper`,`class_third_baby`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32026,'aegis_32026','Blocking Spear','Weapon','1hSpear',3000,210,3,2,true,true,true,true,true,4,170,true,'.@r = getrefine();\nbonus2 bAddClass,Class_All,10;\nbonus2 bSkillAtk,"LG_BANISHINGPOINT",10;\nif (.@r>=7) {\n   bonus bAspdRate,10;\n   bonus bBaseAtk,40;\n}\nif (.@r>=9) {\n   bonus2 bSkillAtk,"LG_BANISHINGPOINT",15;\n   autobonus "{ bonus2 bAddSize,Size_All,15; }",1,10000,BF_WEAPON;\n}\nif (.@r>=11) {\n   bonus bDelayrate,-20;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_crusader`,`class_third`,`class_third_upper`,`class_third_baby`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32027,'aegis_32027','Guardian Knight Spear','Weapon','1hSpear',4000,205,3,2,true,true,true,true,true,4,170,true,'.@r = getrefine();\nbonus bLongAtkRate,.@r;\nif (.@r>=9) {\n   bonus2 bSkillAtk,"LG_BANISHINGPOINT",20;\n}\nif (.@r>=11) {\n   bonus2 bAddRace,RC_Undead,20;\n   bonus2 bAddRace,RC_Angel,20;\n}');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`magic_attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32107,'Black_Circle','Black Circle','Weapon','Whip',1200,100,190,2,2,true,true,true,true,'Male',true,4,170,true,'.@r = getrefine();\nbonus bMatk,4*.@r;\nbonus2 bMagicAtkEle,Ele_Neutral,10;\nif (.@r>=9)\n   bonus2 bSkillAtk,"WM_METALICSOUND",30;\nif (.@r>=11)\n   bonus2 bSkillCooldown,"WM_METALICSOUND",-2000;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`magic_attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32107,'Black_Circle','Black Circle','Weapon','Musical',1200,100,190,2,2,true,true,true,true,'Male',true,4,170,true,'.@r = getrefine();\nbonus bMatk,4*.@r;\nbonus2 bMagicAtkEle,Ele_Neutral,10;\nif (.@r>=9)\n   bonus2 bSkillAtk,"WM_METALICSOUND",30;\nif (.@r>=11)\n   bonus2 bSkillCooldown,"WM_METALICSOUND",-2000;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32108,'Antique_Cello','Antique Cello','Weapon','Musical',1200,180,2,2,true,true,true,true,'Male',true,4,170,true,'.@r = getrefine();\nbonus bVariableCastrate,-10;\nbonus bLongAtkRate,.@r;\nif (.@r>=9)\n   bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-1000;\nif (.@r>=11)\n   bonus2 bSkillUseSPrate,"WM_SEVERE_RAINSTORM",20;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32110,'aegis_32110','Safety Lute','Weapon','Musical',1400,200,1,2,true,true,true,true,'Male',true,4,170,true,'.@r = getrefine();\nbonus bLongAtkRate,10;\nbonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",10;\nif (.@r>=7) {\n   bonus bVariableCastrate,-10;\n   bonus bBaseAtk,40;\n}\nif (.@r>=9) {\n   bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",15;\n   autobonus "{ bonus2 bAddSize,Size_All,15; }",1,10000,BF_WEAPON;\n}\nif (.@r>=11) {\n   bonus bDelayrate,-20;\n   bonus2 bSkillCooldown,"WM_SEVERE_RAINSTORM",-2000;\n}');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`range`,`slots`,`job_barddancer`,`class_third`,`class_third_upper`,`class_third_baby`,`gender`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32111,'aegis_32111','Royal Chello','Weapon','Musical',1000,90,1,2,true,true,true,true,'Male',true,4,170,true,'.@r = getrefine();\nbonus2 bMagicAtkEle,Ele_Neutral,10;\nbonus bMatk,180;\nbonus bUnbreakableWeapon;\nbonus bMatk,4*.@r;\nif (.@r>=9) {\n   bonus2 bSkillCooldown,"WM_METALICSOUND",-1000;\n   bonus2 bSkillAtk,"WM_METALICSOUND",20;\n   bonus2 bSkillAtk,"WM_REVERBERATION",20;\n}\nif (.@r>=11) {\n   bonus2 bMagicAddRace,RC_Undead,20;\n   bonus2 bMagicAddRace,RC_Angel,20;\n   bonus2 bSkillCooldown,"WM_METALICSOUND",-1000;\n}');

+ 15 - 15
sql-files/item_db_re_etc.sql

@@ -3192,17 +3192,17 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`) VALUES (13200,'Bullet','Bullet','Ammo','Bullet',1,1,25,true,true,true,1);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13201,'Silver_Bullet','Surplus Silver Bullet','Ammo','Bullet',15,2,15,true,true,true,1,'bonus bAtkEle,Ele_Holy;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13202,'Shell_Of_Blood','Surplus Bloody Shell','Ammo','Bullet',30,2,30,true,true,true,1,'bonus2 bAddEff,Eff_Bleeding,100;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13203,'Flare_Sphere','Surplus Flare Sphere','Ammo','Grenade',80,5,50,false,'Female',true,'bonus bAtkEle,Ele_Fire;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13204,'Lighting_Sphere','Surplus Lightning Sphere','Ammo','Grenade',80,5,50,false,'Female',true,'bonus bAtkEle,Ele_Wind;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13205,'Poison_Sphere','Surplus Poison Sphere','Ammo','Grenade',80,5,50,false,'Female',true,'bonus bAtkEle,Ele_Poison;\nbonus2 bAddEff,Eff_Poison,500;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13206,'Blind_Sphere','Surplus Blind Sphere','Ammo','Grenade',80,5,50,false,'Female',true,'bonus bAtkEle,Ele_Dark;\nbonus2 bAddEff,Eff_Blind,500;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13207,'Freezing_Sphere','Surplus Freezing Sphere','Ammo','Grenade',80,5,50,false,'Female',true,'bonus bAtkEle,Ele_Water;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13203,'Flare_Sphere','Surplus Flare Sphere','Ammo','Grenade',80,5,50,false,true,'bonus bAtkEle,Ele_Fire;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13204,'Lighting_Sphere','Surplus Lightning Sphere','Ammo','Grenade',80,5,50,false,true,'bonus bAtkEle,Ele_Wind;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13205,'Poison_Sphere','Surplus Poison Sphere','Ammo','Grenade',80,5,50,false,true,'bonus bAtkEle,Ele_Poison;\nbonus2 bAddEff,Eff_Poison,500;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13206,'Blind_Sphere','Surplus Blind Sphere','Ammo','Grenade',80,5,50,false,true,'bonus bAtkEle,Ele_Dark;\nbonus2 bAddEff,Eff_Blind,500;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13207,'Freezing_Sphere','Surplus Freezing Sphere','Ammo','Grenade',80,5,50,false,true,'bonus bAtkEle,Ele_Water;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (13208,'Gong_Bug','Sow Bug','Ammo','Bullet',5,50,true,true,true,50,100,true,true,true,true,true,true,true,'bonus2 bAddEff,Eff_Stun,1000;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`) VALUES (13210,'Slug_Bullet_1','Slug Ammunition L','Ammo','Bullet',250,250,30,false,'Female',true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`) VALUES (13211,'Slug_Bullet_2','Slug Ammunition M','Ammo','Bullet',500,500,30,false,'Female',true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`) VALUES (13212,'Slug_Bullet_3','Slug Ammunition H','Ammo','Bullet',750,750,30,false,'Female',true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`) VALUES (13213,'Slug_Bullet_4','Slug Ammunition SH','Ammo','Bullet',1000,1000,30,false,'Female',true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`) VALUES (13214,'Slug_Bullet_5','Slug Ammunition XH','Ammo','Bullet',1200,1200,30,false,'Female',true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`) VALUES (13210,'Slug_Bullet_1','Slug Ammunition L','Ammo','Bullet',250,250,30,false,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`) VALUES (13211,'Slug_Bullet_2','Slug Ammunition M','Ammo','Bullet',500,500,30,false,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`) VALUES (13212,'Slug_Bullet_3','Slug Ammunition H','Ammo','Bullet',750,750,30,false,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`) VALUES (13213,'Slug_Bullet_4','Slug Ammunition SH','Ammo','Bullet',1000,1000,30,false,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`) VALUES (13214,'Slug_Bullet_5','Slug Ammunition XH','Ammo','Bullet',1200,1200,30,false,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13215,'AP_Ammo','Armor-Piercing Bullet','Ammo','Bullet',15,2,50,true,true,true,100,'bonus bAtkEle,Ele_Neutral;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13216,'Blaze_Bullet','Blazing Bullet','Ammo','Bullet',10,2,40,true,true,true,100,'bonus bAtkEle,Ele_Fire;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13217,'Freezing_Bullet','Freezing Bullet','Ammo','Bullet',10,2,40,true,true,true,100,'bonus bAtkEle,Ele_Water;');
@@ -3211,11 +3211,11 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`pr
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13220,'Sanctified_Bullet','Purifying Bullet','Ammo','Bullet',10,2,40,true,true,true,100,'bonus bAtkEle,Ele_Holy;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13221,'Silver_Bullet_','Silver Bullet','Ammo','Bullet',5,2,15,true,true,true,1,'bonus bAtkEle,Ele_Holy;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13222,'Shell_Of_Blood_','Bloody Shell','Ammo','Bullet',10,2,30,true,true,true,1,'bonus2 bAddEff,Eff_Bleeding,100;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13223,'Flare_Sphere_','Flare Sphere','Ammo','Grenade',15,5,50,false,'Female',true,'bonus bAtkEle,Ele_Fire;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13224,'Lighting_Sphere_','Lightning Sphere','Ammo','Grenade',15,5,50,false,'Female',true,'bonus bAtkEle,Ele_Wind;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13225,'Poison_Sphere_','Poison Sphere','Ammo','Grenade',15,5,50,false,'Female',true,'bonus bAtkEle,Ele_Poison;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13226,'Blind_Sphere_','Blind Sphere','Ammo','Grenade',15,5,50,false,'Female',true,'bonus bAtkEle,Ele_Dark;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`gender`,`location_ammo`,`script`) VALUES (13227,'Freezing_Sphere_','Freezing Sphere','Ammo','Grenade',15,5,50,false,'Female',true,'bonus bAtkEle,Ele_Water;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13223,'Flare_Sphere_','Flare Sphere','Ammo','Grenade',15,5,50,false,true,'bonus bAtkEle,Ele_Fire;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13224,'Lighting_Sphere_','Lightning Sphere','Ammo','Grenade',15,5,50,false,true,'bonus bAtkEle,Ele_Wind;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13225,'Poison_Sphere_','Poison Sphere','Ammo','Grenade',15,5,50,false,true,'bonus bAtkEle,Ele_Poison;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13226,'Blind_Sphere_','Blind Sphere','Ammo','Grenade',15,5,50,false,true,'bonus bAtkEle,Ele_Dark;');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`class_all`,`location_ammo`,`script`) VALUES (13227,'Freezing_Sphere_','Freezing Sphere','Ammo','Grenade',15,5,50,false,true,'bonus bAtkEle,Ele_Water;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13228,'Flare_Bullet','Flare Bullet','Ammo','Bullet',10,2,20,true,true,true,1,'bonus bAtkEle,Ele_Fire;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13229,'Lightning_Bullet','Lightning Bullet','Ammo','Bullet',10,2,20,true,true,true,1,'bonus bAtkEle,Ele_Wind;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`job_gunslinger`,`job_rebellion`,`location_ammo`,`equip_level_min`,`script`) VALUES (13230,'Ice_Bullet','Ice Bullet','Ammo','Bullet',10,2,20,true,true,true,1,'bonus bAtkEle,Ele_Water;');

+ 9 - 9
sql-files/item_db_re_usable.sql

@@ -189,7 +189,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`trade_overri
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (6047,'Clothing_Dye_Coupon_II','Clothing Dye Coupon II','Usable',100,true,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (6720,'Status_Reset_Coupon','Status Reset Coupon','Cash',10,1,100,true,true,true,true,true,true,true,true,'resetstatus;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (6721,'Status_Reset_Coupon_','Status Reset Coupon','Cash',10,1,100,true,true,true,true,true,true,true,true,'resetstatus;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`class_all`,`gender`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (7037,'Trade_Coupon','Coupon','Usable',100,false,'Female',100,true,true,true,true,true,true,true,'/*set pcroom,(gettimetick(2)+7200);*/');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`class_all`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (7037,'Trade_Coupon','Coupon','Usable',100,false,100,true,true,true,true,true,true,true,'/*set pcroom,(gettimetick(2)+7200);*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`script`) VALUES (9510,'Costume_Enchant_Stone_Box17','Costume Enchant Stone Box17','Cash',10,'/*getgroupitem(IG_Costume_Enchant_Stone_Box17);*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`script`) VALUES (9523,'Metal_Smelting_Ticket','Metal Refining Ticket','Delayconsume',1,'/*upgradeui 9523;*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`script`) VALUES (9550,'Gemstone_Of_Time','Gemstone of Time','Delayconsume',1,'/*upgradeui 9550;*/');
@@ -2851,7 +2851,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17281,'Refinement_Ore_Box_IV','Refinement Ore Box IV','Cash',10,10,100,true,true,true,true,true,true,true,'getitem 7619,5;\ngetitem 7620,5;\ngetitem 14627,1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17282,'Refinement_Ore_Box_IV_10','Refinement Ore Box IV(10)','Cash',10,10,100,true,true,true,true,true,true,true,'getitem 7619,50;\ngetitem 7620,50;\ngetitem 14627,11;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17283,'Refinement_Ore_Box_IV_20','Refinement Ore Box IV(20)','Cash',10,10,100,true,true,true,true,true,true,true,'getitem 7619,100;\ngetitem 7620,100;\ngetitem 14627,23;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`gender`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17285,'Events_Beauty_Gift_Box','Events Beauty Gift Box','Cash',10,10,false,'Female',100,true,true,true,true,true,true,true,'/*TODO*/');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17285,'Events_Beauty_Gift_Box','Events Beauty Gift Box','Cash',10,10,false,100,true,true,true,true,true,true,true,'/*TODO*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17292,'Shadow_Box','Shadow Box','Cash',10,10,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",24018,24019,24020,24021,24022,24023,24024,24025,24026),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17293,'Shadow_Physical_Package','Shadow Physical Package','Cash',10,10,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",24018,24019,24020,24024,24025,24026),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (17294,'Shadow_Magical_Package','Shadow Magical Package','Cash',10,10,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",24021,24022,24023,24024,24025,24026),1;');
@@ -3016,7 +3016,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22525,'Level_Up_Box140','Level Up Box(140)','Cash',10,140,100,true,true,true,true,true,true,true,true,'getgroupitem(IG_Level_Up_Box140);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22526,'Level_Up_Box150','Level Up Box(150)','Cash',10,150,100,true,true,true,true,true,true,true,true,'getgroupitem(IG_Level_Up_Box150);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22527,'Level_Up_Box160','Level Up Box(160)','Cash',10,160,100,true,true,true,true,true,true,true,true,'getgroupitem(IG_Level_Up_Box160);');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`gender`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22528,'Pet_Exchange_Ticket_Box','Pet Exchange Ticket Box','Cash',10,20,false,'Female',100,true,true,true,true,true,true,true,'/*TODO*/');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22528,'Pet_Exchange_Ticket_Box','Pet Exchange Ticket Box','Cash',10,20,false,100,true,true,true,true,true,true,true,'/*TODO*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`script`) VALUES (22529,'Shadow_Exchange_Box','Shadow Exchange SynthesisBox','Delayconsume',10,'/*synthesisui 22529;*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`script`) VALUES (22530,'Christmas_Box','Christmas Box','Cash',10,200,1,'getgroupitem(IG_Christmas_Box);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`script`) VALUES (22531,'Special_Christmas_Box','Special Christmas Box','Cash',10,200,1,'getgroupitem(IG_Special_Christmas_Box);');
@@ -3048,8 +3048,8 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_container`,`script`) VALUES (22558,'Lucky_Bag','Lucky Bag','Usable',20,10,true,'getrandgroupitem(IG_Lucky_Bag,1);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`delay_duration`,`delay_status`,`script`) VALUES (22559,'Mock_Strawberry','Mock Strawberry','Delayconsume',20,100,3000,'Reuse_Limit_G','percentheal 50,50;\nitemskill "SM_ENDURE",3;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`script`) VALUES (22563,'Lucky_Bag_Of_New_Era','Lucky Bag Of New Era','Usable','/* TODO */');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nomail`,`trade_noauction`) VALUES (22567,'Squad_Prize','Expedition Award Box','Healing',20,100,100,true,true);
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`gender`,`location_right_hand`) VALUES (22568,'Nyd_Summon_Scroll','Nidhoggur Summon Scroll','Healing',20,100,'Female',true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22567,'Squad_Prize','Expedition Award Box','Usable',20,100,100,true,true,'/* TODO */');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (22568,'Nyd_Summon_Scroll','Nidhoggur Summon Scroll','Usable',20,100,'/* TODO */');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22569,'Gift_New_start','Gift New start','Cash',10,100,100,true,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`) VALUES (22571,'Easter_Egg','Easter Egg','Delayconsume',10,10);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22592,'Happy_Call_Box','Happy Call Box','Cash',10,100,true,true,true,true,true,true,true,true);
@@ -3157,20 +3157,20 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22782,'PC_Bang_Wooden_Box','PC Bang Wooden Box','Usable',10,200,1,100,true,true,true,true,true,true,true,'getitem 547,30;\n/*No Info*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22783,'PC_Bang_Golden_Box','PC Bang Golden Box','Usable',10,200,1,100,true,true,true,true,true,true,true,'getitem 547,1;\ngetitem 985,10;\n/*No Info*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22784,'PC_Bang_Platinum_Box','PC Bang Platinum Box','Usable',10,200,1,100,true,true,true,true,true,true,true,'getitem 547,1;\ngetitem 12017,10;\ngetitem 678,12;\n/*No Info*/');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`gender`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22808,'Special_Gift_Box','Special Gift Box','Usable',10,100,false,'Female',100,true,true,true,true,true,true,true);
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`) VALUES (22808,'Special_Gift_Box','Special Gift Box','Usable',10,100,false,100,true,true,true,true,true,true,true);
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22812,'Sealed_Dracula_Scroll','Sealed Dracula Scroll','Usable',10,10,1,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",6228,6232,22813,19937,17314, 6635),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22813,'Bearer\'s_Shadow_Box','Bearer\'s Shadow Box','Usable',10,10,1,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",24180,24181,24182,24183,24184,24185),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`equip_level_min`,`script`) VALUES (22822,'Summer_Vacation_Costumes','Summer Vacation Costumes','Usable',100,1,'sc_start SC_DRESSUP,600000,1;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`gender`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22823,'Sealed_Sniper_Scroll','Sealed Sniper Scroll','Usable',10,10,false,'Female',100,true,true,true,true,true,true,true,'/*getitem callfunc("F_Rand",4491,6228,6232,24196, Hasty Shadow Armor, 19882, 17474, 6635),1;*/');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22823,'Sealed_Sniper_Scroll','Sealed Sniper Scroll','Usable',10,10,false,100,true,true,true,true,true,true,true,'/*getitem callfunc("F_Rand",4491,6228,6232,24196, Hasty Shadow Armor, 19882, 17474, 6635),1;*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`script`) VALUES (22826,'Enchant_Stone_Box4','Costume Enchantment Stone Box 4','Usable',10,100,1,'getitem callfunc("F_Rand",6636,6637,6638,6639,6640,6641,6642,6643,6644,6645,6740,6741,6742,6743,6744,6745,6790,6791,6792,6908),1;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`gender`,`script`) VALUES (22827,'Shadow_Cube','Shadow Cube','Usable',10,10,false,'Female','/*No Info*/');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`script`) VALUES (22827,'Shadow_Cube','Shadow Cube','Usable',10,10,false,'/*No Info*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22828,'Sealed_Album_Scroll','Sealed Album Scroll','Usable',10,100,1,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",22829,6232,6228,24208,24209,17474/*,Enchanted Letter*/),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22829,'Sealed_Card_Album','Sealed Card Album','Usable',10,100,1,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,4483,4491),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22837,'Integer_Time','Integer Time','Usable',10,50,1,100,true,true,true,true,true,true,true,true,'getitem 673,5;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`script`) VALUES (22838,'Something_Candy_Holder','Something Candy Holders','Usable',10,10,1,'getgroupitem(IG_Something_Candy_Holder);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22842,'Sealed_Dracula_Scroll_II','Sealed Dracula Scroll II','Usable',10,10,1,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",22846,6228,6232,24223,24227,17474/*, Enchant Letter*/),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`script`) VALUES (22843,'Superstar_Snack','Superstar Snack','Usable',10,10,'bonus_script "{ bonus bAtk2,50; bonus bMatk,50; }",300;');
-REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`gender`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22844,'Sealed_Dracula_Card_Album','Sealed Dracula Card Album','Usable',10,10,false,'Female',100,true,true,true,true,true,true,true,'/*No Info*/');
+REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`class_all`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22844,'Sealed_Dracula_Card_Album','Sealed Dracula Card Album','Usable',10,10,false,100,true,true,true,true,true,true,true,'/*No Info*/');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22845,'Sealed_Fortune_Egg','Sealed Fortune Egg','Usable',10,10,1,100,true,true,true,true,true,true,true,'getitem callfunc("F_Rand",4488,4497,4486,4480,4485,4539,4487,4494,4538,4489,4490,4482,4503,22846),1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (22846,'Sealed_Dracula_Card_','Sealed Dracula Card','Usable',10,10,100,true,true,true,true,true,true,'bonus_script "{ bonus2 bSPDrainRate,50,5; }",300;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_buyingstore`,`script`) VALUES (22847,'BadgeOfProntera','Prontera Badge','Usable',10,10,true,'warp "prontera",159,192;');

+ 0 - 1
src/map/battle.cpp

@@ -8770,7 +8770,6 @@ static const struct _battle_data {
 	{ "display_version",                    &battle_config.display_version,                 1,      0,      1,              },
 	{ "display_hallucination",              &battle_config.display_hallucination,           1,      0,      1,              },
 	{ "use_statpoint_table",                &battle_config.use_statpoint_table,             1,      0,      1,              },
-	{ "ignore_items_gender",                &battle_config.ignore_items_gender,             1,      0,      1,              },
 	{ "berserk_cancels_buffs",              &battle_config.berserk_cancels_buffs,           0,      0,      1,              },
 	{ "debuff_on_logout",                   &battle_config.debuff_on_logout,                1|2,    0,      1|2,            },
 	{ "monster_ai",                         &battle_config.mob_ai,                          0x000,  0x000,  0xFFF,          },

+ 0 - 2
src/map/battle.hpp

@@ -427,8 +427,6 @@ struct Battle_Config
 	int display_hallucination;	// [Skotlex]
 	int use_statpoint_table;	// [Skotlex]
 
-	int ignore_items_gender; //[Lupus]
-
 	int berserk_cancels_buffs; // [Aru]
 	int debuff_on_logout; // Removes a few "official" negative Scs on logout. [Skotlex]
 	int mob_ai; //Configures various mob_ai settings to make them smarter or dumber(official). [Skotlex]

+ 34 - 20
src/map/itemdb.cpp

@@ -30,7 +30,6 @@ static DBMap *itemdb_group; /// Item Group DB
 struct s_roulette_db rd;
 
 static void itemdb_jobid2mapid(uint64 bclass[3], e_mapid jobmask, bool active);
-static char itemdb_gendercheck(struct item_data *id);
 
 const std::string ItemDatabase::getDefaultLocation() {
 	return std::string(db_path) + "/item_db.yml";
@@ -379,11 +378,11 @@ uint64 ItemDatabase::parseBodyNode(const YAML::Node &node) {
 		}
 
 		item->sex = static_cast<e_sex>(constant);
-		item->sex = itemdb_gendercheck(item.get());
+		item->sex = this->defaultGender( node, item );
 	} else {
 		if (!exists) {
 			item->sex = SEX_BOTH;
-			item->sex = itemdb_gendercheck(item.get());
+			item->sex = this->defaultGender( node, item );
 		}
 	}
 
@@ -1036,6 +1035,38 @@ void ItemDatabase::loadingFinished(){
 	}
 }
 
+/**
+ * Applies gender restrictions according to settings.
+ * @param node: YAML node containing the entry.
+ * @param node: the already parsed item data.
+ * @return gender that should be used.
+ */
+e_sex ItemDatabase::defaultGender( const YAML::Node &node, std::shared_ptr<item_data> id ){
+	if (id->nameid == WEDDING_RING_M) //Grom Ring
+		return SEX_MALE;
+	if (id->nameid == WEDDING_RING_F) //Bride Ring
+		return SEX_FEMALE;
+	if( id->type == IT_WEAPON ){
+		if( id->subtype == W_MUSICAL ){
+			if( id->sex != SEX_MALE ){
+				this->invalidWarning( node, "Musical instruments are always male-only, defaulting to SEX_MALE.\n" );
+			}
+
+			return SEX_MALE;
+		}
+
+		if( id->subtype == W_WHIP ){
+			if( id->sex != SEX_FEMALE ){
+				this->invalidWarning( node, "Whips are always female-only, defaulting to SEX_FEMALE.\n" );
+			}
+
+			return SEX_FEMALE;
+		}
+	}
+
+	return static_cast<e_sex>( id->sex );
+}
+
 ItemDatabase item_db;
 
 /**
@@ -1908,23 +1939,6 @@ static void itemdb_roulette_free(void) {
 	}
 }
 
-/*======================================
- * Applies gender restrictions according to settings. [Skotlex]
- *======================================*/
-static char itemdb_gendercheck(struct item_data *id)
-{
-	if (id->nameid == WEDDING_RING_M) //Grom Ring
-		return SEX_MALE;
-	if (id->nameid == WEDDING_RING_F) //Bride Ring
-		return SEX_FEMALE;
-	if (id->look == W_MUSICAL && id->type == IT_WEAPON) //Musical instruments are always male-only
-		return SEX_MALE;
-	if (id->look == W_WHIP && id->type == IT_WEAPON) //Whips are always female-only
-		return SEX_FEMALE;
-
-	return (battle_config.ignore_items_gender) ? SEX_BOTH : id->sex;
-}
-
 /**
  * Convert SQL data to YAML Node
  * @param str: Array of parsed SQL data

+ 3 - 0
src/map/itemdb.hpp

@@ -1005,6 +1005,9 @@ public:
 extern RandomOptionGroupDatabase random_option_group;
 
 class ItemDatabase : public TypesafeCachedYamlDatabase<t_itemid, item_data> {
+private:
+	e_sex defaultGender( const YAML::Node &node, std::shared_ptr<item_data> id );
+
 public:
 	ItemDatabase() : TypesafeCachedYamlDatabase("ITEM_DB", 1) {