Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- Modified and simplified the random item group format. It now is <GroupID>,<ItemID>,<Rate>, where Rate normally is 1, greater numbers is the equivalent of adding the line multiple times.

Browse Source 
- Added constants to identify all groups to db/const.txt
- Cleaned up and updated item_db to use these new constants (warning: item_db.sql needs to be updated!)


git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@6275 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
skotlex 2006-04-25 18:05:40 +00:00
parent 4b4b96ea91
commit f983dc57c3
18 changed files with 17365 additions and 20159 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Changelog-Trunk.txt
View File

@ -2,7 +2,15 @@ Date Added
AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK. AS OF SVN REV. 5091, WE ARE NOW USING TRUNK. ALL UNTESTED BUGFIXES/FEATURES GO INTO TRUNK.
IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK. IF YOU HAVE A WORKING AND TESTED BUGFIX PUT IT INTO STABLE AS WELL AS TRUNK.
2006/04/25
* Modified and simplified the random item group format. It now is
<GroupID>,<ItemID>,<Rate>, where Rate normally is 1, greater numbers is the
equivalent of adding the line multiple times. Also has support for import
lines. [Skotlex]
* Added constants to identify all item groups to db/const.txt [Skotlex]
* Cleaned up and updated item_db to use these new constants (warning:
item_db.sql needs to be updated! Sql-db users should not update until this
file is updated) [Skotlex]
2006/04/24 2006/04/24
* Simplified npc_gettimerevent_tick so that it should return a tick value * Simplified npc_gettimerevent_tick so that it should return a tick value
even after the last ontimer label has been reached. [Skotlex] even after the last ontimer label has been reached. [Skotlex]

28
db/const.txt
View File

@ -347,6 +347,34 @@ RC_Dragon 9
RC_Boss 10 RC_Boss 10
RC_NonBoss 11 RC_NonBoss 11
IG_BlueBox 1
IG_VioletBox 2
IG_CardAlbum 3
IG_GiftBox 4
IG_ScrollBox 5
IG_FingingOre 6
IG_CookieBag 7
IG_Potion 8
IG_Herb 9
IG_Fruit 10
IG_Meat 11
IG_Candy 12
IG_Juice 13
IG_Fish 14
IG_Box 15
IG_Gemstone 16
IG_Jellopy 17
IG_Ore 18
IG_Food 19
IG_Recovery 20
IG_Mineral 21
IG_Taming 22
IG_Scroll 23
IG_Quiver 24
IG_Mask 25
IG_Accesory 26
IG_Jewel 27
SC_STONE 0 SC_STONE 0
SC_FREEZE 1 SC_FREEZE 1
SC_STAN 2 SC_STAN 2

16612
db/item_bluebox.txt
View File

File diff suppressed because it is too large Load Diff

937
db/item_cardalbum.txt
View File

@ -1,473 +1,472 @@
// Old Card Album Obtainable Items Database // Old Card Album Obtainable Items Database
// //
// Structure of Database: // Structure of Database:
// ItemID,DummyName,Rate // GroupID,ItemID,Rate
0,Poring Card,4001 3,4001,1 //Poring Card
4001,Poring Card,100000 3,4001,1 //Poring Card
4001,Poring Card,100000 3,4001,1 //Poring Card
4001,Poring Card,100000 3,4001,1 //Poring Card
4001,Poring Card,100000 3,4001,1 //Poring Card
4001,Poring Card,100000 3,4001,1 //Poring Card
4001,Poring Card,100000 3,4001,1 //Poring Card
4001,Poring Card,100000 3,4002,1 //Fabre Card
4002,Fabre Card,100000 3,4002,1 //Fabre Card
4002,Fabre Card,100000 3,4002,1 //Fabre Card
4002,Fabre Card,100000 3,4002,1 //Fabre Card
4002,Fabre Card,100000 3,4002,1 //Fabre Card
4002,Fabre Card,100000 3,4002,1 //Fabre Card
4002,Fabre Card,100000 3,4002,1 //Fabre Card
4002,Fabre Card,100000 3,4003,1 //Pupa Card
4003,Pupa Card,100000 3,4003,1 //Pupa Card
4003,Pupa Card,100000 3,4003,1 //Pupa Card
4003,Pupa Card,100000 3,4003,1 //Pupa Card
4003,Pupa Card,100000 3,4003,1 //Pupa Card
4003,Pupa Card,100000 3,4003,1 //Pupa Card
4003,Pupa Card,100000 3,4004,1 //Drops Card
4004,Drops Card,100000 3,4004,1 //Drops Card
4004,Drops Card,100000 3,4004,1 //Drops Card
4004,Drops Card,100000 3,4004,1 //Drops Card
4004,Drops Card,100000 3,4004,1 //Drops Card
4004,Drops Card,100000 3,4004,1 //Drops Card
4004,Drops Card,100000 3,4004,1 //Drops Card
4004,Drops Card,100000 3,4005,1 //Santa Poring Card
4005,Santa Poring Card,100000 3,4006,1 //Lunatic Card
4006,Lunatic Card,100000 3,4006,1 //Lunatic Card
4006,Lunatic Card,100000 3,4006,1 //Lunatic Card
4006,Lunatic Card,100000 3,4006,1 //Lunatic Card
4006,Lunatic Card,100000 3,4006,1 //Lunatic Card
4006,Lunatic Card,100000 3,4006,1 //Lunatic Card
4006,Lunatic Card,100000 3,4006,1 //Lunatic Card
4006,Lunatic Card,100000 3,4007,1 //Peco Peco Egg Card
4007,Peco Peco Egg Card,100000 3,4007,1 //Peco Peco Egg Card
4007,Peco Peco Egg Card,100000 3,4007,1 //Peco Peco Egg Card
4007,Peco Peco Egg Card,100000 3,4007,1 //Peco Peco Egg Card
4007,Peco Peco Egg Card,100000 3,4008,1 //Picky Card
4008,Picky Card,100000 3,4008,1 //Picky Card
4008,Picky Card,100000 3,4008,1 //Picky Card
4008,Picky Card,100000 3,4008,1 //Picky Card
4008,Picky Card,100000 3,4008,1 //Picky Card
4008,Picky Card,100000 3,4008,1 //Picky Card
4008,Picky Card,100000 3,4008,1 //Picky Card
4008,Picky Card,100000 3,4009,1 //Chonchon Card
4009,Chonchon Card,100000 3,4009,1 //Chonchon Card
4009,Chonchon Card,100000 3,4009,1 //Chonchon Card
4009,Chonchon Card,100000 3,4009,1 //Chonchon Card
4009,Chonchon Card,100000 3,4009,1 //Chonchon Card
4009,Chonchon Card,100000 3,4009,1 //Chonchon Card
4009,Chonchon Card,100000 3,4009,1 //Chonchon Card
4009,Chonchon Card,100000 3,4010,1 //Willow Card
4010,Willow Card,100000 3,4010,1 //Willow Card
4010,Willow Card,100000 3,4010,1 //Willow Card
4010,Willow Card,100000 3,4010,1 //Willow Card
4010,Willow Card,100000 3,4010,1 //Willow Card
4010,Willow Card,100000 3,4010,1 //Willow Card
4010,Willow Card,100000 3,4010,1 //Willow Card
4010,Willow Card,100000 3,4011,1 //Picky Egg Card
4011,Picky Egg Card,100000 3,4011,1 //Picky Egg Card
4011,Picky Egg Card,100000 3,4011,1 //Picky Egg Card
4011,Picky Egg Card,100000 3,4011,1 //Picky Egg Card
4011,Picky Egg Card,100000 3,4011,1 //Picky Egg Card
4011,Picky Egg Card,100000 3,4011,1 //Picky Egg Card
4011,Picky Egg Card,100000 3,4011,1 //Picky Egg Card
4011,Picky Egg Card,100000 3,4012,1 //Thief Bug Egg Card
4012,Thief Bug Egg Card,100000 3,4012,1 //Thief Bug Egg Card
4012,Thief Bug Egg Card,100000 3,4012,1 //Thief Bug Egg Card
4012,Thief Bug Egg Card,100000 3,4012,1 //Thief Bug Egg Card
4012,Thief Bug Egg Card,100000 3,4012,1 //Thief Bug Egg Card
4012,Thief Bug Egg Card,100000 3,4013,1 //Andre Egg Card
4013,Andre Egg Card,100000 3,4013,1 //Andre Egg Card
4013,Andre Egg Card,100000 3,4013,1 //Andre Egg Card
4013,Andre Egg Card,100000 3,4013,1 //Andre Egg Card
4013,Andre Egg Card,100000 3,4013,1 //Andre Egg Card
4013,Andre Egg Card,100000 3,4014,1 //Roda Frog Card
4014,Roda Frog Card,100000 3,4014,1 //Roda Frog Card
4014,Roda Frog Card,100000 3,4014,1 //Roda Frog Card
4014,Roda Frog Card,100000 3,4014,1 //Roda Frog Card
4014,Roda Frog Card,100000 3,4014,1 //Roda Frog Card
4014,Roda Frog Card,100000 3,4015,1 //Condor Card
4015,Condor Card,100000 3,4015,1 //Condor Card
4015,Condor Card,100000 3,4015,1 //Condor Card
4015,Condor Card,100000 3,4015,1 //Condor Card
4015,Condor Card,100000 3,4015,1 //Condor Card
4015,Condor Card,100000 3,4016,1 //Thief Bug Card
4016,Thief Bug Card,100000 3,4016,1 //Thief Bug Card
4016,Thief Bug Card,100000 3,4016,1 //Thief Bug Card
4016,Thief Bug Card,100000 3,4016,1 //Thief Bug Card
4016,Thief Bug Card,100000 3,4016,1 //Thief Bug Card
4016,Thief Bug Card,100000 3,4017,1 //Savage Babe Card
4017,Savage Babe Card,100000 3,4017,1 //Savage Babe Card
4017,Savage Babe Card,100000 3,4017,1 //Savage Babe Card
4017,Savage Babe Card,100000 3,4017,1 //Savage Babe Card
4017,Savage Babe Card,100000 3,4017,1 //Savage Babe Card
4017,Savage Babe Card,100000 3,4019,1 //Hornet Card
4019,Hornet Card,100000 3,4019,1 //Hornet Card
4019,Hornet Card,100000 3,4019,1 //Hornet Card
4019,Hornet Card,100000 3,4019,1 //Hornet Card
4019,Hornet Card,100000 3,4019,1 //Hornet Card
4019,Hornet Card,100000 3,4020,1 //Farmiliar Card
4020,Farmiliar Card,100000 3,4020,1 //Farmiliar Card
4020,Farmiliar Card,100000 3,4020,1 //Farmiliar Card
4020,Farmiliar Card,100000 3,4020,1 //Farmiliar Card
4020,Farmiliar Card,100000 3,4020,1 //Farmiliar Card
4020,Farmiliar Card,100000 3,4021,1 //Rocker Card
4021,Rocker Card,100000 3,4021,1 //Rocker Card
4021,Rocker Card,100000 3,4021,1 //Rocker Card
4021,Rocker Card,100000 3,4021,1 //Rocker Card
4021,Rocker Card,100000 3,4021,1 //Rocker Card
4021,Rocker Card,100000 3,4022,1 //Spore Card
4022,Spore Card,100000 3,4022,1 //Spore Card
4022,Spore Card,100000 3,4022,1 //Spore Card
4022,Spore Card,100000 3,4022,1 //Spore Card
4022,Spore Card,100000 3,4022,1 //Spore Card
4022,Spore Card,100000 3,4023,1 //Baby Desert Wolf Card
4023,Baby Desert Wolf Card,100000 3,4023,1 //Baby Desert Wolf Card
4023,Baby Desert Wolf Card,100000 3,4023,1 //Baby Desert Wolf Card
4023,Baby Desert Wolf Card,100000 3,4023,1 //Baby Desert Wolf Card
4023,Baby Desert Wolf Card,100000 3,4023,1 //Baby Desert Wolf Card
4023,Baby Desert Wolf Card,100000 3,4024,1 //Plankton Card
4024,Plankton Card,100000 3,4024,1 //Plankton Card
4024,Plankton Card,100000 3,4024,1 //Plankton Card
4024,Plankton Card,100000 3,4024,1 //Plankton Card
4024,Plankton Card,100000 3,4024,1 //Plankton Card
4024,Plankton Card,100000 3,4025,1 //Skeleton Card
4025,Skeleton Card,100000 3,4025,1 //Skeleton Card
4025,Skeleton Card,100000 3,4025,1 //Skeleton Card
4025,Skeleton Card,100000 3,4025,1 //Skeleton Card
4025,Skeleton Card,100000 3,4025,1 //Skeleton Card
4025,Skeleton Card,100000 3,4026,1 //Female Thief Bug Card
4026,Female Thief Bug Card,100000 3,4026,1 //Female Thief Bug Card
4026,Female Thief Bug Card,100000 3,4026,1 //Female Thief Bug Card
4026,Female Thief Bug Card,100000 3,4027,1 //Kukre Card
4027,Kukre Card,100000 3,4027,1 //Kukre Card
4027,Kukre Card,100000 3,4027,1 //Kukre Card
4027,Kukre Card,100000 3,4028,1 //Tarou Card
4028,Tarou Card,100000 3,4028,1 //Tarou Card
4028,Tarou Card,100000 3,4028,1 //Tarou Card
4028,Tarou Card,100000 3,4029,1 //Wolf Card
4029,Wolf Card,100000 3,4029,1 //Wolf Card
4029,Wolf Card,100000 3,4029,1 //Wolf Card
4029,Wolf Card,100000 3,4030,1 //Mandragora Card
4030,Mandragora Card,100000 3,4030,1 //Mandragora Card
4030,Mandragora Card,100000 3,4030,1 //Mandragora Card
4030,Mandragora Card,100000 3,4031,1 //Peco Peco Card
4031,Peco Peco Card,100000 3,4031,1 //Peco Peco Card
4031,Peco Peco Card,100000 3,4031,1 //Peco Peco Card
4031,Peco Peco Card,100000 3,4032,1 //Ambernite Card
4032,Ambernite Card,100000 3,4032,1 //Ambernite Card
4032,Ambernite Card,100000 3,4032,1 //Ambernite Card
4032,Ambernite Card,100000 3,4033,1 //Poporing Card
4033,Poporing Card,100000 3,4033,1 //Poporing Card
4033,Poporing Card,100000 3,4033,1 //Poporing Card
4033,Poporing Card,100000 3,4034,1 //Wormtail Card
4034,Wormtail Card,100000 3,4034,1 //Wormtail Card
4034,Wormtail Card,100000 3,4034,1 //Wormtail Card
4034,Wormtail Card,100000 3,4035,1 //Hydra Card
4035,Hydra Card,100000 3,4035,1 //Hydra Card
4035,Hydra Card,100000 3,4035,1 //Hydra Card
4035,Hydra Card,100000 3,4036,1 //Muka Card
4036,Muka Card,100000 3,4036,1 //Muka Card
4036,Muka Card,100000 3,4036,1 //Muka Card
4036,Muka Card,100000 3,4037,1 //Snake Card
4037,Snake Card,100000 3,4037,1 //Snake Card
4037,Snake Card,100000 3,4037,1 //Snake Card
4037,Snake Card,100000 3,4038,1 //Zombie Card
4038,Zombie Card,100000 3,4038,1 //Zombie Card
4038,Zombie Card,100000 3,4038,1 //Zombie Card
4038,Zombie Card,100000 3,4039,1 //Stainer Card
4039,Stainer Card,100000 3,4039,1 //Stainer Card
4039,Stainer Card,100000 3,4039,1 //Stainer Card
4039,Stainer Card,100000 3,4040,1 //Creamy Card
4040,Creamy Card,100000 3,4040,1 //Creamy Card
4040,Creamy Card,100000 3,4040,1 //Creamy Card
4040,Creamy Card,100000 3,4041,1 //Coco Card
4041,Coco Card,100000 3,4041,1 //Coco Card
4041,Coco Card,100000 3,4041,1 //Coco Card
4041,Coco Card,100000 3,4042,1 //Steel Chonchon Card
4042,Steel Chonchon Card,100000 3,4042,1 //Steel Chonchon Card
4042,Steel Chonchon Card,100000 3,4042,1 //Steel Chonchon Card
4042,Steel Chonchon Card,100000 3,4043,1 //Andre Card
4043,Andre Card,100000 3,4043,1 //Andre Card
4043,Andre Card,100000 3,4043,1 //Andre Card
4043,Andre Card,100000 3,4044,1 //Smokie Card
4044,Smokie Card,100000 3,4044,1 //Smokie Card
4044,Smokie Card,100000 3,4044,1 //Smokie Card
4044,Smokie Card,100000 3,4045,1 //Horn Card
4045,Horn Card,100000 3,4045,1 //Horn Card
4045,Horn Card,100000 3,4045,1 //Horn Card
4045,Horn Card,100000 3,4046,1 //Martin Card
4046,Martin Card,100000 3,4046,1 //Martin Card
4046,Martin Card,100000 3,4046,1 //Martin Card
4046,Martin Card,100000 3,4047,1 //Ghostring Card
4047,Ghostring Card,100000 3,4048,1 //Poison Spore Card
4048,Poison Spore Card,100000 3,4048,1 //Poison Spore Card
4048,Poison Spore Card,100000 3,4048,1 //Poison Spore Card
4048,Poison Spore Card,100000 3,4049,1 //Vadon Card
4049,Vadon Card,100000 3,4049,1 //Vadon Card
4049,Vadon Card,100000 3,4049,1 //Vadon Card
4049,Vadon Card,100000 3,4050,1 //Male Thief Bug Card
4050,Male Thief Bug Card,100000 3,4050,1 //Male Thief Bug Card
4050,Male Thief Bug Card,100000 3,4050,1 //Male Thief Bug Card
4050,Male Thief Bug Card,100000 3,4051,1 //Yoyo Card
4051,Yoyo Card,100000 3,4051,1 //Yoyo Card
4051,Yoyo Card,100000 3,4051,1 //Yoyo Card
4051,Yoyo Card,100000 3,4052,1 //Elder Willow Card
4052,Elder Willow Card,100000 3,4052,1 //Elder Willow Card
4052,Elder Willow Card,100000 3,4052,1 //Elder Willow Card
4052,Elder Willow Card,100000 3,4053,1 //Vitata Card
4053,Vitata Card,100000 3,4054,1 //Angeling Card
4054,Angeling Card,100000 3,4055,1 //Marina Card
4055,Marina Card,100000 3,4055,1 //Marina Card
4055,Marina Card,100000 3,4055,1 //Marina Card
4055,Marina Card,100000 3,4056,1 //Dustiness Card
4056,Dustiness Card,100000 3,4056,1 //Dustiness Card
4056,Dustiness Card,100000 3,4056,1 //Dustiness Card
4056,Dustiness Card,100000 3,4057,1 //Metaller Card
4057,Metaller Card,100000 3,4057,1 //Metaller Card
4057,Metaller Card,100000 3,4058,1 //Thara Frog Card
4058,Thara Frog Card,100000 3,4058,1 //Thara Frog Card
4058,Thara Frog Card,100000 3,4060,1 //Goblin Card
4060,Goblin Card,100000 3,4060,1 //Goblin Card
4060,Goblin Card,100000 3,4061,1 //Cornutus Card
4061,Cornutus Card,100000 3,4061,1 //Cornutus Card
4061,Cornutus Card,100000 3,4062,1 //Anacondaq Card
4062,Anacondaq Card,100000 3,4062,1 //Anacondaq Card
4062,Anacondaq Card,100000 3,4063,1 //Caramel Card
4063,Caramel Card,100000 3,4063,1 //Caramel Card
4063,Caramel Card,100000 3,4064,1 //Zerom Card
4064,Zerom Card,100000 3,4064,1 //Zerom Card
4064,Zerom Card,100000 3,4065,1 //Kaho Card
4065,Kaho Card,100000 3,4065,1 //Kaho Card
4065,Kaho Card,100000 3,4066,1 //Orc Warrior Card
4066,Orc Warrior Card,100000 3,4066,1 //Orc Warrior Card
4066,Orc Warrior Card,100000 3,4067,1 //Megalodon Card
4067,Megalodon Card,100000 3,4067,1 //Megalodon Card
4067,Megalodon Card,100000 3,4068,1 //Scorpion Card
4068,Scorpion Card,100000 3,4068,1 //Scorpion Card
4068,Scorpion Card,100000 3,4069,1 //Drainliar Card
4069,Drainliar Card,100000 3,4069,1 //Drainliar Card
4069,Drainliar Card,100000 3,4070,1 //Eggyra Card
4070,Eggyra Card,100000 3,4070,1 //Eggyra Card
4070,Eggyra Card,100000 3,4071,1 //Orc Zombie Card
4071,Orc Zombie Card,100000 3,4071,1 //Orc Zombie Card
4071,Orc Zombie Card,100000 3,4072,1 //Golem Card
4072,Golem Card,100000 3,4072,1 //Golem Card
4072,Golem Card,100000 3,4073,1 //Pirate Skeleton Card
4073,Pirate Skeleton Card,100000 3,4073,1 //Pirate Skeleton Card
4073,Pirate Skeleton Card,100000 3,4074,1 //Bigfoot Card
4074,Bigfoot Card,100000 3,4074,1 //Bigfoot Card
4074,Bigfoot Card,100000 3,4075,1 //Argos Card
4075,Argos Card,100000 3,4075,1 //Argos Card
4075,Argos Card,100000 3,4076,1 //Magnolia Card
4076,Magnolia Card,100000 3,4076,1 //Magnolia Card
4076,Magnolia Card,100000 3,4077,1 //Phen Card
4077,Phen Card,100000 3,4077,1 //Phen Card
4077,Phen Card,100000 3,4078,1 //Savage Card
4078,Savage Card,100000 3,4078,1 //Savage Card
4078,Savage Card,100000 3,4079,1 //Mantis Card
4079,Mantis Card,100000 3,4079,1 //Mantis Card
4079,Mantis Card,100000 3,4080,1 //Flora Card
4080,Flora Card,100000 3,4080,1 //Flora Card
4080,Flora Card,100000 3,4081,1 //Hode Card
4081,Hode Card,100000 3,4081,1 //Hode Card
4081,Hode Card,100000 3,4082,1 //Desert Wolf Card
4082,Desert Wolf Card,100000 3,4083,1 //Rafflesia Card
4083,Rafflesia Card,100000 3,4084,1 //Marine Sphere Card
4084,Marine Sphere Card,100000 3,4085,1 //Orc Skeleton Card
4085,Orc Skeleton Card,100000 3,4086,1 //Soldier Skeleton Card
4086,Soldier Skeleton Card,100000 3,4087,1 //Giearth Card
4087,Giearth Card,100000 3,4088,1 //Frilldora Card
4088,Frilldora Card,100000 3,4089,1 //Swordfish Card
4089,Swordfish Card,100000 3,4090,1 //Munak Card
4090,Munak Card,100000 3,4091,1 //Kobold Card
4091,Kobold Card,100000 3,4092,1 //Skeleton Worker Card
4092,Skeleton Worker Card,100000 3,4093,1 //Obeaune Card
4093,Obeaune Card,100000 3,4094,1 //Archer Skeleton Card
4094,Archer Skeleton Card,100000 3,4095,1 //Marse Card
4095,Marse Card,100000 3,4096,1 //Zenorc Card
4096,Zenorc Card,100000 3,4097,1 //Matyr Card
4097,Matyr Card,100000 3,4098,1 //Dokebi Card
4098,Dokebi Card,100000 3,4099,1 //Pasana Card
4099,Pasana Card,100000 3,4100,1 //Sohee Card
4100,Sohee Card,100000 3,4101,1 //Sandman Card
4101,Sandman Card,100000 3,4102,1 //Whisper Card
4102,Whisper Card,100000 3,4103,1 //Horong Card
4103,Horong Card,100000 3,4104,1 //Requiem Card
4104,Requiem Card,100000 3,4105,1 //Marc Card
4105,Marc Card,100000 3,4106,1 //Mummy Card
4106,Mummy Card,100000 3,4107,1 //Verit Card
4107,Verit Card,100000 3,4108,1 //Myst Card
4108,Myst Card,100000 3,4109,1 //Jakk Card
4109,Jakk Card,100000 3,4110,1 //Ghoul Card
4110,Ghoul Card,100000 3,4111,1 //Strouf Card
4111,Strouf Card,100000 3,4112,1 //Marduk Card
4112,Marduk Card,100000 3,4113,1 //Marionette Card
4113,Marionette Card,100000 3,4114,1 //Argiope Card
4114,Argiope Card,100000 3,4115,1 //Hunter Fly Card
4115,Hunter Fly Card,100000 3,4116,1 //Isis Card
4116,Isis Card,100000 3,4117,1 //Sidewinder Card
4117,Sidewinder Card,100000 3,4118,1 //Earth Petite Card
4118,Earth Petite Card,100000 3,4119,1 //Bathory Card
4119,Bathory Card,100000 3,4120,1 //Sky Petite Card
4120,Sky Petite Card,100000 3,4122,1 //Deviruchi Card
4122,Deviruchi Card,100000 3,4125,1 //Deviace Card
4125,Deviace Card,100000 3,4127,1 //Nightmare Card
4127,Nightmare Card,100000 3,4129,1 //Bapho Jr. Card
4129,Bapho Jr. Card,100000 3,4133,1 //Raydric Card
4133,Raydric Card,100000 3,4136,1 //Khalitzburg Card
4136,Khalitzburg Card,100000 3,4139,1 //Joker Card
4139,Joker Card,100000 3,4141,1 //Evil Druid Card
4141,Evil Druid Card,100000 3,4149,1 //Gargoyle Card
4149,Gargoyle Card,100000 3,4150,1 //Goat Card
4150,Goat Card,100000 3,4151,1 //Gajomart Card
4151,Gajomart Card,100000 3,4152,1 //Galapago Card
4152,Galapago Card,100000 3,4153,1 //Crab Card
4153,Crab Card,100000 3,4154,1 //Dumpling Child Card
4154,Dumpling Child Card,100000 3,4156,1 //Goblin Steamrider Card
4156,Goblin Steamrider Card,100000 3,4157,1 //Goblin Archer Card
4157,Goblin Archer Card,100000 3,4158,1 //Sky Deleter Card
4158,Sky Deleter Card,100000 3,4159,1 //Nine Tail Card
4159,Nine Tail Card,100000 3,4160,1 //Firelock Soldier Card
4160,Firelock Soldier Card,100000 3,4161,1 //Grand Peco Card
4161,Grand Peco Card,100000 3,4162,1 //Grizzly Card
4162,Grizzly Card,100000 3,4164,1 //Gullinbursti Card
4164,Gullinbursti Card,100000 3,4165,1 //Gig Card
4165,Gig Card,100000 3,4166,1 //Nightmare Terror Card
4166,Nightmare Terror Card,100000 3,4167,1 //Neraid Card
4167,Neraid Card,100000 3,4170,1 //Dark Frame Card
4170,Dark Frame Card,100000 3,4172,1 //The Paper Card
4172,The Paper Card,100000 3,4173,1 //Demon Fungus Card
4173,Demon Fungus Card,100000 3,4175,1 //Poisonous Toad Card
4175,Poisonous Toad Card,100000 3,4176,1 //Dullahan Card
4176,Dullahan Card,100000 3,4177,1 //Dryad Card
4177,Dryad Card,100000 3,4178,1 //Dragon Tail Card
4178,Dragon Tail Card,100000 3,4180,1 //Driller Card
4180,Driller Card,100000 3,4181,1 //Disguise Card
4181,Disguise Card,100000 3,4182,1 //Diabolic Card
4182,Diabolic Card,100000 3,4184,1 //Lava Golem Card
4184,Lava Golem Card,100000 3,4185,1 //Rideword Card
4185,Rideword Card,100000 3,4186,1 //Raggler Card
4186,Raggler Card,100000 3,4187,1 //Raydric Archer Card
4187,Raydric Archer Card,100000 3,4188,1 //Leib Olmai Card
4188,Leib Olmai Card,100000 3,4189,1 //Wraith Dead Card
4189,Wraith Dead Card,100000 3,4190,1 //Wraith Card
4190,Wraith Card,100000 3,4191,1 //Loli Ruri Card
4191,Loli Ruri Card,100000 3,4192,1 //Rotar Zairo Card
4192,Rotar Zairo Card,100000 3,4193,1 //Lude Card
4193,Lude Card,100000 3,4194,1 //Rybio Card
4194,Rybio Card,100000 3,4195,1 //Leaf Cat Card
4195,Leaf Cat Card,100000 3,4196,1 //Marin Card
4196,Marin Card,100000 3,4199,1 //Merman Card
4199,Merman Card,100000 3,4200,1 //Megalith Card
4200,Megalith Card,100000 3,4201,1 //Majoruros Card
4201,Majoruros Card,100000 3,4202,1 //Civil Servant Card
4202,Civil Servant Card,100000 3,4204,1 //Mini Demon Card
4204,Mini Demon Card,100000 3,4205,1 //Mimic Card
4205,Mimic Card,100000 3,4206,1 //Myst Case Card
4206,Myst Case Card,100000 3,4208,1 //Miyabi Doll Card
4208,Miyabi Doll Card,100000 3,4209,1 //Violy Card
4209,Violy Card,100000 3,4210,1 //Wanderer Card
4210,Wanderer Card,100000 3,4212,1 //Bongun Card
4212,Bongun Card,100000 3,4213,1 //Brilight Card
4213,Brilight Card,100000 3,4214,1 //Bloody Murderer Card
4214,Bloody Murderer Card,100000 3,4215,1 //Blazer Card
4215,Blazer Card,100000 3,4216,1 //Sasquatch Card
4216,Sasquatch Card,100000 3,4217,1 //Enchanted Peach Tree Card
4217,Enchanted Peach Tree Card,100000 3,4218,1 //Succubus Card
4218,Succubus Card,100000 3,4219,1 //Sage Worm Card
4219,Sage Worm Card,100000 3,4220,1 //Solider Card
4220,Solider Card,100000 3,4221,1 //Skeleton General Card
4221,Skeleton General Card,100000 3,4222,1 //Skeleton Prisoner Card
4222,Skeleton Prisoner Card,100000 3,4223,1 //Stalactic Golem Card
4223,Stalactic Golem Card,100000 3,4224,1 //Stem Worm Card
4224,Stem Worm Card,100000 3,4225,1 //Stone Shooter Card
4225,Stone Shooter Card,100000 3,4226,1 //Sting Card
4226,Sting Card,100000 3,4227,1 //Spring Rabbit Card
4227,Spring Rabbit Card,100000 3,4228,1 //Sleeper Card
4228,Sleeper Card,100000 3,4230,1 //Shinobi Card
4230,Shinobi Card,100000 3,4231,1 //Increase Soil Card
4231,Increase Soil Card,100000 3,4232,1 //Hermit Plant Card
4232,Hermit Plant Card,100000 3,4233,1 //Baby Leopard Card
4233,Baby Leopard Card,100000 3,4234,1 //Anolian Card
4234,Anolian Card,100000 3,4235,1 //Christmas Cookie Card
4235,Christmas Cookie Card,100000 3,4237,1 //Owl Duke Card
4237,Owl Duke Card,100000 3,4238,1 //Owl Baron Card
4238,Owl Baron Card,100000 3,4239,1 //Iron Fist Card
4239,Iron Fist Card,100000 3,4240,1 //Arclouze Card
4240,Arclouze Card,100000 3,4242,1 //Apocalipse Card
4242,Apocalipse Card,100000 3,4244,1 //Alarm Card
4244,Alarm Card,100000 3,4245,1 //Am Mut Card
4245,Am Mut Card,100000 3,4246,1 //Assaulter Card
4246,Assaulter Card,100000 3,4247,1 //Aster Card
4247,Aster Card,100000 3,4248,1 //Ancient Mummy Card
4248,Ancient Mummy Card,100000 3,4249,1 //Ancient Worm Card
4249,Ancient Worm Card,100000 3,4251,1 //Elder Card
4251,Elder Card,100000 3,4252,1 //Alligator Card
4252,Alligator Card,100000 3,4253,1 //Alice Card
4253,Alice Card,100000 3,4255,1 //Orc Lady Card
4255,Orc Lady Card,100000 3,4256,1 //Orc Archer Card
4256,Orc Archer Card,100000 3,4257,1 //Wild Rose Card
4257,Wild Rose Card,100000 3,4258,1 //Evil Nymph Card
4258,Evil Nymph Card,100000 3,4259,1 //Wooden Golem Card
4259,Wooden Golem Card,100000 3,4260,1 //Wootan Shooter Card
4260,Wootan Shooter Card,100000 3,4261,1 //Wootan Fighter Card
4261,Wootan Fighter Card,100000 3,4262,1 //Cloud Hermit Card
4262,Cloud Hermit Card,100000 3,4264,1 //Wind Ghost Card
4264,Wind Ghost Card,100000 3,4265,1 //Li Me Mang Ryang Card
4265,Li Me Mang Ryang Card,100000 3,4267,1 //Explosion Card
4267,Explosion Card,100000 3,4268,1 //Injustice Card
4268,Injustice Card,100000 3,4269,1 //Incubus Card
4269,Incubus Card,100000 3,4270,1 //Giant Spider Card
4270,Giant Spider Card,100000 3,4271,1 //Giant Hornet Card
4271,Giant Hornet Card,100000 3,4272,1 //Dancing Dragon Card
4272,Dancing Dragon Card,100000 3,4273,1 //Shell Fish Card
4273,Shell Fish Card,100000 3,4274,1 //Zombie Master Card
4274,Zombie Master Card,100000 3,4275,1 //Zombie Prisoner Card
4275,Zombie Prisoner Card,100000 3,4277,1 //Zherlthsh Card
4277,Zherlthsh Card,100000 3,4278,1 //Gibbet Card
4278,Gibbet Card,100000 3,4279,1 //Earth Deleter Card
4279,Earth Deleter Card,100000 3,4280,1 //Geographer Card
4280,Geographer Card,100000 3,4281,1 //Zipper Bear Card
4281,Zipper Bear Card,100000 3,4282,1 //Tengu Card
4282,Tengu Card,100000 3,4283,1 //Greatest General Card
4283,Greatest General Card,100000 3,4284,1 //Chepet Card
4284,Chepet Card,100000 3,4285,1 //Choco Card
4285,Choco Card,100000 3,4286,1 //Karakasa Card
4286,Karakasa Card,100000 3,4287,1 //Kapha Card
4287,Kapha Card,100000 3,4288,1 //Carat Card
4288,Carat Card,100000 3,4289,1 //Caterpillar Card
4289,Caterpillar Card,100000 3,4290,1 //Cat O' Nine Tails Card
4290,Cat O' Nine Tails Card,100000 3,4292,1 //Kobold Archer Card
4292,Kobold Archer Card,100000 3,4293,1 //Cookie Card
4293,Cookie Card,100000 3,4294,1 //Quve Card
4294,Quve Card,100000 3,4295,1 //Kraben Card
4295,Kraben Card,100000 3,4296,1 //Cramp Card
4296,Cramp Card,100000 3,4297,1 //Cruiser Card
4297,Cruiser Card,100000 3,4298,1 //Creamy Fear Card
4298,Creamy Fear Card,100000 3,4299,1 //Clock Card
4299,Clock Card,100000 3,4300,1 //Chimera Card
4300,Chimera Card,100000 3,4301,1 //Killer Mantis Card
4301,Killer Mantis Card,100000 3,4304,1 //Tamruan Card
4304,Tamruan Card,100000 3,4229,1 //Clock Tower Manager Card
4229,Clock Tower Manager Card,100000 3,4307,1 //Beetle King Card
4307,Beetle King Card,100000 3,4308,1 //Tri Joint Card
4308,Tri Joint Card,100000 3,4309,1 //Parasite Card
4309,Parasite Card,100000 3,4310,1 //Panzer Goblin Card
4310,Panzer Goblin Card,100000 3,4311,1 //Permeter Card
4311,Permeter Card,100000 3,4312,1 //Seal Card
4312,Seal Card,100000 3,4313,1 //Punk Card
4313,Punk Card,100000 3,4314,1 //Penomena Card
4314,Penomena Card,100000 3,4315,1 //Pest Card
4315,Pest Card,100000 3,4316,1 //False Angel Card
4316,False Angel Card,100000 3,4319,1 //Freezer Card
4319,Freezer Card,100000 3,4321,1 //Hylozoist Card
4321,Hylozoist Card,100000 3,4322,1 //High Orc Card
4322,High Orc Card,100000 3,4323,1 //Garm Baby Card
4323,Garm Baby Card,100000 3,4325,1 //Harpy Card
4325,Harpy Card,100000 3,4326,1 //Sea-Otter Card
4326,Sea-Otter Card,100000 3,4327,1 //Bloody Butterfly Card
4327,Bloody Butterfly Card,100000 3,4328,1 //Hyegun Card
4328,Hyegun Card,100000 3,4329,1 //Phendark Card
4329,Phendark Card,100000 3,4331,1 //Heater Card
4331,Heater Card,100000 3,4243,1 //Antonio Card
4243,Antonio Card,100000

99
db/item_cookie_bag.txt
View File

@ -2,54 +2,53 @@
// Cookie Bag Obtainable Items Database // Cookie Bag Obtainable Items Database
// //
// Structure of Database: // Structure of Database:
// ItemID,DummyName,Rate // GroupID,ItemID,Rate
0,Candy,529 7,529,1 //Candy
529,Candy,1000000 7,570,1 //Lucky Candy
570,Lucky Candy,1000000 7,530,1 //Candy Cane
530,Candy Cane,1000000 7,571,1 //Lucky Candy Cane
571,Lucky Candy Cane,1000000 7,538,1 //Well-baked Cookie
538,Well-baked Cookie,1000000 7,572,1 //Lucky Cookie
572,Lucky Cookie,1000000 7,539,1 //Piece of Cake
539,Piece of Cake,1000000 7,564,1 //Rice Ball
564,Rice Ball,1000000 7,12122,1 //Sesame Pastry
12122,Sesame Pastry,1000000 7,12123,1 //Honey Pastry
12123,Honey Pastry,1000000 7,12124,1 //Rainbow Cake
12124,Rainbow Cake,1000000 7,558,1 //Chocolate
558,Chocolate,1000000 7,559,1 //Hand-made Chocolate
559,Hand-made Chocolate,1000000 7,560,1 //Hand-made White Chocolate
560,Hand-made White Chocolate,1000000 7,561,1 //White Chocolate
561,White Chocolate,1000000 7,573,1 //Chocolate Drink
573,Chocolate Drink,1000000 7,529,1 //Candy
529,Candy,1000000 7,570,1 //Lucky Candy
570,Lucky Candy,1000000 7,530,1 //Candy Cane
530,Candy Cane,1000000 7,571,1 //Lucky Candy Cane
571,Lucky Candy Cane,1000000 7,538,1 //Well-baked Cookie
538,Well-baked Cookie,1000000 7,572,1 //Lucky Cookie
572,Lucky Cookie,1000000 7,539,1 //Piece of Cake
539,Piece of Cake,1000000 7,564,1 //Rice Ball
564,Rice Ball,1000000 7,529,1 //Candy
529,Candy,1000000 7,570,1 //Lucky Candy
570,Lucky Candy,1000000 7,530,1 //Candy Cane
530,Candy Cane,1000000 7,571,1 //Lucky Candy Cane
571,Lucky Candy Cane,1000000 7,538,1 //Well-baked Cookie
538,Well-baked Cookie,1000000 7,572,1 //Lucky Cookie
572,Lucky Cookie,1000000 7,539,1 //Piece of Cake
539,Piece of Cake,1000000 7,564,1 //Rice Ball
564,Rice Ball,1000000 7,529,1 //Candy
529,Candy,1000000 7,570,1 //Lucky Candy
570,Lucky Candy,1000000 7,530,1 //Candy Cane
530,Candy Cane,1000000 7,571,1 //Lucky Candy Cane
571,Lucky Candy Cane,1000000 7,538,1 //Well-baked Cookie
538,Well-baked Cookie,1000000 7,572,1 //Lucky Cookie
572,Lucky Cookie,1000000 7,539,1 //Piece of Cake
539,Piece of Cake,1000000 7,564,1 //Rice Ball
564,Rice Ball,1000000 7,529,1 //Candy
529,Candy,1000000 7,570,1 //Lucky Candy
570,Lucky Candy,1000000 7,530,1 //Candy Cane
530,Candy Cane,1000000 7,571,1 //Lucky Candy Cane
571,Lucky Candy Cane,1000000 7,538,1 //Well-baked Cookie
538,Well-baked Cookie,1000000 7,572,1 //Lucky Cookie
572,Lucky Cookie,1000000 7,539,1 //Piece of Cake
539,Piece of Cake,1000000 7,564,1 //Rice Ball
564,Rice Ball,1000000

60
db/item_db.txt
View File

@ -92,7 +92,7 @@
//=================================================================== //===================================================================
601,Fly_Wing,Fly Wing,2,60,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ warp "Random",0,0; },{},{} 601,Fly_Wing,Fly Wing,2,60,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ warp "Random",0,0; },{},{}
602,Butterfly_Wing,Butterfly Wing,2,300,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ warp "SavePoint",0,0; },{},{} 602,Butterfly_Wing,Butterfly Wing,2,300,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ warp "SavePoint",0,0; },{},{}
603,Old_Blue_Box,Old Blue Box,2,10000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -1,1; },{},{} 603,Old_Blue_Box,Old Blue Box,2,10000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_BlueBox),1; },{},{}
604,Dead_Branch,Dead Branch,2,50,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-1,1,""; },{},{} 604,Dead_Branch,Dead Branch,2,50,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-1,1,""; },{},{}
605,Anodyne,Anodyne,11,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 8,1,"Endure"; },{},{} 605,Anodyne,Anodyne,11,2000,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 8,1,"Endure"; },{},{}
606,Aloevera,Aloevera,11,1500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 6,1,"Provoke"; },{},{} 606,Aloevera,Aloevera,11,1500,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ itemskill 6,1,"Provoke"; },{},{}
@ -107,9 +107,9 @@
614,Golden_Hammer,Golden Hammer,2,3000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 2; },{},{} 614,Golden_Hammer,Golden Hammer,2,3000,,300,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 2; },{},{}
615,Oridecon_Hammer,Oridecon Hammer,2,5000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 3; },{},{} 615,Oridecon_Hammer,Oridecon Hammer,2,5000,,400,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 3; },{},{}
// Item Givers // Item Givers
616,Old_Card_Album,Old Card Album,2,10000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -3,1; },{},{} 616,Old_Card_Album,Old Card Album,2,10000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_CardAlbum),1; },{},{}
617,Old_Purple_Box,Old Purple Box,2,10000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -2,1; },{},{} 617,Old_Purple_Box,Old Purple Box,2,10000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_VioletBox),1; },{},{}
618,Worn_Out_Scroll,Worn Out Scroll,2,50,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -5,1; },{},{} 618,Worn_Out_Scroll,Worn Out Scroll,2,50,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_ScrollBox),1; },{},{}
// Pet Tames // Pet Tames
619,Unripe_Apple,Unripe Apple,11,1000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1002; },{},{} 619,Unripe_Apple,Unripe Apple,11,1000,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1002; },{},{}
620,Orange_Juice,Orange Juice,11,1500,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1113; },{},{} 620,Orange_Juice,Orange Juice,11,1500,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1113; },{},{}
@ -136,7 +136,7 @@
641,Contract_in_Shadow,Contracts in Shadow,11,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1109; },{},{} 641,Contract_in_Shadow,Contracts in Shadow,11,100,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1109; },{},{}
642,Book_of_the_Devil,Book of the Devil,11,1800,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1101; },{},{} 642,Book_of_the_Devil,Book of the Devil,11,1800,,50,,,,,0xFFFFFFFF,7,2,,,,,,{ pet 1101; },{},{}
643,Pet_Incubator,Pet Incubator,2,3000,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ bpet; },{},{} 643,Pet_Incubator,Pet Incubator,2,3000,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ bpet; },{},{}
644,Gift_Box,Gift Box,2,2,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -4,1; },{},{} 644,Gift_Box,Gift Box,2,2,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox),1; },{},{}
// ASPD Potions // ASPD Potions
645,Concentration_Potion,Concentration Potion,2,800,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,0; },{},{} 645,Concentration_Potion,Concentration Potion,2,800,,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_ASPDPOTION0,1800000,0; },{},{}
656,Awakening_Potion,Awakening Potion,2,1500,,150,,,,,0x00E7DEEF,7,2,,,40,,,{ sc_end SC_Sleep; sc_start SC_ASPDPOTION1,1800000,0; },{},{} 656,Awakening_Potion,Awakening Potion,2,1500,,150,,,,,0x00E7DEEF,7,2,,,40,,,{ sc_end SC_Sleep; sc_start SC_ASPDPOTION1,1800000,0; },{},{}
@ -149,10 +149,10 @@
662,Authoritative_Badge,Authoritative Badge,2,1450,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect 507; sc_start SC_SpeedUp0,240000,0; },{},{} 662,Authoritative_Badge,Authoritative Badge,2,1450,,30,,,,,0xFFFFFFFF,7,2,,,,,,{ specialeffect 507; sc_start SC_SpeedUp0,240000,0; },{},{}
663,Songpyun,Songpyun,0,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,0; },{},{} 663,Songpyun,Songpyun,0,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal 10,0; },{},{}
// Item Givers // Item Givers
664,Gift_Box_,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -4,1; },{},{} 664,Gift_Box_,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox),1; },{},{}
665,Gift_Box__,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -4,1; },{},{} 665,Gift_Box__,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox),1; },{},{}
666,Gift_Box___,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -4,1; },{},{} 666,Gift_Box___,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox),1; },{},{}
667,Gift_Box____,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -4,1; },{},{} 667,Gift_Box____,Gift Box,2,1000,,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox),1; },{},{}
668,Red_Envelope,Red_Envelope,2,1,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(100,10000); },{},{} 668,Red_Envelope,Red_Envelope,2,1,,20,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(100,10000); },{},{}
669,Rice-Cake_Soup,Rice-Cake Soup,0,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal -100,-100; },{},{} 669,Rice-Cake_Soup,Rice-Cake Soup,0,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{ percentheal -100,-100; },{},{}
// Coins // Coins
@ -487,8 +487,8 @@
1139,Tirfing,Tirfing,4,,10,1000,200,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Dark; bonus2 bHPLossRate,35,10000; },{},{} 1139,Tirfing,Tirfing,4,,10,1000,200,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Dark; bonus2 bHPLossRate,35,10000; },{},{}
1140,Byeollungum,Byeollungum,4,,10,900,150,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus2 bSubRace,RC_NonBoss,-10; bonus2 bAddRace,RC_Boss,5; bonus bAllStats,2; },{},{} 1140,Byeollungum,Byeollungum,4,,10,900,150,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus2 bSubRace,RC_NonBoss,-10; bonus2 bAddRace,RC_Boss,5; bonus bAllStats,2; },{},{}
1141,Immaterial_Sword,Immaterial Sword,4,,10,900,140,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Ghost; bonus2 bSPDrainRate,1,30; bonus bSPDrainValue,-1; bonus bUnbreakableWeapon,0; },{},{} 1141,Immaterial_Sword,Immaterial Sword,4,,10,900,140,,1,0,0x000654E2,7,2,2,4,40,1,2,{ bonus bAtkEle,Ele_Ghost; bonus2 bSPDrainRate,1,30; bonus bSPDrainValue,-1; bonus bUnbreakableWeapon,0; },{},{}
1142,Jeweled_Sword,Jeweled Sword,4,,10,2200,104,,1,0,0x000654E2,7,2,2,3,68,1,2,{ bonus2 bAddMonsterDropItemGroup,20,5; },{},{} 1142,Jeweled_Sword,Jeweled Sword,4,,10,2200,104,,1,0,0x000654E2,7,2,2,3,68,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Jewel,5; },{},{}
1143,Gaia_Sword,Gaia Sword,4,,10,2500,115,,1,0,0x000654E2,7,2,2,3,74,1,2,{ bonus2 bAddMonsterDropItemGroup,11,5; },{},{} 1143,Gaia_Sword,Gaia Sword,4,,10,2500,115,,1,0,0x000654E2,7,2,2,3,74,1,2,{ bonus2 bAddMonsterDropItemGroup,IG_Ore,5; },{},{}
1144,Sashimi,Sashimi,4,,10,1400,75,,1,0,0x000654E2,7,2,2,3,48,1,2,{ bonus bAtkEle,Ele_Wind; bonus3 bAddMonsterDropItem,544,5,4000; },{},{} 1144,Sashimi,Sashimi,4,,10,1400,75,,1,0,0x000654E2,7,2,2,3,48,1,2,{ bonus bAtkEle,Ele_Wind; bonus3 bAddMonsterDropItem,544,5,4000; },{},{}
1145,Holy_Avenger,Holy Avenger,4,,10,1350,125,,1,0,0x00004000,7,2,2,3,75,1,2,{ bonus bAtkEle,Ele_Holy; },{},{} 1145,Holy_Avenger,Holy Avenger,4,,10,1350,125,,1,0,0x00004000,7,2,2,3,75,1,2,{ bonus bAtkEle,Ele_Holy; },{},{}
1146,Town_Sword,Town Sword,4,42000,,800,100,,1,1,0x00000001,7,2,2,3,30,1,2,{},{},{} 1146,Town_Sword,Town Sword,4,42000,,800,100,,1,1,0x00000001,7,2,2,3,30,1,2,{},{},{}
@ -1286,9 +1286,9 @@
4149,Gargoyle_Card,Gargoyle Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12028,4,10; },{},{} 4149,Gargoyle_Card,Gargoyle Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12028,4,10; },{},{}
4150,Goat_Card,Goat Card,6,,10,10,,,,,,,,16,,,,,{ if(getrefine()>=6) end; bonus bDef,2; bonus bMdef,5; },{},{} 4150,Goat_Card,Goat Card,6,,10,10,,,,,,,,16,,,,,{ if(getrefine()>=6) end; bonus bDef,2; bonus bMdef,5; },{},{}
4151,Gajomart_Card,Gajomart Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10; },{},{} 4151,Gajomart_Card,Gajomart Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Plant,-20; bonus2 bExpAddRace,RC_Plant,10; },{},{}
4152,Galapago_Card,Galapago Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,6,50; bonus3 bAddMonsterDropItemGroup,6,4,4000; },{},{} 4152,Galapago_Card,Galapago Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Juice,50; bonus3 bAddMonsterDropItemGroup,IG_Juice,RC_Insect,4000; },{},{}
4153,Crab_Card,Crab Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30; if(isequipped(4247,4273)==0) end; bonus3 bAddMonsterDropItem,544,5,3000; bonus2 bAddEle,Ele_Water,30; },{},{} 4153,Crab_Card,Crab Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,5; bonus2 bAddDamageClass,1266,30; if(isequipped(4247,4273)==0) end; bonus3 bAddMonsterDropItem,544,5,3000; bonus2 bAddEle,Ele_Water,30; },{},{}
4154,Dumpling_Child_Card,Dumpling Child Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,5,50; bonus3 bAddMonsterDropItemGroup,5,7,4000; },{},{} 4154,Dumpling_Child_Card,Dumpling Child Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Candy,50; bonus3 bAddMonsterDropItemGroup,IG_Candy,RC_DemiHuman,4000; },{},{}
4155,Goblin_Leader_Card,Goblin Leader Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,1,30; },{},{} 4155,Goblin_Leader_Card,Goblin Leader Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bAddRace2,1,30; },{},{}
4156,Goblin_Steamrider_Card,Goblin Steamrider Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Formless,7; },{},{} 4156,Goblin_Steamrider_Card,Goblin Steamrider Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Formless,7; },{},{}
4157,Goblin_Archer_Card,Goblin Archer Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Undead,7; },{},{} 4157,Goblin_Archer_Card,Goblin Archer Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Undead,7; },{},{}
@ -1330,7 +1330,7 @@
4193,Lude_Card,Lude Card,6,,10,10,,,,,,,,136,,,,,{ if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) bonus4 bAutoSpellWhenHit,8,1,200,0; },{},{} 4193,Lude_Card,Lude Card,6,,10,10,,,,,,,,136,,,,,{ if(BaseJob==Job_Novice||BaseJob==Job_SuperNovice) bonus4 bAutoSpellWhenHit,8,1,200,0; },{},{}
4194,Rybio_Card,Rybio Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stan,1000+2000*(readparam(bDex)>=77); },{},{} 4194,Rybio_Card,Rybio Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Stan,1000+2000*(readparam(bDex)>=77); },{},{}
4195,Leaf_Cat_Card,Leaf Cat Card,6,,10,10,,,,,,,,769,,,,,{ bonus2 bSubEle,Ele_Water,10; bonus3 bAddMonsterDropItem,991,5,500; },{},{} 4195,Leaf_Cat_Card,Leaf Cat Card,6,,10,10,,,,,,,,769,,,,,{ bonus2 bSubEle,Ele_Water,10; bonus3 bAddMonsterDropItem,991,5,500; },{},{}
4196,Marin_Card,Marin Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,10,500; },{},{} 4196,Marin_Card,Marin Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Jellopy,500; },{},{}
4197,Mastering_Card,Mastering Card,6,,10,10,,,,,,,,4,,,,,{ bonus bLuk,1; if(isequipped(4001)) bonus bFlee,18; },{},{} 4197,Mastering_Card,Mastering Card,6,,10,10,,,,,,,,4,,,,,{ bonus bLuk,1; if(isequipped(4001)) bonus bFlee,18; },{},{}
4198,Maya_Purple_Card,Maya Purple Card,6,,10,10,,,,,,,,769,,,,,{ bonus bIntravision,0; },{},{} 4198,Maya_Purple_Card,Maya Purple Card,6,,10,10,,,,,,,,769,,,,,{ bonus bIntravision,0; },{},{}
4199,Merman_Card,Merman Card,6,,10,10,,,,,,,,64,,,,,{ bonus bHPrecovRate,10; bonus bSPrecovRate,10; if(isequipped(4297,4234,4252,4178)==0) end; bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass != Job_Archer) end; bonus2 bExpAddRace,RC_Brute,5; bonus2 bWeaponComaRace,RC_Brute,100; },{},{} 4199,Merman_Card,Merman Card,6,,10,10,,,,,,,,64,,,,,{ bonus bHPrecovRate,10; bonus bSPrecovRate,10; if(isequipped(4297,4234,4252,4178)==0) end; bonus bAgi,5; bonus bDex,3; bonus bLongAtkRate,20; bonus bPerfectHitAddRate,20; if(BaseClass != Job_Archer) end; bonus2 bExpAddRace,RC_Brute,5; bonus2 bWeaponComaRace,RC_Brute,100; },{},{}
@ -1349,11 +1349,11 @@
4212,Bongun_Card,Bongun Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,5,1,20; bonus2 bAddSkillBlow,5,5; bonus2 bAddDamageByClass,1026,100; },{},{} 4212,Bongun_Card,Bongun Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAutoSpell,5,1,20; bonus2 bAddSkillBlow,5,5; bonus2 bAddDamageByClass,1026,100; },{},{}
4213,Brilight_Card,Brilight Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Silence,2000; },{},{} 4213,Brilight_Card,Brilight Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Silence,2000; },{},{}
4214,Bloody_Murderer_Card,Bloody Murderer Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Insect,7; },{},{} 4214,Bloody_Murderer_Card,Bloody Murderer Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,10; bonus2 bCriticalAddRace,RC_Insect,7; },{},{}
4215,Blazer_Card,Blazer Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,12,500; },{},{} 4215,Blazer_Card,Blazer Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Food,500; },{},{}
4216,Sasquatch_Card,Sasquatch Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,2000; },{},{} 4216,Sasquatch_Card,Sasquatch Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,2000; },{},{}
4217,Enchanted_Peach_Tree_Card,Enchanted Peach Tree Card,6,,10,10,,,,,,,,32,,,,,{ bonus4 bAutoSpell,28,1+9*(getskilllv(28)==10),20,0; if(isequipped(4280,4185,4293,4312)==0) end; bonus bVit,10; bonus bCastrate,-10; bonus bUseSPRate,-10; if(BaseClass != Job_Acolyte) end; bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,30; bonus2 bSubRace,RC_Demon,30; },{},{} 4217,Enchanted_Peach_Tree_Card,Enchanted Peach Tree Card,6,,10,10,,,,,,,,32,,,,,{ bonus4 bAutoSpell,28,1+9*(getskilllv(28)==10),20,0; if(isequipped(4280,4185,4293,4312)==0) end; bonus bVit,10; bonus bCastrate,-10; bonus bUseSPRate,-10; if(BaseClass != Job_Acolyte) end; bonus2 bExpAddRace,RC_Undead,5; bonus2 bExpAddRace,RC_Demon,5; bonus2 bSubRace,RC_Undead,30; bonus2 bSubRace,RC_Demon,30; },{},{}
4218,Succubus_Card,Succubus Card,6,,10,10,,,,,,,,16,,,,,{ bonus bMaxHP,1000; bonus bVit,-3+4*isequipped(4269); bonus bHPrecovRate,-20+30*isequipped(4269); },{},{} 4218,Succubus_Card,Succubus Card,6,,10,10,,,,,,,,16,,,,,{ bonus bMaxHP,1000; bonus bVit,-3+4*isequipped(4269); bonus bHPrecovRate,-20+30*isequipped(4269); },{},{}
4219,Sage_Worm_Card,Sage Worm Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,9,500; },{},{} 4219,Sage_Worm_Card,Sage Worm Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Gemstone,500; },{},{}
4220,Solider_Card,Solider Card,6,,10,10,,,,,,,,16,,,,,{ bonus bDef,2; bonus bMdef,2; },{},{} 4220,Solider_Card,Solider Card,6,,10,10,,,,,,,,16,,,,,{ bonus bDef,2; bonus bMdef,2; },{},{}
4221,Skeleton_General_Card,Skeleton General Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Insect,-20; bonus2 bExpAddRace,RC_Insect,10; },{},{} 4221,Skeleton_General_Card,Skeleton General Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Insect,-20; bonus2 bExpAddRace,RC_Insect,10; },{},{}
4222,Skeleton_Prisoner_Card,Skeleton Prisoner Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,1000+2000*(isequipped(4025)); },{},{} 4222,Skeleton_Prisoner_Card,Skeleton Prisoner Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Sleep,1000+2000*(isequipped(4025)); },{},{}
@ -1361,12 +1361,12 @@
4224,Stem_Worm_Card,Stem Worm Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12032,2,10; },{},{} 4224,Stem_Worm_Card,Stem Worm Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12032,2,10; },{},{}
4225,Stone_Shooter_Card,Stone Shooter Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,10; bonus bHit,10; },{},{} 4225,Stone_Shooter_Card,Stone Shooter Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,10; bonus bHit,10; },{},{}
4226,Sting_Card,Sting Card,6,,10,10,,,,,,,,32,,,,,{ bonus bDef,2; if(getrefine()>8) bonus bMdef,5; },{},{} 4226,Sting_Card,Sting Card,6,,10,10,,,,,,,,32,,,,,{ bonus bDef,2; if(getrefine()>8) bonus bMdef,5; },{},{}
4227,Spring_Rabbit_Card,Spring Rabbit Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,4,50; bonus3 bAddMonsterDropItem,517,2,5000; bonus3 bAddMonsterDropItem,528,2,5000; },{},{} 4227,Spring_Rabbit_Card,Spring Rabbit Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Meat,50; bonus3 bAddMonsterDropItemGroup,IG_Meat,RC_Brute,5000; },{},{}
4228,Sleeper_Card,Sleeper Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12031,5,10; },{},{} 4228,Sleeper_Card,Sleeper Card,6,,10,10,,,,,,,,136,,,,,{ bonus3 bAddMonsterDropItem,12031,5,10; },{},{}
4229,Clock_Tower_Manager_Card,Clock Tower Manager Card,6,,10,10,,,,,,,,769,,,,,{ bonus bInt,1; bonus bCastrate,-5; if(isequipped(4244,4299,4313)==0) end; bonus bDef,3; bonus bMdef,3; },{},{} 4229,Clock_Tower_Manager_Card,Clock Tower Manager Card,6,,10,10,,,,,,,,769,,,,,{ bonus bInt,1; bonus bCastrate,-5; if(isequipped(4244,4299,4313)==0) end; bonus bDef,3; bonus bMdef,3; },{},{}
4230,Shinobi_Card,Shinobi Card,6,,10,10,,,,,,,,136,,,,,{ bonus bAgi,1; bonus4 bAutoSpellWhenHit,135,5,100,0; },{},{} 4230,Shinobi_Card,Shinobi Card,6,,10,10,,,,,,,,136,,,,,{ bonus bAgi,1; bonus4 bAutoSpellWhenHit,135,5,100,0; },{},{}
4231,Increase_Soil_Card,Increase Soil Card,6,,10,10,,,,,,,,32,,,,,{ bonus2 bAddDamageByClass,1285,-50; bonus2 bAddDamageByClass,1286,-50; bonus2 bAddDamageByClass,1287,-50; },{},{} 4231,Increase_Soil_Card,Increase Soil Card,6,,10,10,,,,,,,,32,,,,,{ bonus2 bAddDamageByClass,1285,-50; bonus2 bAddDamageByClass,1286,-50; bonus2 bAddDamageByClass,1287,-50; },{},{}
4232,Hermit_Plant_Card,Hermit Plant Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,2,50; bonus3 bAddMonsterDropItemGroup,2,3,4000; },{},{} 4232,Hermit_Plant_Card,Hermit Plant Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Herb,50; bonus3 bAddMonsterDropItemGroup,IG_Herb,RC_Plant,4000; },{},{}
4233,Baby_Leopard_Card,Baby Leopard Card,6,,10,10,,,,,,,,16,,,,,{ bonus bLuk,3; if(BaseClass != Job_Merchant) end; bonus bUnbreakableArmor,0; },{},{} 4233,Baby_Leopard_Card,Baby Leopard Card,6,,10,10,,,,,,,,16,,,,,{ bonus bLuk,3; if(BaseClass != Job_Merchant) end; bonus bUnbreakableArmor,0; },{},{}
4234,Anolian_Card,Anolian Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,45,1+9*(getskilllv(45)==10),30,0; },{},{} 4234,Anolian_Card,Anolian Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,45,1+9*(getskilllv(45)==10),30,0; },{},{}
4235,Christmas_Cookie_Card,Christmas Cookie Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Angel,-20; bonus2 bExpAddRace,RC_Angel,10; },{},{} 4235,Christmas_Cookie_Card,Christmas Cookie Card,6,,10,10,,,,,,,,64,,,,,{ bonus2 bSubRace,RC_Angel,-20; bonus2 bExpAddRace,RC_Angel,10; },{},{}
@ -1416,7 +1416,7 @@
4279,Earth_Deleter_Card,Earth Deleter Card,6,,10,10,,,,,,,,16,,,,,{ bonus bSPrecovRate,-100; bonus bSPGainValue,10; },{ },{ heal 0,-100; } 4279,Earth_Deleter_Card,Earth Deleter Card,6,,10,10,,,,,,,,16,,,,,{ bonus bSPrecovRate,-100; bonus bSPGainValue,10; },{ },{ heal 0,-100; }
4280,Geographer_Card,Geographer Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,34,2+8*(getskilllv(34)==10),30,0; },{},{} 4280,Geographer_Card,Geographer Card,6,,10,10,,,,,,,,16,,,,,{ bonus4 bAutoSpellWhenHit,34,2+8*(getskilllv(34)==10),30,0; },{},{}
4281,Zipper_Bear_Card,Zipper Bear Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,30; bonus2 bSPDrainValue,-1,0; if(BaseClass == Job_Merchant) bonus bUnbreakableWeapon,0; },{},{} 4281,Zipper_Bear_Card,Zipper Bear Card,6,,10,10,,,,,,,,2,,,,,{ bonus bBaseAtk,30; bonus2 bSPDrainValue,-1,0; if(BaseClass == Job_Merchant) bonus bUnbreakableWeapon,0; },{},{}
4282,Tengu_Card,Tengu Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,13,500; },{},{} 4282,Tengu_Card,Tengu Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddMonsterDropItemGroup,IG_Recovery,500; },{},{}
4283,Greatest_General_Card,Greatest General Card,6,,10,10,,,,,,,,136,,,,,{ bonus4 bAutoSpell,261,5,2+18*(BaseClass == Job_Acolyte),0; },{},{} 4283,Greatest_General_Card,Greatest General Card,6,,10,10,,,,,,,,136,,,,,{ bonus4 bAutoSpell,261,5,2+18*(BaseClass == Job_Acolyte),0; },{},{}
4284,Chepet_Card,Chepet Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,28,5,50; },{},{} 4284,Chepet_Card,Chepet Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,28,5,50; },{},{}
4285,Choco_Card,Choco Card,6,,10,10,,,,,,,,4,,,,,{ bonus bFlee2,5; bonus bFlee,10; },{},{} 4285,Choco_Card,Choco Card,6,,10,10,,,,,,,,4,,,,,{ bonus bFlee2,5; bonus bFlee,10; },{},{}
@ -1453,14 +1453,14 @@
4316,False_Angel_Card,False Angel Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Angel,5; },{ },{ heal 0,-5; } 4316,False_Angel_Card,False Angel Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_Angel,5; },{ },{ heal 0,-5; }
4317,Mobster_Card,Mobster Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,15; if(BaseClass == Job_Thief) bonus bCritical,4; },{},{} 4317,Mobster_Card,Mobster Card,6,,10,10,,,,,,,,2,,,,,{ bonus bCritAtkRate,15; if(BaseClass == Job_Thief) bonus bCritical,4; },{},{}
4318,Stormy_Knight_Card,Stormy Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,89,2,20; bonus2 bAddEffWhenHit,Eff_Freeze,2000; },{},{} 4318,Stormy_Knight_Card,Stormy Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,89,2,20; bonus2 bAddEffWhenHit,Eff_Freeze,2000; },{},{}
4319,Freezer_Card,Freezer Card,6,,10,10,,,,,,,,64,,,,,{ bonus bMaxHP,300; if(getrefine()>=9) bonus2 bSkillAtk,5,10; if(isequipped(4246,4311,4220,4331)==0) end; bonus bStr,10; bonus bMaxHPrate,20; bonus bHPrecovRate,50; bonus4 bAutoSpell,112,1,3,0; bonus2 bAddMonsterDropItem,501,100; if(BaseClass != Job_Swordman) end; bonus2 bAddItemHealRate,1,50; },{},{} 4319,Freezer_Card,Freezer Card,6,,10,10,,,,,,,,64,,,,,{ bonus bMaxHP,300; if(getrefine()>=9) bonus2 bSkillAtk,5,10; if(isequipped(4246,4311,4220,4331)==0) end; bonus bStr,10; bonus bMaxHPrate,20; bonus bHPrecovRate,50; bonus4 bAutoSpell,112,1,3,0; bonus2 bAddMonsterDropItem,501,100; if(BaseClass != Job_Swordman) end; bonus2 bAddItemHealRate,IG_Potion,50; },{},{}
4320,Bloody_Knight_Card,Bloody Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,83,1,20; },{},{} 4320,Bloody_Knight_Card,Bloody Knight Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,83,1,20; },{},{}
4321,Hylozoist_Card,Hylozoist Card,6,,10,10,,,,,,,,136,,,,,{ bonus bClassChange,100; },{},{} 4321,Hylozoist_Card,Hylozoist Card,6,,10,10,,,,,,,,136,,,,,{ bonus bClassChange,100; },{},{}
4322,High_Orc_Card,High Orc Card,6,,10,10,,,,,,,,32,,,,,{ bonus bDef,1; bonus bShortWeaponDamageReturn,5; },{},{} 4322,High_Orc_Card,High Orc Card,6,,10,10,,,,,,,,32,,,,,{ bonus bDef,1; bonus bShortWeaponDamageReturn,5; },{},{}
4323,Garm_Baby_Card,Garm Baby Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,15,3,50+250*isequipped(4324); },{},{} 4323,Garm_Baby_Card,Garm Baby Card,6,,10,10,,,,,,,,2,,,,,{ bonus3 bAutoSpell,15,3,50+250*isequipped(4324); },{},{}
4324,Garm_Card,Garm Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,5000; },{},{} 4324,Garm_Card,Garm Card,6,,10,10,,,,,,,,16,,,,,{ bonus2 bAddEffWhenHit,Eff_Freeze,5000; },{},{}
4325,Harpy_Card,Harpy Card,6,,10,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bSkillAtk,11,5; if(isequipped(4191,4208,4258,4309,4327)==0) end; bonus bMaxHP,500; bonus bDef,5; bonus bMDef,5; bonus2 bSkillAtk,14,10; bonus2 bSkillAtk,19,10; bonus2 bSkillAtk,20,10; if(BaseClass != Job_Mage) end; bonus bMatkRate,3; bonus bCastrate,-15; },{},{} 4325,Harpy_Card,Harpy Card,6,,10,10,,,,,,,,4,,,,,{ bonus2 bSubEle,Ele_Neutral,15; bonus2 bSkillAtk,11,5; if(isequipped(4191,4208,4258,4309,4327)==0) end; bonus bMaxHP,500; bonus bDef,5; bonus bMDef,5; bonus2 bSkillAtk,14,10; bonus2 bSkillAtk,19,10; bonus2 bSkillAtk,20,10; if(BaseClass != Job_Mage) end; bonus bMatkRate,3; bonus bCastrate,-15; },{},{}
4326,Sea-Otter_Card,Sea-Otter Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,7,50; bonus3 bAddMonsterDropItem,544,5,5000; bonus3 bAddMonsterDropItem,551,5,5000; },{},{} 4326,Sea-Otter_Card,Sea-Otter Card,6,,10,10,,,,,,,,136,,,,,{ bonus2 bAddItemHealRate,IG_Fish,50; bonus3 bAddMonsterDropItemGroup,IG_Fish,RC_Fish,5000; },{},{}
4327,Bloody_Butterfly_Card,Bloody Butterfly Card,6,,10,10,,,,,,,,136,,,,,{ bonus bCastrate,30; bonus bNoCastCancel,0; bonus2 bSkillAtk,18,5; },{},{} 4327,Bloody_Butterfly_Card,Bloody Butterfly Card,6,,10,10,,,,,,,,136,,,,,{ bonus bCastrate,30; bonus bNoCastCancel,0; bonus2 bSkillAtk,18,5; },{},{}
4328,Hyegun_Card,Hyegun Card,6,,10,10,,,,,,,,4,,,,,{ bonus bFlee,15; bonus bCritical,1; if(isequipped(4090,4212)) bonus bAllStats,1; },{},{} 4328,Hyegun_Card,Hyegun Card,6,,10,10,,,,,,,,4,,,,,{ bonus bFlee,15; bonus bCritical,1; if(isequipped(4090,4212)) bonus bAllStats,1; },{},{}
4329,Phendark_Card,Phendark Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_DemiHuman,5; },{ },{ heal 0,-5; } 4329,Phendark_Card,Phendark Card,6,,10,10,,,,,,,,2,,,,,{ bonus2 bSPGainRace,RC_DemiHuman,5; },{ },{ heal 0,-5; }
@ -2243,7 +2243,7 @@
12020,Cursed_Water,Cursed_Water,0,,1,30,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SHADOWWEAPON, 1200000, 1; },{},{} 12020,Cursed_Water,Cursed_Water,0,,1,30,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_SHADOWWEAPON, 1200000, 1; },{},{}
12021,Pork,Pork,0,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,99),0; },{},{} 12021,Pork,Pork,0,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,99),0; },{},{}
12022,Galbi,Galbi,0,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,99),0; },{},{} 12022,Galbi,Galbi,0,,10,10,,,,,0xFFFFFFFF,7,2,,,,,,{ itemheal rand(70,99),0; },{},{}
12023,Wrapped_Box,Wrapped Box,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -4,1; },{},{} 12023,Wrapped_Box,Wrapped Box,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_GiftBox),1; },{},{}
12024,Red_Pouch,Red Pouch,2,,10,50,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(100,1000); },{},{} 12024,Red_Pouch,Red Pouch,2,,10,50,,,,,0xFFFFFFFF,7,2,,,,,,{ set Zeny,Zeny+rand(100,1000); },{},{}
12025,Dano_Festival_Egg,Dano Festival Egg,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12025,Dano_Festival_Egg,Dano Festival Egg,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12026,Dano_Festival_Egg_,Dano Festival Egg,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12026,Dano_Festival_Egg_,Dano Festival Egg,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
@ -2328,14 +2328,14 @@
12102,Grilled_Skewer,Grilled Skewer,0,,10,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12102,Grilled_Skewer,Grilled Skewer,0,,10,300,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
// New Monster Summoners & Item Givers // New Monster Summoners & Item Givers
12103,Bloody_Branch,Bloody Branch,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-3,1,""; },{},{} 12103,Bloody_Branch,Bloody Branch,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-3,1,""; },{},{}
12104,Random_Quiver,Random Quiver,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(17),1; },{},{} 12104,Random_Quiver,Random Quiver,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Quiver),1; },{},{}
12105,Taming_Item_Giftset,Taming Item Giftset,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(15),3; },{},{} 12105,Taming_Item_Giftset,Taming Item Giftset,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Taming),3; },{},{}
12106,Jewel_Box,Jewel Case,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(19),1; },{},{} 12106,Jewel_Box,Jewel Case,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Jewel),1; },{},{}
12107,Wrapped_Mask,Wrapped Mask,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(18),1; },{},{} 12107,Wrapped_Mask,Wrapped Mask,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Mask),1; },{},{}
12108,Bundle_of_Spells,Bundle of Spells,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(16),5; },{},{} 12108,Bundle_of_Spells,Bundle of Spells,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Scroll),5; },{},{}
12109,Poring_Box,Poring Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-2,1,""; },{},{} 12109,Poring_Box,Poring Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ monster "this",0,0,"--ja--",-2,1,""; },{},{}
12110,First_Aid_Box,First Aid Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(1),5; },{},{} 12110,First_Aid_Box,First Aid Box,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Potion),5; },{},{}
12111,Wrapped_Food,Wrapped Food,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(3),1; getitem groupranditem(4),1; getitem groupranditem(7),1; },{},{} 12111,Wrapped_Food,Wrapped Food,2,,5000,200,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_Fruit),1; getitem groupranditem(IG_Meat),1; getitem groupranditem(IG_Fish),1; },{},{}
12112,Tropical_Sograt,Tropical Sograt,0,,500,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Curse,10000,1; },{},{} 12112,Tropical_Sograt,Tropical Sograt,0,,500,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Curse,10000,1; },{},{}
12113,Vermilion_the_Beach,Vermilion the Beach,0,,500,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Stan,10000,1; },{},{} 12113,Vermilion_the_Beach,Vermilion the Beach,0,,500,100,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Stan,10000,1; },{},{}
// Elemental Converters // Elemental Converters
@ -2358,7 +2358,7 @@
12128,Court_Cooking_Set,Court Cooking Set,2,,10,70,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 11; },{},{} 12128,Court_Cooking_Set,Court Cooking Set,2,,10,70,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 11; },{},{}
12129,Legendary_Cooking_Set,Legendary Cooking Set,2,,10,70,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 11; },{},{} 12129,Legendary_Cooking_Set,Legendary Cooking Set,2,,10,70,,,,,0xFFFFFFFF,7,2,,,,,,{ produce 11; },{},{}
// //
12130,Cookie_Bag,Cookie Bag,2,,10,70,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem -7,1; },{},{} 12130,Cookie_Bag,Cookie Bag,2,,10,70,,,,,0xFFFFFFFF,7,2,,,,,,{ getitem groupranditem(IG_CookieBag),1; },{},{}
12131,Lucky_Potion,Lucky Potion,0,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12131,Lucky_Potion,Lucky Potion,0,,10,100,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{}
12132,Santa's_Bag,Santa's Bag,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Xmas,600000,0; },{},{} 12132,Santa's_Bag,Santa's Bag,2,,10,200,,,,,0xFFFFFFFF,7,2,,,,,,{ sc_start SC_Xmas,600000,0; },{},{}
12133,McDonald's_Ice_Cone,McDonald's Ice Cone,0,50,,80,,,,,0xFFFFFFFF,7,2,,,,,,{ if(gettime(5)==MDiceCone)end; set MDiceCone,gettime(5); percentheal 50,50; },{},{} 12133,McDonald's_Ice_Cone,McDonald's Ice Cone,0,50,,80,,,,,0xFFFFFFFF,7,2,,,,,,{ if(gettime(5)==MDiceCone)end; set MDiceCone,gettime(5); percentheal 50,50; },{},{}

43
db/item_findingore.txt
View File

@ -1,26 +1,25 @@
// Ore Discovery Obtainable Items Database // Ore Discovery Obtainable Items Database
// //
// Structure of Database: // Structure of Database:
// ItemID,DummyName,Rate // GroupID,ItemID,Rate
0,Iron Ore,1002 6,714,3 //Emperium
714,Emperium,30000 6,756,20 //Rough Oridecon
756,Rough Oridecon,200000 6,757,20 //Rough Elunium
757,Rough Elunium,200000 6,969,2 //Gold
969,Gold,20000 6,984,10 //Oridecon
984,Oridecon,100000 6,985,10 //Elunium
985,Elunium,100000 6,990,30 //Red Blood
990,Red Blood,300000 6,991,30 //Crystal Blue
991,Crystal Blue,300000 6,992,30 //Wind of Verdure
992,Wind of Verdure,300000 6,993,30 //Green Live
993,Green Live,300000 6,994,15 //Flame Heart
994,Flame Heart,150000 6,995,15 //Mystic Frozen
995,Mystic Frozen,150000 6,996,15 //Rough Wind
996,Rough Wind,150000 6,997,15 //Great Nature
997,Great Nature,150000 6,998,80 //Iron
998,Iron,800000 6,999,50 //Steel
999,Steel,500000 6,1002,100 //Iron Ore
1002,Iron Ore,1000000 6,1003,60 //Coal
1003,Coal,600000 6,1010,95 //Phracon
1010,Phracon,950000 6,1011,55 //Emveretarcon
1011,Emveretarcon,550000

185
db/item_giftbox.txt
View File

@ -1,106 +1,87 @@
// Gift Box Obtainable Items Database // Gift Box Obtainable Items Database
// //
// Structure of Database: // Structure of Database:
// ItemID,DummyName,Rate // GroupID,ItemID,Rate
0,Rough Oridecon,756 4,756,1 //Rough Oridecon
756,Rough Oridecon,10000 4,756,1 //Rough Oridecon
756,Rough Oridecon,10000 4,756,1 //Rough Oridecon
756,Rough Oridecon,10000 4,756,1 //Rough Oridecon
756,Rough Oridecon,10000 4,756,1 //Rough Oridecon
756,Rough Oridecon,10000 4,757,1 //Rough Elunium
757,Rough Elunium,10000 4,757,1 //Rough Elunium
757,Rough Elunium,10000 4,984,1 //Oridecon
984,Oridecon,10000 4,984,1 //Oridecon
984,Oridecon,10000 4,985,1 //Elunium
985,Elunium,10000 4,714,1 //Emperium
714,Emperium,10000 4,999,1 //Steel
999,Steel,10000 4,1000,1 //Star Crumb
1000,Star Crumb,10000 4,994,1 //Flame Heart
994,Flame Heart,10000 4,995,1 //Mystic Frozen
995,Mystic Frozen,10000 4,996,1 //Rough Wind
996,Rough Wind,10000 4,997,1 //Great Nature
997,Great Nature,10000 4,975,1 //Scarlet Dyestuff
975,Scarlet Dyestuff,10000 4,976,1 //Lemon Dyestuff
976,Lemon Dyestuff,10000 4,978,1 //Cobaltblue Dyestuff
978,Cobaltblue Dyestuff,10000 4,979,1 //Darkgreen Dyestuff
979,Darkgreen Dyestuff,10000 4,980,1 //Orange Dyestuff
980,Orange Dyestuff,10000 4,981,1 //Violet Dyestuff
981,Violet Dyestuff,10000 4,982,1 //White Dyestuff
982,White Dyestuff,10000 4,983,1 //Black Dyestuff
983,Black Dyestuff,10000 4,969,1 //Gold
969,Gold,10000 4,718,1 //Garnet
718,Garnet,10000 4,719,1 //Amethyst
719,Amethyst,10000 4,720,1 //Aquamarine
720,Aquamarine,10000 4,721,1 //Emerald
721,Emerald,10000 4,722,1 //Pearl
722,Pearl,10000 4,723,1 //Ruby
723,Ruby,10000 4,724,1 //Cursed Ruby
724,Cursed Ruby,10000 4,725,1 //Sardonyx
725,Sardonyx,10000 4,726,1 //Sapphire
726,Sapphire,10000 4,727,1 //Opal
727,Opal,10000 4,728,1 //Topaz
728,Topaz,10000 4,729,1 //Zircon
729,Zircon,10000 4,730,1 //1carat Diamond
730,1carat Diamond,10000 4,731,1 //2carat Diamond
731,2carat Diamond,10000 4,732,1 //3carat Diamond
732,3carat Diamond,10000 4,733,1 //Cracked Diamond
733,Cracked Diamond,10000 4,734,1 //Red Frame
734,Red Frame,10000 4,735,1 //Chung Jah
735,Chung Jah,10000 4,736,1 //China
736,China,10000 4,737,1 //Black Ladle
737,Black Ladle,10000 4,738,1 //Pencil Case
738,Pencil Case,10000 4,739,1 //Rouge
739,Rouge,10000 4,740,1 //Puppet
740,Puppet,10000 4,741,1 //Poring Doll
741,Poring Doll,10000 4,742,1 //Chonchon Doll
742,Chonchon Doll,10000 4,743,1 //Spore Doll
743,Spore Doll,10000 4,744,1 //Bouquet
744,Bouquet,10000 4,745,1 //Wedding Bouquet
745,Wedding Bouquet,10000 4,746,1 //Glass Bead
746,Glass Bead,10000 4,747,1 //Crystal Mirror
747,Crystal Mirror,10000 4,748,1 //Witherless Rose
748,Witherless Rose,10000 4,749,1 //Frozen Rose
749,Frozen Rose,10000 4,750,1 //Baphomet Doll
750,Baphomet Doll,10000 4,751,1 //Osiris Doll
751,Osiris Doll,10000 4,752,1 //Grasshopper Doll
752,Grasshopper Doll,10000 4,753,1 //Yoyo Doll
753,Yoyo Doll,10000 4,754,1 //Raccoon Doll
754,Raccoon Doll,10000 4,706,1 //Four Leaf Clover
706,Four Leaf Clover,10000 4,4005,1 //Santa Poring Card
4005,Santa Poring Card,10000 4,7034,1 //Red Stocking
7034,Red Stocking,10000 4,501,1 //Red Potion
501,Red Potion,10000 4,502,1 //Orange Potion
502,Orange Potion,10000 4,503,1 //Yellow Potion
503,Yellow Potion,10000 4,504,1 //White Potion
504,White Potion,10000 4,505,1 //Blue Potion
505,Blue Potion,10000 4,506,1 //Green Potion
506,Green Potion,10000 4,526,1 //Royal Jelly
526,Royal Jelly,10000 4,529,1 //Candy
529,Candy,10000 4,530,1 //Candy Cane
530,Candy Cane,10000 4,537,1 //Pet Food
537,Pet Food,10000 4,538,1 //Well-baked Cookie
538,Well-baked Cookie,10000 4,539,1 //Piece of Cake
539,Piece of Cake,10000 4,603,1 //Old Blue Box
603,Old Blue Box,10000 4,617,1 //Old Purple Box
617,Old Purple Box,10000 4,644,20 //Gift Box
644,Gift Box,10000 4,1558,1 //Girl's Diary
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
644,Gift Box,10000
1558,Girl's Diary,10000

30
db/item_group_db.txt
View File

@ -1,22 +1,8 @@
// GROUP,Item ID1,Item ID2,Item ID3,...,Item ID20 import: db/item_bluebox.txt
// import: db/item_violetbox.txt
1,501,502,503,504,505,506 // potions import: db/item_cardalbum.txt
2,507,508,509,510,511 // herbs import: db/item_cookie_bag.txt
3,512,513,514,515,516 // fruits import: db/item_findingore.txt
4,517,528 // meat import: db/item_giftbox.txt
5,529,530 // candy import: db/item_scroll.txt
6,531,532,534 // juices (removed Grape juice 533) import: db/item_misc.txt
7,544,551 // raw fish
8,603,617,644 // boxes
9,715,716,717 // gemstones
10,909,7126 // jellopy/giant jellopy
11,756,757,998,999,1002,1003,1010,1011 // ores
12,512,513,514,515,516,517,528,529,530,544,551 // food types
13,501,502,503,504,505,506,507,508,509,510,511,531,532,533,534 // recovery-types
14,714,756,757,969,984,985,990,991,992,993,994,995,996,997,998,999,1002,1003,1010,1011 // minerals
15,619,620,621,622,623,624,625,626,627,628,629,630,631,632,633,634,635,636,637,638,639,640,641,642,659,660,661 // taming items
16,686,687,688,689,690,691,692,693,694,695,696,697,698,699,700,12000,12001,12002,12003 //scrolls
17,12004,12005,12006,12007,12008,12009,12010,12011,12012,12013,12014,12015 //quivers
18,2263,2278,2288,2297,5043,5087,5088,5089,5090 //masks
19,2601,2602,2603,2604,2605,2606,2607,2608,2610,2611,2612,2613,2614,2615,2616,2617,2618,2619,2620,2621,2622,2623,2624,2625,2626,2627,2628,2640,2641,2648,2649,2650,2651 //accessory
20,718,719,720,721,722,723,724,725,726,727,728,729,730,731,732,733 // jewels

225
db/item_misc.txt Normal file
View File

@ -0,0 +1,225 @@
//GroupID,ItemID,Rate
//
// Potions
8,501,1
8,502,1
8,503,1
8,504,1
8,505,1
8,506,1
// Herbs
9,507,1
9,508,1
9,509,1
9,510,1
9,511,1
// Fruits
10,512,1
10,513,1
10,514,1
10,515,1
10,516,1
// Meat
11,517,1
11,528,1
// Candy
12,529,1
12,530,1
// Juice (removed Grape juice 533)
13,531,1
13,532,1
13,534,1
// Fish
14,544,1
14,551,1
// Boxes
15,603,1
15,617,1
15,644,1
// Gemstones
16,715,1
16,716,1
16,717,1
//jellopy/giant jellopy
17,909,1
17,7126,1
// ores
18,756,1
18,757,1
18,998,1
18,999,1
18,1002,1
18,1003,1
18,1010,1
18,1011,1
// food types
19,512,1
19,513,1
19,514,1
19,515,1
19,516,1
19,517,1
19,528,1
19,529,1
19,530,1
19,544,1
19,551,1
//recovery-types
20,501,1
20,502,1
20,503,1
20,504,1
20,505,1
20,506,1
20,507,1
20,508,1
20,509,1
20,510,1
20,511,1
20,531,1
20,532,1
20,533,1
20,534,1
// minerals
21,714,1
21,756,1
21,757,1
21,969,1
21,984,1
21,985,1
21,990,1
21,991,1
21,992,1
21,993,1
21,994,1
21,995,1
21,996,1
21,997,1
21,998,1
21,999,1
21,1002,1
21,1003,1
21,1010,1
21,1011,1
// taming items
22,619,1
22,620,1
22,621,1
22,622,1
22,623,1
22,624,1
22,625,1
22,626,1
22,627,1
22,628,1
22,629,1
22,630,1
22,631,1
22,632,1
22,633,1
22,634,1
22,635,1
22,636,1
22,637,1
22,638,1
22,639,1
22,640,1
22,641,1
22,642,1
22,659,1
22,660,1
22,661,1
//scrolls
23,686,1
23,687,1
23,688,1
23,689,1
23,690,1
23,691,1
23,692,1
23,693,1
23,694,1
23,695,1
23,696,1
23,697,1
23,698,1
23,699,1
23,700,1
23,12000,1
23,12001,1
23,12002,1
23,12003,1
//quivers
24,12004,1
24,12005,1
24,12006,1
24,12007,1
24,12008,1
24,12009,1
24,12010,1
24,12011,1
24,12012,1
24,12013,1
24,12014,1
24,12015,1
//masks
25,2263,1
25,2278,1
25,2288,1
25,2297,1
25,5043,1
25,5087,1
25,5088,1
25,5089,1
25,5090,1
//accessory
26,2601,1
26,2602,1
26,2603,1
26,2604,1
26,2605,1
26,2606,1
26,2607,1
26,2608,1
26,2610,1
26,2611,1
26,2612,1
26,2613,1
26,2614,1
26,2615,1
26,2616,1
26,2617,1
26,2618,1
26,2619,1
26,2620,1
26,2621,1
26,2622,1
26,2623,1
26,2624,1
26,2625,1
26,2626,1
26,2627,1
26,2628,1
26,2640,1
26,2641,1
26,2648,1
26,2649,1
26,2650,1
26,2651,1
// jewels
27,718,1
27,719,1
27,720,1
27,721,1
27,722,1
27,723,1
27,724,1
27,725,1
27,726,1
27,727,1
27,728,1
27,729,1
27,730,1
27,731,1
27,732,1
27,733,1

4
db/item_scroll.txt
View File

@ -1,6 +1,6 @@
// Worn-Out Scroll Obtainable Items Database // Worn-Out Scroll Obtainable Items Database
// //
// Structure of Database: // Structure of Database:
// ItemID,DummyName,Rate // GroupID,ItemID,Rate
0,Jellopy,909 5,909,1 //Jellopy

18963
db/item_violetbox.txt
View File

File diff suppressed because it is too large Load Diff

262
src/map/itemdb.c
View File

@ -15,18 +15,12 @@
#include "script.h" #include "script.h"
#include "pc.h" #include "pc.h"
#define MAX_RANDITEM 10000
#define MAX_ITEMGROUP 32
// ** ITEMDB_OVERRIDE_NAME_VERBOSE ** // ** ITEMDB_OVERRIDE_NAME_VERBOSE **
// 定義すると、itemdb.txtとgrfで名前が異なる場合、表示します. // 定義すると、itemdb.txtとgrfで名前が異なる場合、表示します.
//#define ITEMDB_OVERRIDE_NAME_VERBOSE 1 //#define ITEMDB_OVERRIDE_NAME_VERBOSE 1
static struct dbt* item_db; static struct dbt* item_db;
static struct random_item_data blue_box[MAX_RANDITEM], violet_box[MAX_RANDITEM], card_album[MAX_RANDITEM], gift_box[MAX_RANDITEM], scroll[MAX_RANDITEM], finding_ore[MAX_RANDITEM], cookie_bag[MAX_RANDITEM];
static int blue_box_count=0, violet_box_count=0, card_album_count=0, gift_box_count=0, scroll_count=0, finding_ore_count = 0, cookie_bag_count=0;
static int blue_box_default=0, violet_box_default=0, card_album_default=0, gift_box_default=0, scroll_default=0, finding_ore_default = 0, cookie_bag_default=0;
static struct item_group itemgroup_db[MAX_ITEMGROUP]; static struct item_group itemgroup_db[MAX_ITEMGROUP];
struct item_data *dummy_item=NULL; //This is the default dummy item used for non-existant items. [Skotlex] struct item_data *dummy_item=NULL; //This is the default dummy item used for non-existant items. [Skotlex]
@ -102,56 +96,19 @@ int itemdb_searchname_array(struct item_data** data, int size, const char *str)
* 箱系アイテム検索 * 箱系アイテム検索
*------------------------------------------ *------------------------------------------
*/ */
int itemdb_searchrandomid(int flags) int itemdb_searchrandomid(int group)
{ {
int nameid=0,i,index,count; if(group<1 || group>=MAX_ITEMGROUP) {
struct random_item_data *list=NULL; if (battle_config.error_log)
ShowError("itemdb_searchrandomid: Invalid group id %d\n", group);
return 512; //Return apple?
}
if (itemgroup_db[group].qty)
return itemgroup_db[group].nameid[rand()%itemgroup_db[group].qty];
static struct { if (battle_config.error_log)
int nameid,count; ShowError("itemdb_searchrandomid: No item entries for group id %d\n", group);
struct random_item_data *list; return 512;
} data[8];
if (flags == 0) { //Initialize.
memset(data, 0, sizeof(data));
data[1].nameid = blue_box_default;
data[1].count = blue_box_count;
data[1].list = blue_box;
data[2].nameid = violet_box_default;
data[2].count = violet_box_count;
data[2].list = violet_box;
data[3].nameid = card_album_default;
data[3].count = card_album_count;
data[3].list = card_album;
data[4].nameid = gift_box_default;
data[4].count = gift_box_count;
data[4].list = gift_box;
data[5].nameid = scroll_default;
data[5].count = scroll_count;
data[5].list = scroll;
data[6].nameid = finding_ore_default;
data[6].count = finding_ore_count;
data[6].list = finding_ore;
data[7].nameid = cookie_bag_default;
data[7].count = cookie_bag_count;
data[7].list = cookie_bag;
}
if(flags>=1 && flags<=7){
nameid=data[flags].nameid;
count=data[flags].count;
list=data[flags].list;
if(count > 0) {
for(i=0;i<1000;i++) {
index = rand()%count;
if(rand()%1000000 < list[index].per) {
nameid = list[index].nameid;
break;
}
}
}
}
return nameid;
} }
/*========================================== /*==========================================
@ -162,21 +119,13 @@ int itemdb_group (int nameid)
{ {
int i, j; int i, j;
for (i=0; i < MAX_ITEMGROUP; i++) { for (i=0; i < MAX_ITEMGROUP; i++) {
for (j=0; j < itemgroup_db[i].qty && itemgroup_db[i].id[j]; j++) { for (j=0; j < itemgroup_db[i].qty; j++) {
if (itemgroup_db[i].id[j] == nameid) if (itemgroup_db[i].id[j] == nameid)
return i; return i;
} }
} }
return -1; return -1;
} }
int itemdb_searchrandomgroup (int groupid)
{
if (groupid < 0 || groupid >= MAX_ITEMGROUP ||
itemgroup_db[groupid].qty == 0 || itemgroup_db[groupid].id[0] == 0)
return 0;
return itemgroup_db[groupid].id[ rand()%itemgroup_db[groupid].qty ];
}
/*========================================== /*==========================================
* DBの存在確認 * DBの存在確認
@ -381,90 +330,6 @@ int itemdb_isequip3(int nameid)
return 0; return 0;
} }
/*==========================================
* ランダムアイテム出現データの読み込み
*------------------------------------------
*/
static int itemdb_read_randomitem(void)
{
FILE *fp;
char line[1024];
int nameid,i,j;
char *str[10],*p;
const struct {
char filename[64];
struct random_item_data *pdata;
int *pcount,*pdefault;
} data[] = {
{"item_bluebox.txt", blue_box, &blue_box_count, &blue_box_default },
{"item_violetbox.txt", violet_box, &violet_box_count, &violet_box_default },
{"item_cardalbum.txt", card_album, &card_album_count, &card_album_default },
{"item_giftbox.txt", gift_box, &gift_box_count, &gift_box_default },
{"item_scroll.txt", scroll, &scroll_count, &scroll_default },
{"item_findingore.txt", finding_ore,&finding_ore_count, &finding_ore_default },
{"item_cookie_bag.txt", cookie_bag,&cookie_bag_count, &cookie_bag_default },
};
for(i=0;i<sizeof(data)/sizeof(data[0]);i++){
struct random_item_data *pd=data[i].pdata;
int *pc=data[i].pcount;
int *pdefault=data[i].pdefault;
char *fn=(char *) data[i].filename;
*pdefault = 0;
*pc = 0; //zero the count in case we are reloading. [Skotlex]
sprintf(line, "%s/%s", db_path, fn);
if( (fp=fopen(line,"r"))==NULL ){
ShowError("can't read %s\n",line);
continue;
}
while(fgets(line,1020,fp)){
if(line[0]=='/' && line[1]=='/')
continue;
memset(str,0,sizeof(str));
for(j=0,p=line;j<3 && p;j++){
str[j]=p;
p=strchr(p,',');
if(p) *p++=0;
}
if(str[0]==NULL)
continue;
nameid=atoi(str[0]);
if(nameid<0 || nameid>=20000)
continue;
if(nameid == 0) {
if(str[2])
*pdefault = atoi(str[2]);
continue;
}
if(str[2]){
pd[ *pc ].nameid = nameid;
pd[(*pc)++].per = atoi(str[2]);
}
if(*pc >= MAX_RANDITEM)
{
if (battle_config.error_log)
ShowWarning("Reached limit of random items [%d] in file [%s]\n", MAX_RANDITEM, data[i].filename);
break;
}
}
fclose(fp);
if (*pc > 0) {
ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",*pc,fn);
}
}
itemdb_searchrandomid(0); //Initialize values.
return 0;
}
/*========================================== /*==========================================
* アイテム使用可能フラグのオーバーライド * アイテム使用可能フラグのオーバーライド
*------------------------------------------ *------------------------------------------
@ -514,62 +379,106 @@ static int itemdb_read_itemavail (void)
* read item group data * read item group data
*------------------------------------------ *------------------------------------------
*/ */
static int itemdb_read_itemgroup(void) static void itemdb_read_itemgroup_sub(const char* filename)
{ {
FILE *fp; FILE *fp;
char line[1024]; char line[1024];
int ln=0; int ln=0;
int groupid,j,k; int groupid,j,k,nameid;
char *str[31],*p; char *str[3],*p;
char w1[1024], w2[1024];
sprintf(line, "%s/item_group_db.txt", db_path); if( (fp=fopen(filename,"r"))==NULL ){
if( (fp=fopen(line,"r"))==NULL ){
ShowError("can't read %s\n", line); ShowError("can't read %s\n", line);
return -1; return;
} }
while(fgets(line,1020,fp)){ while(fgets(line,1020,fp)){
ln++;
if(line[0]=='/' && line[1]=='/') if(line[0]=='/' && line[1]=='/')
continue; continue;
if(strstr(line,"import")) {
if (sscanf(line, "%[^:]: %[^\r\n]", w1, w2) == 2 &&
strcmpi(w1, "import") == 0) {
itemdb_read_itemgroup_sub(w2);
continue;
}
}
memset(str,0,sizeof(str)); memset(str,0,sizeof(str));
for(j=0,p=line;j<31 && p;j++){ for(j=0,p=line;j<3 && p;j++){
str[j]=p; str[j]=p;
p=strchr(p,','); p=strchr(p,',');
if(p) *p++=0; if(p) *p++=0;
} }
if(str[0]==NULL) if(str[0]==NULL)
continue; continue;
if (j<3)
continue;
groupid = atoi(str[0]); groupid = atoi(str[0]);
if (groupid < 0 || groupid >= MAX_ITEMGROUP) if (groupid < 0 || groupid >= MAX_ITEMGROUP) {
ShowWarning("itemdb_read_itemgroup: Invalid group %d in %s:%d\n", groupid, filename, ln);
continue; continue;
}
for (j=1; j<=30; j++) { nameid = atoi(str[1]);
if (!str[j]) if (!itemdb_exists(nameid)) {
break; ShowWarning("itemdb_read_itemgroup: Non-existant item %d in %s:%d\n", nameid, filename, ln);
k=atoi(str[j]);
if (k < 0 || k >= 20000 || !itemdb_exists(k))
continue; continue;
//printf ("%d[%d] = %d\n", groupid, j-1, k);
itemgroup_db[groupid].id[j-1] = k;
itemgroup_db[groupid].qty=j;
} }
for (j=1; j<30; j++) { //Cleanup the contents. [Skotlex] k = atoi(str[2]);
if (itemgroup_db[groupid].id[j-1] == 0 && if (itemgroup_db[groupid].qty+k > MAX_RANDITEM) {
itemgroup_db[groupid].id[j] != 0) ShowWarning("itemdb_read_itemgroup: Group %d is full (%d entries) in %s:%d\n", groupid, MAX_RANDITEM, filename, ln);
{ continue;
itemgroup_db[groupid].id[j-1] = itemgroup_db[groupid].id[j];
itemgroup_db[groupid].id[j] = 0;
itemgroup_db[groupid].qty = j;
} }
} for(j=0;j<k;j++)
ln++; itemgroup_db[groupid].nameid[itemgroup_db[groupid].qty++] = nameid;
} }
fclose(fp); fclose(fp);
ShowStatus("Done reading '"CL_WHITE"%d"CL_RESET"' entries in '"CL_WHITE"%s"CL_RESET"'.\n",ln,"item_group_db.txt"); return;
return 0;
} }
static void itemdb_read_itemgroup(void)
{
char path[256];
int i;
const char* groups[] = {
"Blue Box",
"Violet Box",
"Card Album",
"Gift Box",
"Scroll Box",
"Finding Ore",
"Cookie Bag",
"Potion",
"Herbs",
"Fruits",
"Meat",
"Candy",
"Juice",
"Fish",
"Boxes",
"Gemstone",
"Jellopy",
"Ore",
"Food",
"Recovery",
"Minerals",
"Taming",
"Scrolls",
"Quivers",
"Masks",
"Accesory",
"Jewels",
};
memset(&itemgroup_db, 0, sizeof(itemgroup_db));
snprintf(path, 255, "%s/item_group_db.txt", db_path);
itemdb_read_itemgroup_sub(path);
ShowStatus("Done reading '"CL_WHITE"%s"CL_RESET"'.\n","item_group_db.txt");
if (battle_config.etc_log) {
for (i = 1; i < MAX_ITEMGROUP; i++)
ShowInfo("Group %s: %d entries.\n", groups[i-1], itemgroup_db[i].qty);
}
return;
}
/*========================================== /*==========================================
* アイテムの名前テーブルを読み込む * アイテムの名前テーブルを読み込む
*------------------------------------------ *------------------------------------------
@ -1188,7 +1097,6 @@ static void itemdb_read(void)
itemdb_readdb(); itemdb_readdb();
itemdb_read_itemgroup(); itemdb_read_itemgroup();
itemdb_read_randomitem();
itemdb_read_itemavail(); itemdb_read_itemavail();
itemdb_read_noequip(); itemdb_read_noequip();
itemdb_read_itemtrade(); itemdb_read_itemtrade();

38
src/map/itemdb.h
View File

@ -5,6 +5,7 @@
#define _ITEMDB_H_ #define _ITEMDB_H_
#include "map.h" #include "map.h"
#define MAX_RANDITEM 10000
struct item_data { struct item_data {
int nameid; int nameid;
@ -53,16 +54,43 @@ struct item_data {
int view_id; int view_id;
}; };
struct random_item_data {
int nameid;
int per;
};
struct item_group { struct item_group {
int nameid[MAX_RANDITEM];
int qty; //Counts amount of items in the group. int qty; //Counts amount of items in the group.
int id[30]; // 120 bytes int id[30]; // 120 bytes
}; };
enum {
IG_BLUEBOX=1,
IG_VIOLETBOX, //2
IG_CARDALBUM, //3
IG_GIFTBOX, //4
IG_SCROLLBOX, //5
IG_FINDINGORE, //6
IG_COOKIEBAG, //7
IG_POTION, //8
IG_HERBS, //9
IG_FRUITS, //10
IG_MEAT, //11
IG_CANDY, //12
IG_JUICE, //13
IG_FISH, //14
IG_BOXES, //15
IG_GEMSTONE, //16
IG_JELLOPY, //17
IG_ORE, //18
IG_FOOD, //19
IG_RECOVERY, //20
IG_MINERALS, //21
IG_TAMING, //22
IG_SCROLLS, //23
IG_QUIVERS, //24
IG_MASKS, //25
IG_ACCESORY, //26
IG_JEWELS, //27
MAX_ITEMGROUP,
} item_group_list;
struct item_data* itemdb_searchname(const char *name); struct item_data* itemdb_searchname(const char *name);
int itemdb_searchname_array(struct item_data** data, int size, const char *str); int itemdb_searchname_array(struct item_data** data, int size, const char *str);
struct item_data* itemdb_load(int nameid); struct item_data* itemdb_load(int nameid);

4
src/map/mob.c
View File

@ -1985,7 +1985,7 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type)
// Ore Discovery [Celest] // Ore Discovery [Celest]
if (sd == mvp_sd && !map[md->bl.m].flag.nomobloot && pc_checkskill(sd,BS_FINDINGORE)>0 && battle_config.finding_ore_rate/10 >= rand()%10000) { if (sd == mvp_sd && !map[md->bl.m].flag.nomobloot && pc_checkskill(sd,BS_FINDINGORE)>0 && battle_config.finding_ore_rate/10 >= rand()%10000) {
ditem = mob_setdropitem(itemdb_searchrandomid(6), 1); ditem = mob_setdropitem(itemdb_searchrandomid(IG_FINDINGORE), 1);
if (drop_ore<0) drop_ore=8; //we have only 10 slots in LOG, there's a check to not overflow (9th item usually a card, so we use 8th slot) if (drop_ore<0) drop_ore=8; //we have only 10 slots in LOG, there's a check to not overflow (9th item usually a card, so we use 8th slot)
log_item[drop_ore] = ditem->item_data.nameid; //it's for logging only log_item[drop_ore] = ditem->item_data.nameid; //it's for logging only
drop_items++; //we count if there were any drops drop_items++; //we count if there were any drops
@ -2020,7 +2020,7 @@ int mob_damage(struct block_list *src,struct mob_data *md,int damage,int type)
if (drop_rate < rand()%10000 +1) if (drop_rate < rand()%10000 +1)
continue; continue;
itemid = (sd->add_drop[i].id > 0) ? sd->add_drop[i].id : itemid = (sd->add_drop[i].id > 0) ? sd->add_drop[i].id :
itemdb_searchrandomgroup(sd->add_drop[i].group); itemdb_searchrandomid(sd->add_drop[i].group);
mob_item_drop(md, dlist, mob_setdropitem(itemid,1), 0, drop_rate); mob_item_drop(md, dlist, mob_setdropitem(itemid,1), 0, drop_rate);
} }

2
src/map/npc.c
View File

@ -744,8 +744,6 @@ void npc_timerevent_quit(struct map_session_data *sd) {
int npc_gettimerevent_tick(struct npc_data *nd) int npc_gettimerevent_tick(struct npc_data *nd)
{ {
int tick; int tick;
struct map_session_data *sd =NULL;
nullpo_retr(0, nd); nullpo_retr(0, nd);
tick=nd->u.scr.timer; tick=nd->u.scr.timer;

2
src/map/script.c
View File

@ -3945,7 +3945,7 @@ int buildin_grouprandomitem(struct script_state *st)
int group; int group;
group = conv_num(st,& (st->stack->stack_data[st->start+2])); group = conv_num(st,& (st->stack->stack_data[st->start+2]));
push_val(st->stack, C_INT, itemdb_searchrandomgroup(group)); push_val(st->stack, C_INT, itemdb_searchrandomid(group));
return 0; return 0;
} }

14
src/map/skill.c
View File

@ -6653,13 +6653,13 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
case UNT_ROKISWEIL: case UNT_ROKISWEIL:
case UNT_INTOABYSS: case UNT_INTOABYSS:
case UNT_SIEGFRIED: case UNT_SIEGFRIED:
case UNT_HERMODE:
//Needed to check when a dancer/bard leaves their ensemble area. //Needed to check when a dancer/bard leaves their ensemble area.
if (sg->src_id==bl->id && (!sc || sc->data[SC_SPIRIT].timer == -1 || sc->data[SC_SPIRIT].val2 != SL_BARDDANCER)) if (sg->src_id==bl->id && (!sc || sc->data[SC_SPIRIT].timer == -1 || sc->data[SC_SPIRIT].val2 != SL_BARDDANCER))
return sg->skill_id; return sg->skill_id;
if (sc && sc->data[type].timer==-1) if (sc && sc->data[type].timer==-1)
sc_start4(bl,type,100,sg->skill_lv,sg->val1,sg->val2,0,sg->limit); sc_start4(bl,type,100,sg->skill_lv,sg->val1,sg->val2,0,sg->limit);
break; break;
case UNT_WHISTLE: case UNT_WHISTLE:
case UNT_ASSASSINCROSS: case UNT_ASSASSINCROSS:
case UNT_POEMBRAGI: case UNT_POEMBRAGI:
@ -6668,11 +6668,18 @@ int skill_unit_onplace(struct skill_unit *src,struct block_list *bl,unsigned int
case UNT_DONTFORGETME: case UNT_DONTFORGETME:
case UNT_FORTUNEKISS: case UNT_FORTUNEKISS:
case UNT_SERVICEFORYOU: case UNT_SERVICEFORYOU:
case UNT_HERMODE:
if (sg->src_id==bl->id && (!sc || sc->data[SC_SPIRIT].timer == -1 || sc->data[SC_SPIRIT].val2 != SL_BARDDANCER)) if (sg->src_id==bl->id && (!sc || sc->data[SC_SPIRIT].timer == -1 || sc->data[SC_SPIRIT].val2 != SL_BARDDANCER))
return 0; return 0;
if (sc && sc->data[type].timer==-1) if (!sc)
break;
if (sc->data[type].timer==-1)
sc_start4(bl,type,100,sg->skill_lv,sg->val1,sg->val2,0,sg->limit); sc_start4(bl,type,100,sg->skill_lv,sg->val1,sg->val2,0,sg->limit);
else if (sc->data[type].val4 == 1) {
//Readjust timers since the effect will not last long.
sc->data[type].val4 = 0;
delete_timer(sc->data[type].timer, status_change_timer);
sc->data[type].timer = add_timer(tick+sg->limit, status_change_timer, bl->id, type);
}
break; break;
/* Basilica does not knocks back... /* Basilica does not knocks back...
case UNT_BASILICA: case UNT_BASILICA:
@ -7188,6 +7195,7 @@ static int skill_unit_onleft(int skill_id, struct block_list *bl,unsigned int ti
delete_timer(sc->data[type].timer, status_change_timer); delete_timer(sc->data[type].timer, status_change_timer);
//NOTE: It'd be nice if we could get the skill_lv for a more accurate extra time, but alas... //NOTE: It'd be nice if we could get the skill_lv for a more accurate extra time, but alas...
//not possible on our current implementation. //not possible on our current implementation.
sc->data[type].val4 = 1; //Store the fact that this is a "reduced" duration effect.
sc->data[type].timer = add_timer(tick+skill_get_time2(skill_id,1), status_change_timer, bl->id, type); sc->data[type].timer = add_timer(tick+skill_get_time2(skill_id,1), status_change_timer, bl->id, type);
} }
break; break;