summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-08-04 22:21:12 +0000
committerKisuka <Kisuka@54d463be-8e91-2dee-dedb-b68131a5f0ec>2009-08-04 22:21:12 +0000
commit3f070a9a4f2081aaa8242325bf89490248ba1ff9 (patch)
treeaad9673a656e1da03adaa73c311127923364743f
parent094979064d459e66b7a02419a8eaed7495b65a6e (diff)
downloadhercules-3f070a9a4f2081aaa8242325bf89490248ba1ff9.tar.gz
hercules-3f070a9a4f2081aaa8242325bf89490248ba1ff9.tar.bz2
hercules-3f070a9a4f2081aaa8242325bf89490248ba1ff9.tar.xz
hercules-3f070a9a4f2081aaa8242325bf89490248ba1ff9.zip
- Added episode 12 & 13 cards (most episode 13 ones need matk + n;).
- Added some items from the ep 12 & 13 item givers. - Increased MAX_RANDITEM to 11000. (topic:226055) git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@13993 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r--db/item_db.txt17
-rw-r--r--src/map/itemdb.h2
2 files changed, 15 insertions, 4 deletions
diff --git a/db/item_db.txt b/db/item_db.txt
index ca21ff055..a6004581d 100644
--- a/db/item_db.txt
+++ b/db/item_db.txt
@@ -2062,6 +2062,17 @@
4439,Flame_Skull_Card,Flame Skull Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bResEff,Eff_Blind,3000; bonus2 bResEff,Eff_Stun,3000; bonus2 bResEff,Eff_Curse,3000; bonus2 bResEff,Eff_Stone,3000; bonus2 bAddEffWhenHit,Eff_Blind,500; bonus2 bAddEffWhenHit,Eff_Stun,500; bonus2 bAddEffWhenHit,Eff_Curse,500; bonus2 bAddEffWhenHit,Eff_Stone,500; },{},{}
4440,Necromancer_Card,Necromancer Card,6,20,,10,,,,,,,,2,,,,,{ if (getiteminfo(getequipid(EQI_HAND_R),11) == 10) { bonus bInt,1; bonus bIgnoreMdefRate,2; } },{},{}
4441,Fallen_Bishop_Card,Fallen Bishop Hibram Card,6,20,,10,,,,,,,,64,,,,,{ bonus bMatkRate,10; bonus bMaxSPrate,-50; bonus2 bMagicAddRace,RC_Angel,50; bonus2 bMagicAddRace,RC_DemiHuman,50; },{},{}
+4442,Tatacho_Card,Tatacho Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Earth,15; },{},{}
+4443,Aqua_Elemental_Card,Aqua Elemental Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Water,15; },{},{}
+4444,Draco_Card,Draco Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Fire,15; },{},{}
+4445,Luciola_Vespa_Card,Luciola Vespa Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Wind,15; },{},{}
+4447,Centipede_Card,Centipede Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Poison,15; },{},{}
+4448,Cornus_Card,Cornus Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Holy,15; },{},{}
+4449,Dark_Shadow_Card,Dark Shadow Card,6,20,,10,,,,,,,,32,,,,,{ bonus2 bSubEle,Ele_Dark,15; },{},{}
+4450,Banshee_Master_Card,Banshee Master Card,6,20,,10,,,,,,,,16,,,,,{},{},{}
+4451,Entweihen_Card,Entweihen Card,6,20,,10,,,,,,,,2,,,,,{},{},{}
+4452,Centipede_Larva_Card,Centipede Larva Card,6,20,,10,,,,,,,,2,,,,,{},{},{}
+4453,Hillsrion_Card,Hillsrion Card,6,20,,10,,,,,,,,2,,,,,{ bonus bAtk,25; },{},{}
// Armor Enchant System
//===================================================================
4700,Strength1,STR+1,6,20,,10,,,,,,,,16,,,,,{ bonus bStr,1; },{},{}
@@ -2580,9 +2591,9 @@
//5451,Dragonhelm_Gold
//5452,Dragonhelm_Silver
//5453,Dragonhelm_Copper
-//5454,Dog_Cap_
-//5455,Geographer_Band_
-//5456,Vacation_Hat_
+5454,Dog_Cap_,Puppy Hat,5,,,500,,3,,1,0xFFFFFFFF,7,2,256,,0,1,455,{},{},{}
+5455,Geographer_Band_,Decorative Geographer,5,,,500,,1,,1,0xFFFFFFFF,7,2,256,,0,1,456,{},{},{}
+5456,Vacation_Hat_,Summer Hat,5,,,200,,0,,1,0xFFFFFFFF,7,2,256,,0,1,457,{},{},{}
//5457,Spring_Rabbit_Hat
//5458,Pinwheel_Cap
//5459,Drooping_Bunny_Chusuk
diff --git a/src/map/itemdb.h b/src/map/itemdb.h
index 01f7b0f7d..12fcdf6bb 100644
--- a/src/map/itemdb.h
+++ b/src/map/itemdb.h
@@ -6,7 +6,7 @@
#include "../common/mmo.h" // ITEM_NAME_LENGTH
-#define MAX_RANDITEM 10000
+#define MAX_RANDITEM 11000
#define MAX_SEARCH 5 //Designed for search functions, species max number of matches to display.