diff options
author | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-22 18:32:55 +0000 |
---|---|---|
committer | euphyy <euphyy@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-09-22 18:32:55 +0000 |
commit | a197f9763d38ebc24e80180160b1db9cb9e2e41f (patch) | |
tree | 86d835cfb5dea388d36cb61c1e75bad69b9a2d4c | |
parent | 4dbea4c5a42e39f46f59826bf7412fdaa38f14ca (diff) | |
download | hercules-a197f9763d38ebc24e80180160b1db9cb9e2e41f.tar.gz hercules-a197f9763d38ebc24e80180160b1db9cb9e2e41f.tar.bz2 hercules-a197f9763d38ebc24e80180160b1db9cb9e2e41f.tar.xz hercules-a197f9763d38ebc24e80180160b1db9cb9e2e41f.zip |
* Fixed applicable job on Ebone Armor (bugreport:6705)
* Follow-up r16790 / r16791, formatting and strncmp -> strcmp (src\map\atcommand.c)
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16792 54d463be-8e91-2dee-dedb-b68131a5f0ec
-rw-r--r-- | db/re/item_db.txt | 2 | ||||
-rw-r--r-- | sql-files/item_db_re.sql | 2 | ||||
-rw-r--r-- | src/map/atcommand.c | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/db/re/item_db.txt b/db/re/item_db.txt index be05a569a..d2910e47d 100644 --- a/db/re/item_db.txt +++ b/db/re/item_db.txt @@ -7017,7 +7017,7 @@ 15011,Para_Team_Uniform3,Eden Team Uniform III,5,0,,0,,58,,0,0xFFFFFFFF,7,2,16,,40,0,0,{ bonus bMaxHP,300; bonus bMaxSP,30; bonus bMdef,5; },{},{} 15012,Puente_Robe,Puente Robe,5,12000,,400,,42,,1,0xFFFFFFFF,7,2,16,,22,1,0,{ /* bonus bFixedCastrate,-3; */ bonus bHealPower,5; },{},{} 15013,Claire_Suits,Claire Suits,5,28000,,2800,,58,,1,0xFFFFFFFE,2,2,16,,22,1,0,{},{},{} -15014,Ebone_Armor,Ebon Armor,5,40000,,4500,,93,,1,0x000FDF80,8,2,16,,100,1,0,{},{},{} +15014,Ebone_Armor,Ebon Armor,5,40000,,4500,,93,,1,0x00004080,8,2,16,,100,1,0,{},{},{} 15015,Upg_Adv_Suit,Upg Adv Suit,5,20,,150,,25,,1,0xFFFFFFFF,7,2,16,,1,1,0,{ bonus bMaxHPRate,3; },{},{} 15016,Upg_Coat,Upg Coat,5,20,,600,,47,,1,0xFFFFFFFE,7,2,16,,1,1,0,{ bonus bMaxHPRate,3; },{},{} 15017,Upg_Saint_Robe,Upg Saint Robe,5,20,,300,,55,,1,0x00048530,7,2,16,,1,1,0,{ bonus bMdef,5; bonus bMaxHPRate,3; },{},{} diff --git a/sql-files/item_db_re.sql b/sql-files/item_db_re.sql index b99208762..23d3c6e4f 100644 --- a/sql-files/item_db_re.sql +++ b/sql-files/item_db_re.sql @@ -7048,7 +7048,7 @@ REPLACE INTO `item_db_re` VALUES (15010,'Para_Team_Uniform2','Eden Team Uniform REPLACE INTO `item_db_re` VALUES (15011,'Para_Team_Uniform3','Eden Team Uniform III',5,NULL,NULL,0,NULL,58,NULL,NULL,0xFFFFFFFF,7,2,16,NULL,'40',NULL,0,'bonus bMaxHP,300; bonus bMaxSP,30; bonus bMdef,5;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (15012,'Puente_Robe','Puente Robe',5,12000,NULL,400,NULL,42,NULL,1,0xFFFFFFFF,7,2,16,NULL,'22',1,0,'/* bonus bFixedCastrate,-3; */ bonus bHealPower,5;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (15013,'Claire_Suits','Claire Suits',5,28000,NULL,2800,NULL,58,NULL,1,0xFFFFFFFE,2,2,16,NULL,'22',1,0,NULL,NULL,NULL); -REPLACE INTO `item_db_re` VALUES (15014,'Ebone_Armor','Ebon Armor',5,40000,NULL,4500,NULL,93,NULL,1,0x000FDF80,8,2,16,NULL,'100',1,0,NULL,NULL,NULL); +REPLACE INTO `item_db_re` VALUES (15014,'Ebone_Armor','Ebon Armor',5,40000,NULL,4500,NULL,93,NULL,1,0x00004080,8,2,16,NULL,'100',1,0,NULL,NULL,NULL); REPLACE INTO `item_db_re` VALUES (15015,'Upg_Adv_Suit','Upg Adv Suit',5,20,NULL,150,NULL,25,NULL,1,0xFFFFFFFF,7,2,16,NULL,'1',1,0,'bonus bMaxHPRate,3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (15016,'Upg_Coat','Upg Coat',5,20,NULL,600,NULL,47,NULL,1,0xFFFFFFFE,7,2,16,NULL,'1',1,0,'bonus bMaxHPRate,3;',NULL,NULL); REPLACE INTO `item_db_re` VALUES (15017,'Upg_Saint_Robe','Upg Saint Robe',5,20,NULL,300,NULL,55,NULL,1,0x00048530,7,2,16,NULL,'1',1,0,'bonus bMdef,5; bonus bMaxHPRate,3;',NULL,NULL); diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 4f0bad774..956637a8f 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -1958,7 +1958,7 @@ ACMD_FUNC(go) if (strncmp(map_name, "prontera", 3) == 0) { town = 0; } else if (strncmp(map_name, "morocc", 4) == 0 || - strncmp(map_name, "morroc", 4) ==0) { + strncmp(map_name, "morroc", 4) == 0) { town = 1; } else if (strncmp(map_name, "geffen", 3) == 0) { town = 2; @@ -2027,7 +2027,7 @@ ACMD_FUNC(go) town = 29; } else if (strncmp(map_name, "dicastes01", 3) == 0) { town = 30; - } else if (strncmp(map_name, "mora", 4) == 0) { + } else if (strcmp(map_name, "mora") == 0) { town = 31; } else if (strncmp(map_name, "dewata", 3) == 0) { town = 32; |