Przeglądaj źródła

Implemented the items from sky fortress instance (#5479)

* Implemented the items from sky fortress instance (part of https://github.com/rathena/rathena/pull/3586)

Co-authored-by: Lemongrass3110 <lemongrass@kstp.at>
Atemo 4 lat temu
rodzic
commit
99e75b07bc

+ 2 - 0
db/re/item_combo_db.txt

@@ -1442,6 +1442,8 @@
 28907:2998,{ bonus bSpeedRate,25; }
 28908:2998,{ bonus bDelayrate,-10; }
 28909:2998,{ bonus bUseSPrate,-10; bonus bMaxSPrate,10; }
+31024:31026,{ bonus bAspd,1; }
+31025:31026,{ bonus bVariableCastrate,-10; }
 32228:15388:15389,{ bonus bBaseAtk,25; bonus bHit,10; }
 32229:15388:15389,{ bonus bMatk,25; bonus bVariableCastrate,-8; }
 32230:15388:15389,{ bonus bCritAtkRate,7; bonus2 bAddClass,Class_All,5; }

+ 41 - 0
db/re/item_db_etc.yml

@@ -37400,3 +37400,44 @@ Body:
       Right_Hand: true
     Script: |
       bonus bMatkRate,10; bonus5 bAutoSpell,"NPC_CRITICALWOUND",3,5+(10*(getrefine()/3)),BF_MAGIC,1;
+  - Id: 31024
+    AegisName: As_Bdy_Knight_Card
+    Name: Immortal Cursed Knight Card
+    Type: Card
+    Buy: 20
+    Weight: 10
+    Locations:
+      Right_Hand: true
+    Flags:
+      BuyingStore: true
+    Script: |
+      bonus2 bAddClass,Class_All,10;
+      bonus5 bAutoSpell,"RK_IGNITIONBREAK",5,20,BF_WEAPON,1;
+  - Id: 31025
+    AegisName: As_Wind_Ghost_Card
+    Name: Immortal Wind Ghost Card
+    Type: Card
+    Buy: 20
+    Weight: 10
+    Locations:
+      Right_Hand: true
+    Flags:
+      BuyingStore: true
+    Script: |
+      bonus bMatkRate,10;
+      bonus5 bAutoSpell,"SO_CLOUD_KILL",5,10,BF_MAGIC,1;
+  - Id: 31026
+    AegisName: As_Ragged_Golem_Card
+    Name: Stephane Jack Earnest Wolf Card
+    Type: Card
+    Buy: 20
+    Weight: 10
+    Locations:
+      Shoes: true
+    Flags:
+      BuyingStore: true
+    Script: |
+      bonus5 bAutoSpellWhenHit,"SO_FIREWALK",5,35,BF_WEAPON,0;
+      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; }";

+ 8 - 7
db/re/item_db_usable.yml

@@ -31519,7 +31519,7 @@ Body:
     Script: |
       sc_start SC_LIFEINSURANCE,3600000,0;
   - Id: 14505
-    AegisName: Dungeon_1_hour_Ticket
+    AegisName: Dun_1HR_Voucher
     Name: Dungeon 1 Hour Ticket
     Type: Usable
     Buy: 20
@@ -31534,10 +31534,10 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      warp "1@sthb",0,0; /*No map+coord info*/
+      warp "dali02",117,69; 
   - Id: 14506
-    AegisName: Dungeon_Ticket
-    Name: Dungeon Ticket
+    AegisName: Dun_Voucher
+    Name: Dungeon 1 Hour Ticket
     Type: Usable
     Buy: 20
     Trade:
@@ -31551,7 +31551,8 @@ Body:
       NoMail: true
       NoAuction: true
     Script: |
-      warp "1@sthc",0,0; /*No map+coord info*/
+      select("Invasion of Air Stronghold - Lv. 145 or higher");
+      warp "dali02",117,69;
   - Id: 14508
     AegisName: Zeny_Scroll
     Name: Zeny Pet Egg Scroll
@@ -42939,8 +42940,8 @@ Body:
     Script: |
       getitem 22902,11; bonus_script "{ bonus bAllStats,10; bonus bBaseAtk,30; bonus bMatk,30; }",1800;
   - Id: 17569
-    AegisName: Dungeon_1_hour_Ticket_Box
-    Name: Dungeon 1 Hour Ticket Box
+    AegisName: Dun_Voucher_Box1
+    Name: Sky Fortress Ticket 1 Hour Box
     Type: Usable
     Buy: 20
     Weight: 10

+ 3 - 0
sql-files/item_db_re_etc.sql

@@ -4036,3 +4036,6 @@ 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`,`script`) VALUES (31021,'Dancing_Marionette_Card','Dancing Marionette Card','Card',20,10,true,'bonus bAspdRate,10; bonus2 bAddClass,Class_All,-3;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_shoes`,`script`) VALUES (31022,'Abandoned_Teddy_Bear_Card','Abandoned Teddy Bear Card','Card',20,10,true,'bonus bMaxSPRate,20; bonus2 bAddEff2,Eff_Curse,20;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`location_right_hand`,`script`) VALUES (31023,'Celine_Kimi_Card','Celine Kimi Card','Card',20,10,true,'bonus bMatkRate,10; bonus5 bAutoSpell,"NPC_CRITICALWOUND",3,5+(10*(getrefine()/3)),BF_MAGIC,1;');
+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; }";');

+ 3 - 3
sql-files/item_db_re_usable.sql

@@ -2274,8 +2274,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_uniqueid`,`script`) VALUES (14498,'Pisces_Crown_Box','Pisces Crown Box','Cash',20,10,true,'getitem 5515,1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`flag_uniqueid`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (14499,'Peacock_Feather_Box','Peacock Feather Box','Cash',20,10,true,100,true,true,true,true,true,true,true,'getitem 5519,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 (14500,'Insurance60','Life Insurrance Certificate','Usable',20,10,100,true,true,true,true,true,true,true,'sc_start SC_LIFEINSURANCE,3600000,0;');
-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`,`script`) VALUES (14505,'Dungeon_1_hour_Ticket','Dungeon 1 Hour Ticket','Usable',20,100,true,true,true,true,true,true,true,true,'warp "1@sthb",0,0; /*No map+coord info*/');
-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`,`script`) VALUES (14506,'Dungeon_Ticket','Dungeon Ticket','Usable',20,100,true,true,true,true,true,true,true,true,'warp "1@sthc",0,0; /*No map+coord info*/');
+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`,`script`) VALUES (14505,'Dun_1HR_Voucher','Dungeon 1 Hour Ticket','Usable',20,100,true,true,true,true,true,true,true,true,'warp "dali02",117,69;');
+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`,`script`) VALUES (14506,'Dun_Voucher','Dungeon 1 Hour Ticket','Usable',20,100,true,true,true,true,true,true,true,true,'select("Invasion of Air Stronghold - Lv. 145 or higher");\nwarp "dali02",117,69;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (14508,'Zeny_Scroll','Zeny Pet Egg Scroll','Usable',10,100,true,true,true,true,true,true,true,'Zeny += rand(1000,77777);');
 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 (14509,'Light_Center_Pot','Light Concentration Potion','Usable',800,20,100,true,true,true,true,true,true,true,'sc_start SC_ASPDPOTION0,1800000,4;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`price_buy`,`weight`,`job_alchemist`,`job_archer`,`job_assassin`,`job_blacksmith`,`job_crusader`,`job_gunslinger`,`job_hunter`,`job_kagerouoboro`,`job_knight`,`job_mage`,`job_merchant`,`job_monk`,`job_ninja`,`job_novice`,`job_rebellion`,`job_rogue`,`job_sage`,`job_soullinker`,`job_stargladiator`,`job_summoner`,`job_supernovice`,`job_swordman`,`job_taekwon`,`job_thief`,`job_wizard`,`equip_level_min`,`trade_override`,`trade_nodrop`,`trade_notrade`,`trade_nosell`,`trade_nocart`,`trade_noguildstorage`,`trade_nomail`,`trade_noauction`,`script`) VALUES (14510,'Light_Awakening_Pot','Light Awakening Potion','Usable',1500,20,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,true,40,100,true,true,true,true,true,true,true,'sc_start SC_ASPDPOTION1,1800000,6;');
@@ -3095,7 +3095,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`,`weight`,`flag_container`,`script`) VALUES (17552,'Garnet_Lucky_Scroll','Garnet Lucky Egg','Cash',10,true,'getgroupitem(IG_Garnet_Lucky_Scroll);');
 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 (17567,'Event_Almighty_Box__','Event Almighty Box','Cash',20,10,100,true,true,true,true,true,true,true,'getitem 22902,1; bonus_script "{ bonus bAllStats,10; bonus bBaseAtk,30; bonus bMatk,30; }",1800;');
 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 (17568,'Event_Almighty_Box_100_','Event Almighty Box(100)','Cash',20,10,100,true,true,true,true,true,true,true,'getitem 22902,11; bonus_script "{ bonus bAllStats,10; bonus bBaseAtk,30; bonus bMatk,30; }",1800;');
-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 (17569,'Dungeon_1_hour_Ticket_Box','Dungeon 1 Hour Ticket Box','Usable',20,10,100,true,true,true,true,true,true,true,'getitem 14505,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 (17569,'Dun_Voucher_Box1','Sky Fortress Ticket 1 Hour Box','Usable',20,10,100,true,true,true,true,true,true,true,'getitem 14505,1;');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`flag_container`,`script`) VALUES (17572,'Erzulie_Lucky_Scroll','Erzulie Lucky Egg','Cash',10,true,'getgroupitem(IG_Erzulie_Lucky_Scroll);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`flag_container`,`script`) VALUES (17584,'Venus_Lucky_Scroll','Venus Lucky Egg','Cash',10,true,'getgroupitem(IG_Venus_Lucky_Scroll);');
 REPLACE INTO `item_db_re` (`id`,`name_aegis`,`name_english`,`type`,`weight`,`flag_container`,`script`) VALUES (17588,'Amora_Lucky_Scroll','Amora Lucky Egg','Cash',10,true,'getgroupitem(IG_Amora_Lucky_Scroll);');