From c867d2f5b74a13e00f75848ccfcb1c87d73e9f7d Mon Sep 17 00:00:00 2001 From: Atemo Date: Thu, 29 Oct 2020 01:21:40 +0100 Subject: [PATCH] Added Royal Members Cards (nov 2019) (#5498) --- db/re/item_combo_db.txt | 4 ++++ db/re/item_db_equip.yml | 40 ++++++++++++++++++++++++++++++++++ db/re/item_db_etc.yml | 36 +++++++++++++++++++++++++++++- sql-files/item_db_re_equip.sql | 3 +++ sql-files/item_db_re_etc.sql | 5 +++++ 5 files changed, 87 insertions(+), 1 deletion(-) diff --git a/db/re/item_combo_db.txt b/db/re/item_combo_db.txt index 81957dc05e..45c4bee648 100644 --- a/db/re/item_combo_db.txt +++ b/db/re/item_combo_db.txt @@ -1517,6 +1517,7 @@ 22238:830002,{ bonus bDex,10; bonus bLongAtkRate,5; } 22238:820001,{ bonus bDex,10; bonus bLongAtkRate,5; } 28763:510022,{ .@r = getequiprefinerycnt(EQI_HAND_R) + getequiprefinerycnt(EQI_HAND_L); bonus bBaseAtk,15*(.@r/3); bonus2 bAddClass,Class_All,3*(.@r/5); if (.@r>=14){ bonus2 bSkillAtk,"KO_JYUMONJIKIRI",30; bonus2 bSkillCooldown,"KO_JYUMONJIKIRI",-2000; } if (.@r>=16){ skill "OB_ZANGETSU",getskilllv("KG_KAGEHUMI"); skill "KG_KAGEHUMI",getskilllv("OB_ZANGETSU"); } if (.@r>=18){ bonus2 bAddEle,Ele_All,15; } if (.@r>=20){ bonus2 bSkillAtk,"KO_JYUMONJIKIRI",25; } } +300128:300130,{ bonus2 bAddSize,Size_Medium,5; bonus2 bMagicAddSize,Size_Medium,5; bonus bMatkRate,5; bonus2 bAddClass,Class_All,5; } //300141:300120,{ bonus2 bMagicAddEle,Ele_Water,15; } 300144:300150,{ bonus bCritAtkRate,15; } 300146:4521,{ bonus bCritAtkRate,15; } @@ -1525,6 +1526,9 @@ 300148:300142,{ bonus bBaseAtk,30; } 300149:300141,{ bonus2 bSubEle,Ele_Neutral,5; } 300150:4524,{ bonus bMaxHPrate,15; bonus bStr,4; } +400049:18179,{ .@r_weapon = getequiprefinerycnt(EQI_HAND_R); bonus2 bSkillAtk,"WM_SEVERE_RAINSTORM",10; bonus bLongAtkRate,3*(.@r_weapon/2); } +400049:18180,{ .@r_weapon = getequiprefinerycnt(EQI_HAND_R); bonus bDelayrate,-10; bonus bLongAtkRate,3*(.@r_weapon/2); } +400049:32019,{ .@r_weapon = getequiprefinerycnt(EQI_HAND_R); bonus bBaseAtk,30; bonus2 bSkillAtk,"LG_CANNONSPEAR",4*(.@r_weapon/2); } 400053:480054:490069:490070,{ bonus2 bAddSize,Size_Small,20; bonus bCritical,5; bonus2 bAddClass,Class_All,10; bonus bMaxHPrate,10; bonus bMaxSPrate,10; bonus bStr,5; if (.@r>=18) { bonus bFlee2,10; bonus bBaseAtk,50; } if (.@r>=22) { bonus2 bAddSize,Size_Medium,20; bonus bCritAtkRate,20; } } 400054:13493,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,30; bonus2 bSkillAtk,"WL_HELLINFERNO",4*(.@r/2); } 400054:26151,{ .@r = getequiprefinerycnt(EQI_HAND_R); bonus bMatk,30; bonus2 bSkillAtk,"WL_COMET",5*(.@r/2); } diff --git a/db/re/item_db_equip.yml b/db/re/item_db_equip.yml index 2681aa0f1a..8bad39f3b4 100644 --- a/db/re/item_db_equip.yml +++ b/db/re/item_db_equip.yml @@ -97919,6 +97919,46 @@ Body: Refineable: true Script: | .@r = getrefine(); bonus2 bSkillCooldown,"GN_SPORE_EXPLOSION",-1000; bonus bBaseAtk,4*.@r; if (.@r>=11) .@val = 50; else if (.@r>=9) .@val = 30; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",.@val; + - Id: 400045 + AegisName: aegis_400045 + Name: Pierced apple # !todo check english name + Type: Armor + View: 1952 + Locations: + Head_Top: true + Refineable: true + - Id: 400046 + AegisName: aegis_400046 + Name: Costume pierced apple # !todo check english name + Type: Armor + View: 1952 + Locations: + Costume_Head_Top: true + - Id: 400049 + AegisName: aegis_400049 + Name: Stripe Hat + Type: Armor + View: 1728 + Weight: 100 + Slots: 1 + Locations: + Head_Top: true + EquipLevelMin: 130 + Refineable: true + Script: | + .@r = getrefine(); + bonus bBaseAtk,20*(.@r/2); + if (.@r>=7) { + bonus bVariableCastrate,-15; + } + if (.@r>=9) { + bonus bLongAtkRate,15; + } + if (.@r>=11) { + bonus bFixedCast,-200; + bonus2 bAddSize,Size_Small,15; + bonus2 bAddSize,Size_Medium,15; + } - Id: 400053 AegisName: aegis_400053 Name: Illusion Morrigane's Helm diff --git a/db/re/item_db_etc.yml b/db/re/item_db_etc.yml index fbda490d98..1c6a5b24ce 100644 --- a/db/re/item_db_etc.yml +++ b/db/re/item_db_etc.yml @@ -37511,6 +37511,37 @@ Body: bonus5 bAutoSpellWhenHit,"SO_ELECTRICWALK",5,80,BF_MAGIC,0; autobonus "{ bonus bFlee,200; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_TEIHIT1; }"; autobonus "{ bonus bSpeedRate,25; }",25,10000,BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }"; + - Id: 300127 + AegisName: aegis_300127 + Name: Wolf Card + Type: Card + Weight: 10 + Locations: + Right_Hand: true + - Id: 300128 + AegisName: aegis_300128 + Name: Wolf Lugenburg Card + Type: Card + Weight: 10 + Locations: + Right_Hand: true + Script: | + bonus2 bAddRace,RC_Insect,15; + bonus2 bMagicAddRace,RC_Insect,15; + - Id: 300129 + AegisName: aegis_300129 + Name: Poe Card + Type: Card + Weight: 10 + Locations: + Right_Hand: true + - Id: 300130 + AegisName: aegis_300130 + Name: Poe Richard Card + Type: Card + Weight: 10 + Locations: + Right_Hand: true - Id: 300140 AegisName: aegis_300140 Name: Deep Sea Sropho Card @@ -37653,4 +37684,7 @@ Body: Script: | bonus bLongAtkRate,25; bonus bPerfectHitRate,5; - + - Id: 1000235 + AegisName: aegis_1000235 + Name: Great Hunter's Mark # !todo check english name + Type: Etc diff --git a/sql-files/item_db_re_equip.sql b/sql-files/item_db_re_equip.sql index fe27e6b298..dc60d37293 100644 --- a/sql-files/item_db_re_equip.sql +++ b/sql-files/item_db_re_equip.sql @@ -6258,6 +6258,9 @@ 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_rebellion`,`location_left_hand`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32302,'Crimson_Rose','Crimson Rose','Weapon','Revolver',20,700,150,7,2,true,true,true,4,100,true,'.@r = getrefine(); bonus bBaseAtk,10*(.@r/2); bonus bAspdRate,3*(.@r/3); if (.@r >= 7) { bonus bAspd,1; bonus2 bAddClass,Class_All,5; if (.@r >= 9) { bonus bCritAtkRate,20; if (.@r >= 11) { autobonus3 "{ bonus bCritical,20; bonus bLongAtkRate,15; }",1000,60000,"RL_HEAT_BARREL"; } } }'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`magic_attack`,`range`,`slots`,`job_crusader`,`class_third`,`class_third_upper`,`class_third_baby`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32350,'Farthezan','Farthezan','Weapon','1hSword',20,1100,130,180,1,2,true,true,true,true,true,4,170,true,'.@r = getrefine(); bonus2 bSkillAtk,"PA_PRESSURE",40; bonus bVariableCastrate,-.@r; if (.@r>=9) bonus2 bSkillAtk,"LG_RAYOFGENESIS",30; if (.@r>=11) { bonus2 bSkillAtk,"LG_RAYOFGENESIS",20; bonus2 bSkillAtk,"PA_PRESSURE",20; }'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`subtype`,`price_buy`,`weight`,`attack`,`range`,`slots`,`job_alchemist`,`class_third`,`class_third_upper`,`class_third_baby`,`location_right_hand`,`weapon_level`,`equip_level_min`,`refineable`,`script`) VALUES (32351,'Estal','Estal','Weapon','1hSword',20,700,195,1,2,true,true,true,true,true,4,170,true,'.@r = getrefine(); bonus2 bSkillCooldown,"GN_SPORE_EXPLOSION",-1000; bonus bBaseAtk,4*.@r; if (.@r>=11) .@val = 50; else if (.@r>=9) .@val = 30; bonus2 bSkillAtk,"GN_SPORE_EXPLOSION",.@val;'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_head_top`,`refineable`,`view`) VALUES (400045,'aegis_400045','Pierced apple','Armor',true,true,1952); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_top`,`view`) VALUES (400046,'aegis_400046','Costume pierced apple','Armor',true,1952); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (400049,'aegis_400049','Stripe Hat','Armor',100,1,true,130,true,1728,'.@r = getrefine();\nbonus bBaseAtk,20*(.@r/2);\nif (.@r>=7) {\n bonus bVariableCastrate,-15;\n}\nif (.@r>=9) {\n bonus bLongAtkRate,15;\n}\nif (.@r>=11) {\n bonus bFixedCast,-200;\n bonus2 bAddSize,Size_Small,15;\n bonus2 bAddSize,Size_Medium,15;\n}'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`job_all`,`job_novice`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (400053,'aegis_400053','Illusion Morrigane\'s Helm','Armor',500,15,1,true,false,true,130,true,257,'.@r = getrefine();\nbonus bCritical,5;\nbonus bStr,5;\nif (.@r>=7) {\n bonus bBaseAtk,50;\n}\nif (.@r>=9) {\n bonus bAspdRate,10;\n}'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (400054,'aegis_400054','Great Magician\'s Ceremonial Crown','Armor',100,1,true,130,true,1811,'.@r = getrefine();\nbonus bMatk,20*(.@r/2);\nif (.@r>=7) {\n bonus bVariableCastrate,-15;\n}\nif (.@r>=9) {\n bonus2 bMagicAtkEle,Ele_All,15;\n}\nif (.@r>=11) {\n bonus bFixedCast,-200;\n bonus2 bMagicAddSize,Size_Small,15;\n bonus2 bMagicAddSize,Size_Medium,15;\n}'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`defense`,`slots`,`job_knight`,`class_third`,`class_third_upper`,`class_third_baby`,`location_armor`,`equip_level_min`,`refineable`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (450018,'Noblesse_Breath_Armor','Noblesse Breath Armor','Armor',20,100,1,true,true,true,true,true,100,true,100,true,true,true,true,true,true,true,'.@r = getrefine(); bonus bMaxHPrate,5; if(.@r>=7) bonus bVariableCastrate,-10; if(.@r>=9) bonus bMaxHPrate,5;'); diff --git a/sql-files/item_db_re_etc.sql b/sql-files/item_db_re_etc.sql index e7ed095ee5..41bce84783 100644 --- a/sql-files/item_db_re_etc.sql +++ b/sql-files/item_db_re_etc.sql @@ -3935,6 +3935,10 @@ 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`,`location_right_hand`,`flag_buyingstore`,`script`) VALUES (31024,'As_Bdy_Knight_Card','Immortal Cursed Knight Card','Card',20,10,true,true,'bonus2 bAddClass,Class_All,10;\nbonus5 bAutoSpell,"RK_IGNITIONBREAK",5,20,BF_WEAPON,1;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_right_hand`,`flag_buyingstore`,`script`) VALUES (31025,'As_Wind_Ghost_Card','Immortal Wind Ghost Card','Card',20,10,true,true,'bonus bMatkRate,10;\nbonus5 bAutoSpell,"SO_CLOUD_KILL",5,10,BF_MAGIC,1;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_shoes`,`flag_buyingstore`,`script`) VALUES (31026,'As_Ragged_Golem_Card','Stephane Jack Earnest Wolf Card','Card',20,10,true,true,'bonus5 bAutoSpellWhenHit,"SO_FIREWALK",5,35,BF_WEAPON,0;\nbonus5 bAutoSpellWhenHit,"SO_ELECTRICWALK",5,80,BF_MAGIC,0;\nautobonus "{ bonus bFlee,200; }",30,10000,BF_WEAPON,"{ specialeffect2 EF_TEIHIT1; }";\nautobonus "{ bonus bSpeedRate,25; }",25,10000,BF_MAGIC,"{ specialeffect2 EF_POTION_BERSERK; }";'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_right_hand`) VALUES (300127,'aegis_300127','Wolf Card','Card',10,true); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_right_hand`,`script`) VALUES (300128,'aegis_300128','Wolf Lugenburg Card','Card',10,true,'bonus2 bAddRace,RC_Insect,15;\nbonus2 bMagicAddRace,RC_Insect,15;'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_right_hand`) VALUES (300129,'aegis_300129','Poe Card','Card',10,true); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_right_hand`) VALUES (300130,'aegis_300130','Poe Richard Card','Card',10,true); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_right_hand`,`script`) VALUES (300140,'aegis_300140','Deep Sea Sropho Card','Card',10,true,'.@r = getrefine();\nbonus2 bMagicAtkEle,Ele_Wind,3;\nif (.@r>=9) {\n bonus2 bMagicAtkEle,Ele_Wind,2;\n}\nif (.@r>=11) {\n bonus2 bMagicAtkEle,Ele_Wind,5;\n}'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_right_accessory`,`location_left_accessory`,`script`) VALUES (300141,'aegis_300141','Deep Sea Obeaune Card','Card',10,true,true,'bonus bMatk,30;'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_right_hand`,`script`) VALUES (300142,'aegis_300142','Deep Sea Deviace Card','Card',10,true,'.@r = getrefine();\nbonus2 bAddRace,RC_Fish,5;\nbonus2 bAddEle,Ele_Water,5;\nif (.@r>=7) {\n bonus2 bAddEle,Ele_Water,5;\n}\nif (.@r>=9) {\n bonus2 bAddRace,RC_Fish,5;\n}'); @@ -3947,3 +3951,4 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`loc REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_garment`,`script`) VALUES (300149,'aegis_300149','Deep Sea Phen Card','Card',10,true,'bonus2 bSubEle,Ele_Neutral,15;\nbonus2 bMagicAtkEle,Ele_Wind,3*getrefine();'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_head_top`,`location_head_mid`,`location_head_low`,`script`) VALUES (300150,'aegis_300150','Deep Sea King Dramoh Card','Card',10,true,true,true,'bonus bMaxHPrate,-5;\nbonus2 bAddClass,Class_All,(getrefine()/3);'); REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`location_right_hand`,`script`) VALUES (300151,'aegis_300151','Deep Sea Kraken Card','Card',10,true,'bonus bLongAtkRate,25;\nbonus bPerfectHitRate,5;'); +REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`) VALUES (1000235,'aegis_1000235','Great Hunter\'s Mark','Etc');