diff options
| author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-25 01:08:33 +0000 |
|---|---|---|
| committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-11-25 01:08:33 +0000 |
| commit | a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c (patch) | |
| tree | b95e5afdc7726e814eee75b869bf5b489552eccf /db | |
| parent | 432e794f6cda3d5bcf03db78dcc36e3c006f72d4 (diff) | |
| download | hercules-a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c.tar.gz hercules-a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c.tar.bz2 hercules-a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c.tar.xz hercules-a8fedec270c751ee212cf5c8d5c1eab9dbca5f9c.zip | |
* Added the "Catalog Magician" NPC to merchants/buying_shops.txt, thanks to Muad_Dib!
* Changed all commands in atcommands.txt to their defined names, not aliases, and added two more common aliases.
* Documented 'makerune' in script_commands.txt.
* Documented '@accinfo' in atcommands.txt.
* Follow-up r16965, database update for rune crafting formula.
* Updated Magic Mushroom DB according to 3CeAM revision 703.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16966 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'db')
| -rw-r--r-- | db/magicmushroom_db.txt | 5 | ||||
| -rw-r--r-- | db/pre-re/item_db.txt | 10 | ||||
| -rw-r--r-- | db/re/item_db.txt | 10 |
3 files changed, 13 insertions, 12 deletions
diff --git a/db/magicmushroom_db.txt b/db/magicmushroom_db.txt index 70fcf3432..5705e537e 100644 --- a/db/magicmushroom_db.txt +++ b/db/magicmushroom_db.txt @@ -18,9 +18,10 @@ 151 //TF_PICKSTONE 157 //MG_ENERGYCOAT 249 //CR_AUTOGUARD -261 //MO_CALLSPIRITS 256 //CR_PROVIDENCE -318 //BA_FROSTJOKER +261 //MO_CALLSPIRITS +270 //MO_EXPLOSIONSPIRITS +326 //DC_SCREAM 500 //GS_GLITTERING 527 //NJ_TATAMIGAESHI 531 //NJ_UTSUSEMI diff --git a/db/pre-re/item_db.txt b/db/pre-re/item_db.txt index 1008ae96a..fee98e460 100644 --- a/db/pre-re/item_db.txt +++ b/db/pre-re/item_db.txt @@ -5161,11 +5161,11 @@ 12733,Runstone_Hagalas,Hagalaz Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_STONEHARDSKIN",1; },{},{} // Rune Knight Rune Ores -12734,Runstone_Quality,Luxurious Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 1; },{},{} -12735,Runstone_Ancient,Ancient Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 2; },{},{} -12736,Runstone_Mystic,Mystic Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 3; },{},{} -12737,Runstone_Ordinary,General Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 4; },{},{} -12738,Runstone_Rare,Rare Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 5; },{},{} +12734,Runstone_Quality,Luxurious Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 5; },{},{} +12735,Runstone_Ancient,Ancient Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 11; },{},{} +12736,Runstone_Mystic,Mystic Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 14; },{},{} +12737,Runstone_Ordinary,General Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 2; },{},{} +12738,Runstone_Rare,Rare Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 8; },{},{} 12739,Snow_Flower,Snow Flowers,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12740,Inc_Str_Scroll,Amplification Scroll,2,1,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} diff --git a/db/re/item_db.txt b/db/re/item_db.txt index 59b8f4c57..f2b59072a 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -5688,11 +5688,11 @@ 12733,Runstone_Hagalas,Hagalaz Rune,11,100,,100,,,,,0xFFFFFFFF,8,2,,,,,,{ itemskill "RK_STONEHARDSKIN",1; },{},{} // Rune Knight Rune Ores -12734,Runstone_Quality,Luxurious Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 1; },{},{} -12735,Runstone_Ancient,Ancient Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 2; },{},{} -12736,Runstone_Mystic,Mystic Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 3; },{},{} -12737,Runstone_Ordinary,General Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 4; },{},{} -12738,Runstone_Rare,Rare Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 5; },{},{} +12734,Runstone_Quality,Luxurious Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 5; },{},{} +12735,Runstone_Ancient,Ancient Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 11; },{},{} +12736,Runstone_Mystic,Mystic Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 14; },{},{} +12737,Runstone_Ordinary,General Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 2; },{},{} +12738,Runstone_Rare,Rare Rune,0,2,,100,,,,,0x00000080,8,2,,,,,,{ makerune 8; },{},{} 12739,Snow_Flower,Snow Flowers,2,0,,10,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} 12740,Inc_Str_Scroll,Amplification Scroll,2,1,,0,,,,,0xFFFFFFFF,7,2,,,,,,{},{},{} |