Skip to content

Commit

Permalink
Item fixes (#6136)
Browse files Browse the repository at this point in the history 
* RWC Headgear Set effect fixes
* Fixes wrong sealed card effects
** Fixed Sealed Randgris Card wrong trigger chance and unnecessary trigger criteria "BF_NORMAL" for casting Dispell has been removed.
** Fixed Sealed Detale Card wrong trigger chance and now casts Land Protector on self instead of enemy.

Fixes #6123, #6130, #6150, #6151
  • Loading branch information
@Everade
Everade committed Jul 31, 2021
1 parent ea872f1 commit d8e5908
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 18 deletions.
2 changes: 1 addition & 1 deletion db/re/item_combo_db.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -598,7 +598,7 @@
4627:4628,{ bonus2 bIgnoreDefRaceRate,RC_Formless,50; bonus2 bIgnoreDefRaceRate,RC_Demon,50;}
4629:4630,{ bonus3 bAutoSpell,"NPC_WIDECURSE",2,2; bonus2 bSubEle,Ele_Neutral,5; }
4631:4632,{ bonus5 bAutoSpell,"WZ_VERMILION",1,1,BF_WEAPON,0; }
4635:4636,{ bonus2 bResEff,Eff_Burning,10000; }
4635:4636,{ bonus2 bSubEle,Ele_Dark,100; bonus2 bSubEle,Ele_Undead,100; }
4642:4646,{ bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; }
4643:4646,{ bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; }
4644:4646,{ bonus2 bAddClass,Class_All,10; bonus bMatkRate,10; }
Expand Down
26 changes: 20 additions & 6 deletions db/re/item_db_equip.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47386,8 +47386,12 @@ Body:
Script: |
bonus bAllStats,3;
bonus bAspdRate,10;
bonus2 bAddRace,RC_DemiHuman,5;
bonus2 bAddRace,RC_Player_Human,5;
bonus bFixedCast,-500;
bonus2 bAddRace,RC_DemiHuman,10;
bonus2 bMagicAddRace,RC_DemiHuman,10;
bonus2 bAddRace,RC_Player_Human,10;
bonus2 bMagicAddRace,RC_Player_Human,10;
bonus bUnbreakableHelm;
- Id: 5604
AegisName: RTC_Second_Best
Name: RTC Second Place
Expand All @@ -47412,8 +47416,12 @@ Body:
Script: |
bonus bAllStats,2;
bonus bAspdRate,7;
bonus2 bAddRace,RC_DemiHuman,3;
bonus2 bAddRace,RC_Player_Human,3;
bonus bFixedCast,-300;
bonus2 bAddRace,RC_DemiHuman,5;
bonus2 bMagicAddRace,RC_DemiHuman,5;
bonus2 bAddRace,RC_Player_Human,5;
bonus2 bMagicAddRace,RC_Player_Human,5;
bonus bUnbreakableHelm;
- Id: 5605
AegisName: RTC_Third_Best
Name: RTC Third Place
Expand All @@ -47438,8 +47446,12 @@ Body:
Script: |
bonus bAllStats,1;
bonus bAspdRate,5;
bonus2 bAddRace,RC_DemiHuman,1;
bonus2 bAddRace,RC_Player_Human,1;
bonus bFixedCast,-100;
bonus2 bAddRace,RC_DemiHuman,3;
bonus2 bMagicAddRace,RC_DemiHuman,3;
bonus2 bAddRace,RC_Player_Human,3;
bonus2 bMagicAddRace,RC_Player_Human,3;
bonus bUnbreakableHelm;
- Id: 5606
AegisName: Campume_Hat
Name: Champune Hat
Expand Down Expand Up @@ -82199,6 +82211,8 @@ Body:
Type: Armor
Locations:
Costume_Head_Top: true
Costume_Head_Mid: true
Costume_Head_Low: true
EquipLevelMin: 1
View: 676
Trade:
Expand Down
8 changes: 4 additions & 4 deletions db/re/item_db_etc.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10338,9 +10338,9 @@ Body:
BuyingStore: true
DropEffect: CLIENT
Script: |
bonus2 bAddClass,Class_All,(getrefine()>=15?8:5);
bonus5 bAutoSpell,"SA_DISPELL",1,1,BF_NORMAL,1;
bonus bUnbreakableWeapon;
bonus2 bAddClass,Class_All,(getrefine()>=15?8:5);
bonus3 bAutoSpell,"SA_DISPELL",1,25;
- Id: 4536
AegisName: Sealed_Atroce_Card
Name: Sealed Atroce Card
Expand Down Expand Up @@ -10456,9 +10456,9 @@ Body:
BuyingStore: true
DropEffect: CLIENT
Script: |
bonus2 bResEff,Eff_Freeze,(getrefine()>=15?6000:4000);
bonus5 bAutoSpell,"SA_LANDPROTECTOR",1,1,BF_MAGIC,1;
bonus bMdef,-20;
bonus2 bResEff,Eff_Freeze,(getrefine()>=15?6000:4000);
bonus5 bAutoSpellWhenHit,"SA_LANDPROTECTOR",1,35,BF_MAGIC,0;
- Id: 4543
AegisName: SLD_Garm_Card
Name: Sealed Hatii Card
Expand Down
10 changes: 5 additions & 5 deletions sql-files/item_db_re_equip.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2279,9 +2279,9 @@ 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_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5600,'Br_Twin_Ribbon','Brazil Twin Ribbon','Armor',20,100,1,true,1,true,575,'bonus bAllStats,3;\nbonus bMdef,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5601,'Br_Beret','Brazil Beret','Armor',20,100,1,true,1,true,576,'bonus bAllStats,3;\nbonus bMdef,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`slots`,`location_head_mid`,`location_head_low`,`equip_level_min`,`view`,`script`) VALUES (5602,'Jaguar_Hat_J','Jaguar Hat J','Armor',20,300,1,true,true,50,530,'bonus2 bAddEle,Ele_Fire,5;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5603,'RTC_Winner_Only','RTC First Place','Armor',250,8,1,true,1,true,577,100,true,true,true,true,true,true,true,'bonus bAllStats,3;\nbonus bAspdRate,10;\nbonus2 bAddRace,RC_DemiHuman,5;\nbonus2 bAddRace,RC_Player_Human,5;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5604,'RTC_Second_Best','RTC Second Place','Armor',250,6,1,true,1,true,578,100,true,true,true,true,true,true,true,'bonus bAllStats,2;\nbonus bAspdRate,7;\nbonus2 bAddRace,RC_DemiHuman,3;\nbonus2 bAddRace,RC_Player_Human,3;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5605,'RTC_Third_Best','RTC Third Place','Armor',250,4,1,true,1,true,579,100,true,true,true,true,true,true,true,'bonus bAllStats,1;\nbonus bAspdRate,5;\nbonus2 bAddRace,RC_DemiHuman,1;\nbonus2 bAddRace,RC_Player_Human,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5603,'RTC_Winner_Only','RTC First Place','Armor',250,8,1,true,1,true,577,100,true,true,true,true,true,true,true,'bonus bAllStats,3;\nbonus bAspdRate,10;\nbonus bFixedCast,-500;\nbonus2 bAddRace,RC_DemiHuman,10;\nbonus2 bMagicAddRace,RC_DemiHuman,10;\nbonus2 bAddRace,RC_Player_Human,10;\nbonus2 bMagicAddRace,RC_Player_Human,10;\nbonus bUnbreakableHelm;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5604,'RTC_Second_Best','RTC Second Place','Armor',250,6,1,true,1,true,578,100,true,true,true,true,true,true,true,'bonus bAllStats,2;\nbonus bAspdRate,7;\nbonus bFixedCast,-300;\nbonus2 bAddRace,RC_DemiHuman,5;\nbonus2 bMagicAddRace,RC_DemiHuman,5;\nbonus2 bAddRace,RC_Player_Human,5;\nbonus2 bMagicAddRace,RC_Player_Human,5;\nbonus bUnbreakableHelm;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (5605,'RTC_Third_Best','RTC Third Place','Armor',250,4,1,true,1,true,579,100,true,true,true,true,true,true,true,'bonus bAllStats,1;\nbonus bAspdRate,5;\nbonus bFixedCast,-100;\nbonus2 bAddRace,RC_DemiHuman,3;\nbonus2 bMagicAddRace,RC_DemiHuman,3;\nbonus2 bAddRace,RC_Player_Human,3;\nbonus2 bMagicAddRace,RC_Player_Human,3;\nbonus bUnbreakableHelm;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`defense`,`location_head_top`,`equip_level_min`,`refineable`,`view`,`script`) VALUES (5606,'Campume_Hat','Champune Hat','Armor',500,1200,4,true,3,true,580,'bonus bAllStats,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`slots`,`location_head_top`,`equip_level_min`,`view`,`script`) VALUES (5607,'Lyria_Doll_Hat','Lyria Doll Hat','Armor',500,1,true,60,581,'bonus bMaxHP,500;\nbonus2 bSubRace,RC_DemiHuman,5;\nbonus2 bSubRace,RC_Player_Human,5;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`slots`,`location_head_top`,`equip_level_min`,`view`,`script`) VALUES (5608,'Dorothy_Doll_Hat','Dorothy Doll Hat','Armor',500,1,true,60,582,'bonus bMaxSP,80;\nbonus2 bSubRace,RC_DemiHuman,5;\nbonus2 bSubRace,RC_Player_Human,5;');
Expand Down Expand Up @@ -4028,7 +4028,7 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_cos
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_Mid`,`location_costume_head_Low`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`) VALUES (19564,'C_Tiger_Arhat_Mask','Costume Tiger Arhat Mask','Armor',true,true,1,546,100,true);
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_top`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (19565,'C_Chung_Hairband','Costume Chung Hairpin','Armor',true,1,583,100,true,'bonus bInt,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_Low`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`) VALUES (19566,'C_Samurai_Mask','Costume Samurai Mask','Armor',true,1,644,100,true);
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_top`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (19567,'C_Hatta_Black','Costume Hatta Black','Armor',true,1,676,100,true,'bonus bVit,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_top`,`location_costume_head_Mid`,`location_costume_head_Low`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (19567,'C_Hatta_Black','Costume Hatta Black','Armor',true,true,true,1,676,100,true,'bonus bVit,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_top`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (19568,'C_Ancient_Horns','Costume Ancient Horns','Armor',true,1,757,100,true,'bonus bStr,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_top`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (19569,'C_Sprout_Hat','Costume Sprout Hat','Armor',true,1,758,100,true,'bonus bInt,1;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`location_costume_head_top`,`equip_level_min`,`view`,`trade_override`,`trade_nodrop`,`script`) VALUES (19570,'C_Mercury_Riser','Costume Mercury Riser','Armor',true,1,759,100,true,'bonus bLuk,1;');
Expand Down Expand Up @@ -7243,8 +7243,8 @@ REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`defense`,`sl
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_right_accessory`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (490017,'Imperial_Attack_Ring','Imperial Attack Ring','Armor',0,8,1,true,125,100,true,true,true,true,true,true,true,'bonus bAspdRate,5;\nbonus bVariableCastrate,-7;\nbonus bCritAtkRate,7;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_right_accessory`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (490018,'Imperial_Magic_Ring','Imperial Magic Ring','Armor',0,8,1,true,125,100,true,true,true,true,true,true,true,'bonus bAspdRate,5;\nbonus bVariableCastrate,-7;\nbonus2 bMagicAddEle,Ele_All,7;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_right_accessory`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (490019,'Grace_Attack_Ring','Grace Attack Ring','Armor',0,10,1,true,150,100,true,true,true,true,true,true,true,'bonus bAspdRate,7;\nbonus bVariableCastrate,-10;\nbonus bCritAtkRate,10;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_right_accessory`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (490020,'Grace_Magic_Ring','Grace Magic Ring','Armor',0,10,1,true,150,100,true,true,true,true,true,true,true,'bonus bAspdRate,7;\nbonus bVariableCastrate,-10;\nbonus2 bMagicAddEle,Ele_All,10;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`slots`,`location_right_accessory`,`location_left_accessory`,`equip_level_min`,`script`) VALUES (490022,'TrustRing','Thunder Ring','Armor',300,1,true,true,100,'bonus2 bAddRace,RC_All,5;\nbonus bMatkRate,5;\nbonus2 bAddEle,Ele_Water,10;\nbonus2 bMagicAddEle,Ele_Water,10;\nbonus2 bSubEle,Ele_Water,5;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`defense`,`slots`,`location_right_accessory`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nocart`,`trade_nostorage`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (490020,'Grace_Magic_Ring','Grace Magic Ring','Armor',0,10,1,true,150,100,true,true,true,true,true,true,true,'bonus bAspdRate,7;\nbonus bVariableCastrate,-10;\nbonus2 bMagicAddEle,Ele_All,10;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`slots`,`location_right_accessory`,`equip_level_min`,`script`) VALUES (490024,'Auto_B_R','Automatic Booster R','Armor',100,1,true,160,'bonus2 bAddClass,Class_All,5;\nbonus bMaxHPrate,5;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`slots`,`location_left_accessory`,`equip_level_min`,`script`) VALUES (490025,'Auto_B_L','Automatic Booster L','Armor',100,1,true,160,'bonus2 bAddClass,Class_All,5;\nbonus bMaxSPrate,5;');
REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`slots`,`location_right_accessory`,`equip_level_min`,`script`) VALUES (490026,'Auto_BC_R','Automatic Battle Chip R','Armor',100,1,true,160,'bonus bMatkRate,5;\nbonus bMaxHPrate,5;');
Expand Down
Loading

0 comments on commit d8e5908

Please sign in to comment.